feat: bump automuteus version for grafana to 7.x

README.md

@@ -38,8 +38,6 @@ Some tips and tricks for someone in the future.
   - This introduces the minimum privileges required for your bots on discord.
 - 📋 [**Backup and Restore**](tips/backup-and-restore.md)
   - How to backup and restore your AutoMuteUs.
-- 📋 [**Secure Redis**](tips/secure-redis.md)
-  - This introduces the way to secure your Redis by password authentication.
 - 📋 [**AutoMuteUs on Raspberry Pi**](tips/raspberry-pi.md)
   - Some helpful information for getting AutoMuteUs to work on Raspberry Pi.
 

grafana-dashboard/README.md

@@ -30,11 +30,11 @@ Create your `.env` file using `sample.env` in this repository as in the official
 # - Json exporter (used as Galactus exporter): https://github.com/prometheus-community/json_exporter/releases
 # - Node exporter: https://github.com/prometheus/node_exporter/releases
 # - cAdvisor: https://github.com/google/cadvisor/releases
-GRAFANA_TAG=7.4.3
-PROMETHEUS_TAG=2.25.0
-PROMETHEUS_GALACTUS_EXPORTER_TAG=0.3.0
-PROMETHEUS_DOCKER_NODE_EXPORTER_TAG=1.1.1
-PROMETHEUS_CADVISOR_TAG=0.37.5
+GRAFANA_TAG=8.4.5
+PROMETHEUS_TAG=2.34.0
+PROMETHEUS_GALACTUS_EXPORTER_TAG=0.4.0
+PROMETHEUS_DOCKER_NODE_EXPORTER_TAG=1.3.1
+PROMETHEUS_CADVISOR_TAG=0.39.3
 
 # Specify default username and password for Grafana
 GRAFANA_USER=
@@ -56,7 +56,7 @@ docker-compose -f docker-compose.full.yml up -d
 
 Within a few minutes, you can view Grafana at: `http://<your-docker-host>:3000/`.
 
-Once you logged in, now you can access pre-configured dashboard named **AutoMuteUs** from the `Dashboards` > `Manage` menu on the left. It may take a few minutes for the values to actually start showing up.
+Once you logged in, now you can access pre-configured dashboard named **AutoMuteUs** from the `Dashboards` > `Browse` menu on the left. It may take a few minutes for the values to actually start showing up.
 
 ### Troubleshoot
 

grafana-dashboard/docker-compose.full.yml

@@ -21,31 +21,34 @@ services:
       - POSTGRES_PASS=${POSTGRES_PASS:?err}
 
       # These Variables are optional
-      - WORKER_BOT_TOKENS=${WORKER_BOT_TOKENS:-}
       - EMOJI_GUILD_ID=${EMOJI_GUILD_ID:-}
       - CAPTURE_TIMEOUT=${CAPTURE_TIMEOUT:-}
       - AUTOMUTEUS_LISTENING=${AUTOMUTEUS_LISTENING:-}
       - AUTOMUTEUS_GLOBAL_PREFIX=${AUTOMUTEUS_GLOBAL_PREFIX:-}
       - BASE_MAP_URL=${BASE_MAP_URL:-}
+      - SLASH_COMMAND_GUILD_IDS=${SLASH_COMMAND_GUILD_IDS:-}
 
       # Do **NOT** change this
       - REDIS_ADDR=${AUTOMUTEUS_REDIS_ADDR}
       - GALACTUS_ADDR=${GALACTUS_ADDR}
       - POSTGRES_ADDR=${POSTGRES_ADDR}
+    stop_grace_period: ${STOP_GRACE_PERIOD:-2m}
     depends_on:
       - redis
       - galactus
       - postgres
     volumes:
       - "bot-logs:/app/logs"
-
   galactus:
     ports:
       # See sample.env for details, but in general, match the GALACTUS_EXTERNAL_PORT w/ the GALACTUS_HOST's port
       - ${GALACTUS_EXTERNAL_PORT:-8123}:${BROKER_PORT}
     image: automuteus/galactus:${GALACTUS_TAG:?err}
     restart: always
     environment:
+      # This Variable is optional
+      - WORKER_BOT_TOKENS=${WORKER_BOT_TOKENS:-}
+
       # Do **NOT** change these
       - DISCORD_BOT_TOKEN=${DISCORD_BOT_TOKEN:?err}
       - BROKER_PORT=${BROKER_PORT}

grafana-dashboard/docker-compose.yml

@@ -21,31 +21,34 @@ services:
       - POSTGRES_PASS=${POSTGRES_PASS:?err}
 
       # These Variables are optional
-      - WORKER_BOT_TOKENS=${WORKER_BOT_TOKENS:-}
       - EMOJI_GUILD_ID=${EMOJI_GUILD_ID:-}
       - CAPTURE_TIMEOUT=${CAPTURE_TIMEOUT:-}
       - AUTOMUTEUS_LISTENING=${AUTOMUTEUS_LISTENING:-}
       - AUTOMUTEUS_GLOBAL_PREFIX=${AUTOMUTEUS_GLOBAL_PREFIX:-}
       - BASE_MAP_URL=${BASE_MAP_URL:-}
