[maven-release-plugin] prepare release oneplusbot-1.6.9

updating version

.github/workflows/build.yml

@@ -17,11 +17,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
         with:
-          java-version: 1.8
+          persist-credentials: false
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
       - name: Build with Maven
         run: mvn -s settings.xml -B install --file pom.xml
         env:

.github/workflows/release.yml

@@ -6,13 +6,14 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           persist-credentials: false
       - name: Set up Java for publishing to GitHub Packages
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'corretto'
+          java-version: 17
       - name: Load current version
         id: version
         run: echo "version=$(mvn -s settings.xml --file pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
@@ -22,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/.env
+      - 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/oneplusbot/
-          VERSION: ${{ env.version }}
-          ABSTRACTO_VERSION: 1.4.20
-          ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/
+          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 oneplus-bot
+          helm push oneplus-bot*.tgz oci://harbor.sheldan.dev/oneplus-bot

Tiltfile

@@ -0,0 +1,40 @@
+allow_k8s_contexts('k8s-cluster')
+
+load('ext://restart_process', 'docker_build_with_restart')
+registry = 'harbor.sheldan.dev/oneplus-bot/'
+
+local_resource(
+  'oneplus-bot-java-compile',
+  'mvn install && ' +
+  'rm -rf application/executable/target/jar-staging && ' +
+  'unzip -o application/executable/target/oneplus-bot-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 + 'oneplus-bot',
+  './application/executable/target/jar',
+  entrypoint=['java', '-noverify', '-cp', '.:./lib/*', 'dev.sheldan.oneplus.bot.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 + 'oneplus-bot-db-data', 'deployment/image-packaging/src/main/docker/db-data/')
+docker_build(registry + 'oneplus-bot-template-data', 'deployment/image-packaging/src/main/docker/template-data/')
+
+
+k8s_yaml(helm('deployment/helm/oneplus-bot', values=
+['./../OnePlusBot-environments/argocd/apps/oneplus-bot/values/local/values.yaml',
+'secrets://./../OnePlusBot-environments/argocd/apps/oneplus-bot/values/local/values.secrets.yaml']
+))
+
+local_resource('fetch-packages', 'mvn install -f deployment/image-packaging/pom.xml', auto_init=False, trigger_mode = TRIGGER_MODE_MANUAL)
+k8s_resource('chart-oneplus-bot', port_forwards='5005:5005')

application/database/pom.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>dev.sheldan.oneplus.bot.application</groupId>
-        <artifactId>application</artifactId>
-        <version>1.6.5</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>database</artifactId>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/liquibase.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

application/database/src/main/assembly/liquibase.xml

@@ -1,18 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
-    <id>liquibase</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <outputDirectory>.</outputDirectory>
-            <directory>${project.basedir}/src/main/resources/migrations</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>

application/database/src/main/resources/migrations/1.5.4/collection.xml

@@ -1,10 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
-    <include file="structure/structure.xml" relativeToChangelogFile="true"/>
-</databaseChangeLog>

application/database/src/main/resources/migrations/1.5.4/structure/grafana_user.xml

@@ -1,19 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
-    <changeSet author="Sheldan" id="create_grafana_user">
-        <sql>
-            CREATE USER ${abstractografanadbuser} WITH PASSWORD '${abstractografanadbpass}';
-            GRANT CONNECT ON DATABASE abstracto TO ${abstractografanadbuser};
-            GRANT USAGE ON SCHEMA abstracto TO ${abstractografanadbuser};
-            GRANT SELECT ON ALL TABLES IN SCHEMA abstracto TO ${abstractografanadbuser};
-            ALTER DEFAULT PRIVILEGES IN SCHEMA abstracto
-            GRANT SELECT ON TABLES TO ${abstractografanadbuser};
-        </sql>
-    </changeSet>
-</databaseChangeLog>

application/database/src/main/resources/migrations/1.5.4/structure/structure.xml

@@ -1,10 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
-    <include file="grafana_user.xml" relativeToChangelogFile="true"/>
-</databaseChangeLog>

application/database/src/main/resources/migrations/changeLog.xml

@@ -1,10 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
-    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
-    <include file="1.5.4/collection.xml" relativeToChangelogFile="true"/>
-</databaseChangeLog>

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.oneplus.bot.executable.Application

application/executable/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>executable</artifactId>
@@ -14,6 +14,7 @@
     </properties>
 
     <build>
+        <finalName>oneplus-bot</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

application/executable/src/main/java/dev/sheldan/oneplus/bot/executable/SecurityConfig.java

@@ -0,0 +1,18 @@
+package dev.sheldan.oneplus.bot.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();
+    }
+
+}

application/executable/src/main/resources/application-local.properties

@@ -1,21 +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=oneplus-bot
-spring.security.user.name=abstracto
-spring.security.user.password=password
-spring.security.user.roles=USER
-
-spring.application.name=OnePlusBot

application/executable/src/main/resources/application.properties

@@ -1,11 +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=oneplus-bot
-spring.security.user.name= ${REST_USER_NAME}
-spring.security.user.password= ${REST_PASSWORD}
-spring.security.user.roles=USER
+management.metrics.tags.application=OnePlusBot
+management.endpoint.health.probes.enabled=true
+management.health.livenessState.enabled=true
+management.health.readinessState.enabled=true
+spring.application.name=OnePlusBot
 
-spring.application.name=OnePlusBot
+spring.main.allow-circular-references=true

