diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 630dee28..bbe0b303 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,17 +23,26 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} user: Sheldan token: ${{ secrets.ABSTRACTO_PAT }} - - name: Login to GitHub Packages Docker Registry - uses: docker/login-action@v1 + - name: Login to Harbor + uses: docker/login-action@v2 with: - registry: docker.pkg.github.com - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Push deployment container + registry: harbor.sheldan.dev + username: ${{ secrets.HARBOR_USERNAME }} + password: ${{ secrets.HARBOR_TOKEN }} + - name: Load env files + id: dotenv + uses: falti/dotenv-action@v1.0.4 + with: + path: ./deployment/image-packaging/src/main/docker + - name: Push container working-directory: ./deployment/image-packaging/src/main/docker run: docker-compose build && docker-compose push env: - REGISTRY_PREFIX: docker.pkg.github.com/sheldan/sissi/ - VERSION: ${{ env.version }} - ABSTRACTO_VERSION: 1.5.1 - ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/ \ No newline at end of file + REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }} + VERSION: ${{ steps.dotenv.outputs.version }} + - name: Helm push + working-directory: ./deployment/helm/ + run: |- + helm registry login -u ${{ secrets.HARBOR_USERNAME }} -p ${{ secrets.HARBOR_TOKEN }} harbor.sheldan.dev + helm package sissi + helm push sissi*.tgz oci://harbor.sheldan.dev/sissi diff --git a/Tiltfile b/Tiltfile new file mode 100644 index 00000000..a41f354e --- /dev/null +++ b/Tiltfile @@ -0,0 +1,37 @@ +allow_k8s_contexts('k8s-cluster') + +load('ext://restart_process', 'docker_build_with_restart') +registry = 'harbor.sheldan.dev/sissi/' + +local_resource( + 'sissi-java-compile', + 'mvn install && ' + + 'rm -rf application/executable/target/jar-staging && ' + + 'unzip -o application/executable/target/sissi-exec.jar -d application/executable/target/jar-staging && ' + + 'rsync --delete --inplace --checksum -r application/executable/target/jar-staging/ application/executable/target/jar && ' + + 'mkdir application/executable/target/jar/snapshots && ' + + 'rsync --delete --inplace --checksum -r application/executable/target/jar/BOOT-INF/lib/*-SNAPSHOT.jar application/executable/target/jar/snapshots && ' + + 'rm -f application/executable/target/jar/BOOT-INF/lib/*-SNAPSHOT.jar ', + deps=['pom.xml']) + +docker_build_with_restart( + registry + 'sissi', + './application/executable/target/jar', + entrypoint=['java', '-noverify', '-cp', '.:./lib/*', 'dev.sheldan.sissi.executable.Application'], + dockerfile='./application/executable/Dockerfile', + live_update=[ + sync('./application/executable/target/jar/BOOT-INF/lib', '/app/lib'), + sync('./application/executable/target/jar/META-INF', '/app/META-INF'), + sync('./application/executable/target/jar/BOOT-INF/classes', '/app'), + sync('./application/executable/target/jar/snapshots', '/app/lib') + ], +) + +docker_build(registry + 'sissi-db-data', 'deployment/image-packaging/src/main/docker/db-data/') +docker_build(registry + 'sissi-template-data', 'deployment/image-packaging/src/main/docker/template-data/') + + +k8s_yaml(helm('deployment/helm/sissi', values= +['./../Sissi-environments/values/local/values.yaml', +'secrets://./../Sissi-environments/values/local/values.secrets.yaml'] +)) \ No newline at end of file diff --git a/application/executable/Dockerfile b/application/executable/Dockerfile new file mode 100644 index 00000000..3221004c --- /dev/null +++ b/application/executable/Dockerfile @@ -0,0 +1,10 @@ +FROM amazoncorretto:17.0.8-alpine3.18 +RUN apk add entr + +WORKDIR /app +ADD BOOT-INF/lib/ /app/lib +ADD snapshots/ /app/lib +ADD META-INF /app/META-INF +ADD BOOT-INF/classes /app + +ENTRYPOINT java -cp .:./lib/* dev.sheldan.sissi.executable.Application \ No newline at end of file diff --git a/application/executable/pom.xml b/application/executable/pom.xml index f500e8ca..e9c634f4 100644 --- a/application/executable/pom.xml +++ b/application/executable/pom.xml @@ -14,6 +14,7 @@ + sissi org.springframework.boot diff --git a/application/executable/src/main/java/dev/sheldan/sissi/executable/SecurityConfig.java b/application/executable/src/main/java/dev/sheldan/sissi/executable/SecurityConfig.java new file mode 100644 index 00000000..ae3e63e6 --- /dev/null +++ b/application/executable/src/main/java/dev/sheldan/sissi/executable/SecurityConfig.java @@ -0,0 +1,18 @@ +package dev.sheldan.sissi.executable; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; + +@Configuration +public class SecurityConfig { + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests((authorize) -> authorize + .anyRequest().permitAll()); + return http.build(); + } + +} diff --git a/application/executable/src/main/resources/application-local.properties b/application/executable/src/main/resources/application-local.properties deleted file mode 100644 index 4b4c81cc..00000000 --- a/application/executable/src/main/resources/application-local.properties +++ /dev/null @@ -1,23 +0,0 @@ -spring.datasource.url=jdbc:postgresql://localhost:5432/abstracto -spring.datasource.username=abstracto -spring.datasource.password=abstracto -spring.jpa.properties.hibernate.default_schema=abstracto -spring.quartz.jdbc.initialize-schema=never - -spring.jpa.hibernate.ddl-auto = none - -spring.jpa.show-sql = false - -spring.jpa.properties.hibernate.format_sql = true -log4j.logger.org.hibernate.SQL=trace -log4j.logger.org.hibernate.type.descriptor.sql=trace -log4j.logger.org.hibernate.type=trace - -management.metrics.tags.application=sissi -spring.security.user.name=abstracto -spring.security.user.password=password -spring.security.user.roles=USER - -spring.application.name=Sissi - -spring.main.allow-circular-references=true \ No newline at end of file diff --git a/application/executable/src/main/resources/application.properties b/application/executable/src/main/resources/application.properties index a15be0c1..77ba648b 100644 --- a/application/executable/src/main/resources/application.properties +++ b/application/executable/src/main/resources/application.properties @@ -1,13 +1,13 @@ spring.datasource.url=jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME} spring.datasource.username= ${DB_USER} spring.datasource.password= ${DB_PASS} -spring.jpa.hibernate.default_schema=${DB_NAME} +spring.jpa.hibernate.default_schema=abstracto +spring.jpa.properties.hibernate.default_schema=abstracto spring.quartz.jdbc.initialize-schema=never management.metrics.tags.application=Sissi -spring.security.user.name= ${REST_USER_NAME} -spring.security.user.password= ${REST_PASSWORD} -spring.security.user.roles=USER - +management.endpoint.health.probes.enabled=true +management.health.livenessState.enabled=true +management.health.readinessState.enabled=true spring.application.name=Sissi spring.main.allow-circular-references=true \ No newline at end of file diff --git a/deployment/docker-compose/pom.xml b/deployment/docker-compose/pom.xml deleted file mode 100644 index 059f8eec..00000000 --- a/deployment/docker-compose/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - dev.sheldan.sissi - deployment - 1.4.2-SNAPSHOT - - 4.0.0 - - pom - docker-compose - - - - - maven-assembly-plugin - - - assembly-docker-compose-configuration - package - - single - - - - src/main/assembly/docker-compose.xml - - - - - - - - \ No newline at end of file diff --git a/deployment/docker-compose/src/main/assembly/docker-compose.xml b/deployment/docker-compose/src/main/assembly/docker-compose.xml deleted file mode 100644 index 370bed3a..00000000 --- a/deployment/docker-compose/src/main/assembly/docker-compose.xml +++ /dev/null @@ -1,19 +0,0 @@ - - docker-compose - - zip - - false - - - ./docker-compose - ${project.basedir}/src/main/resources/ - - **/* - - true - - - \ No newline at end of file diff --git a/deployment/docker-compose/src/main/resources/.env b/deployment/docker-compose/src/main/resources/.env deleted file mode 100644 index dba04b9f..00000000 --- a/deployment/docker-compose/src/main/resources/.env +++ /dev/null @@ -1,37 +0,0 @@ -COMPOSE_PROJECT_NAME=sissi -# database configuration -DATABASE_HOST=database -DATABASE_PORT=5432 -DATABASE_USER=abstracto -DATABASE_NAME=abstracto -DATABASE_PASSWORD=abstracto -GRAFANA_DATABASE_PASSWORD=grafana -GRAFANA_DATABASE_USER=grafana -# deployment configuration, whether or not the container should execute the parts on startup -EXECUTE_DEPLOYMENT=true -EXECUTE_LIQUIBASE=true -EXECUTE_TEMPLATES=true -# whether or not remote debug should be enabled on the application -REMOTE_DEBUG=false -DEBUG_PORT=5005 -TOMCAT_PORT=8080 -# authentication for actuator endpoints -REST_USER_NAME=abstracto -REST_PASSWORD=password -# port grafana will be reachable -GRAFANA_PORT=3000 -# port prometheus will be reachable -LOKI_PORT=3100 -PROMETHEUS_PORT=9090 -# port pg admin will be reachable -PGADMIN_PORT=5050 -# default authentication for pg admin -PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev -DEBRA_DONATION_NOTIFICATION_SERVER_ID=0 -PGADMIN_DEFAULT_PASSWORD=admin -TOKEN= -YOUTUBE_API_KEY= -OPEN_WEATHER_MAP_API_KEY= -TWITCH_CLIENT_ID= -TWITCH_SECRET= -SISSI_VERSION=1.4.1 \ No newline at end of file diff --git a/deployment/docker-compose/src/main/resources/README.md b/deployment/docker-compose/src/main/resources/README.md deleted file mode 100644 index 11c76474..00000000 --- a/deployment/docker-compose/src/main/resources/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Setup for local docker-compose deployment - -* Install docker [here](https://docs.docker.com/get-docker/) -* Install docker-compose [here](https://docs.docker.com/compose/install/). -* Execute `docker-compose build` in `image-packaging`. -* Fill out values in `.env` for token and database password. There are some default values, but token is required to be changed. -* Execute `fill-prometheus-file-sh` in order to populate the prometheus config with the correct password (https://github.com/prometheus/prometheus/issues/2357) -* Execute `docker-compose up` in this directory and wait for completion. -* Per default pgAdmin is available on `localhost:5050` with the configured user and password. It will contain a configuration in the servers list. - diff --git a/deployment/docker-compose/src/main/resources/docker-compose.yml b/deployment/docker-compose/src/main/resources/docker-compose.yml deleted file mode 100644 index 6cc0a194..00000000 --- a/deployment/docker-compose/src/main/resources/docker-compose.yml +++ /dev/null @@ -1,149 +0,0 @@ -version: '3.7' - -services: - db: - image: ${REGISTRY_PREFIX}sissi_database:${SISSI_VERSION} - container_name: ${COMPOSE_PROJECT_NAME}_database - restart: always - environment: - POSTGRES_PASSWORD: ${DATABASE_PASSWORD} - POSTGRES_USER: ${DATABASE_USER} - ports: - - "127.0.0.1:${DATABASE_PORT}:5432" - networks: - - sissi - volumes: - - db-data:/var/lib/postgresql/data - deployment_container: - container_name: ${COMPOSE_PROJECT_NAME}_deployment - image: ${REGISTRY_PREFIX}sissi_deployment:${SISSI_VERSION} - depends_on: - - db - environment: - DB_PASS: ${DATABASE_PASSWORD} - DB_HOST: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST} - DB_PORT: ${DATABASE_PORT} - DB_USER: ${DATABASE_USER} - DB_NAME: ${DATABASE_NAME} - ABSTRACTO_GRAFANA_DB_PASS: ${GRAFANA_DATABASE_PASSWORD} - ABSTRACTO_GRAFANA_DB_USER: ${GRAFANA_DATABASE_USER} - EXECUTE_DEPLOYMENT: ${EXECUTE_DEPLOYMENT} - EXECUTE_LIQUIBASE: ${EXECUTE_LIQUIBASE} - EXECUTE_TEMPLATES: ${EXECUTE_TEMPLATES} - LIQUIBASE_PATH: ${LIQUIBASE_PATH:-/liquibase} - POSTGRES_DRIVER_PATH: ${EXECUTE_DEPLOYMENT:-/postgres/driver.jar} - WAIT_HOSTS: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST}:${DATABASE_PORT} - networks: - - sissi - bot: - image: ${REGISTRY_PREFIX}sissi:${SISSI_VERSION} - depends_on: - - db - - deployment_container - restart: on-failure - container_name: ${COMPOSE_PROJECT_NAME}bot - environment: - TOKEN: ${TOKEN} - REMOTE_DEBUG: ${REMOTE_DEBUG} - DB_PASS: ${DATABASE_PASSWORD} - DEBRA_DONATION_NOTIFICATION_SERVER_ID: ${DEBRA_DONATION_NOTIFICATION_SERVER_ID} - DB_HOST: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST} - DB_PORT: ${DATABASE_PORT} - DB_USER: ${DATABASE_USER} - DB_NAME: ${DATABASE_NAME} - REST_USER_NAME: ${REST_USER_NAME} - TZ: "UTC" - REST_PASSWORD: ${REST_PASSWORD} - YOUTUBE_API_KEY: ${YOUTUBE_API_KEY} - OPEN_WEATHER_MAP_API_KEY: ${OPEN_WEATHER_MAP_API_KEY} - command: sh -c "while ping -c1 deployment_container &>/dev/null; do sleep 1; done; echo 'Liquibase finished!' && ./start.sh" - ports: - - "127.0.0.1:${DEBUG_PORT}:5005" - - "127.0.0.1:${TOMCAT_PORT}:8080" - networks: - - sissi - volumes: - - bot-logs:/logs - - ./config:/config - pgadmin: - container_name: ${COMPOSE_PROJECT_NAME}_pgadmin - image: ${REGISTRY_PREFIX}sissi_pg_admin:${SISSI_VERSION} - depends_on: - - db - environment: - PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL} - PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD} - ports: - - "127.0.0.1:${PGADMIN_PORT}:80" - restart: unless-stopped - networks: - - sissi - prometheus: - container_name: ${COMPOSE_PROJECT_NAME}_prometheus - image: ${REGISTRY_PREFIX}sissi_prometheus:${SISSI_VERSION} - depends_on: - - bot - ports: - - "127.0.0.1:${PROMETHEUS_PORT}:9090" - restart: unless-stopped - networks: - - sissi - volumes: - - ./res/prometheus-scrapper-password-filled:/etc/prometheus/micrometer_password - - prometheus-data:/prometheus - grafana: - container_name: ${COMPOSE_PROJECT_NAME}_grafana - image: ${REGISTRY_PREFIX}sissi_grafana:${SISSI_VERSION} - depends_on: - - prometheus - - bot - ports: - - "127.0.0.1:${GRAFANA_PORT}:3000" - restart: unless-stopped - environment: - DB_PASS: ${GRAFANA_DATABASE_PASSWORD} - DB_HOST: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST} - DB_PORT: ${DATABASE_PORT} - DB_USER: ${GRAFANA_DATABASE_USER} - DB_NAME: ${DATABASE_NAME} - PROMETHEUS_HOST: '${COMPOSE_PROJECT_NAME}_prometheus' - PROMETHEUS_PORT: 9090 - LOKI_HOST: '${COMPOSE_PROJECT_NAME}_loki' - LOKI_PORT: ${LOKI_PORT} - volumes: - - grafana-user-data:/var/lib/grafana - networks: - - sissi - promtail: - container_name: ${COMPOSE_PROJECT_NAME}_promtail - image: ${REGISTRY_PREFIX}sissi_promtail:${SISSI_VERSION} - depends_on: - - bot - restart: unless-stopped - command: -config.file=/mnt/config/promtail-config.yaml - volumes: - - bot-logs:/logs - networks: - - sissi - loki: - container_name: ${COMPOSE_PROJECT_NAME}_loki - image: ${REGISTRY_PREFIX}sissi_loki:${SISSI_VERSION} - depends_on: - - promtail - command: -config.file=/mnt/config/loki-config.yaml - ports: - - "127.0.0.1:${LOKI_PORT}:3100" - restart: unless-stopped - networks: - - sissi - -networks: - sissi: - driver: bridge - name: sissi-network - -volumes: - db-data: - grafana-user-data: - prometheus-data: - bot-logs: diff --git a/deployment/docker-compose/src/main/resources/fill-prometheus-file.sh b/deployment/docker-compose/src/main/resources/fill-prometheus-file.sh deleted file mode 100755 index d0707806..00000000 --- a/deployment/docker-compose/src/main/resources/fill-prometheus-file.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -o allexport -source .env -set +o allexport -envsubst < res/prometheus-scrapper-password > res/prometheus-scrapper-password-filled \ No newline at end of file diff --git a/deployment/docker-compose/src/main/resources/res/prometheus-scrapper-password b/deployment/docker-compose/src/main/resources/res/prometheus-scrapper-password deleted file mode 100644 index 70b2df20..00000000 --- a/deployment/docker-compose/src/main/resources/res/prometheus-scrapper-password +++ /dev/null @@ -1 +0,0 @@ -${REST_PASSWORD} \ No newline at end of file diff --git a/deployment/helm/sissi/.helmignore b/deployment/helm/sissi/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/deployment/helm/sissi/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/deployment/helm/sissi/Chart.yaml b/deployment/helm/sissi/Chart.yaml new file mode 100644 index 00000000..b58d105b --- /dev/null +++ b/deployment/helm/sissi/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: sissi +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "1.4.2" diff --git a/deployment/helm/sissi/configuration/grafana/config.yaml b/deployment/helm/sissi/configuration/grafana/config.yaml new file mode 100644 index 00000000..4e288004 --- /dev/null +++ b/deployment/helm/sissi/configuration/grafana/config.yaml @@ -0,0 +1,4 @@ +base_url: {{ $.Values.grafanaDeployment.grafana.host }} +username: {{ $.Values.grafanaDeployment.grafana.basicAuth.username }} +password: {{ $.Values.grafanaDeployment.grafana.basicAuth.password }} +folder_name: Sissi \ No newline at end of file diff --git a/deployment/helm/sissi/configuration/grafana/sissi-discord-dashboard.json b/deployment/helm/sissi/configuration/grafana/sissi-discord-dashboard.json new file mode 100644 index 00000000..8ae91191 --- /dev/null +++ b/deployment/helm/sissi/configuration/grafana/sissi-discord-dashboard.json @@ -0,0 +1,929 @@ +{ + "dashboard": { + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "grafana", + "uid": "-- Grafana --" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "links": [], + "liveNow": false, + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 0 + }, + "id": 1, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "editorMode": "code", + "expr": "increase(discord_api_interactions_total[1m]) /2", + "instant": false, + "legendFormat": "{{ "{{" }} action {{ "}}" }}", + "range": true, + "refId": "A" + } + ], + "title": "Discord API Interaction", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 0 + }, + "id": 2, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "editorMode": "code", + "expr": "increase(command_processed_total[1m]) / 2 ", + "instant": false, + "legendFormat": "{{ "{{" }}type{{ "}}" }}-{{ "{{" }}status{{ "}}" }}", + "range": true, + "refId": "A" + } + ], + "title": "Commands processed", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 8 + }, + "id": 3, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "editorMode": "code", + "expr": "increase(message_total[1m]) / 2", + "instant": false, + "legendFormat": "{{ "{{" }} action {{ "}}" }}", + "range": true, + "refId": "A" + } + ], + "title": "Message events", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 8 + }, + "id": 4, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "editorMode": "code", + "expr": "increase(okhttp_request_total[1m]) / 2", + "instant": false, + "legendFormat": "{{ "{{" }} http_code {{ "}}" }}", + "range": true, + "refId": "A" + } + ], + "title": "HTTP Reponse codes", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 16 + }, + "id": 5, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "editorMode": "code", + "expr": "increase(cache_evictions_total{application=\"$application\", cache=\"messages\"}[1m]) / 2", + "instant": false, + "legendFormat": "Cache evictions", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "editorMode": "code", + "expr": "increase(cache_gets_total{application=\"$application\", cache=\"messages\"}[1m]) / 2", + "hide": false, + "instant": false, + "legendFormat": "Cache gets {{ "{{" }} result {{ "}}" }}", + "range": true, + "refId": "B" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "editorMode": "code", + "expr": "increase(cache_puts_total{application=\"$application\", cache=\"messages\"}[1m]) / 2", + "hide": false, + "instant": false, + "legendFormat": "Cache puts", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "editorMode": "code", + "expr": "increase(cache_removals{application=\"$application\", cache=\"messages\"}[1m]) / 2", + "hide": false, + "instant": false, + "legendFormat": "Cache removals", + "range": true, + "refId": "D" + } + ], + "title": "Message cache statistic", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 16 + }, + "id": 6, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "editorMode": "code", + "expr": "discord_gateway_ping", + "instant": false, + "legendFormat": "Gateway ping", + "range": true, + "refId": "A" + } + ], + "title": "Gateway ping", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 24 + }, + "id": 7, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "editorMode": "code", + "expr": "increase(starboard_stars_total[1m]) / 2", + "instant": false, + "legendFormat": "{{ "{{" }} action {{ "}}" }}", + "range": true, + "refId": "A" + } + ], + "title": "Starboard reactions", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 24 + }, + "id": 8, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "editorMode": "code", + "expr": "increase(emote_usages_total[1m]) / 2", + "instant": false, + "legendFormat": "Used emotes", + "range": true, + "refId": "A" + } + ], + "title": "Used tracked emotes", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 16, + "w": 24, + "x": 0, + "y": 32 + }, + "id": 9, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "editorMode": "code", + "expr": "increase(jda_event_total[1m]) / 2", + "instant": false, + "legendFormat": "{{ "{{" }} event_class {{ "}}" }}", + "range": true, + "refId": "A" + } + ], + "title": "JDA Events", + "type": "timeseries" + } + ], + "refresh": "", + "schemaVersion": 38, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "hide": 2, + "label": "", + "name": "application", + "query": "Sissi", + "skipUrlSync": false, + "type": "constant" + } + ] + }, + "time": { + "from": "now-30m", + "to": "now" + }, + "timepicker": {}, + "timezone": "", + "title": "Sissi Discord status", + "uid": "a7b3297d-972e-4dbd-9223-88d589817d34", + "version": 1, + "weekStart": "" + }, + "overwrite": true +} diff --git a/deployment/helm/sissi/configuration/grafana/sissi-log-dashboard.json b/deployment/helm/sissi/configuration/grafana/sissi-log-dashboard.json new file mode 100644 index 00000000..99cd2bc3 --- /dev/null +++ b/deployment/helm/sissi/configuration/grafana/sissi-log-dashboard.json @@ -0,0 +1,237 @@ +{ + "dashboard": { + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "grafana", + "uid": "-- Grafana --" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "description": "Overview over logging outputs of Sissi bot", + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "links": [], + "liveNow": false, + "panels": [ + { + "datasource": { + "type": "loki", + "uid": "loki" + }, + "description": "Display logs and search for logs", + "gridPos": { + "h": 13, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 4, + "options": { + "dedupStrategy": "none", + "enableLogDetails": true, + "prettifyLogMessage": false, + "showCommonLabels": false, + "showLabels": false, + "showTime": false, + "sortOrder": "Ascending", + "wrapLogMessage": true + }, + "targets": [ + { + "datasource": { + "type": "loki", + "uid": "loki" + }, + "editorMode": "builder", + "expr": "{app=\"sissi\"} |= `$logFilter`", + "maxLines": 5000, + "queryType": "range", + "refId": "A" + } + ], + "title": "Sissi Logs", + "type": "logs" + }, + { + "datasource": { + "type": "loki", + "uid": "loki" + }, + "description": "Any line on level ERROR", + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 13 + }, + "id": 2, + "options": { + "dedupStrategy": "none", + "enableLogDetails": true, + "prettifyLogMessage": false, + "showCommonLabels": false, + "showLabels": false, + "showTime": false, + "sortOrder": "Ascending", + "wrapLogMessage": true + }, + "targets": [ + { + "datasource": { + "type": "loki", + "uid": "loki" + }, + "editorMode": "code", + "expr": "{app=\"sissi\"} |= \"ERROR\"", + "maxLines": 5000, + "queryType": "range", + "refId": "A" + } + ], + "title": "Sissi Error Logs", + "type": "logs" + }, + { + "datasource": { + "type": "loki", + "uid": "loki" + }, + "description": "Number of log events", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 13 + }, + "id": 3, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "loki", + "uid": "loki" + }, + "editorMode": "code", + "expr": "rate({app=\"sissi\"}[$__interval])", + "queryType": "range", + "refId": "A" + } + ], + "title": "Log Rate", + "type": "timeseries" + } + ], + "refresh": "", + "schemaVersion": 38, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "current": { + "selected": false, + "text": "", + "value": "" + }, + "description": "What to search in the logs", + "hide": 0, + "name": "logFilter", + "options": [ + { + "selected": true, + "text": "", + "value": "" + } + ], + "query": "", + "skipUrlSync": false, + "type": "textbox" + } + ] + }, + "time": { + "from": "now-30m", + "to": "now" + }, + "timepicker": {}, + "timezone": "", + "title": "Sissi Logs", + "uid": "a5b429af-860c-4438-a575-24bed6dcba09", + "version": 2, + "weekStart": "" + }, + "overwrite": true +} \ No newline at end of file diff --git a/deployment/helm/sissi/templates/_helpers.tpl b/deployment/helm/sissi/templates/_helpers.tpl new file mode 100644 index 00000000..01af83a2 --- /dev/null +++ b/deployment/helm/sissi/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "sissi.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "sissi.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "sissi.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "sissi.labels" -}} +helm.sh/chart: {{ include "sissi.chart" . }} +{{ include "sissi.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "sissi.selectorLabels" -}} +app.kubernetes.io/name: {{ include "sissi.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "sissi.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "sissi.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/deployment/helm/sissi/templates/api-keys.yaml b/deployment/helm/sissi/templates/api-keys.yaml new file mode 100644 index 00000000..79cc0750 --- /dev/null +++ b/deployment/helm/sissi/templates/api-keys.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Secret +metadata: + name: api-keys +data: + discordToken: {{ $.Values.apiKeys.discord.token | b64enc }} # b64enc is needed, because a stringData secret field cannot hold numeric values + youtubeApiKey: {{ $.Values.apiKeys.youtube.apiKey | b64enc }} + twitchClientId: {{ $.Values.apiKeys.twitch.clientId | b64enc }} + twitchSecret: {{ $.Values.apiKeys.twitch.secret | b64enc }} + openWeatherMapApiKey: {{ $.Values.apiKeys.openWeatherMap.apiKey | b64enc }} \ No newline at end of file diff --git a/deployment/helm/sissi/templates/db-config-deployment-job.yaml b/deployment/helm/sissi/templates/db-config-deployment-job.yaml new file mode 100644 index 00000000..bbf7edc6 --- /dev/null +++ b/deployment/helm/sissi/templates/db-config-deployment-job.yaml @@ -0,0 +1,69 @@ +{{- if .Values.dbConfigDeployment.enabled -}} +apiVersion: batch/v1 +kind: Job +metadata: +{{- $deploymentJobName := print ((include "sissi.fullname" .) | trunc 39) "-db-config-deployment-job" }} + name: {{ $deploymentJobName | trunc 63 }} + annotations: + "helm.sh/hook": post-install + "helm.sh/hook-weight": "-5" + "helm.sh/hook-delete-policy": hook-succeeded +spec: + template: + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: db-config-deployment-job + image: "{{ $.Values.dbConfigDeployment.repository }}/{{ $.Values.dbConfigDeployment.image }}:{{ $.Values.dbConfigDeployment.tag | default .Chart.AppVersion}}" + imagePullPolicy: {{ $.Values.dbConfigDeployment.pullPolicy }} + args: + - "/var/db-config/" + env: + - name: DB_PASS + valueFrom: + secretKeyRef: + name: db-credentials + key: dbPassword + - name: DB_HOST + valueFrom: + secretKeyRef: + name: db-credentials + key: dbHost + - name: DB_PORT + valueFrom: + secretKeyRef: + name: db-credentials + key: dbPort + - name: DB_USER + valueFrom: + secretKeyRef: + name: db-credentials + key: dbUser + - name: DB_NAME + valueFrom: + secretKeyRef: + name: db-credentials + key: dbName + - name: DB_SCHEME + value: "abstracto" + volumeMounts: + - mountPath: "/var/db-config/" + name: database-config-mount + restartPolicy: Never + initContainers: + - name: database-config-data + image: "{{ $.Values.dbConfigDeploymentData.repository }}/{{ $.Values.dbConfigDeploymentData.image }}:{{ $.Values.dbConfigDeploymentData.tag | default .Chart.AppVersion}}" + imagePullPolicy: {{ $.Values.dbConfigDeploymentData.pullPolicy }} + volumeMounts: + - mountPath: "/var/run-config" + name: database-config-mount + volumes: + - name: database-config-mount + emptyDir: {} + backoffLimit: 4 +{{- end }} + + diff --git a/deployment/helm/sissi/templates/db-credentials.yaml b/deployment/helm/sissi/templates/db-credentials.yaml new file mode 100644 index 00000000..df10feb8 --- /dev/null +++ b/deployment/helm/sissi/templates/db-credentials.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Secret +metadata: + name: db-credentials +data: + dbPassword: {{ $.Values.dbCredentials.password | b64enc }} # b64enc is needed, because a stringData secret field cannot hold numeric values + dbUser: {{ $.Values.dbCredentials.userName | b64enc }} + dbHost: {{ $.Values.dbCredentials.host | b64enc }} + dbPort: {{ $.Values.dbCredentials.port | b64enc }} + dbName: {{ $.Values.dbCredentials.name | b64enc }} \ No newline at end of file diff --git a/deployment/helm/sissi/templates/deployment.yaml b/deployment/helm/sissi/templates/deployment.yaml new file mode 100644 index 00000000..64573ba4 --- /dev/null +++ b/deployment/helm/sissi/templates/deployment.yaml @@ -0,0 +1,116 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "sissi.fullname" . }} + labels: + {{- include "sissi.labels" . | nindent 4 }} +spec: + replicas: 1 + selector: + matchLabels: + {{- include "sissi.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "sissi.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "sissi.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.bot.repository }}/{{ .Values.bot.image }}:{{ .Values.bot.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.bot.pullPolicy }} + env: + - name: DB_PASS + valueFrom: + secretKeyRef: + name: db-credentials + key: dbPassword + - name: DB_HOST + valueFrom: + secretKeyRef: + name: db-credentials + key: dbHost + - name: DB_PORT + valueFrom: + secretKeyRef: + name: db-credentials + key: dbPort + - name: DB_USER + valueFrom: + secretKeyRef: + name: db-credentials + key: dbUser + - name: DB_NAME + valueFrom: + secretKeyRef: + name: db-credentials + key: dbName + - name: DEBRA_DONATION_NOTIFICATION_SERVER_ID + value: "297910194841583616" + - name: TOKEN + valueFrom: + secretKeyRef: + name: api-keys + key: discordToken + - name: YOUTUBE_API_KEY + valueFrom: + secretKeyRef: + name: api-keys + key: youtubeApiKey + - name: OPEN_WEATHER_MAP_API_KEY + valueFrom: + secretKeyRef: + name: api-keys + key: openWeatherMapApiKey + - name: TWITCH_CLIENT_ID + valueFrom: + secretKeyRef: + name: api-keys + key: twitchClientId + - name: TWITCH_SECRET + valueFrom: + secretKeyRef: + name: api-keys + key: twitchSecret + ports: + - name: http + containerPort: {{ .Values.service.port }} + protocol: TCP + livenessProbe: + httpGet: + path: /actuator/health/liveness + port: 8080 + initialDelaySeconds: 60 + periodSeconds: 3 + readinessProbe: + httpGet: + path: /actuator/health/readiness + port: 8080 + initialDelaySeconds: 60 + periodSeconds: 3 + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/deployment/helm/sissi/templates/grafana-credentials.yaml b/deployment/helm/sissi/templates/grafana-credentials.yaml new file mode 100644 index 00000000..baf1e261 --- /dev/null +++ b/deployment/helm/sissi/templates/grafana-credentials.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Secret +metadata: + name: grafana-credentials +data: + dbPassword: {{ $.Values.dbCredentials.password | b64enc }} # b64enc is needed, because a stringData secret field cannot hold numeric values + dbUser: {{ $.Values.dbCredentials.userName | b64enc }} + dbHost: {{ $.Values.dbCredentials.host | b64enc }} + dbPort: {{ $.Values.dbCredentials.port | b64enc }} + dbName: {{ $.Values.dbCredentials.name | b64enc }} \ No newline at end of file diff --git a/deployment/helm/sissi/templates/grafana-dashboard-deployment.yaml b/deployment/helm/sissi/templates/grafana-dashboard-deployment.yaml new file mode 100644 index 00000000..a608316e --- /dev/null +++ b/deployment/helm/sissi/templates/grafana-dashboard-deployment.yaml @@ -0,0 +1,42 @@ +{{- if $.Values.grafanaDeployment.enabled }} +apiVersion: batch/v1 +kind: Job +metadata: + name: grafana-dashboard-deployment-job + annotations: + "helm.sh/hook": post-install + "helm.sh/hook-weight": "-4" + "helm.sh/hook-delete-policy": hook-succeeded +spec: + template: + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: template-deployment-job + image: "{{ $.Values.grafanaDeployment.repository }}/{{ $.Values.grafanaDeployment.image }}:{{ $.Values.grafanaDeployment.tag }}" + imagePullPolicy: {{ $.Values.grafanaDeployment.pullPolicy }} + args: + - "/var/userconfig" + volumeMounts: + - mountPath: "/var/userconfig" + name: grafana-dashboard-config + readOnly: true + volumes: + - name: grafana-dashboard-config + secret: + secretName: grafana-dashboard-config + restartPolicy: Never + backoffLimit: 4 +--- +apiVersion: v1 +kind: Secret +metadata: + name: grafana-dashboard-config +data: + config.yaml: {{ (tpl (.Files.Get "configuration/grafana/config.yaml") . ) | b64enc }} + log-dashboard.json: {{ (tpl (.Files.Get "configuration/grafana/sissi-log-dashboard.json") . ) | b64enc }} + discord-dashboard.json: {{ (tpl (.Files.Get "configuration/grafana/sissi-discord-dashboard.json") . ) | b64enc }} +{{- end }} \ No newline at end of file diff --git a/deployment/helm/sissi/templates/service.yaml b/deployment/helm/sissi/templates/service.yaml new file mode 100644 index 00000000..37a6b104 --- /dev/null +++ b/deployment/helm/sissi/templates/service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "sissi.fullname" . }} + labels: + {{- include "sissi.labels" . | nindent 4 }} + {{- with .Values.service.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "sissi.selectorLabels" . | nindent 4 }} diff --git a/deployment/helm/sissi/templates/serviceaccount.yaml b/deployment/helm/sissi/templates/serviceaccount.yaml new file mode 100644 index 00000000..b79290ef --- /dev/null +++ b/deployment/helm/sissi/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "sissi.serviceAccountName" . }} + labels: + {{- include "sissi.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/deployment/helm/sissi/templates/template-deployment-job.yaml b/deployment/helm/sissi/templates/template-deployment-job.yaml new file mode 100644 index 00000000..59ff9ebf --- /dev/null +++ b/deployment/helm/sissi/templates/template-deployment-job.yaml @@ -0,0 +1,69 @@ +{{- if .Values.dbConfigDeployment.enabled -}} +apiVersion: batch/v1 +kind: Job +metadata: +{{- $deploymentJobName := print ((include "sissi.fullname" .) | trunc 39) "-template-deployment-job" }} + name: {{ $deploymentJobName | trunc 63 }} + annotations: + "helm.sh/hook": post-install + "helm.sh/hook-weight": "-4" + "helm.sh/hook-delete-policy": hook-succeeded +spec: + template: + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: template-deployment-job + image: "{{ $.Values.templateDeployment.repository }}/{{ $.Values.templateDeployment.image }}:{{ $.Values.templateDeployment.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ $.Values.templateDeployment.pullPolicy }} + args: + - "/var/template-config/" + env: + - name: DB_PASS + valueFrom: + secretKeyRef: + name: db-credentials + key: dbPassword + - name: DB_HOST + valueFrom: + secretKeyRef: + name: db-credentials + key: dbHost + - name: DB_PORT + valueFrom: + secretKeyRef: + name: db-credentials + key: dbPort + - name: DB_USER + valueFrom: + secretKeyRef: + name: db-credentials + key: dbUser + - name: DB_NAME + valueFrom: + secretKeyRef: + name: db-credentials + key: dbName + - name: DB_SCHEME + value: "abstracto." + volumeMounts: + - mountPath: "/var/template-config/" + name: template-config-mount + initContainers: + - name: database-config-data + image: "{{ $.Values.templateDeploymentData.repository }}/{{ $.Values.templateDeploymentData.image }}:{{ $.Values.templateDeploymentData.tag | default .Chart.AppVersion}}" + imagePullPolicy: {{ $.Values.templateDeploymentData.pullPolicy }} + volumeMounts: + - mountPath: "/var/run-config" + name: template-config-mount + volumes: + - name: template-config-mount + emptyDir: {} + restartPolicy: Never + backoffLimit: 4 +{{- end }} + + diff --git a/deployment/helm/sissi/values.yaml b/deployment/helm/sissi/values.yaml new file mode 100644 index 00000000..6a309a61 --- /dev/null +++ b/deployment/helm/sissi/values.yaml @@ -0,0 +1,117 @@ +# Default values for sissi. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +bot: + repository: harbor.sheldan.dev/testing + pullPolicy: IfNotPresent + image: sissi + tag: 1.4.2 + +templateDeployment: + enabled: true + repository: harbor.sheldan.dev/abstracto + pullPolicy: Always + image: abstracto-template-deployment + tag: 1.5.5 + +templateDeploymentData: + repository: harbor.sheldan.dev/sissi + pullPolicy: Always + image: sissi-template-data + tag: 1.4.2 + +dbConfigDeployment: + enabled: true + repository: harbor.sheldan.dev/abstracto + pullPolicy: Always + image: abstracto-db-deployment + tag: 1.5.5 + +dbConfigDeploymentData: + repository: harbor.sheldan.dev/sissi + pullPolicy: Always + image: sissi-db-data + tag: 1.4.2 + +dbCredentials: + host: + port: + userName: + password: + name: + +grafanaDeployment: + repository: harbor.sheldan.dev/grafana-tools + pullPolicy: Always + image: grafana-dashboard-deployment + tag: 0.0.2 + enabled: true + grafana: + host: + basicAuth: + username: + password: + +apiKeys: + discord: + token: + youtube: + apiKey: + openWeatherMap: + apiKey: + twitch: + secret: + clientId: + + +imagePullSecrets: +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 8080 + annotations: + prometheus.io/scrape: "true" + prometheus.io/path: "/actuator/prometheus" + prometheus.io/port: "8080" + +resources: + limits: + cpu: + memory: + requests: + cpu: + memory: + + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml index 91aebe21..3bf336fc 100644 --- a/deployment/image-packaging/pom.xml +++ b/deployment/image-packaging/pom.xml @@ -49,7 +49,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ core.zip @@ -59,7 +59,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ assignable-roles.zip @@ -69,7 +69,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ twitch.zip @@ -79,7 +79,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ experience-tracking.zip @@ -89,7 +89,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ modmail.zip @@ -99,7 +99,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ utility.zip @@ -109,7 +109,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ logging.zip @@ -119,7 +119,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ webservices.zip @@ -129,7 +129,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ remind.zip @@ -139,7 +139,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ suggestion.zip @@ -149,7 +149,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ link-embed.zip @@ -159,7 +159,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ starboard.zip @@ -169,7 +169,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ moderation.zip @@ -179,7 +179,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ entertainment.zip @@ -189,7 +189,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ custom-command.zip @@ -199,7 +199,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ statistic.zip @@ -210,7 +210,7 @@ ${project.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ quotes.zip @@ -220,7 +220,7 @@ ${project.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ meetup.zip @@ -230,7 +230,7 @@ ${project.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ debra.zip @@ -242,7 +242,7 @@ ${project.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ moderation-custom.zip @@ -254,7 +254,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ core.zip @@ -264,7 +264,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ link-embed.zip @@ -274,7 +274,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ experience-tracking.zip @@ -284,7 +284,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ twitch.zip @@ -294,7 +294,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ modmail.zip @@ -304,7 +304,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ assignable-roles.zip @@ -314,7 +314,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ utility.zip @@ -324,7 +324,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ webservices.zip @@ -334,7 +334,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ remind.zip @@ -344,7 +344,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ suggestion.zip @@ -354,7 +354,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ starboard.zip @@ -364,7 +364,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ moderation.zip @@ -374,7 +374,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ entertainment.zip @@ -384,7 +384,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ logging.zip @@ -394,7 +394,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ custom-command.zip @@ -404,7 +404,7 @@ ${abstracto.templates.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ statistic.zip @@ -416,7 +416,7 @@ ${project.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ quotes.zip @@ -426,7 +426,7 @@ ${project.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ meetup.zip @@ -436,7 +436,7 @@ ${project.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ debra.zip @@ -450,7 +450,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ scheduling.zip @@ -461,7 +461,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ core.zip @@ -472,7 +472,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ link-embed.zip @@ -483,7 +483,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ twitch.zip @@ -494,7 +494,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ experience-tracking.zip @@ -505,7 +505,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ logging.zip @@ -516,7 +516,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ starboard.zip @@ -527,7 +527,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ assignable-roles.zip @@ -538,7 +538,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ utility.zip @@ -549,7 +549,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ modmail.zip @@ -560,7 +560,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ utility.zip @@ -571,7 +571,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ webservices.zip @@ -582,7 +582,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ remind.zip @@ -593,7 +593,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ suggestion.zip @@ -604,7 +604,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ moderation.zip @@ -615,7 +615,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ entertainment.zip @@ -626,7 +626,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ custom-command.zip @@ -639,7 +639,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ quotes.zip @@ -650,7 +650,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ meetup.zip @@ -661,7 +661,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ debra.zip @@ -672,7 +672,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ statistic.zip @@ -685,7 +685,7 @@ liquibase zip true - ${file.basedir}/deployment/liquibase-artifacts/ + ${file.basedir}/db-data/liquibase-artifacts/ moderation-custom.zip @@ -695,7 +695,7 @@ ${project.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ moderation-custom.zip @@ -707,7 +707,7 @@ ${project.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ moderation-template-overrides.zip @@ -717,7 +717,7 @@ ${project.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ experience-template-overrides.zip @@ -727,7 +727,7 @@ ${project.version} zip true - ${file.basedir}/deployment/template-artifacts/ + ${file.basedir}/template-data/template-artifacts/ logging-template-overrides.zip @@ -739,7 +739,7 @@ ${project.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ moderation-translation-overrides.zip @@ -749,7 +749,7 @@ ${project.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ experience-translation-overrides.zip @@ -759,7 +759,7 @@ ${project.version} zip true - ${file.basedir}/deployment/translation-artifacts/ + ${file.basedir}/template-data/translation-artifacts/ logging-translation-overrides.zip diff --git a/deployment/image-packaging/src/main/docker/.env b/deployment/image-packaging/src/main/docker/.env index a889c551..2a015808 100644 --- a/deployment/image-packaging/src/main/docker/.env +++ b/deployment/image-packaging/src/main/docker/.env @@ -1,6 +1,2 @@ -PROMTAIL_VERSION=2.2.1 -LOKI_VERSION=2.2.1 -PROMETHEUS_VERSION=v2.28.1 -PG_ADMIN_VERSION=5.5 -GRAFANA_VERSION=8.0.6 -POSTGRES_VERSION=13.3-buster \ No newline at end of file +REGISTRY_PREFIX=harbor.sheldan.dev/sissi/ +VERSION=0.0.1 \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/database/Dockerfile b/deployment/image-packaging/src/main/docker/database/Dockerfile deleted file mode 100644 index 78e491ae..00000000 --- a/deployment/image-packaging/src/main/docker/database/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -ARG POSTGRES_VERSION -FROM postgres:${POSTGRES_VERSION} -MAINTAINER Sheldan -VOLUME /tmp -ADD sql/init.sql /docker-entrypoint-initdb.d/init.sql \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/database/sql/init.sql b/deployment/image-packaging/src/main/docker/database/sql/init.sql deleted file mode 100644 index 176cd93c..00000000 --- a/deployment/image-packaging/src/main/docker/database/sql/init.sql +++ /dev/null @@ -1 +0,0 @@ -CREATE SCHEMA abstracto \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/db-data/Dockerfile b/deployment/image-packaging/src/main/docker/db-data/Dockerfile new file mode 100644 index 00000000..d9712b08 --- /dev/null +++ b/deployment/image-packaging/src/main/docker/db-data/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine:3.18.0 +MAINTAINER Sheldan +ADD config/ /var/db-config/ +ADD liquibase-artifacts /var/db-config/liquibase-zips + +CMD ["/bin/sh", "/var/db-config/move.sh"] \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json b/deployment/image-packaging/src/main/docker/db-data/config/artifact_versions.json similarity index 61% rename from deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json rename to deployment/image-packaging/src/main/docker/db-data/config/artifact_versions.json index 52adf6e1..33c14b4a 100644 --- a/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json +++ b/deployment/image-packaging/src/main/docker/db-data/config/artifact_versions.json @@ -1,17 +1,4 @@ { - "template_artifacts": [ - "core","starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "remind", "suggestion", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch", - "quotes", "meetup", "debra", - "moderation-custom", - "moderation-template-overrides", "experience-template-overrides", "logging-template-overrides" - ], - "translation_artifacts": [ - "core", - "starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "suggestion", "remind", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch", - "quotes", "meetup", "debra", - "moderation-custom", - "moderation-translation-overrides", "experience-translation-overrides", "logging-translation-overrides" - ], "liquibase_artifacts": [ { "zip": "scheduling", "file": "scheduling-changeLog.xml" }, { "zip": "core", "file": "core-changeLog.xml" }, diff --git a/deployment/image-packaging/src/main/docker/db-data/config/move.sh b/deployment/image-packaging/src/main/docker/db-data/config/move.sh new file mode 100644 index 00000000..94e34a3a --- /dev/null +++ b/deployment/image-packaging/src/main/docker/db-data/config/move.sh @@ -0,0 +1,2 @@ +#!/bin/sh +mv /var/db-config/* /var/run-config/ \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/deployment/Dockerfile b/deployment/image-packaging/src/main/docker/deployment/Dockerfile deleted file mode 100644 index 3a793eaf..00000000 --- a/deployment/image-packaging/src/main/docker/deployment/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -ARG ABSTRACTO_REGISTRY_PREFIX -ARG ABSTRACTO_VERSION=latest -FROM ${ABSTRACTO_REGISTRY_PREFIX}abstracto_deployment:${ABSTRACTO_VERSION:-latest} -MAINTAINER Sheldan -ADD template-artifacts /templates -ADD translation-artifacts /translations -ADD liquibase-artifacts /liquibase-zips -ADD config / diff --git a/deployment/image-packaging/src/main/docker/docker-compose.yml b/deployment/image-packaging/src/main/docker/docker-compose.yml index 64c82496..982454bf 100644 --- a/deployment/image-packaging/src/main/docker/docker-compose.yml +++ b/deployment/image-packaging/src/main/docker/docker-compose.yml @@ -5,46 +5,11 @@ services: build: context: sissi image: ${REGISTRY_PREFIX}sissi:${VERSION:-latest} - database: + db-data: build: - context: database - args: - POSTGRES_VERSION: ${POSTGRES_VERSION} - image: ${REGISTRY_PREFIX}sissi_database:${VERSION:-latest} - pg_admin: + context: db-data + image: ${REGISTRY_PREFIX}sissi-db-data:${VERSION:-latest} + template-data: build: - context: pgAdmin - args: - PG_ADMIN_VERSION: ${PG_ADMIN_VERSION} - image: ${REGISTRY_PREFIX}sissi_pg_admin:${VERSION:-latest} - deployment_container: - build: - context: deployment - args: - ABSTRACTO_REGISTRY_PREFIX: ${ABSTRACTO_REGISTRY_PREFIX} - ABSTRACTO_VERSION: ${ABSTRACTO_VERSION} - image: ${REGISTRY_PREFIX}sissi_deployment:${VERSION:-latest} - prometheus: - build: - context: prometheus - args: - PROMETHEUS_VERSION: ${PROMETHEUS_VERSION} - image: ${REGISTRY_PREFIX}sissi_prometheus:${VERSION:-latest} - grafana: - build: - context: grafana - args: - GRAFANA_VERSION: ${GRAFANA_VERSION} - image: ${REGISTRY_PREFIX}sissi_grafana:${VERSION:-latest} - promtail: - build: - context: promtail - args: - PROMTAIL_VERSION: ${PROMTAIL_VERSION} - image: ${REGISTRY_PREFIX}sissi_promtail:${VERSION:-latest} - loki: - build: - context: loki - args: - LOKI_VERSION: ${LOKI_VERSION} - image: ${REGISTRY_PREFIX}sissi_loki:${VERSION:-latest} + context: template-data + image: ${REGISTRY_PREFIX}sissi-template-data:${VERSION:-latest} diff --git a/deployment/image-packaging/src/main/docker/grafana/Dockerfile b/deployment/image-packaging/src/main/docker/grafana/Dockerfile deleted file mode 100644 index 78971746..00000000 --- a/deployment/image-packaging/src/main/docker/grafana/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -ARG GRAFANA_VERSION -FROM grafana/grafana:${GRAFANA_VERSION} -MAINTAINER Sheldan -ADD ./provisioning /etc/grafana/provisioning -ADD ./config.ini /etc/grafana/config.ini -ADD ./dashboards /var/lib/grafana/dashboards \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/grafana/config.ini b/deployment/image-packaging/src/main/docker/grafana/config.ini deleted file mode 100644 index 4980ea84..00000000 --- a/deployment/image-packaging/src/main/docker/grafana/config.ini +++ /dev/null @@ -1,2 +0,0 @@ -[paths] -provisioning = conf/provisioning \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/grafana/dashboards/jvm-dashboard.json b/deployment/image-packaging/src/main/docker/grafana/dashboards/jvm-dashboard.json deleted file mode 100644 index e015f972..00000000 --- a/deployment/image-packaging/src/main/docker/grafana/dashboards/jvm-dashboard.json +++ /dev/null @@ -1,1561 +0,0 @@ -{ - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "limit": 100, - "name": "Annotations & Alerts", - "showIn": 0, - "type": "dashboard" - } - ] - }, - "description": "Dashboard for Sissi spring boot monitoring (adapted from https://grafana.com/grafana/dashboards/4701)", - "editable": true, - "gnetId": null, - "graphTooltip": 1, - "id": 2, - "iteration": 1612052492351, - "links": [], - "panels": [ - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 125, - "panels": [], - "repeat": null, - "title": "Overview", - "type": "row" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "prometheus", - "decimals": 1, - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "s", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 6, - "x": 0, - "y": 1 - }, - "height": "", - "id": 63, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "70%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "tableColumn": "", - "targets": [ - { - "expr": "process_uptime_seconds{application=\"$application\"}", - "format": "time_series", - "interval": "", - "intervalFactor": 2, - "legendFormat": "", - "metric": "", - "refId": "A", - "step": 14400 - } - ], - "thresholds": "", - "title": "Uptime", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "prometheus", - "decimals": null, - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "dateTimeAsIso", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 6, - "x": 6, - "y": 1 - }, - "height": "", - "id": 92, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "70%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "tableColumn": "", - "targets": [ - { - "expr": "process_start_time_seconds{application=\"$application\"}*1000", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "", - "metric": "", - "refId": "A", - "step": 14400 - } - ], - "thresholds": "", - "title": "Start time", - "type": "singlestat", - "valueFontSize": "70%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "prometheus", - "decimals": 2, - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 6, - "x": 12, - "y": 1 - }, - "id": 65, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "70%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(jvm_memory_used_bytes{application=\"$application\", area=\"heap\"})*100/sum(jvm_memory_max_bytes{application=\"$application\", area=\"heap\"})", - "format": "time_series", - "interval": "", - "intervalFactor": 2, - "legendFormat": "", - "refId": "A", - "step": 14400 - } - ], - "thresholds": "70,90", - "title": "Heap used", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "prometheus", - "decimals": 2, - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 6, - "x": 18, - "y": 1 - }, - "id": 75, - "interval": null, - "links": [], - "mappingType": 2, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "70%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - }, - { - "from": "-99999999999999999999999999999999", - "text": "N/A", - "to": "0" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(jvm_memory_used_bytes{application=\"$application\", area=\"nonheap\"})*100/sum(jvm_memory_max_bytes{application=\"$application\",area=\"nonheap\"})", - "format": "time_series", - "interval": "", - "intervalFactor": 2, - "legendFormat": "", - "refId": "A", - "step": 14400 - } - ], - "thresholds": "70,90", - "title": "Non-Heap used", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - }, - { - "op": "=", - "text": "x", - "value": "" - } - ], - "valueName": "current" - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 4 - }, - "id": 127, - "panels": [], - "repeat": null, - "title": "Memory", - "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 0, - "y": 5 - }, - "hiddenSeries": false, - "id": 24, - "legend": { - "avg": false, - "current": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.3.7", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum(jvm_memory_used_bytes{application=\"$application\", area=\"heap\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "used", - "metric": "", - "refId": "A", - "step": 2400 - }, - { - "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", area=\"heap\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "committed", - "refId": "B", - "step": 2400 - }, - { - "expr": "sum(jvm_memory_max_bytes{application=\"$application\", area=\"heap\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "max", - "refId": "C", - "step": 2400 - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "JVM Heap", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "y-axis": true, - "y_formats": [ - "mbytes", - "short" - ], - "yaxes": [ - { - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 6, - "y": 5 - }, - "hiddenSeries": false, - "id": 25, - "legend": { - "avg": false, - "current": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.3.7", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum(jvm_memory_used_bytes{application=\"$application\", area=\"nonheap\"})", - "format": "time_series", - "interval": "", - "intervalFactor": 2, - "legendFormat": "used", - "metric": "", - "refId": "A", - "step": 2400 - }, - { - "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", area=\"nonheap\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "committed", - "refId": "B", - "step": 2400 - }, - { - "expr": "sum(jvm_memory_max_bytes{application=\"$application\", area=\"nonheap\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "max", - "refId": "C", - "step": 2400 - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "JVM Non-Heap", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "y-axis": true, - "y_formats": [ - "mbytes", - "short" - ], - "yaxes": [ - { - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 12, - "y": 5 - }, - "hiddenSeries": false, - "id": 26, - "legend": { - "alignAsTable": false, - "avg": false, - "current": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.3.7", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum(jvm_memory_used_bytes{application=\"$application\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "used", - "metric": "", - "refId": "A", - "step": 2400 - }, - { - "expr": "sum(jvm_memory_committed_bytes{application=\"$application\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "committed", - "refId": "B", - "step": 2400 - }, - { - "expr": "sum(jvm_memory_max_bytes{application=\"$application\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "max", - "refId": "C", - "step": 2400 - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "JVM Total", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "y-axis": true, - "y_formats": [ - "mbytes", - "short" - ], - "yaxes": [ - { - "format": "bytes", - "label": "", - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": { - "debug": "#1F78C1", - "error": "#BF1B00", - "info": "#508642", - "trace": "#6ED0E0", - "warn": "#EAB839" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null - }, - "gridPos": { - "h": 7, - "w": 24, - "x": 0, - "y": 12 - }, - "height": "", - "hiddenSeries": false, - "id": 91, - "legend": { - "alignAsTable": false, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": true, - "pluginVersion": "7.3.7", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "error", - "yaxis": 1 - }, - { - "alias": "warn", - "yaxis": 1 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "increase(logback_events_total{application=\"$application\"}[1m])", - "format": "time_series", - "interval": "", - "intervalFactor": 2, - "legendFormat": "{{level}}", - "metric": "", - "refId": "A", - "step": 1200 - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Log Events", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "x-axis": true, - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "y-axis": true, - "y_formats": [ - "short", - "short" - ], - "yaxes": [ - { - "decimals": 0, - "format": "opm", - "label": null, - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "collapsed": false, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 19 - }, - "id": 128, - "panels": [], - "repeat": null, - "title": "CPU & Load", - "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 0, - "y": 20 - }, - "hiddenSeries": false, - "id": 106, - "legend": { - "avg": false, - "current": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.3.7", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "system_cpu_usage{application=\"$application\"}", - "format": "time_series", - "hide": false, - "intervalFactor": 1, - "legendFormat": "system", - "metric": "", - "refId": "A", - "step": 2400 - }, - { - "expr": "process_cpu_usage{application=\"$application\"}", - "format": "time_series", - "hide": false, - "intervalFactor": 1, - "legendFormat": "process", - "refId": "B" - }, - { - "expr": "avg_over_time(process_cpu_usage{application=\"$application\"}[1h])", - "format": "time_series", - "hide": false, - "intervalFactor": 1, - "legendFormat": "process-1h", - "refId": "C" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "CPU Usage", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "y-axis": true, - "y_formats": [ - "short", - "short" - ], - "yaxes": [ - { - "decimals": 1, - "format": "percentunit", - "label": "", - "logBase": 1, - "max": "1", - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 6, - "y": 20 - }, - "hiddenSeries": false, - "id": 93, - "legend": { - "avg": false, - "current": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.3.7", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "system_load_average_1m{application=\"$application\"}", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "system-1m", - "metric": "", - "refId": "A", - "step": 2400 - }, - { - "expr": "system_cpu_count{application=\"$application\"}", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "cpus", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Load", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "y-axis": true, - "y_formats": [ - "short", - "short" - ], - "yaxes": [ - { - "decimals": 1, - "format": "short", - "label": "", - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": { - "leftLogBase": 1, - "leftMax": null, - "leftMin": null, - "rightLogBase": 1, - "rightMax": null, - "rightMin": null - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 12, - "y": 20 - }, - "hiddenSeries": false, - "id": 32, - "legend": { - "avg": false, - "current": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.3.7", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "jvm_threads_live_threads{application=\"$application\"}", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "live", - "metric": "", - "refId": "A", - "step": 2400 - }, - { - "expr": "jvm_threads_daemon_threads{application=\"$application\"}", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "daemon", - "metric": "", - "refId": "B", - "step": 2400 - }, - { - "expr": "jvm_threads_peak_threads{application=\"$application\"}", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "peak", - "refId": "C", - "step": 2400 - }, - { - "expr": "process_threads{application=\"$application\"}", - "format": "time_series", - "interval": "", - "intervalFactor": 2, - "legendFormat": "process", - "refId": "D", - "step": 2400 - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Threads", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "x-axis": true, - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "y-axis": true, - "y_formats": [ - "short", - "short" - ], - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": { - "blocked": "#bf1b00", - "new": "#fce2de", - "runnable": "#7eb26d", - "terminated": "#511749", - "timed-waiting": "#c15c17", - "waiting": "#eab839" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 7, - "w": 6, - "x": 18, - "y": 20 - }, - "hiddenSeries": false, - "id": 124, - "legend": { - "alignAsTable": false, - "avg": false, - "current": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.3.7", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "jvm_threads_states_threads{application=\"$application\"}", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{state}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Thread States", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "refresh": "30s", - "schemaVersion": 26, - "style": "dark", - "tags": [], - "templating": { - "list": [ - { - "allValue": null, - "current": { - "selected": true, - "text": "Sissi", - "value": "sissi" - }, - "datasource": "prometheus", - "definition": "", - "error": null, - "hide": 0, - "includeAll": false, - "label": "Application", - "multi": false, - "name": "application", - "options": [], - "query": "label_values(application)", - "refresh": 2, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } - ] - }, - "time": { - "from": "now-1h", - "to": "now" - }, - "timepicker": { - "now": true, - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d" - ] - }, - "timezone": "browser", - "title": "JVM (Micrometer)", - "uid": "YryNLtLMk", - "version": 1 -} \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-logs.json b/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-logs.json deleted file mode 100644 index fe4e376f..00000000 --- a/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-logs.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "editable": true, - "gnetId": null, - "graphTooltip": 0, - "id": 4, - "links": [], - "panels": [ - { - "datasource": "Loki", - "gridPos": { - "h": 14, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 2, - "options": { - "dedupStrategy": "none", - "enableLogDetails": true, - "showLabels": false, - "showTime": false, - "sortOrder": "Descending", - "wrapLogMessage": true - }, - "targets": [ - { - "expr": "{job=\"sissi-logs\", filename=\"/logs/log.log\"}", - "queryType": "randomWalk", - "refId": "A" - } - ], - "title": "Sissi logs", - "type": "logs" - } - ], - "refresh": "", - "schemaVersion": 30, - "style": "dark", - "tags": [], - "templating": { - "list": [] - }, - "time": { - "from": "now-3h", - "to": "now" - }, - "timepicker": {}, - "timezone": "", - "title": "Sissi logs", - "uid": "1uGb0q4nz", - "version": 2 -} \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json b/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json deleted file mode 100644 index 64e72453..00000000 --- a/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json +++ /dev/null @@ -1,1007 +0,0 @@ -{ - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "editable": true, - "gnetId": null, - "graphTooltip": 1, - "iteration": 1627217870213, - "links": [], - "panels": [ - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 0 - }, - "hiddenSeries": false, - "id": 16, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "increase(discord_api_interactions_total[1m])", - "interval": "", - "legendFormat": "{{ action }}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Discord API Interaction", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 0 - }, - "hiddenSeries": false, - "id": 4, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "increase(command_processed_total[1m])", - "interval": "", - "legendFormat": "{{type}}-{{status}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Commands processed", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 8 - }, - "hiddenSeries": false, - "id": 2, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "increase(message_total[1m])", - "interval": "", - "legendFormat": "{{ action }}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Message events", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 8 - }, - "hiddenSeries": false, - "id": 26, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "increase(okhttp_request_total[1m])", - "interval": "", - "legendFormat": "{{ http_code }}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "HTTP Reponse codes", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 7, - "w": 12, - "x": 0, - "y": 16 - }, - "hiddenSeries": false, - "id": 30, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "exemplar": true, - "expr": "increase(cache_evictions_total{application=\"$application\", cache=\"messages\"}[1m])", - "interval": "", - "legendFormat": "Cache evictions", - "refId": "A" - }, - { - "exemplar": true, - "expr": "increase(cache_gets_total{application=\"$application\", cache=\"messages\"}[1m])", - "hide": false, - "interval": "", - "legendFormat": "Cache gets {{ result }}", - "refId": "B" - }, - { - "exemplar": true, - "expr": "increase(cache_puts_total{application=\"$application\", cache=\"messages\"}[1m])", - "hide": false, - "interval": "", - "legendFormat": "Cache puts", - "refId": "C" - }, - { - "exemplar": true, - "expr": "increase(cache_removals{application=\"$application\", cache=\"messages\"}[1m])", - "hide": false, - "interval": "", - "legendFormat": "Cache removals", - "refId": "D" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Cache statistic", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 7, - "w": 12, - "x": 12, - "y": 16 - }, - "hiddenSeries": false, - "id": 32, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "exemplar": true, - "expr": "discord_gateway_ping", - "interval": "", - "legendFormat": "Gateway ping", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Gateway ping", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 7, - "w": 6, - "x": 0, - "y": 23 - }, - "hiddenSeries": false, - "id": 8, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "increase(starboard_stars_total[1m])", - "interval": "", - "legendFormat": "{{ action }}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Starboard reactions", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 7, - "w": 6, - "x": 6, - "y": 23 - }, - "hiddenSeries": false, - "id": 12, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "increase(emote_usages_total[1m])", - "interval": "", - "legendFormat": "Used emotes", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Emote tracking", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 7, - "w": 6, - "x": 18, - "y": 23 - }, - "hiddenSeries": false, - "id": 14, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "increase(assignable_roles_total[1m])", - "interval": "", - "legendFormat": "{{ action }}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Assignable role actions", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "prometheus", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 14, - "w": 24, - "x": 0, - "y": 30 - }, - "hiddenSeries": false, - "id": 34, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "exemplar": true, - "expr": "increase(jda_event_total[1m])", - "interval": "", - "legendFormat": "{{ event_class }}", - "queryType": "randomWalk", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "JDA Events", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "refresh": "10s", - "schemaVersion": 27, - "style": "dark", - "tags": [], - "templating": { - "list": [ - { - "description": "The spring boot application which contains the messages cache", - "error": null, - "hide": 2, - "label": null, - "name": "application", - "query": "Sissi", - "skipUrlSync": false, - "type": "constant" - } - ] - }, - "time": { - "from": "now-15m", - "to": "now" - }, - "timepicker": {}, - "timezone": "", - "title": "Sissi status", - "uid": "6WIJ36BMz", - "version": 3 -} \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/grafana/provisioning/dashboards/all.yml b/deployment/image-packaging/src/main/docker/grafana/provisioning/dashboards/all.yml deleted file mode 100644 index c5b30acc..00000000 --- a/deployment/image-packaging/src/main/docker/grafana/provisioning/dashboards/all.yml +++ /dev/null @@ -1,6 +0,0 @@ -- name: 'sissi-bot-dashboards' - org_id: 1 - folder: '' - type: 'file' - options: - folder: '/var/lib/grafana/dashboards' \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/grafana/provisioning/datasources/all.yml b/deployment/image-packaging/src/main/docker/grafana/provisioning/datasources/all.yml deleted file mode 100644 index 26c8b9df..00000000 --- a/deployment/image-packaging/src/main/docker/grafana/provisioning/datasources/all.yml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: 1 -datasources: - - access: 'proxy' - editable: true - is_default: true - name: 'prometheus' - org_id: 1 - type: 'prometheus' - url: 'http://${PROMETHEUS_HOST}:${PROMETHEUS_PORT}' - version: 1 - - name: 'postgres-db' - type: postgres - access: 'proxy' - url: '${DB_HOST}:${DB_PORT}' - password: '${DB_PASS}' - user: '${DB_USER}' - database: '${DB_NAME}' - basicAuth: false - is_default: false - jsonData: - sslmode: 'disable' - version: 1 - editable: false - - name: Loki - type: loki - access: proxy - url: 'http://${LOKI_HOST}:${LOKI_PORT}' - jsonData: - maxLines: 2000 \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/loki/Dockerfile b/deployment/image-packaging/src/main/docker/loki/Dockerfile deleted file mode 100644 index 6259268e..00000000 --- a/deployment/image-packaging/src/main/docker/loki/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -ARG LOKI_VERSION -FROM grafana/loki:${LOKI_VERSION} -MAINTAINER Sheldan -ADD loki.yml /mnt/config/loki-config.yaml \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/loki/loki.yml b/deployment/image-packaging/src/main/docker/loki/loki.yml deleted file mode 100644 index 0b8ea89f..00000000 --- a/deployment/image-packaging/src/main/docker/loki/loki.yml +++ /dev/null @@ -1,66 +0,0 @@ -auth_enabled: false - -server: - http_listen_port: 3100 - grpc_listen_port: 9096 - -ingester: - wal: - enabled: true - dir: /tmp/wal - lifecycler: - address: 127.0.0.1 - ring: - kvstore: - store: inmemory - replication_factor: 1 - final_sleep: 0s - chunk_idle_period: 1h - max_chunk_age: 1h - chunk_target_size: 1048576 - chunk_retain_period: 30s - max_transfer_retries: 0 - -schema_config: - configs: - - from: 2020-10-24 - store: boltdb-shipper - object_store: filesystem - schema: v11 - index: - prefix: index_ - period: 24h - -storage_config: - boltdb_shipper: - active_index_directory: /tmp/loki/boltdb-shipper-active - cache_location: /tmp/loki/boltdb-shipper-cache - cache_ttl: 24h - shared_store: filesystem - filesystem: - directory: /tmp/loki/chunks - -compactor: - working_directory: /tmp/loki/boltdb-shipper-compactor - shared_store: filesystem - -limits_config: - reject_old_samples: true - reject_old_samples_max_age: 168h - -chunk_store_config: - max_look_back_period: 0s - -table_manager: - retention_deletes_enabled: true - retention_period: 360h - -ruler: - storage: - type: local - local: - directory: /tmp/loki/rules - rule_path: /tmp/loki/rules-temp - ring: - kvstore: - store: inmemory \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/pgAdmin/Dockerfile b/deployment/image-packaging/src/main/docker/pgAdmin/Dockerfile deleted file mode 100644 index 6c0fef60..00000000 --- a/deployment/image-packaging/src/main/docker/pgAdmin/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -ARG PG_ADMIN_VERSION -FROM dpage/pgadmin4:${PG_ADMIN_VERSION} -MAINTAINER Sheldan -VOLUME /tmp -ADD config/servers.json /pgadmin4/servers.json \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/pgAdmin/config/servers.json b/deployment/image-packaging/src/main/docker/pgAdmin/config/servers.json deleted file mode 100644 index 50164cdc..00000000 --- a/deployment/image-packaging/src/main/docker/pgAdmin/config/servers.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "Servers": { - "1": { - "Name": "Sissi database", - "Group": "Server Group 1", - "Port": 5432, - "Username": "abstracto", - "Host": "sissi_database", - "SSLMode": "prefer", - "MaintenanceDB": "postgres" - } - } -} \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/prometheus/Dockerfile b/deployment/image-packaging/src/main/docker/prometheus/Dockerfile deleted file mode 100644 index 4c6b0294..00000000 --- a/deployment/image-packaging/src/main/docker/prometheus/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -ARG PROMETHEUS_VERSION -FROM prom/prometheus:${PROMETHEUS_VERSION} -MAINTAINER Sheldan -ADD prometheus.yml /etc/prometheus/prometheus.yml \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml b/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml deleted file mode 100644 index a1c2a1c0..00000000 --- a/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml +++ /dev/null @@ -1,17 +0,0 @@ -global: - scrape_interval: 10s - scrape_timeout: 10s - evaluation_interval: 1m -scrape_configs: - - job_name: sissi_micrometer - honor_timestamps: true - scrape_interval: 5s - scrape_timeout: 5s - metrics_path: /actuator/prometheus - scheme: http - static_configs: - - targets: - - sissibot:8080 - basic_auth: - username: "abstracto" - password_file: /etc/prometheus/micrometer_password \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/promtail/Dockerfile b/deployment/image-packaging/src/main/docker/promtail/Dockerfile deleted file mode 100644 index d9c4e0d8..00000000 --- a/deployment/image-packaging/src/main/docker/promtail/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -ARG PROMTAIL_VERSION -FROM grafana/promtail:${PROMTAIL_VERSION} -MAINTAINER Sheldan -ADD promtail.yaml /mnt/config/promtail-config.yaml \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/promtail/promtail.yaml b/deployment/image-packaging/src/main/docker/promtail/promtail.yaml deleted file mode 100644 index f8551d56..00000000 --- a/deployment/image-packaging/src/main/docker/promtail/promtail.yaml +++ /dev/null @@ -1,17 +0,0 @@ -server: - disable: true - -positions: - filename: /tmp/positions.yaml - -clients: - - url: http://sissi_loki:3100/loki/api/v1/push - -scrape_configs: - - job_name: system - static_configs: - - targets: - - localhost - labels: - job: sissi-logs - __path__: /logs/*.log \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/sissi/Dockerfile b/deployment/image-packaging/src/main/docker/sissi/Dockerfile index fc987f8b..6c7db77f 100644 --- a/deployment/image-packaging/src/main/docker/sissi/Dockerfile +++ b/deployment/image-packaging/src/main/docker/sissi/Dockerfile @@ -1,10 +1,8 @@ FROM openjdk:17-alpine MAINTAINER Sheldan VOLUME /tmp -ADD bot/app.jar /app.jar ADD config/* /config/ -VOLUME ["/config"] -VOLUME ["/logs"] ADD wrapper/*.sh / RUN chmod +x /start.sh +ADD bot/app.jar /app.jar CMD ["/start.sh"] \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/template-data/Dockerfile b/deployment/image-packaging/src/main/docker/template-data/Dockerfile new file mode 100644 index 00000000..3ff8749f --- /dev/null +++ b/deployment/image-packaging/src/main/docker/template-data/Dockerfile @@ -0,0 +1,7 @@ +FROM alpine:3.18.0 +MAINTAINER Sheldan +ADD config /var/template-config/ +ADD template-artifacts /var/template-config/templates +ADD translation-artifacts /var/template-config/translations + +CMD ["/bin/sh", "/var/template-config/move.sh"] \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json b/deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json new file mode 100644 index 00000000..19974086 --- /dev/null +++ b/deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json @@ -0,0 +1,17 @@ +{ + "template_artifacts": [ + "core","starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "remind", "suggestion", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch", + "quotes", "meetup", "debra", + "moderation-custom", + "moderation-template-overrides", "experience-template-overrides", "logging-template-overrides" + ], + "translation_artifacts": [ + "core", + "starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "suggestion", "remind", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch", + "quotes", "meetup", "debra", + "moderation-custom", + "moderation-translation-overrides", "experience-translation-overrides", "logging-translation-overrides" + ] +} + + diff --git a/deployment/image-packaging/src/main/docker/template-data/config/move.sh b/deployment/image-packaging/src/main/docker/template-data/config/move.sh new file mode 100644 index 00000000..ee61b615 --- /dev/null +++ b/deployment/image-packaging/src/main/docker/template-data/config/move.sh @@ -0,0 +1,2 @@ +#!/bin/sh +mv /var/template-config/* /var/run-config/ \ No newline at end of file diff --git a/deployment/pom.xml b/deployment/pom.xml index fef50171..bf1327c6 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -11,7 +11,6 @@ pom - docker-compose image-packaging diff --git a/pom.xml b/pom.xml index 7cec0a8e..29d0d184 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 17 - 1.5.1 + 1.5.5 1.4.18