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

upgrading to newer abstracto version
adding some info to readme

.github/workflows/release.yml

@@ -34,5 +34,5 @@ jobs:
         env:
           REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
           VERSION: ${{ env.version }}
-          ABSTRACTO_VERSION: 1.3.5
+          ABSTRACTO_VERSION: 1.3.8
           ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/

PRIVACY_POLICY.md

@@ -1,6 +1,6 @@
 # r/oneplus Discord bot privacy policy
 
-Last updated: 04.07.2021
+Last updated: 06.09.2021
 
 ## Description
 
@@ -75,6 +75,7 @@ The detailed list of what information is stored and processed is the following:
     * this was used for the message used to update the status of a suggestion, but this is currently disabled
 * the author of the suggestion and the message which has been posted in the suggestions channel
 * every suggestion will be deleted completely from the database a few days after it has reached a final state (rejected, denied, accepted)
+* whether you voted for a suggestion and which decision you took
 
 ### Leveling system
 * the amount of messages which were considered for the leveling system

README.md

@@ -1,11 +1,21 @@
 # r/oneplus Discord server bot
 
-This repository contains the rewrite of the [Bot](https://github.com/Rithari/OnePlusBot), which is still in use. The features will be gradually be ported 
+This repository contains the rewrite of the [Bot](https://github.com/Rithari/OnePlusBot). It is developed by customizing [abstracto](https://github.com/Sheldan/abstracto), because some features are r/oneplus specific.
-and most of them will be in [abstracto](https://github.com/Sheldan/abstracto), but some of the features need to be customized, as they are r/oneplus specific.
 
 The migration of the existing data from the database is handled via one time migration, and can be found [here](https://github.com/Sheldan/OnePlusBot-migration).
 
+The FAQ configuration can be found [here](https://github.com/Sheldan/OnePlusBot-faq/).
+
 Custom features which were ported
  - [x] FAQ
  - [x] Setup channel handling
  - [x] Referral link handling 
+
+# Technologies used in addition to the ones provided in abstracto
+- [grafana](https://github.com/grafana/grafana) for visualization of the bot status and metrics
+- [Loki](https://github.com/grafana/loki) to visualize and query log files
+- [pgAdmin](https://github.com/postgres/pgadmin4) to view the database
+- [prometheus](https://github.com/prometheus/prometheus) for metric collection
+- [postgres](https://github.com/postgres/postgres) as a database
+- [loki](https://github.com/grafana/loki) for log aggregation
+  

application/database/pom.xml

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

application/executable/pom.xml

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

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.5.4</version>
+        <version>1.5.7</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.5.4</version>
+        <version>1.5.7</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.5.4</version>
+        <version>1.5.7</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.5.4</version>
+        <version>1.5.7</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.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/ImportFAQ.java

@@ -66,6 +66,7 @@ public class ImportFAQ extends AbstractConditionableCommand {
                 AServer server = serverManagementService.loadServer(commandContext.getGuild());
                 List<FaqCommandConfig> commands = faqServiceBean.loadFAQCommandsFromJson(jsonContent);
                 faqServiceBean.createOrUpdateFAQCommands(commands, server);
+                return CompletableFuture.completedFuture(CommandResult.fromSuccess());
             } else {
 
                 List<String> errors = jsonValidationService.getDetailedException(result.getExceptions())
@@ -73,8 +74,8 @@ public class ImportFAQ extends AbstractConditionableCommand {
                         .map(ValidationException::getMessage)
                         .collect(Collectors.toList());
                 channelService.sendTextToChannel(String.join("\n", errors), commandContext.getChannel());
+                return CompletableFuture.completedFuture(CommandResult.fromError("Incorrect faq config."));
             }
-            return CompletableFuture.completedFuture(CommandResult.fromSuccess());
         } catch (IOException e) {
             log.error("IO Exception when loading input file.", e);
             throw new AbstractoTemplatedException("Failed to load json config.", "failed_to_set_template_exception", e);

application/oneplus-bot-modules/faq/src/main/resources/validation/createScheme.json

@@ -3,143 +3,124 @@
   "type": "array",
   "minItems": 1,
   "maxItems": 30,
-  "items": [
+  "items": {
-    {
+    "type": "object",
-      "type": "object",
+    "properties": {
-      "properties": {
+      "faqCommandName": {
-        "faqCommandName": {
+        "type": "string",
+        "minLength": 1,
+        "maxLength": 30,
+        "pattern": "\\w*"
+      },
+      "global": {
+        "default": false,
+        "type": "boolean"
+      },
+      "aliases": {
+        "type": "array",
+        "minItems": 1,
+        "maxItems": 20,
+        "items": {
           "type": "string",
           "minLength": 1,
           "maxLength": 30,
           "pattern": "\\w*"
-        },
+        }
-        "global": {
+      },
-          "default": false,
+      "responses": {
-          "type": "boolean"
+        "type": "array",
-        },
+        "minItems": 1,
-        "aliases": {
+        "maxItems": 255,
-          "type": "array",
+        "items": {
-          "minItems": 1,
+          "type": "object",
-          "maxItems": 20,
+          "properties": {
-          "items": {
+            "channelGroupName": {
-            "type": "string",
+              "type": "string",
-            "minLength": 1,
+              "minLength": 1,
-            "maxLength": 30,
+              "maxLength": 20,
-            "pattern": "\\w*"
+              "pattern": "\\w*"
-          }
+            },
-        },
+            "messages": {
-        "responses": {
+              "type": "array",
-          "type": "array",
+              "minItems": 1,
-          "minItems": 1,
+              "maxItems": 3,
-          "maxItems": 255,
+              "items": {
-          "items": {
+                "type": "object",
-            "type": "object",
+                "properties": {
-            "properties": {
+                  "position": {
-              "channelGroupName": {
+                    "type": "number",
-                "type": "string",
+                    "minimum": 0,
-                "minLength": 1,
+                    "maximum": 2
-                "maxLength": 20,
+                  },
-                "pattern": "\\w*"
+                  "additionalMessage": {
-              },
+                    "type": "string",
-              "messages": {
+                    "minLength": 1,
-                "type": "array",
+                    "maxLength": 2000
-                "minItems": 1,
+                  },
-                "maxItems": 3,
+                  "embed": {
-                "items": [
-                  {
                     "type": "object",
                     "properties": {
-                      "position": {
+                      "description": {
-                        "type": "number",
-                        "minimum": 0,
-                        "maximum": 2
-                      },
-                      "additionalMessage": {
                         "type": "string",
                         "minLength": 1,
                         "maxLength": 2000
                       },
-                      "embed": {
+                      "imageUrl": {
+                        "type": "string",
+                        "minLength": 1,
+                        "maxLength": 2000,
+                        "pattern": "\\s*https?:\/\/\\S+"
+                      },
+                      "color": {
                         "type": "object",
                         "properties": {
-                          "description": {
+                          "red": {
-                            "type": "string",
+                            "type": "integer",
-                            "minLength": 1,
+                            "minimum": 0,
-                            "maxLength": 2000
+                            "default": 0,
+                            "maximum": 255
                           },
-                          "imageUrl": {
+                          "green": {
-                            "type": "string",
+                            "type": "integer",
-                            "minLength": 1,
+                            "minimum": 0,
-                            "maxLength": 2000,
+                            "default": 0,
-                            "pattern": "\\s*https?:\/\/\\S+"
+                            "maximum": 255
                           },
-                          "color": {
+                          "blue": {
-                            "type": "object",
+                            "type": "integer",
-                            "properties": {
+                            "minimum": 0,
-                              "red": {
+                            "default": 0,
-                                "type": "integer",
+                            "maximum": 255
-                                "minimum": 0,
+                          }
-                                "default": 0,
+                        },
-                                "maximum": 255
+                        "required": [
-                              },
+                          "red",
-                              "green": {
+                          "green",
-                                "type": "integer",
+                          "blue"
-                                "minimum": 0,
+                        ]
-                                "default": 0,
+                      },
-                                "maximum": 255
+                      "author": {
-                              },
+                        "type": "object",
-                              "blue": {
+                        "properties": {
-                                "type": "integer",
+                          "userId": {
-                                "minimum": 0,
+                            "minimum": 1,
-                                "default": 0,
+                            "maximum": 18446744073709551615,
-                                "maximum": 255
+                            "type": "integer"
-                              }
-                            },
-                            "required": [
-                              "red",
-                              "green",
-                              "blue"
-                            ]
                           },
-                          "author": {
+                          "useBot": {
-                            "type": "object",
+                            "type": "boolean"
-                            "properties": {
-                              "userId": {
-                                "minimum": 1,
-                                "maximum": 18446744073709551615,
-                                "type": "integer"
-                              },
-                              "useBot": {
-                                "type": "boolean"
-                              }
-                            },
-                            "additionalProperties": false,
-                            "anyOf": [
-                              {
-                                "required": [
-                                  "userId"
-                                ]
-                              },
-                              {
-                                "required": [
-                                  "useBot"
-                                ]
-                              }
-                            ]
                           }
                         },
                         "additionalProperties": false,
                         "anyOf": [
                           {
                             "required": [
-                              "description",
+                              "userId"
-                              "author"
                             ]
                           },
                           {
                             "required": [
-                              "imageUrl",
+                              "useBot"
-                              "author"
                             ]
                           }
                         ]
@@ -149,41 +130,56 @@
                     "anyOf": [
                       {
                         "required": [
-                          "additionalMessage",
+                          "description",
-                          "position"
+                          "author"
                         ]
                       },
                       {
                         "required": [
-                          "embed",
+                          "imageUrl",
-                          "position"
+                          "author"
-                        ]
-                      },
-                      {
-                        "required": [
-                          "additionalMessage",
-                          "embed",
-                          "position"
                         ]
                       }
                     ]
                   }
+                },
+                "additionalProperties": false,
+                "anyOf": [
+                  {
+                    "required": [
+                      "additionalMessage",
+                      "position"
+                    ]
+                  },
+                  {
+                    "required": [
+                      "embed",
+                      "position"
+                    ]
+                  },
+                  {
+                    "required": [
+                      "additionalMessage",
+                      "embed",
+                      "position"
+                    ]
+                  }
                 ]
               }
-            },
+            }
-            "additionalProperties": false,
+          },
-            "required": [
+          "additionalProperties": false,
-              "channelGroupName",
+          "required": [
-              "messages"
+            "channelGroupName",
-            ]
+            "messages"
-          }
+          ]
         }
-      },
+      }
-      "additionalProperties": false,
+    },
-      "required": [
+    "additionalProperties": false,
-        "faqCommandName",
+    "required": [
-        "responses"
+      "faqCommandName",
-      ]
+      "responses"
-    }
+    ]
-  ]
+  }
 }

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.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.4</version>
+        <version>1.5.7</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.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot</groupId>
         <artifactId>oneplusbot</artifactId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
 
     <groupId>dev.sheldan.oneplus.bot.application</groupId>
     <artifactId>application</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.4</version>
+    <version>1.5.7</version>
     <modules>
         <module>executable</module>
         <module>oneplus-bot-customizations</module>

deployment/docker-compose/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

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

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

@@ -32,7 +32,7 @@ services:
       EXECUTE_TEMPLATES: ${EXECUTE_TEMPLATES}
       LIQUIBASE_PATH: ${LIQUIBASE_PATH:-/liquibase}
       POSTGRES_DRIVER_PATH: ${EXECUTE_DEPLOYMENT:-/postgres/driver.jar}
-      WAIT_HOSTS: database:5432
+      WAIT_HOSTS: ${DATABASE_HOST}:${DATABASE_PORT}
     networks:
       - oneplusbot
   bot:
@@ -105,10 +105,34 @@ services:
       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:

deployment/image-packaging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

deployment/image-packaging/src/main/docker/.env

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

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

@@ -1,4 +1,5 @@
-FROM postgres
+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/docker-compose.yml

@@ -2,13 +2,20 @@ version: "3.7"
 
 services:
   bot:
-    build: oneplusbot
+    build:
+      context: oneplusbot
     image: ${REGISTRY_PREFIX}oneplus_bot:${VERSION:-latest}
   database:
-    build: database
+    build:
+      context: database
+      args:
+        POSTGRES_VERSION: ${POSTGRES_VERSION}
     image: ${REGISTRY_PREFIX}oneplus_bot_database:${VERSION:-latest}
   pg_admin:
-    build: pgAdmin
+    build:
+      context: pgAdmin
+      args:
+        PG_ADMIN_VERSION: ${PG_ADMIN_VERSION}
     image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${VERSION:-latest}
   deployment_container:
     build:
@@ -18,8 +25,26 @@ services:
         ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
     image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${VERSION:-latest}
   prometheus:
-    build: prometheus
+    build:
+      context: prometheus
+      args:
+        PROMETHEUS_VERSION: ${PROMETHEUS_VERSION}
     image: ${REGISTRY_PREFIX}oneplus_bot_prometheus:${VERSION:-latest}
   grafana:
-    build: 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}

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

@@ -1,4 +1,5 @@
-FROM grafana/grafana
+ARG GRAFANA_VERSION
+FROM grafana/grafana:${GRAFANA_VERSION}
 MAINTAINER Sheldan
 ADD ./provisioning /etc/grafana/provisioning
 ADD ./config.ini /etc/grafana/config.ini

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

@@ -0,0 +1,66 @@
+{
+  "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": 10,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 2,
+      "maxDataPoints": 10000,
+      "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": 1
+}

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

@@ -21,3 +21,9 @@ datasources:
        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

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

@@ -0,0 +1,66 @@
+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/pgAdmin/Dockerfile

@@ -1,4 +1,5 @@
-FROM dpage/pgadmin4
+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/prometheus/Dockerfile

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

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

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

@@ -0,0 +1,17 @@
+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/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplusbot</artifactId>
         <groupId>dev.sheldan.oneplus.bot</groupId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -12,15 +12,15 @@
 
     <groupId>dev.sheldan.oneplus.bot</groupId>
     <artifactId>oneplusbot</artifactId>
-    <version>1.5.4</version>
+    <version>1.5.7</version>
 
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
         <!-- edit in release.yml as well -->
         <!-- when releasing a new opbot version, update the .env as well-->
-        <abstracto.version>1.3.5</abstracto.version>
+        <abstracto.version>1.3.8</abstracto.version>
-        <abstracto.templates.version>1.2.18</abstracto.templates.version>
+        <abstracto.templates.version>1.2.20</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.5.4</tag>
+        <tag>oneplusbot-1.5.7</tag>
     </scm>
 
 </project>

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

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

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

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

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

@@ -3,14 +3,14 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
     <artifactId>oneplus-bot-modules-templates</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.4</version>
+    <version>1.5.7</version>
     <modules>
         <module>starboard-custom-templates</module>
         <module>news-templates</module>

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

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

templates/oneplus-bot-modules-templates/starboard-custom-templates/pom.xml

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

templates/overrides/pom.xml

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

templates/overrides/template-overrides/core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>template-overrides</artifactId>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/overrides/template-overrides/logging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/overrides/template-overrides/moderation/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>template-overrides</artifactId>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/overrides/template-overrides/modmail/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>template-overrides</artifactId>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/overrides/template-overrides/pom.xml

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

templates/overrides/template-overrides/statistic/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/overrides/template-overrides/webservices/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
         <artifactId>template-overrides</artifactId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/overrides/translation-overrides/moderation/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.overrides.translations</groupId>
         <artifactId>translation-overrides</artifactId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/overrides/translation-overrides/pom.xml

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

templates/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot</groupId>
         <artifactId>oneplusbot</artifactId>
-        <version>1.5.4</version>
+        <version>1.5.7</version>
     </parent>
 
     <modules>
@@ -15,7 +15,7 @@
 
     <groupId>dev.sheldan.oneplus.bot.templates</groupId>
     <artifactId>templates</artifactId>
-    <version>1.5.4</version>
+    <version>1.5.7</version>
     <packaging>pom</packaging>
 
 </project>

templates/translations/dynamic-activity-custom-translations/pom.xml

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

templates/translations/faq-translations/pom.xml

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

templates/translations/moderation-custom/pom.xml

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

templates/translations/news-translations/pom.xml

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

templates/translations/pom.xml

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

templates/translations/referral-translations/pom.xml

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

templates/translations/setup-translations/pom.xml

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

templates/translations/starboard-custom-translations/pom.xml

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