application/oneplus-bot-customizations/dynamic-activity-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
         <artifactId>oneplus-bot-customizations</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/moderation-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplus-bot-customizations</artifactId>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/starboard-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
         <artifactId>oneplus-bot-customizations</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/faq/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplus-bot-modules</artifactId>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/FAQChannelGroup.java

@@ -3,7 +3,7 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database;
 import dev.sheldan.abstracto.core.models.database.AChannelGroup;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 
 @Builder

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/FAQChannelGroupCommand.java

@@ -3,7 +3,7 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database;
 import dev.sheldan.oneplus.bot.modules.faq.models.database.embed.ChannelGroupCommandId;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.ArrayList;

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/FAQCommand.java

@@ -3,7 +3,7 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.ArrayList;

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/FAQCommandAlias.java

@@ -3,7 +3,7 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database;
 import dev.sheldan.oneplus.bot.modules.faq.models.database.embed.FAQCommandAliasId;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/FAQCommandResponse.java

@@ -3,7 +3,7 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database;
 import dev.sheldan.oneplus.bot.modules.faq.models.database.embed.CommandResponseId;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 
 @Builder

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/embed/ChannelGroupCommandId.java

@@ -2,8 +2,8 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database.embed;
 
 import lombok.*;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 
 @Embeddable

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/embed/CommandResponseId.java

@@ -2,8 +2,8 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database.embed;
 
 import lombok.*;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 
 @Embeddable

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/embed/FAQCommandAliasId.java

@@ -2,8 +2,8 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database.embed;
 
 import lombok.*;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 
 @Embeddable

application/oneplus-bot-modules/news/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
         <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/database/NewsPost.java

@@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 
 @Builder

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/service/management/NewsPostManagementServiceBean.java

@@ -6,12 +6,12 @@ import dev.sheldan.abstracto.core.service.management.UserInServerManagementServi
 import dev.sheldan.oneplus.bot.modules.news.exception.NewsPostNotFoundException;
 import dev.sheldan.oneplus.bot.modules.news.model.database.NewsPost;
 import dev.sheldan.oneplus.bot.modules.news.repository.NewsPostRepository;
+import jakarta.persistence.*;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.persistence.EntityManager;
 import java.time.Instant;
 import java.util.List;
 import java.util.Optional;

application/oneplus-bot-modules/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/referral/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
         <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/referral/src/main/java/dev/sheldan/oneplus/bot/modules/referral/model/database/ReferralUserInAServer.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 
 @Builder

application/oneplus-bot-modules/seasonal/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
         <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/seasonal/src/main/java/dev/sheldan/oneplus/bot/modules/seasonal/lights/models/database/LightsRole.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.ARole;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Builder
 @Entity

application/oneplus-bot-modules/setup/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplus-bot-modules</artifactId>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/pom.xml

@@ -5,18 +5,17 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot</groupId>
         <artifactId>oneplusbot</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
 
     <groupId>dev.sheldan.oneplus.bot.application</groupId>
     <artifactId>application</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.5</version>
+    <version>1.6.9</version>
     <modules>
         <module>executable</module>
         <module>oneplus-bot-customizations</module>
         <module>oneplus-bot-modules</module>
-        <module>database</module>
     </modules>
 
     <dependencyManagement>

deployment/docker-compose/pom.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
-        <artifactId>deployment</artifactId>
-        <version>1.6.5</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <packaging>pom</packaging>
-    <artifactId>docker-compose</artifactId>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>assembly-docker-compose-configuration</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/docker-compose.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

deployment/docker-compose/src/main/assembly/docker-compose.xml

@@ -1,19 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
-    <id>docker-compose</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <outputDirectory>./docker-compose</outputDirectory>
-            <directory>${project.basedir}/src/main/resources/</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <filtered>true</filtered>
-        </fileSet>
-    </fileSets>
-</assembly>

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

@@ -1,32 +0,0 @@
-# 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
-PGADMIN_DEFAULT_PASSWORD=admin
-TOKEN=<INSERT TOKEN>
-YOUTUBE_API_KEY=<INSERT KEY>
-ONEPLUS_BOT_VERSION=1.6.5

deployment/docker-compose/src/main/resources/README.md

@@ -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.
-

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