+      - SLASH_COMMAND_GUILD_IDS=${SLASH_COMMAND_GUILD_IDS:-}
 
       # Do **NOT** change this
       - REDIS_ADDR=${AUTOMUTEUS_REDIS_ADDR}
       - GALACTUS_ADDR=${GALACTUS_ADDR}
       - POSTGRES_ADDR=${POSTGRES_ADDR}
+    stop_grace_period: ${STOP_GRACE_PERIOD:-2m}
     depends_on:
       - redis
       - galactus
       - postgres
     volumes:
       - "bot-logs:/app/logs"
-
   galactus:
     ports:
       # See sample.env for details, but in general, match the GALACTUS_EXTERNAL_PORT w/ the GALACTUS_HOST's port
       - ${GALACTUS_EXTERNAL_PORT:-8123}:${BROKER_PORT}
     image: automuteus/galactus:${GALACTUS_TAG:?err}
     restart: always
     environment:
+      # This Variable is optional
+      - WORKER_BOT_TOKENS=${WORKER_BOT_TOKENS:-}
+
       # Do **NOT** change these
       - DISCORD_BOT_TOKEN=${DISCORD_BOT_TOKEN:?err}
       - BROKER_PORT=${BROKER_PORT}

grafana-dashboard/sample.env

@@ -1,17 +1,25 @@
-# Please refer to the latest versions of Galactus and AutoMuteUs when specifying these versions:
+# Please refer to the latest stable versions of Galactus and AutoMuteUs when specifying these versions.
+# Note, using versions that are not SemVer format (x.y.z) is NOT recommended, as these can be experimental or unsupported
+AUTOMUTEUS_TAG=
+GALACTUS_TAG=
+
 # Automuteus: https://github.com/automuteus/automuteus/releases
 # or https://hub.docker.com/r/automuteus/automuteus/tags
-
 # Galactus: https://github.com/automuteus/galactus/releases
 # or https://hub.docker.com/r/automuteus/galactus/tags
 
-AUTOMUTEUS_TAG=
-GALACTUS_TAG=
-
-# change these, but see comment below about HOST/PORT
+# change these, but see comment block down below about HOST/PORT
 DISCORD_BOT_TOKEN=
 GALACTUS_HOST=
 GALACTUS_EXTERNAL_PORT=
+# GALACTUS_HOST can include the port or not. If you don't include the port,
+# it will default to :80/:443 depending on http:// v https://
+# **Make sure that GALACTUS_EXTERNAL_PORT matches the Port for the above host, UNLESS you use a reverse proxy/nginx!!!**
+# Ex: if GALACTUS_HOST=http://localhost, then GALACTUS_EXTERNAL_PORT should be 80 (HTTP)
+# Ex: if GALACTUS_HOST=https://localhost, then GALACTUS_EXTERNAL_PORT should be 443 (HTTPS)
+# Ex: if GALACTUS_HOST=http://localhost:8123, then GALACTUS_EXTERNAL_PORT should be 8123
+# If you use a reverse proxy, then GALACTUS_HOST should have the port of your reverse proxy, and it should proxy to the
+# GALACTUS_EXTERNAL_PORT (ex 443 -> 8123)
 
 # recommend changing these to something more secure
 POSTGRES_USER=postgres
@@ -25,11 +33,11 @@ POSTGRES_PASS=putsomesecretpasswordhere
 # - Json exporter (used as Galactus exporter): https://github.com/prometheus-community/json_exporter/releases
 # - Node exporter: https://github.com/prometheus/node_exporter/releases
 # - cAdvisor: https://github.com/google/cadvisor/releases
-GRAFANA_TAG=7.4.3
-PROMETHEUS_TAG=2.25.0
-PROMETHEUS_GALACTUS_EXPORTER_TAG=0.3.0
-PROMETHEUS_DOCKER_NODE_EXPORTER_TAG=1.1.1
-PROMETHEUS_CADVISOR_TAG=0.37.5
+GRAFANA_TAG=8.4.5
+PROMETHEUS_TAG=2.34.0
+PROMETHEUS_GALACTUS_EXPORTER_TAG=0.4.0
+PROMETHEUS_DOCKER_NODE_EXPORTER_TAG=1.3.1
+PROMETHEUS_CADVISOR_TAG=0.39.3
 
 # Specify default username and password for Grafana
 GRAFANA_USER=
@@ -53,6 +61,9 @@ WORKER_BOT_TOKENS=
 CAPTURE_TIMEOUT=
 AUTOMUTEUS_LISTENING=
 AUTOMUTEUS_GLOBAL_PREFIX=
+# comma-separated
+SLASH_COMMAND_GUILD_IDS=
+STOP_GRACE_PERIOD=
 
 # DO NOT change these unless you really know what you're doing
 BROKER_PORT=8123