[RAB-1] rename project to Sissi

This commit is contained in:
Sheldan
2022-06-07 00:54:43 +02:00
parent a2e304fdd8
commit d06fb7ff30
91 changed files with 138 additions and 138 deletions

View File

@@ -32,7 +32,7 @@ jobs:
working-directory: ./deployment/image-packaging/src/main/docker
run: docker-compose build && docker-compose push
env:
REGISTRY_PREFIX: docker.pkg.github.com/sheldan/r-austria-bot/
REGISTRY_PREFIX: docker.pkg.github.com/sheldan/sissi/
VERSION: ${{ env.version }}
ABSTRACTO_VERSION: 1.3.13
ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/

View File

@@ -1,7 +1,7 @@
<?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.raustria.bot.application</groupId>
<groupId>dev.sheldan.sissi.application</groupId>
<artifactId>application</artifactId>
<version>1.0.3-SNAPSHOT</version>
</parent>
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>dev.sheldan.raustria.bot.application.module</groupId>
<groupId>dev.sheldan.sissi.application.module</groupId>
<artifactId>quotes</artifactId>
<version>${project.version}</version>
</dependency>

View File

@@ -1,6 +1,6 @@
spring.datasource.url=jdbc:postgresql://localhost:5432/abstracto
spring.datasource.username= abstracto
spring.datasource.password= abstracto
spring.datasource.username=abstracto
spring.datasource.password=abstracto
spring.jpa.properties.hibernate.default_schema=abstracto
spring.quartz.jdbc.initialize-schema=never
@@ -13,9 +13,9 @@ log4j.logger.org.hibernate.SQL=trace
log4j.logger.org.hibernate.type.descriptor.sql=trace
log4j.logger.org.hibernate.type=trace
management.metrics.tags.application=r-austria-bot
management.metrics.tags.application=sissi
spring.security.user.name=abstracto
spring.security.user.password=password
spring.security.user.roles=USER
spring.application.name=RAustriaBot
spring.application.name=Sissi

View File

@@ -3,9 +3,9 @@ spring.datasource.username= ${DB_USER}
spring.datasource.password= ${DB_PASS}
spring.jpa.hibernate.default_schema=${DB_NAME}
spring.quartz.jdbc.initialize-schema=never
management.metrics.tags.application=r-austria-bot
management.metrics.tags.application=Sissi
spring.security.user.name= ${REST_USER_NAME}
spring.security.user.password= ${REST_PASSWORD}
spring.security.user.roles=USER
spring.application.name=RAustriaBot
spring.application.name=Sissi

View File

@@ -1,8 +1,8 @@
<?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.raustria.bot</groupId>
<artifactId>r-austria-bot</artifactId>
<groupId>dev.sheldan.sissi</groupId>
<artifactId>sissi</artifactId>
<version>1.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -10,7 +10,7 @@
<packaging>pom</packaging>
<groupId>dev.sheldan.raustria.bot.application</groupId>
<groupId>dev.sheldan.sissi.application</groupId>
<artifactId>application</artifactId>
<dependencyManagement>
@@ -27,7 +27,7 @@
<modules>
<module>executable</module>
<module>r-austria-modules</module>
<module>sissi-modules</module>
</modules>
<dependencies>

View File

@@ -1,13 +1,13 @@
<?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.sissi.application</groupId>
<artifactId>application</artifactId>
<groupId>dev.sheldan.raustria.bot.application</groupId>
<version>1.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>r-austria-modules</artifactId>
<artifactId>sissi-modules</artifactId>
<packaging>pom</packaging>
<modules>

View File