@@ -1,146 +0,0 @@
-version: '3.7'
-
-services:
-  db:
-    image: ${REGISTRY_PREFIX}oneplus_bot_database:${ONEPLUS_BOT_VERSION}
-    container_name: database
-    restart: always
-    environment:
-      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
-      POSTGRES_USER: ${DATABASE_USER}
-    ports:
-      - "127.0.0.1:${DATABASE_PORT}:5432"
-    networks:
-      - oneplusbot
-    volumes:
-      - db-data:/var/lib/postgresql/data
-  deployment_container:
-    container_name: deployment
-    image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - db
-    environment:
-      DB_PASS: ${DATABASE_PASSWORD}
-      DB_HOST: ${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: ${DATABASE_HOST}:${DATABASE_PORT}
-    networks:
-      - oneplusbot
-  bot:
-    image: ${REGISTRY_PREFIX}oneplus_bot:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - db
-      - deployment_container
-    restart: on-failure
-    container_name: oneplusbot
-    environment:
-      TOKEN: ${TOKEN}
-      REMOTE_DEBUG: ${REMOTE_DEBUG}
-      DB_PASS: ${DATABASE_PASSWORD}
-      DB_HOST: ${DATABASE_HOST}
-      DB_PORT: ${DATABASE_PORT}
-      DB_USER: ${DATABASE_USER}
-      DB_NAME: ${DATABASE_NAME}
-      REST_USER_NAME: ${REST_USER_NAME}
-      REST_PASSWORD: ${REST_PASSWORD}
-      YOUTUBE_API_KEY: ${YOUTUBE_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:
-      - oneplusbot
-    volumes:
-      - bot-logs:/logs
-      - ./config:/config
-  pgadmin:
-    container_name: pgadmin
-    image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${ONEPLUS_BOT_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:
-      - oneplusbot
-  prometheus:
-    container_name: prometheus
-    image: ${REGISTRY_PREFIX}oneplus_bot_prometheus:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - bot
-    ports:
-      - "127.0.0.1:${PROMETHEUS_PORT}:9090"
-    restart: unless-stopped
-    networks:
-      - oneplusbot
-    volumes:
-      - ./res/prometheus-scrapper-password-filled:/etc/prometheus/micrometer_password
-      - prometheus-data:/prometheus
-  grafana:
-    container_name: grafana
-    image: ${REGISTRY_PREFIX}oneplus_bot_grafana:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - prometheus
-      - bot
-    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
-      LOKI_HOST: 'loki'
-      LOKI_PORT: ${LOKI_PORT}
-    volumes:
-      - grafana-user-data:/var/lib/grafana
-    networks:
-      - oneplusbot
-  promtail:
-    container_name: promtail
-    image: ${REGISTRY_PREFIX}oneplus_bot_promtail:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - bot
-    restart: unless-stopped
-    command: -config.file=/mnt/config/promtail-config.yaml
-    volumes:
-      - bot-logs:/logs
-    networks:
-      - oneplusbot
-  loki:
-    container_name: loki
-    image: ${REGISTRY_PREFIX}oneplus_bot_loki:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - promtail
-    command: -config.file=/mnt/config/loki-config.yaml
-    ports:
-      - "127.0.0.1:${LOKI_PORT}:3100"
-    restart: unless-stopped
-    networks:
-      - oneplusbot
-
-networks:
-  oneplusbot:
-    driver: bridge
-    name: oneplusbot-network
-
-volumes:
-  db-data:
-  grafana-user-data:
-  prometheus-data:
-  bot-logs:

deployment/docker-compose/src/main/resources/fill-prometheus-file.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-set -o allexport
-source .env
-set +o allexport
-envsubst < res/prometheus-scrapper-password > res/prometheus-scrapper-password-filled

deployment/docker-compose/src/main/resources/res/prometheus-scrapper-password

@@ -1 +0,0 @@
-${REST_PASSWORD}

deployment/helm/oneplus-bot/.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/

deployment/helm/oneplus-bot/Chart.yaml

@@ -0,0 +1,24 @@
+apiVersion: v2
+name: oneplus-bot
+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: 1.6.9
+
+# 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.6.9"

deployment/helm/oneplus-bot/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: OnePlusBot

deployment/helm/oneplus-bot/configuration/grafana/oneplus-bot-discord-dashboard.json

@@ -0,0 +1,939 @@
+{
+  "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
+              },
+              "insertNulls": 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{namespace=\"oneplus-bot\"}[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
+              },
+              "insertNulls": 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{namespace=\"oneplus-bot\"}[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
+              },
+              "insertNulls": 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{namespace=\"oneplus-bot\"}[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
+              },
+              "insertNulls": 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{namespace=\"oneplus-bot\"}[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
+              },
+              "insertNulls": 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\", namespace=\"oneplus-bot\"}[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\", namespace=\"oneplus-bot\"}[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\", namespace=\"oneplus-bot\"}[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\", namespace=\"oneplus-bot\"}[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
+              },
+              "insertNulls": 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{namespace=\"oneplus-bot\"}",
+            "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
+              },
+              "insertNulls": 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{namespace=\"oneplus-bot\"}[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
+              },
+              "insertNulls": 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{namespace=\"oneplus-bot\"}[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
+              },
+              "insertNulls": 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": 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{namespace=\"oneplus-bot\"}[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": "OnePlusBot",
+          "skipUrlSync": false,
+          "type": "constant"
+        }
+      ]
+    },
+    "time": {
+      "from": "now-30m",
+      "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "",
+    "title": "OnePlusBot Discord status",
+    "uid": "8e3188c3-4ea2-4223-865e-d1681f1ef0fb",
+    "version": 2,
+    "weekStart": ""
+  },
+  "overwrite": true
+}

deployment/helm/oneplus-bot/configuration/grafana/oneplus-bot-log-dashboard.json

@@ -0,0 +1,238 @@
+{
+  "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 OnePlusBot",
+    "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=\"OnePlusBot\", namespace=\"oneplus-bot\"} |= `$logFilter`",
+            "maxLines": 5000,
+            "queryType": "range",
+            "refId": "A"
+          }
+        ],
+        "title": "OnePlusBot 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=\"OnePlusBot\", namespace=\"oneplus-bot\"} |= \"ERROR\"",
+            "maxLines": 5000,
+            "queryType": "range",
+            "refId": "A"
+          }
+        ],
+        "title": "OnePlusBot 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
+              },
+              "insertNulls": 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=\"OnePlusBot\", namespace=\"oneplus-bot\"}[$__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": "OnePlus Bot Logs",
+    "uid": "b30e19ce-eb4b-4534-bf51-9fd7da75f606",
+    "version": 2,
+    "weekStart": ""
+  },
+  "overwrite": true
+}

deployment/helm/oneplus-bot/templates/_helpers.tpl

