[OPB-36] adding oneplus bot stats dashboard

restructuring oneplus bot status dashboard to include jda events and remove less relevant metrics

deployment/docker-compose/src/main/resources/.env

@@ -4,6 +4,8 @@ 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
@@ -26,4 +28,4 @@ PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
 PGADMIN_DEFAULT_PASSWORD=admin
 TOKEN=<INSERT TOKEN>
 YOUTUBE_API_KEY=<INSERT KEY>
-ONEPLUS_BOT_VERSION=1.5.3
+ONEPLUS_BOT_VERSION=1.5.4

deployment/docker-compose/src/main/resources/docker-compose.yml

@@ -25,6 +25,8 @@ services:
       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}
@@ -95,6 +97,14 @@ services:
     ports:
       - "127.0.0.1:${GRAFANA_PORT}:3000"
     restart: unless-stopped
+    environment:
+      DB_PASS: ${GRAFANA_DATABASE_PASSWORD}
+      DB_HOST: ${DATABASE_HOST}
+      DB_PORT: ${DATABASE_PORT}
+      DB_USER: ${GRAFANA_DATABASE_USER}
+      DB_NAME: ${DATABASE_NAME}
+      PROMETHEUS_HOST: 'prometheus'
+      PROMETHEUS_PORT: 9090
     volumes:
       - grafana-user-data:/var/lib/grafana
     networks:

deployment/image-packaging/pom.xml

@@ -834,6 +834,17 @@
                             <destFileName>faq.zip</destFileName>
                         </artifactItem>
 
+                        <artifactItem>
+                            <groupId>dev.sheldan.oneplus.bot.application</groupId>
+                            <artifactId>database</artifactId>
+                            <version>${project.version}</version>
+                            <classifier>liquibase</classifier>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <destFileName>database.zip</destFileName>
+                        </artifactItem>
+
                         <!-- overrides -->
 
                         <artifactItem>

deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json

@@ -34,6 +34,7 @@
     { "zip": "anti-raid", "file": "antiRaid-changeLog.xml"},
     { "zip": "dynamic-activity", "file": "dynamicActivity-changeLog.xml"},
     { "zip": "setup", "file": "setup-changeLog.xml"},
+    { "zip": "database", "file": "changeLog.xml"},
     { "zip": "referral", "file": "referral-changeLog.xml"},
     { "zip": "starboard-custom", "file": "starboard-custom-changeLog.xml"},
     { "zip": "moderation-custom", "file": "moderation-custom-changeLog.xml"},

deployment/image-packaging/src/main/docker/grafana/provisioning/datasources/all.yml

@@ -1,3 +1,4 @@
+apiVersion: 1
 datasources:
   -  access: 'proxy'
      editable: true
@@ -5,5 +6,18 @@ datasources:
      name: 'prometheus'
      org_id: 1
      type: 'prometheus'
-     url: 'http://prometheus:9090'
-     version: 1
+     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