@@ -1,13 +1,13 @@
<?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>
<artifactId>r-austria-modules</artifactId>
<groupId>dev.sheldan.raustria.bot.application</groupId>
<groupId>dev.sheldan.sissi.application</groupId>
<artifactId>sissi-modules</artifactId>
<version>1.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>dev.sheldan.raustria.bot.application.module</groupId>
<groupId>dev.sheldan.sissi.application.module</groupId>
<artifactId>quotes</artifactId>
<build>

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.command;
package dev.sheldan.sissi.module.quotes.command;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -14,11 +14,11 @@ import dev.sheldan.abstracto.core.service.management.ServerManagementService;
import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
import dev.sheldan.abstracto.core.templating.model.MessageToSend;
import dev.sheldan.abstracto.core.utils.FutureUtils;
import dev.sheldan.raustria.bot.module.quotes.config.QuotesFeatureDefinition;
import dev.sheldan.raustria.bot.module.quotes.config.QuotesModuleDefinition;
import dev.sheldan.raustria.bot.module.quotes.exception.QuoteNotFoundException;
import dev.sheldan.raustria.bot.module.quotes.model.database.Quote;
import dev.sheldan.raustria.bot.module.quotes.service.QuoteServiceBean;
import dev.sheldan.sissi.module.quotes.config.QuotesFeatureDefinition;
import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition;
import dev.sheldan.sissi.module.quotes.exception.QuoteNotFoundException;
import dev.sheldan.sissi.module.quotes.model.database.Quote;
import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.MessageChannel;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.command;
package dev.sheldan.sissi.module.quotes.command;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -9,9 +9,9 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.management.ServerManagementService;
import dev.sheldan.raustria.bot.module.quotes.config.QuotesFeatureDefinition;
import dev.sheldan.raustria.bot.module.quotes.config.QuotesModuleDefinition;
import dev.sheldan.raustria.bot.module.quotes.service.QuoteServiceBean;
import dev.sheldan.sissi.module.quotes.config.QuotesFeatureDefinition;
import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition;
import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.command;
package dev.sheldan.sissi.module.quotes.command;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -12,11 +12,11 @@ import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.service.management.ServerManagementService;
import dev.sheldan.abstracto.core.templating.model.MessageToSend;
import dev.sheldan.abstracto.core.utils.FutureUtils;
import dev.sheldan.raustria.bot.module.quotes.config.QuotesFeatureDefinition;
import dev.sheldan.raustria.bot.module.quotes.config.QuotesModuleDefinition;
import dev.sheldan.raustria.bot.module.quotes.exception.QuoteNotFoundException;
import dev.sheldan.raustria.bot.module.quotes.model.database.Quote;
import dev.sheldan.raustria.bot.module.quotes.service.QuoteServiceBean;
import dev.sheldan.sissi.module.quotes.config.QuotesFeatureDefinition;
import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition;
import dev.sheldan.sissi.module.quotes.exception.QuoteNotFoundException;
import dev.sheldan.sissi.module.quotes.model.database.Quote;
import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean;
import net.dv8tion.jda.api.entities.MessageChannel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.command;
package dev.sheldan.sissi.module.quotes.command;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -12,11 +12,11 @@ import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.service.management.ServerManagementService;
import dev.sheldan.abstracto.core.templating.model.MessageToSend;
import dev.sheldan.abstracto.core.utils.FutureUtils;
import dev.sheldan.raustria.bot.module.quotes.config.QuotesFeatureDefinition;
import dev.sheldan.raustria.bot.module.quotes.config.QuotesModuleDefinition;
import dev.sheldan.raustria.bot.module.quotes.exception.QuoteNotFoundException;
import dev.sheldan.raustria.bot.module.quotes.model.database.Quote;
import dev.sheldan.raustria.bot.module.quotes.service.QuoteServiceBean;
import dev.sheldan.sissi.module.quotes.config.QuotesFeatureDefinition;
import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition;
import dev.sheldan.sissi.module.quotes.exception.QuoteNotFoundException;
import dev.sheldan.sissi.module.quotes.model.database.Quote;
import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean;
import net.dv8tion.jda.api.entities.MessageChannel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.command;
package dev.sheldan.sissi.module.quotes.command;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
@@ -9,10 +9,10 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.utils.FutureUtils;
import dev.sheldan.raustria.bot.module.quotes.config.QuotesFeatureDefinition;
import dev.sheldan.raustria.bot.module.quotes.config.QuotesModuleDefinition;
import dev.sheldan.raustria.bot.module.quotes.model.command.QuoteStatsModel;
import dev.sheldan.raustria.bot.module.quotes.service.QuoteServiceBean;
import dev.sheldan.sissi.module.quotes.config.QuotesFeatureDefinition;
import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition;
import dev.sheldan.sissi.module.quotes.model.command.QuoteStatsModel;
import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean;
import net.dv8tion.jda.api.entities.Member;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.config;
package dev.sheldan.sissi.module.quotes.config;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.FeatureDefinition;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.config;
package dev.sheldan.sissi.module.quotes.config;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.config;
package dev.sheldan.sissi.module.quotes.config;
import dev.sheldan.abstracto.core.command.config.ModuleDefinition;
import dev.sheldan.abstracto.core.command.config.ModuleInfo;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.config;
package dev.sheldan.sissi.module.quotes.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.exception;
package dev.sheldan.sissi.module.quotes.exception;
import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.model.command;
package dev.sheldan.sissi.module.quotes.model.command;
import dev.sheldan.abstracto.core.models.ServerChannelMessage;
import lombok.Builder;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.model.command;
package dev.sheldan.sissi.module.quotes.model.command;
import lombok.Builder;
import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.model.database;
package dev.sheldan.sissi.module.quotes.model.database;
import dev.sheldan.abstracto.core.models.ServerSpecificId;
import dev.sheldan.abstracto.core.models.database.AChannel;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.model.database;
package dev.sheldan.sissi.module.quotes.model.database;
import lombok.*;

