Skip to content

Commit

Permalink
Merge branch 'main' into checkit-deploy
Browse files Browse the repository at this point in the history
# Conflicts:
#	components.yml
#	docker-compose.yml
  • Loading branch information
blcham committed Oct 31, 2023
2 parents db7bd6e + ff3d83b commit d345fe3
Show file tree
Hide file tree
Showing 7 changed files with 114 additions and 8 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,28 @@ All notable changes to the Assembly line tooling will be documented here.
## [Unreleased] - yyyy-mm-dd
- /RELEASE-MANAGER/ short description

## 2023-08-20
- Term list export and compact mode improvements

### Features
- [Ontographer - AL#129](https://github.com/opendata-mvcr/sgov-assembly-line/issues/129), implementation of term list export and relator type trope modeling in Compact mode

## 2023-06-17
New release to coincide with the migration to new servers and the redeployment of the production environment after its outages.

### Features
- [TermIt-ui - #127](https://github.com/datagov-cz/termit-ui/pull/127), export button added to vocabulary summary
- [Mission Control - #246](https://github.com/datagov-cz/mission-control/pull/246), added button that calls CheckIt, it it visible only when CheckIt is deployed in AL

### Bug fixes
- [OntoGrapher - #495](https://github.com/datagov-cz/ontoGrapher/issues/495), fix errors when filtering for project vocabularies,
- [OntoGrapher - #487](https://github.com/datagov-cz/ontoGrapher/issues/487), fix data representation for connections,
- [OntoGrapher - #491](https://github.com/datagov-cz/ontoGrapher/issues/491), support for equivalent classes,
- [OntoGrapher - #488](https://github.com/datagov-cz/ontoGrapher/issues/488), fix for selection artifacts baking themselves into exported images,
- [OntoGrapher - #485](https://github.com/datagov-cz/ontoGrapher/issues/485), fix for assignment/creation of tropes in Compact view did not add that trope in Full view
- [TermIt - #109](https://github.com/datagov-cz/termit/issues/109), fix exporting of a vocabulary to respect selected contexts
- [Assembly line - #135](https://github.com/opendata-mvcr/sgov-assembly-line/pull/135), updated database ruleset

## 2023-04-08 - Easter release
This release changes user eXperience of major applications -- Mission Control, OntoGrapher, and some minor changes in other tools. It also fixes bugs found in previously released version.

Expand Down
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2023 Otevřená data ČR @ DIA

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
42 changes: 42 additions & 0 deletions bin/backup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#!/bin/bash

# Helper script to backup docker volumes. It allows to set up automatic cleanup of backups (picks up backups to remove randomly).

#####################
### CONFIGURATION ###
#####################

# directory where backups are created
BACKUPS_ROOT_DIR=/backup/docker-volumes

# automatic cleanup is triggered only if at least MIN_BACKUPS_COUNT backups are available
MIN_BACKUPS_COUNT=10

# automatic cleanup is triggered only if more than MAXIMAL_BACKUP_STORAGE_SIZE_IN_GB space is taken
MAXIMAL_BACKUP_STORAGE_SIZE_IN_GB=35

##########################
### REMOVE OLD BACKUPS ###
##########################

BACKUP_STORAGE_SIZE="`du -BG -s $BACKUPS_ROOT_DIR | sed 's/G.*//' 2>/dev/null`"
BACKUPS_COUNT="`ls $BACKUPS_ROOT_DIR/*.tar.gz | wc -l 2>/dev/null`"

if [ "$BACKUPS_COUNT" -gt "$MIN_BACKUPS_COUNT" ]; then
if [ "$BACKUP_STORAGE_SIZE" -gt "$MAXIMAL_BACKUP_STORAGE_SIZE_IN_GB" ]; then

# pick random 2 files beside MIN_BACKUPS_COUNT newest
FILES_TO_REMOVE="`ls -t $BACKUPS_ROOT_DIR/[0-9]*.tar.gz | tail +$( expr $MIN_BACKUPS_COUNT + 1 ) | shuf -n 2`"
echo INFO: Removing files $FILES_TO_REMOVE
rm $FILES_TO_REMOVE
fi
fi

##########################
### CREATE NEW BACKUPS ###
##########################

FILE=$(date +'%Y%m%d').tar.gz
tar -zcvf $FILE /var/lib/docker/volumes
mv $FILE $BACKUPS_ROOT_DIR

22 changes: 22 additions & 0 deletions bin/notify.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash

# Helper script to send messages to slack channel.

#################
# CONFIGURATION #
#################

# webhook to slack channel typically starting with https://hooks.slack.com/services/
WEBHOOK=

# context of assembly line e.g. PROD/TEST/DEV
CTX=PROD

########
# MAIN #
########

MESSAGE=$1
ICON=$2

curl -X POST --data-urlencode "payload={\"channel\": \"#monitorování-výrobní-linky\", \"username\": \"[$CTX] Nasazení výrobní linky\", \"text\": \"$MESSAGE\", \"icon_emoji\": \"$ICON\"}" $WEBHOOK
6 changes: 3 additions & 3 deletions components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ al-mission-control:
feature-demo: false
al-issue-tracker:
name: Issue Tracker
url: https://github.com/opendata-mvcr/sgov-assembly-line/issues
url: https://github.com/datagov-cz/sgov-assembly-line/issues
meta:
new-bug: https://github.com/opendata-mvcr/sgov-assembly-line/issues/new?labels=bug&template=po-adavek-na-opravu.md&title=
new-feature: https://github.com/opendata-mvcr/sgov-assembly-line/issues/new?labels=enhancement&template=po-adavek-na-novou-funkcionalitu.md&title=
new-bug: https://github.com/datagov-cz/sgov-assembly-line/issues/new?labels=bug&template=po-adavek-na-opravu.md&title=
new-feature: https://github.com/datagov-cz/sgov-assembly-line/issues/new?labels=enhancement&template=po-adavek-na-novou-funkcionalitu.md&title=
al-checkit-server:
name: CheckIt backend
url: ${URL}/sluzby/checkit-server
Expand Down
7 changes: 3 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ services:
build:
context: al-db-server
args:
GRAPHDB_ZIP: ${GRAPHDB_ZIP_FILE_NAME}
image: al-graphdb
GRAPHDB_ZIP: ${GRAPHDB_ZIP:-graphdb-free-9.6.0-dist.zip}
environment:
CONTEXT:
ID: al-db-server
Expand Down Expand Up @@ -171,12 +170,12 @@ services:
restart: always
al-checkit-ui:
image: ghcr.io/filip-kopecky/checkit-ui/al-checkit-ui:latest
environment:
environment:
VITE_URL: ${URL}/v-nástroji/checkit/
VITE_APP_ID: al-checkit-ui
VITE_AUTHENTICATION_SERVER: ${URL}/sluzby/auth-server/realms/assembly-line
VITE_SERVER: ${URL}/sluzby/checkit-server
depends_on:
depends_on:
- al-auth-server
restart: always
al-checkit-server:
Expand Down
2 changes: 1 addition & 1 deletion gen_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ case $ENV in

development)
export CONTEXT=development
export URL=https://xn--slovnk-test-scb.mvcr.gov.cz/modelujeme
export URL=https://xn--slovnk-test-scb.dia.gov.cz/modelujeme
FILE=.env.development
;;

Expand Down

0 comments on commit d345fe3

Please sign in to comment.