@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "oneplusBot.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 "oneplusBot.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 "oneplusBot.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "oneplusBot.labels" -}}
+helm.sh/chart: {{ include "oneplusBot.chart" . }}
+{{ include "oneplusBot.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "oneplusBot.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "oneplusBot.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "oneplusBot.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "oneplusBot.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

deployment/helm/oneplus-bot/templates/api-keys.yaml

@@ -0,0 +1,7 @@
+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 }}

deployment/helm/oneplus-bot/templates/db-config-deployment-job.yaml

@@ -0,0 +1,69 @@
+{{- if .Values.dbConfigDeployment.enabled -}}
+apiVersion: batch/v1
+kind: Job
+metadata:
+{{- $deploymentJobName := print ((include "oneplusBot.fullname" .) | trunc 39) "-db-config-deployment-job" }}
+  name: {{ $deploymentJobName | trunc 63 }}
+  annotations:
+    "helm.sh/hook": pre-upgrade,pre-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 }}
+
+

deployment/helm/oneplus-bot/templates/db-credentials.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: db-credentials
+  annotations:
+    "helm.sh/hook": pre-upgrade,pre-install
+    "helm.sh/hook-weight": "-6"
+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 }}

deployment/helm/oneplus-bot/templates/deployment.yaml

@@ -0,0 +1,106 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "oneplusBot.fullname" . }}
+  labels:
+    {{- include "oneplusBot.labels" . | nindent 4 }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      {{- include "oneplusBot.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "oneplusBot.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "oneplusBot.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: TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: api-keys
+                  key: discordToken
+            - name: OPEN_WEATHER_MAP_API_KEY
+              value: "placeholder" # a value is required, if the webservices module is loaded, but weather not used
+            - name: YOUTUBE_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: api-keys
+                  key: youtubeApiKey
+          ports:
+            - name: http
+              containerPort: {{ .Values.service.port }}
+              protocol: TCP
+            - name: debug
+              containerPort: 5005
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /actuator/health/liveness
+              port: 8080
+            initialDelaySeconds: {{ $.Values.bot.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ $.Values.bot.livenessProbe.periodSeconds }}
+            failureThreshold: {{ $.Values.bot.livenessProbe.failureThreshold }}
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: 8080
+            initialDelaySeconds: {{ $.Values.bot.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ $.Values.bot.readinessProbe.periodSeconds }}
+            failureThreshold: {{ $.Values.bot.readinessProbe.failureThreshold }}
+          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 }}

deployment/helm/oneplus-bot/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/oneplus-bot-log-dashboard.json") . ) | b64enc }}
+  discord-dashboard.json: {{ (tpl (.Files.Get "configuration/grafana/oneplus-bot-discord-dashboard.json") . ) | b64enc }}
+{{- end }}

deployment/helm/oneplus-bot/templates/service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "oneplusBot.fullname" . }}
+  labels:
+    {{- include "oneplusBot.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 "oneplusBot.selectorLabels" . | nindent 4 }}

deployment/helm/oneplus-bot/templates/serviceaccount.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "oneplusBot.serviceAccountName" . }}
+  labels:
+    {{- include "oneplusBot.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}

deployment/helm/oneplus-bot/templates/template-deployment-job.yaml

@@ -0,0 +1,69 @@
+{{- if .Values.dbConfigDeployment.enabled -}}
+apiVersion: batch/v1
+kind: Job
+metadata:
+{{- $deploymentJobName := print ((include "oneplusBot.fullname" .) | trunc 39) "-template-deployment-job" }}
+  name: {{ $deploymentJobName | trunc 63 }}
+  annotations:
+    "helm.sh/hook": pre-upgrade,pre-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 }}
+
+

deployment/helm/oneplus-bot/values.yaml

@@ -0,0 +1,125 @@
+# Default values for oneplus-bot.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+bot:
+  repository: harbor.sheldan.dev/oneplus-bot
+  pullPolicy: IfNotPresent
+  image: oneplus-bot-image
+  tag: 1.6.9
+  livenessProbe:
+    initialDelaySeconds: 60
+    periodSeconds: 5
+    failureThreshold: 3
+  readinessProbe:
+    initialDelaySeconds: 60
+    periodSeconds: 5
+    failureThreshold: 3
+
+templateDeployment:
+  enabled: true
+  repository: harbor.sheldan.dev/abstracto
+  pullPolicy: Always
+  image: abstracto-template-deployment
+  tag: 1.5.9
+
+templateDeploymentData:
+  repository: harbor.sheldan.dev/oneplus-bot
+  pullPolicy: Always
+  image: oneplus-bot-template-data
+  tag: 1.6.9
+
+dbConfigDeployment:
+  enabled: true
+  repository: harbor.sheldan.dev/abstracto
+  pullPolicy: Always
+  image: abstracto-db-deployment
+  tag: 1.5.9
+
+dbConfigDeploymentData:
+  repository: harbor.sheldan.dev/oneplus-bot
+  pullPolicy: Always
+  image: oneplus-bot-db-data
+  tag: 1.6.9
+
+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: {}

deployment/image-packaging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -49,7 +49,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>core.zip</destFileName>
                         </artifactItem>
 
@@ -59,7 +59,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>experience-tracking.zip</destFileName>
                         </artifactItem>
 
@@ -69,7 +69,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>assignable-roles.zip</destFileName>
                         </artifactItem>
 
@@ -79,7 +79,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>anti-raid.zip</destFileName>
                         </artifactItem>
 
@@ -89,7 +89,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>voice-channel-context.zip</destFileName>
                         </artifactItem>
 