View File

@@ -1,9 +1,9 @@
package dev.sheldan.raustria.bot.module.quotes.repository;
package dev.sheldan.sissi.module.quotes.repository;
import dev.sheldan.abstracto.core.models.ServerSpecificId;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.raustria.bot.module.quotes.model.database.Quote;
import dev.sheldan.sissi.module.quotes.model.database.Quote;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

View File

@@ -1,4 +1,4 @@
package dev.sheldan.raustria.bot.module.quotes.service;
package dev.sheldan.sissi.module.quotes.service;
import dev.sheldan.abstracto.core.models.ServerChannelMessage;
import dev.sheldan.abstracto.core.models.ServerSpecificId;
@@ -11,12 +11,12 @@ import dev.sheldan.abstracto.core.service.management.UserInServerManagementServi
import dev.sheldan.abstracto.core.templating.model.MessageToSend;
import dev.sheldan.abstracto.core.templating.service.TemplateService;
import dev.sheldan.abstracto.core.utils.CompletableFutureList;
import dev.sheldan.raustria.bot.module.quotes.exception.QuoteNotFoundException;
import dev.sheldan.raustria.bot.module.quotes.model.command.QuoteResponseModel;
import dev.sheldan.raustria.bot.module.quotes.model.command.QuoteStatsModel;
import dev.sheldan.raustria.bot.module.quotes.model.database.Quote;
import dev.sheldan.raustria.bot.module.quotes.model.database.QuoteAttachment;
import dev.sheldan.raustria.bot.module.quotes.repository.QuoteRepository;
import dev.sheldan.sissi.module.quotes.exception.QuoteNotFoundException;
import dev.sheldan.sissi.module.quotes.model.command.QuoteResponseModel;
import dev.sheldan.sissi.module.quotes.model.command.QuoteStatsModel;
import dev.sheldan.sissi.module.quotes.model.database.Quote;
import dev.sheldan.sissi.module.quotes.model.database.QuoteAttachment;
import dev.sheldan.sissi.module.quotes.repository.QuoteRepository;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.entities.AbstractChannel;
import net.dv8tion.jda.api.entities.Member;

View File

@@ -1,7 +1,7 @@
<?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.raustria.bot</groupId>
<groupId>dev.sheldan.sissi</groupId>
<artifactId>deployment</artifactId>
<version>1.0.3-SNAPSHOT</version>
</parent>

View File

@@ -1,4 +1,4 @@
COMPOSE_PROJECT_NAME=r-austria
COMPOSE_PROJECT_NAME=sissi
# database configuration
DATABASE_HOST=database
DATABASE_PORT=5432
@@ -30,4 +30,4 @@ PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
PGADMIN_DEFAULT_PASSWORD=admin
TOKEN=<INSERT TOKEN>
YOUTUBE_API_KEY=<INSERT KEY>
R_AUSTRIA_BOT_VERSION=1.0.2
SISSI_VERSION=1.0.2

View File

@@ -2,7 +2,7 @@ version: '3.7'
services:
db:
image: ${REGISTRY_PREFIX}r_austria_bot_database:${R_AUSTRIA_BOT_VERSION}
image: ${REGISTRY_PREFIX}sissi_database:${SISSI_VERSION}
container_name: ${COMPOSE_PROJECT_NAME}_database
restart: always
environment:
@@ -11,12 +11,12 @@ services:
ports:
- "127.0.0.1:${DATABASE_PORT}:5432"
networks:
- raustriabot
- sissi
volumes:
- db-data:/var/lib/postgresql/data
deployment_container:
container_name: ${COMPOSE_PROJECT_NAME}_deployment
image: ${REGISTRY_PREFIX}r_austria_bot_deployment:${R_AUSTRIA_BOT_VERSION}
image: ${REGISTRY_PREFIX}sissi_deployment:${SISSI_VERSION}
depends_on:
- db
environment:
@@ -34,14 +34,14 @@ services:
POSTGRES_DRIVER_PATH: ${EXECUTE_DEPLOYMENT:-/postgres/driver.jar}
WAIT_HOSTS: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST}:${DATABASE_PORT}
networks:
- raustriabot
- sissi
bot:
image: ${REGISTRY_PREFIX}r_austria_bot:${R_AUSTRIA_BOT_VERSION}
image: ${REGISTRY_PREFIX}sissi:${SISSI_VERSION}
depends_on:
- db
- deployment_container
restart: on-failure
container_name: ${COMPOSE_PROJECT_NAME}_raustriabot
container_name: ${COMPOSE_PROJECT_NAME}bot
environment:
TOKEN: ${TOKEN}
REMOTE_DEBUG: ${REMOTE_DEBUG}
@@ -58,13 +58,13 @@ services:
- "127.0.0.1:${DEBUG_PORT}:5005"
- "127.0.0.1:${TOMCAT_PORT}:8080"
networks:
- raustriabot
- sissi
volumes:
- bot-logs:/logs
- ./config:/config
pgadmin:
container_name: ${COMPOSE_PROJECT_NAME}_pgadmin
image: ${REGISTRY_PREFIX}r_austria_bot_pg_admin:${R_AUSTRIA_BOT_VERSION}
image: ${REGISTRY_PREFIX}sissi_pg_admin:${SISSI_VERSION}
depends_on:
- db
environment:
@@ -74,23 +74,23 @@ services:
- "127.0.0.1:${PGADMIN_PORT}:80"
restart: unless-stopped
networks:
- raustriabot
- sissi
prometheus:
container_name: ${COMPOSE_PROJECT_NAME}_prometheus
image: ${REGISTRY_PREFIX}r_austria_bot_prometheus:${R_AUSTRIA_BOT_VERSION}
image: ${REGISTRY_PREFIX}sissi_prometheus:${SISSI_VERSION}
depends_on:
- bot
ports:
- "127.0.0.1:${PROMETHEUS_PORT}:9090"
restart: unless-stopped
networks:
- raustriabot
- sissi
volumes:
- ./res/prometheus-scrapper-password-filled:/etc/prometheus/micrometer_password
- prometheus-data:/prometheus
grafana:
container_name: ${COMPOSE_PROJECT_NAME}_grafana
image: ${REGISTRY_PREFIX}r_austria_bot_grafana:${R_AUSTRIA_BOT_VERSION}
image: ${REGISTRY_PREFIX}sissi_grafana:${SISSI_VERSION}
depends_on:
- prometheus
- bot
@@ -110,10 +110,10 @@ services:
volumes:
- grafana-user-data:/var/lib/grafana
networks:
- raustriabot
- sissi
promtail:
container_name: ${COMPOSE_PROJECT_NAME}_promtail
image: ${REGISTRY_PREFIX}r_austria_bot_promtail:${R_AUSTRIA_BOT_VERSION}
image: ${REGISTRY_PREFIX}sissi_promtail:${SISSI_VERSION}
depends_on:
- bot
restart: unless-stopped
@@ -121,10 +121,10 @@ services:
volumes:
- bot-logs:/logs
networks:
- raustriabot
- sissi
loki:
container_name: ${COMPOSE_PROJECT_NAME}_loki
image: ${REGISTRY_PREFIX}r_austria_bot_loki:${R_AUSTRIA_BOT_VERSION}
image: ${REGISTRY_PREFIX}sissi_loki:${SISSI_VERSION}
depends_on:
- promtail
command: -config.file=/mnt/config/loki-config.yaml
@@ -132,12 +132,12 @@ services:
- "127.0.0.1:${LOKI_PORT}:3100"
restart: unless-stopped
networks:
- raustriabot
- sissi
networks:
raustriabot:
sissi:
driver: bridge
name: raustriabot-network
name: sissi-network
volumes:
db-data:

View File

@@ -1,7 +1,7 @@
<?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.raustria.bot</groupId>
<groupId>dev.sheldan.sissi</groupId>
<artifactId>deployment</artifactId>
<version>1.0.3-SNAPSHOT</version>
</parent>
@@ -32,13 +32,13 @@
<!-- backend jar -->
<artifactItem>
<groupId>dev.sheldan.raustria.bot.application</groupId>
<groupId>dev.sheldan.sissi.application</groupId>
<artifactId>executable</artifactId>
<version>${project.version}</version>
<classifier>exec</classifier>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${file.basedir}/r-austria-bot/bot</outputDirectory>
<outputDirectory>${file.basedir}/sissi/bot</outputDirectory>
<destFileName>app.jar</destFileName>
</artifactItem>
@@ -73,7 +73,7 @@
</artifactItem>
<artifactItem>
<groupId>dev.sheldan.raustria.bot.templates</groupId>
<groupId>dev.sheldan.sissi.templates</groupId>
<artifactId>quotes-templates</artifactId>
<version>${project.version}</version>
<type>zip</type>
@@ -115,7 +115,7 @@
</artifactItem>
<artifactItem>
<groupId>dev.sheldan.raustria.bot.templates.translations</groupId>
<groupId>dev.sheldan.sissi.templates.translations</groupId>
<artifactId>quote-translations</artifactId>
<version>${project.version}</version>
<type>zip</type>
@@ -174,7 +174,7 @@
<!-- custom modules -->
<artifactItem>
<groupId>dev.sheldan.raustria.bot.application.module</groupId>
<groupId>dev.sheldan.sissi.application.module</groupId>
<artifactId>quotes</artifactId>
<version>${project.version}</version>
<classifier>liquibase</classifier>

View File

@@ -3,48 +3,48 @@ version: "3.7"
services:
bot:
build:
context: r-austria-bot
image: ${REGISTRY_PREFIX}r_austria_bot:${VERSION:-latest}
context: sissi
image: ${REGISTRY_PREFIX}sissi:${VERSION:-latest}
database:
build:
context: database
args:
POSTGRES_VERSION: ${POSTGRES_VERSION}
image: ${REGISTRY_PREFIX}r_austria_bot_database:${VERSION:-latest}
image: ${REGISTRY_PREFIX}sissi_database:${VERSION:-latest}
pg_admin:
build:
context: pgAdmin
args:
PG_ADMIN_VERSION: ${PG_ADMIN_VERSION}
image: ${REGISTRY_PREFIX}r_austria_bot_pg_admin:${VERSION:-latest}
image: ${REGISTRY_PREFIX}sissi_pg_admin:${VERSION:-latest}
deployment_container:
build:
context: deployment
args:
ABSTRACTO_REGISTRY_PREFIX: ${ABSTRACTO_REGISTRY_PREFIX}
ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
image: ${REGISTRY_PREFIX}r_austria_bot_deployment:${VERSION:-latest}
image: ${REGISTRY_PREFIX}sissi_deployment:${VERSION:-latest}
prometheus:
build:
context: prometheus
args:
PROMETHEUS_VERSION: ${PROMETHEUS_VERSION}
image: ${REGISTRY_PREFIX}r_austria_bot_prometheus:${VERSION:-latest}
image: ${REGISTRY_PREFIX}sissi_prometheus:${VERSION:-latest}
grafana:
build:
context: grafana
args:
GRAFANA_VERSION: ${GRAFANA_VERSION}
image: ${REGISTRY_PREFIX}r_austria_bot_grafana:${VERSION:-latest}
image: ${REGISTRY_PREFIX}sissi_grafana:${VERSION:-latest}
promtail:
build:
context: promtail
args:
PROMTAIL_VERSION: ${PROMTAIL_VERSION}
image: ${REGISTRY_PREFIX}r_austria_bot_promtail:${VERSION:-latest}
image: ${REGISTRY_PREFIX}sissi_promtail:${VERSION:-latest}
loki:
build:
context: loki
args:
LOKI_VERSION: ${LOKI_VERSION}
image: ${REGISTRY_PREFIX}r_austria_bot_loki:${VERSION:-latest}
image: ${REGISTRY_PREFIX}sissi_loki:${VERSION:-latest}