@@ -99,7 +99,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>modmail.zip</destFileName>
                         </artifactItem>
 
@@ -109,7 +109,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>moderation.zip</destFileName>
                         </artifactItem>
 
@@ -119,7 +119,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>entertainment.zip</destFileName>
                         </artifactItem>
                         <artifactItem>
@@ -128,7 +128,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>link-embed.zip</destFileName>
                         </artifactItem>
                         <artifactItem>
@@ -137,7 +137,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>starboard.zip</destFileName>
                         </artifactItem>
                         <artifactItem>
@@ -146,7 +146,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>utility.zip</destFileName>
                         </artifactItem>
 
@@ -156,7 +156,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>webservices.zip</destFileName>
                         </artifactItem>
 
@@ -166,7 +166,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>remind.zip</destFileName>
                         </artifactItem>
 
@@ -176,7 +176,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>suggestion.zip</destFileName>
                         </artifactItem>
 
@@ -186,7 +186,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>invite-filter.zip</destFileName>
                         </artifactItem>
 
@@ -196,7 +196,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>statistic.zip</destFileName>
                         </artifactItem>
 
@@ -206,7 +206,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>logging.zip</destFileName>
                         </artifactItem>
 
@@ -216,7 +216,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>profanity-filter.zip</destFileName>
                         </artifactItem>
 
@@ -226,7 +226,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>starboard-custom.zip</destFileName>
                         </artifactItem>
 
@@ -236,7 +236,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>news.zip</destFileName>
                         </artifactItem>
 
@@ -246,7 +246,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>referral.zip</destFileName>
                         </artifactItem>
 
@@ -256,7 +256,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>faq.zip</destFileName>
                         </artifactItem>
 
@@ -268,7 +268,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>core.zip</destFileName>
                         </artifactItem>
 
@@ -278,7 +278,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>modmail.zip</destFileName>
                         </artifactItem>
 
@@ -288,7 +288,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>assignable-roles.zip</destFileName>
                         </artifactItem>
 
@@ -298,7 +298,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>anti-raid.zip</destFileName>
                         </artifactItem>
 
@@ -308,7 +308,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>voice-channel-context.zip</destFileName>
                         </artifactItem>
 
@@ -318,7 +318,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>utility.zip</destFileName>
                         </artifactItem>
 
@@ -328,7 +328,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>experience-tracking.zip</destFileName>
                         </artifactItem>
 
@@ -338,7 +338,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>entertainment.zip</destFileName>
                         </artifactItem>
 
@@ -348,7 +348,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>moderation.zip</destFileName>
                         </artifactItem>
 
@@ -358,7 +358,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>link-embed.zip</destFileName>
                         </artifactItem>
 
@@ -368,7 +368,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>starboard.zip</destFileName>
                         </artifactItem>
 
@@ -378,7 +378,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>webservices.zip</destFileName>
                         </artifactItem>
 
@@ -388,7 +388,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>remind.zip</destFileName>
                         </artifactItem>
 
@@ -398,7 +398,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>suggestion.zip</destFileName>
                         </artifactItem>
 
@@ -408,7 +408,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>invite-filter.zip</destFileName>
                         </artifactItem>
 
@@ -418,7 +418,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>statistic.zip</destFileName>
                         </artifactItem>
 
@@ -428,7 +428,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>profanity-filter.zip</destFileName>
                         </artifactItem>
 
@@ -438,7 +438,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>logging.zip</destFileName>
                         </artifactItem>
 
@@ -448,7 +448,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>starboard-custom.zip</destFileName>
                         </artifactItem>
 
@@ -458,7 +458,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>moderation-custom.zip</destFileName>
                         </artifactItem>
 
@@ -468,7 +468,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>dynamic-activity-custom-translations.zip</destFileName>
                         </artifactItem>
 
@@ -479,7 +479,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>news.zip</destFileName>
                         </artifactItem>
 
@@ -489,7 +489,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>setup.zip</destFileName>
                         </artifactItem>
 
@@ -499,7 +499,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>referral.zip</destFileName>
                         </artifactItem>
 
@@ -509,7 +509,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>seasonal.zip</destFileName>
                         </artifactItem>
 
@@ -519,7 +519,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>faq.zip</destFileName>
                         </artifactItem>
 
@@ -531,7 +531,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>scheduling.zip</destFileName>
                         </artifactItem>
 
@@ -542,7 +542,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>core.zip</destFileName>
                         </artifactItem>
 
@@ -553,7 +553,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>assignable-roles.zip</destFileName>
                         </artifactItem>
 
@@ -564,7 +564,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>anti-raid.zip</destFileName>
                         </artifactItem>
 
@@ -575,7 +575,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>voice-channel-context.zip</destFileName>
                         </artifactItem>
 
@@ -586,7 +586,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>dynamic-activity.zip</destFileName>
                         </artifactItem>
 
@@ -597,7 +597,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>modmail.zip</destFileName>
                         </artifactItem>
 
@@ -608,7 +608,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>moderation.zip</destFileName>
                         </artifactItem>
 
@@ -619,7 +619,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>experience-tracking.zip</destFileName>
                         </artifactItem>
 
@@ -630,7 +630,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>entertainment.zip</destFileName>
                         </artifactItem>
 
@@ -641,7 +641,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>link-embed.zip</destFileName>
                         </artifactItem>
 
@@ -652,7 +652,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>starboard.zip</destFileName>
                         </artifactItem>
 
@@ -664,7 +664,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>utility.zip</destFileName>
                         </artifactItem>
 