View File

@@ -14,7 +14,7 @@
}
]
},
"description": "Dashboard for RAustria Bot spring boot monitoring (adapted from https://grafana.com/grafana/dashboards/4701)",
"description": "Dashboard for Sissi spring boot monitoring (adapted from https://grafana.com/grafana/dashboards/4701)",
"editable": true,
"gnetId": null,
"graphTooltip": 1,
@@ -1502,8 +1502,8 @@
"allValue": null,
"current": {
"selected": true,
"text": "raustriabot",
"value": "raustriabot"
"text": "Sissi",
"value": "sissi"
},
"datasource": "prometheus",
"definition": "",

View File

@@ -37,12 +37,12 @@
},
"targets": [
{
"expr": "{job=\"r-austria-bot-logs\", filename=\"/logs/log.log\"}",
"expr": "{job=\"sissi-logs\", filename=\"/logs/log.log\"}",
"queryType": "randomWalk",
"refId": "A"
}
],
"title": "RAustria Bot logs",
"title": "Sissi logs",
"type": "logs"
}
],
@@ -59,7 +59,7 @@
},
"timepicker": {},
"timezone": "",
"title": "RAustria Bot logs",
"title": "Sissi logs",
"uid": "1uGb0q4nz",
"version": 2
}

View File

@@ -1082,7 +1082,7 @@
"hide": 2,
"label": null,
"name": "application",
"query": "r-austria-bot",
"query": "sissi",
"skipUrlSync": false,
"type": "constant"
}
@@ -1094,7 +1094,7 @@
},
"timepicker": {},
"timezone": "",
"title": "r-Austria Bot status",
"title": "Sissi status",
"uid": "6WIJ36BMz",
"version": 3
}

View File

@@ -1,4 +1,4 @@
- name: 'r-austria-bot-dashboards'
- name: 'sissi-bot-dashboards'
org_id: 1
folder: ''
type: 'file'

View File