@@ -675,7 +675,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>webservices.zip</destFileName>
                         </artifactItem>
 
@@ -686,7 +686,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>remind.zip</destFileName>
                         </artifactItem>
 
@@ -697,7 +697,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>suggestion.zip</destFileName>
                         </artifactItem>
 
@@ -708,7 +708,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>invite-filter.zip</destFileName>
                         </artifactItem>
 
@@ -719,7 +719,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>statistic.zip</destFileName>
                         </artifactItem>
 
@@ -730,7 +730,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>profanity-filter.zip</destFileName>
                         </artifactItem>
 
@@ -741,7 +741,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>logging.zip</destFileName>
                         </artifactItem>
 
@@ -753,7 +753,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>starboard-custom.zip</destFileName>
                         </artifactItem>
 
@@ -764,7 +764,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>moderation-custom.zip</destFileName>
                         </artifactItem>
 
@@ -775,7 +775,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>dynamic-activity-custom.zip</destFileName>
                         </artifactItem>
 
@@ -786,7 +786,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>news.zip</destFileName>
                         </artifactItem>
 
@@ -797,7 +797,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>setup.zip</destFileName>
                         </artifactItem>
 
@@ -808,7 +808,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>referral.zip</destFileName>
                         </artifactItem>
 
@@ -819,7 +819,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>faq.zip</destFileName>
                         </artifactItem>
 
@@ -830,21 +830,10 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>seasonal.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>
@@ -853,7 +842,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>overrides-templates-core.zip</destFileName>
                         </artifactItem>
 
@@ -863,7 +852,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>overrides-templates-webservices.zip</destFileName>
                         </artifactItem>
 
@@ -873,7 +862,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>overrides-templates-logging.zip</destFileName>
                         </artifactItem>
 
@@ -884,7 +873,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>overrides-templates-statistic.zip</destFileName>
                         </artifactItem>
 
@@ -894,7 +883,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>overrides-templates-modmail.zip</destFileName>
                         </artifactItem>
 
@@ -904,7 +893,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>overrides-templates-moderation.zip</destFileName>
                         </artifactItem>
 
@@ -915,7 +904,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>overrides-translation-moderation.zip</destFileName>
                         </artifactItem>
 

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
+REGISTRY_PREFIX=harbor.sheldan.dev/oneplus-bot/
+VERSION=1.6.9

deployment/image-packaging/src/main/docker/database/Dockerfile

@@ -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

deployment/image-packaging/src/main/docker/database/sql/init.sql

@@ -1 +0,0 @@
-CREATE SCHEMA abstracto

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"]

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

@@ -1,17 +1,4 @@
 {
-  "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "remind", "logging",
-    "suggestion", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation", "modmail", "assignable-roles",
-    "voice-channel-context", "anti-raid",
-    "starboard-custom",
-    "overrides-templates-webservices", "overrides-templates-core", "overrides-templates-logging", "overrides-templates-statistic",
-    "overrides-templates-modmail", "overrides-templates-moderation",
-    "news", "referral", "faq"],
-  "translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "suggestion",
-    "remind", "logging", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation", "modmail", "assignable-roles",
-    "voice-channel-context", "anti-raid",
-    "starboard-custom", "dynamic-activity-custom-translations", "moderation-custom",
-    "overrides-translation-moderation",
-    "news", "setup", "referral", "faq", "seasonal"],
   "liquibase_artifacts": [
     { "zip": "scheduling", "file": "scheduling-changeLog.xml" },
     { "zip": "core", "file": "core-changeLog.xml" },
@@ -34,7 +21,6 @@
     { "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/db-data/config/move.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+mv /var/db-config/* /var/run-config/

deployment/image-packaging/src/main/docker/deployment/Dockerfile

@@ -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 /

deployment/image-packaging/src/main/docker/docker-compose.yml

@@ -4,47 +4,12 @@ services:
   bot:
     build:
       context: oneplusbot
-    image: ${REGISTRY_PREFIX}oneplus_bot:${VERSION:-latest}
-  database:
+    image: ${REGISTRY_PREFIX}oneplus-bot-image:${VERSION:-latest}
+  db-data:
     build:
-      context: database
-      args:
-        POSTGRES_VERSION: ${POSTGRES_VERSION}
-    image: ${REGISTRY_PREFIX}oneplus_bot_database:${VERSION:-latest}
-  pg_admin:
+      context: db-data
+    image: ${REGISTRY_PREFIX}oneplus-bot-db-data:${VERSION:-latest}
+  template-data:
     build:
-      context: pgAdmin
-      args:
-        PG_ADMIN_VERSION: ${PG_ADMIN_VERSION}
-    image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${VERSION:-latest}
-  deployment_container:
-    build:
-      context: deployment
-      args:
-        ABSTRACTO_REGISTRY_PREFIX: ${ABSTRACTO_REGISTRY_PREFIX}
-        ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
-    image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${VERSION:-latest}
-  prometheus:
-    build:
-      context: prometheus
-      args:
-        PROMETHEUS_VERSION: ${PROMETHEUS_VERSION}
-    image: ${REGISTRY_PREFIX}oneplus_bot_prometheus:${VERSION:-latest}
-  grafana:
-    build:
-      context: grafana
-      args:
-        GRAFANA_VERSION: ${GRAFANA_VERSION}
-    image: ${REGISTRY_PREFIX}oneplus_bot_grafana:${VERSION:-latest}
-  promtail:
-    build:
-      context: promtail
-      args:
-        PROMTAIL_VERSION: ${PROMTAIL_VERSION}
-    image: ${REGISTRY_PREFIX}oneplus_bot_promtail:${VERSION:-latest}
-  loki:
-    build:
-      context: loki
-      args:
-        LOKI_VERSION: ${LOKI_VERSION}
-    image: ${REGISTRY_PREFIX}oneplus_bot_loki:${VERSION:-latest}
+      context: template-data
+    image: ${REGISTRY_PREFIX}oneplus-bot-template-data:${VERSION:-latest}

deployment/image-packaging/src/main/docker/grafana/Dockerfile

@@ -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

deployment/image-packaging/src/main/docker/grafana/config.ini

@@ -1,2 +0,0 @@
-[paths]
-provisioning = conf/provisioning

deployment/image-packaging/src/main/docker/grafana/dashboards/oneplus-bot-logs.json

@@ -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=\"oneplus-bot-logs\", filename=\"/logs/log.log\"}",
-          "queryType": "randomWalk",
-          "refId": "A"
-        }
-      ],
-      "title": "OnePlus Bot logs",
-      "type": "logs"
-    }
-  ],
-  "refresh": "",
-  "schemaVersion": 30,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-3h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "OnePlus Bot logs",
-  "uid": "1uGb0q4nz",
-  "version": 2
-}

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

@@ -1,6 +0,0 @@
-- name: 'oneplus-dashboards'
-  org_id: 1
-  folder: ''
-  type: 'file'
-  options:
-    folder: '/var/lib/grafana/dashboards'

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

@@ -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

deployment/image-packaging/src/main/docker/loki/Dockerfile

@@ -1,4 +0,0 @@
-ARG LOKI_VERSION
-FROM grafana/loki:${LOKI_VERSION}
-MAINTAINER Sheldan
-ADD loki.yml /mnt/config/loki-config.yaml

deployment/image-packaging/src/main/docker/loki/loki.yml

@@ -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

deployment/image-packaging/src/main/docker/oneplusbot/Dockerfile

@@ -1,10 +1,8 @@
-FROM openjdk:8-jdk-alpine
+FROM amazoncorretto:17.0.8-alpine3.18
 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"]

deployment/image-packaging/src/main/docker/pgAdmin/Dockerfile

@@ -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

deployment/image-packaging/src/main/docker/pgAdmin/config/servers.json

@@ -1,13 +0,0 @@
-{
-  "Servers": {
-    "1": {
-      "Name": "OnePlusBot database",
-      "Group": "Server Group 1",
-      "Port": 5432,
-      "Username": "abstracto",
-      "Host": "db",
-      "SSLMode": "prefer",
-      "MaintenanceDB": "postgres"
-    }
-  }
-}

deployment/image-packaging/src/main/docker/prometheus/Dockerfile

@@ -1,4 +0,0 @@
-ARG PROMETHEUS_VERSION
-FROM prom/prometheus:${PROMETHEUS_VERSION}
-MAINTAINER Sheldan
-ADD prometheus.yml /etc/prometheus/prometheus.yml

deployment/image-packaging/src/main/docker/prometheus/prometheus.yml

@@ -1,17 +0,0 @@
-global:
-  scrape_interval: 10s
-  scrape_timeout: 10s
-  evaluation_interval: 1m
-scrape_configs:
-  - job_name: oneplus_bot_micrometer
-    honor_timestamps: true
-    scrape_interval: 5s
-    scrape_timeout: 5s
-    metrics_path: /actuator/prometheus
-    scheme: http
-    static_configs:
-      - targets:
-          - oneplusbot:8080
-    basic_auth:
-      username: "abstracto"
-      password_file: /etc/prometheus/micrometer_password

deployment/image-packaging/src/main/docker/promtail/Dockerfile

@@ -1,4 +0,0 @@
-ARG PROMTAIL_VERSION
-FROM grafana/promtail:${PROMTAIL_VERSION}
-MAINTAINER Sheldan
-ADD promtail.yaml /mnt/config/promtail-config.yaml

deployment/image-packaging/src/main/docker/promtail/promtail.yaml