@@ -1,11 +1,11 @@
{
"Servers": {
"1": {
"Name": "r-austria bot database",
"Name": "Sissi database",
"Group": "Server Group 1",
"Port": 5432,
"Username": "abstracto",
"Host": "r-austria_db",
"Host": "sissi_database",
"SSLMode": "prefer",
"MaintenanceDB": "postgres"
}

View File

@@ -3,7 +3,7 @@ global:
scrape_timeout: 10s
evaluation_interval: 1m
scrape_configs:
- job_name: r_austria_bot_micrometer
- job_name: sissi_micrometer
honor_timestamps: true
scrape_interval: 5s
scrape_timeout: 5s
@@ -11,7 +11,7 @@ scrape_configs:
scheme: http
static_configs:
- targets:
- r-austria_raustriabot:8080
- sissibot:8080
basic_auth:
username: "abstracto"
password_file: /etc/prometheus/micrometer_password

View File

@@ -5,7 +5,7 @@ positions:
filename: /tmp/positions.yaml
clients:
- url: http://r-austria_loki:3100/loki/api/v1/push
- url: http://sissi_loki:3100/loki/api/v1/push
scrape_configs:
- job_name: system
@@ -13,5 +13,5 @@ scrape_configs:
- targets:
- localhost
labels:
job: r-austria-bot-logs
job: sissi-logs
__path__: /logs/*.log

View File

@@ -1,8 +1,8 @@
<?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.raustria.bot</groupId>
<artifactId>r-austria-bot</artifactId>
<groupId>dev.sheldan.sissi</groupId>
<artifactId>sissi</artifactId>
<version>1.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

10
pom.xml
View File

@@ -10,8 +10,8 @@
<relativePath />
</parent>
<groupId>dev.sheldan.raustria.bot</groupId>
<artifactId>r-austria-bot</artifactId>
<groupId>dev.sheldan.sissi</groupId>
<artifactId>sissi</artifactId>
<version>1.0.3-SNAPSHOT</version>
<properties>
@@ -49,13 +49,13 @@
<repository>
<id>github</id>
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/Sheldan/r-austria-bot</url>
<url>https://maven.pkg.github.com/Sheldan/Sissi</url>
</repository>
</distributionManagement>
<scm>
<url>https://maven.pkg.github.com/Sheldan/r-austria-bot</url>
<developerConnection>scm:git:git@github.com:Sheldan/r-austria-bot.git</developerConnection>
<url>https://maven.pkg.github.com/Sheldan/Sissi</url>
<developerConnection>scm:git:git@github.com:Sheldan/Sissi.git</developerConnection>
<tag>HEAD</tag>
</scm>

View File

@@ -1,18 +1,18 @@
<?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>
<artifactId>r-austria-bot</artifactId>
<groupId>dev.sheldan.raustria.bot</groupId>
<groupId>dev.sheldan.sissi</groupId>
<artifactId>sissi</artifactId>
<version>1.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>dev.sheldan.raustria.bot.templates</groupId>
<groupId>dev.sheldan.sissi.templates</groupId>
<artifactId>templates</artifactId>
<packaging>pom</packaging>
<modules>
<module>r-austria-bot-templates</module>
<module>r-austria-bot-translations</module>
<module>sissi-templates</module>
<module>sissi-translations</module>
</modules>

View File

@@ -1,8 +1,8 @@
<?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.raustria.bot.templates</groupId>
<artifactId>r-austria-bot-templates</artifactId>
<groupId>dev.sheldan.sissi.templates</groupId>
<artifactId>sissi-templates</artifactId>
<version>1.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -1,7 +1,7 @@
<?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.raustria.bot.templates</groupId>
<groupId>dev.sheldan.sissi.templates</groupId>
<artifactId>module-templates</artifactId>
<version>1.0.3-SNAPSHOT</version>
</parent>

View File

@@ -1,13 +1,13 @@
<?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.sissi.templates</groupId>
<artifactId>templates</artifactId>
<groupId>dev.sheldan.raustria.bot.templates</groupId>
<version>1.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>r-austria-bot-templates</artifactId>
<artifactId>sissi-templates</artifactId>
<packaging>pom</packaging>
<modules>

View File

@@ -1,8 +1,8 @@
<?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.raustria.bot.templates.translations</groupId>
<artifactId>r-austria-bot-translations</artifactId>
<groupId>dev.sheldan.sissi.templates.translations</groupId>
<artifactId>sissi-translations</artifactId>
<version>1.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -1,8 +1,8 @@
<?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.sissi.templates.translations</groupId>
<artifactId>module-translations</artifactId>
<groupId>dev.sheldan.raustria.bot.templates.translations</groupId>
<version>1.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -1,14 +1,14 @@
<?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.sissi.templates</groupId>
<artifactId>templates</artifactId>
<groupId>dev.sheldan.raustria.bot.templates</groupId>
<version>1.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>dev.sheldan.raustria.bot.templates.translations</groupId>
<artifactId>r-austria-bot-translations</artifactId>
<groupId>dev.sheldan.sissi.templates.translations</groupId>
<artifactId>sissi-translations</artifactId>
<packaging>pom</packaging>
<modules>
<module>module-translations</module>