@@ -1,17 +0,0 @@
-server:
-  disable: true
-
-positions:
-  filename: /tmp/positions.yaml
-
-clients:
-  - url: http://loki:3100/loki/api/v1/push
-
-scrape_configs:
-  - job_name: system
-    static_configs:
-      - targets:
-          - localhost
-        labels:
-          job: oneplus-bot-logs
-          __path__: /logs/*.log

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"]

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

@@ -0,0 +1,17 @@
+{
+  "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "remind", "logging",
+    "suggestion", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation", "modmail", "assignable-roles",
+    "voice-channel-context", "anti-raid",
+    "starboard-custom",
+    "overrides-templates-webservices", "overrides-templates-core", "overrides-templates-logging", "overrides-templates-statistic",
+    "overrides-templates-modmail", "overrides-templates-moderation",
+    "news", "referral", "faq"],
+  "translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "suggestion",
+    "remind", "logging", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation", "modmail", "assignable-roles",
+    "voice-channel-context", "anti-raid",
+    "starboard-custom", "dynamic-activity-custom-translations", "moderation-custom",
+    "overrides-translation-moderation",
+    "news", "setup", "referral", "faq", "seasonal"]
+}
+
+

deployment/image-packaging/src/main/docker/template-data/config/move.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+mv /var/template-config/* /var/run-config/

deployment/infrastructure/terraform/.gitignore

@@ -1,29 +0,0 @@
-# Local .terraform directories
-**/.terraform/*
-
-# .tfstate files
-*.tfstate
-*.tfstate.*
-
-# Crash log files
-crash.log
-
-# Ignore any .tfvars files that are generated automatically for each Terraform run. Most
-# .tfvars files are managed as part of configuration and so should be included in
-# version control.
-#
-# example.tfvars
-
-# Ignore override files as they are usually used to override resources locally and so
-# are not checked in
-override.tf
-override.tf.json
-*_override.tf
-*_override.tf.json
-
-# Include override files you do wish to add to version control using negated pattern
-#
-# !example_override.tf
-
-# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
-# example: *tfplan*

deployment/infrastructure/terraform/.terraform.lock.hcl

@@ -1,23 +0,0 @@
-# This file is maintained automatically by "terraform init".
-# Manual edits may be lost in future updates.
-
-provider "registry.terraform.io/hetznercloud/hcloud" {
-  version = "1.34.3"
-  hashes = [
-    "h1:ZAFEiotL15xHI957CrTJEm3z83/lFMQdNWiMqN7Dyu4=",
-    "zh:08e4aea3c4e895d941c24d76f373977e5fae112c531b56cb2fcdaa8b5086ebec",
-    "zh:09f1255aad8f790c86a14522c7fff2fcb6529bb18f1e49a7423ca79db07f5a47",
-    "zh:0b2bcab12aa913adaf89228a250eb41e827c64723a741f2b74b318833f77c9df",
-    "zh:0c6947f73dc5779b2425e231b22643741b1877705fb4135df06f7a201f10d094",
-    "zh:26513bdefecae83411997a5c4e11dffd886b4594cb8663f4b0c36a064b1a650e",
-    "zh:42790576142fb7d0ce851923f58a642e7e4c9e6df9a02b531703131d836daade",
-    "zh:5095ea6c8b31dfebd52a03f9ba4e2a8a7ecb0c0442f68c98cab76b677c343e81",
-    "zh:6b80223b2831f9f2adf72c7ed37692cef67c8f43de62c405c7162bf524896bc3",
-    "zh:6b90164e839ad0977b3feb4dbec153ab76a4f7ee8451ee2d202992ff5a4157b1",
-    "zh:72d88705afb9d0a9d90a5ad342c605cb119b678e76f45c5e4c516da5d591f907",
-    "zh:881889a9e974a15c616cd7648f1c415a4fb3e9a08c166bcb17e488bfcbb67985",
-    "zh:967286f7ef73bb15c2412b9ae8853d1176a039374c5ea39cbfd75e7ebe13bcfd",
-    "zh:967a6cc506a019c1720f0207068097a06eb006e940ecc63060373b4b4b6181cc",
-    "zh:a68e5e2e2f03656e427045e32ca999422e00be299fc6ecedbd41bef48871b7c5",
-  ]
-}

deployment/infrastructure/terraform/cloud.tf

@@ -1,10 +0,0 @@
-terraform {
-  cloud {
-    hostname = "app.terraform.io"
-    organization = "OnePlusBot"
-
-    workspaces {
-      name = "main"
-    }
-  }
-}

deployment/infrastructure/terraform/main.tf

@@ -1,7 +0,0 @@
-module "hetzner" {
-  source            = "git@github.com:Sheldan/discord-bot-terraform-module.git//hetzner-bot?ref=v1.0.1"
-  ssh_key_key       = "Sheldan"
-  project_name      = "OnePlusBot"
-  user_name         = "sheldan"
-  hcloud_token      = var.hcloud_token
-}

deployment/infrastructure/terraform/output.tf

@@ -1,4 +0,0 @@
-output "instance_ipv4" {
-  description = "IPv4 address of the instance"
-  value = module.hetzner.instance_ipv4
-}

deployment/infrastructure/terraform/variables.tf

@@ -1,3 +0,0 @@
-variable "hcloud_token" {
-  type = string
-}

deployment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplusbot</artifactId>
         <groupId>dev.sheldan.oneplus.bot</groupId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -12,7 +12,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>docker-compose</module>
         <module>image-packaging</module>
     </modules>
 

pom.xml

@@ -6,21 +6,21 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.1.RELEASE</version>
+        <version>3.1.1</version>
         <relativePath />
     </parent>
 
     <groupId>dev.sheldan.oneplus.bot</groupId>
     <artifactId>oneplusbot</artifactId>
-    <version>1.6.5</version>
+    <version>1.6.9</version>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
         <!-- edit in release.yml as well -->
         <!-- when releasing a new opbot version, update the .env as well-->
-        <abstracto.version>1.4.20</abstracto.version>
-        <abstracto.templates.version>1.4.13</abstracto.templates.version>
+        <abstracto.version>1.5.9</abstracto.version>
+        <abstracto.templates.version>1.4.21</abstracto.templates.version>
     </properties>
 
     <modules>
@@ -56,7 +56,7 @@
     <scm>
         <url>https://maven.pkg.github.com/Sheldan/OnePlusBot</url>
         <developerConnection>scm:git:git@github.com:Sheldan/OnePlusBot.git</developerConnection>
-        <tag>oneplusbot-1.6.5</tag>
+        <tag>oneplusbot-1.6.9</tag>
     </scm>
 
 </project>

templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
         <artifactId>customization-templates</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/customization-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates</groupId>
         <artifactId>oneplus-bot-templates</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
         <artifactId>customization-templates</artifactId>
-        <version>1.6.5</version>
+        <version>1.6.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>