10 Commits

8 changed files with 59 additions and 28 deletions

View File

@@ -1,6 +1,6 @@
services: services:
jellyfin: jellyfin:
image: jellyfin/jellyfin:10.11.5 image: jellyfin/jellyfin:10.11.6
user: ${JELLYFIN_USER_UID}:${JELLYFIN_USER_GID} user: ${JELLYFIN_USER_UID}:${JELLYFIN_USER_GID}
network_mode: 'host' network_mode: 'host'
restart: always restart: always

View File

@@ -13,10 +13,15 @@ GRAFANA_SMTP_FROM=
GRAFANA_DATA_DIR= GRAFANA_DATA_DIR=
PROMETHEUS_CONFIG_PATH= PROMETHEUS_CONFIG_PATH=
PROMETHEUS_ALERT_RULES_PATH=
PROMETHEUS_DATA_DIR= PROMETHEUS_DATA_DIR=
ALERTMANAGER_CONFIG_PATH=
ALERTMANAGER_DATA_DIR=
BLACKBOX_CONFIG_PATH= BLACKBOX_CONFIG_PATH=
LOKI_CONFIG_PATH=
LOKI_DATA_DIR=
ALLOY_CONFIG_PATH=
GMF_MATRIX_HOMESERVER=
GMF_MATRIX_USER=
GMF_MATRIX_TOKEN=

View File

@@ -7,7 +7,6 @@ services:
- "9091:9090" - "9091:9090"
volumes: volumes:
- ${PROMETHEUS_CONFIG_PATH}:/etc/prometheus/prometheus.yml:ro - ${PROMETHEUS_CONFIG_PATH}:/etc/prometheus/prometheus.yml:ro
- ${PROMETHEUS_ALERT_RULES_PATH}:/etc/prometheus/alert_rules.yml
- ${PROMETHEUS_DATA_DIR}:/prometheus - ${PROMETHEUS_DATA_DIR}:/prometheus
command: command:
- '--config.file=/etc/prometheus/prometheus.yml' - '--config.file=/etc/prometheus/prometheus.yml'
@@ -41,6 +40,27 @@ services:
depends_on: depends_on:
- prometheus - prometheus
loki:
image: grafana/loki:3.6.3
restart: unless-stopped
ports:
- "3100:3100"
volumes:
- ${LOKI_CONFIG_PATH}:/etc/loki/local-config.yaml
- ${LOKI_DATA_DIR}:/loki
command:
- '-config.file=/etc/loki/local-config.yaml'
- '-target=all'
alloy:
image: grafana/alloy:v1.12.2
restart: unless-stopped
ports:
- "12345:12345"
volumes:
- ${ALLOY_CONFIG_PATH}:/etc/alloy/config.alloy:ro
- /var/log:/var/log:ro
# Node Exporter - Host System Metrics # Node Exporter - Host System Metrics
node_exporter: node_exporter:
image: prom/node-exporter:v1.10.2 image: prom/node-exporter:v1.10.2
@@ -79,22 +99,6 @@ services:
- '--disable_metrics=disk,diskIO,tcp,udp,percpu,sched,process,hugetlb,referenced_memory' - '--disable_metrics=disk,diskIO,tcp,udp,percpu,sched,process,hugetlb,referenced_memory'
- '--docker_only=true' - '--docker_only=true'
# Alertmanager - Alert Management
alertmanager:
image: prom/alertmanager:v0.30.1
restart: unless-stopped
ports:
- "9093:9093"
volumes:
- ${ALERTMANAGER_CONFIG_PATH}:/etc/alertmanager/alertmanager.yml
- ${ALERTMANAGER_DATA_DIR}:/alertmanager
command:
- '--config.file=/etc/alertmanager/alertmanager.yml'
- '--storage.path=/alertmanager'
- '--web.external-url=http://localhost:9093'
depends_on:
- prometheus
# Blackbox Exporter - Endpoint Monitoring # Blackbox Exporter - Endpoint Monitoring
blackbox_exporter: blackbox_exporter:
image: prom/blackbox-exporter:v0.28.0 image: prom/blackbox-exporter:v0.28.0
@@ -103,3 +107,9 @@ services:
- "9115:9115" - "9115:9115"
volumes: volumes:
- ${BLACKBOX_CONFIG_PATH}:/etc/blackbox_exporter/config.yml - ${BLACKBOX_CONFIG_PATH}:/etc/blackbox_exporter/config.yml
grafana-matrix-forwarder:
build: ./grafana-matrix-forwarder
restart: unless-stopped
env_file:
- .env

View File

@@ -0,0 +1,9 @@
FROM alpine
# Create main app folder to run from
WORKDIR /app
# Copy compiled binary to release image
COPY grafana-matrix-forwarder /app/grafana-matrix-forwarder
ENTRYPOINT ["/app/grafana-matrix-forwarder"]

Binary file not shown.

View File

@@ -6,7 +6,7 @@ services:
- ${PAPERLESS_REDIS_DATA_DIR}:/data - ${PAPERLESS_REDIS_DATA_DIR}:/data
db: db:
image: docker.io/library/postgres:17 image: docker.io/library/postgres:18
restart: always restart: always
volumes: volumes:
- ${PAPERLESS_POSTGRES_DATA_DIR}:/var/lib/postgresql/data - ${PAPERLESS_POSTGRES_DATA_DIR}:/var/lib/postgresql/data

View File

@@ -30,7 +30,7 @@ services:
volumes: volumes:
- ${MAUTRIX_SIGNAL_DATA_DIR}:/data - ${MAUTRIX_SIGNAL_DATA_DIR}:/data
mautrix-signal_db: mautrix-signal_db:
image: docker.io/library/postgres:17 image: docker.io/library/postgres:18
restart: always restart: always
volumes: volumes:
- ${MAUTRIX_SIGNAL_POSTGRES_DATA_DIR}:/var/lib/postgresql/data - ${MAUTRIX_SIGNAL_POSTGRES_DATA_DIR}:/var/lib/postgresql/data
@@ -50,7 +50,7 @@ services:
depends_on: depends_on:
- mautrix-whatsapp_db - mautrix-whatsapp_db
mautrix-whatsapp_db: mautrix-whatsapp_db:
image: docker.io/library/postgres:17 image: docker.io/library/postgres:18
restart: always restart: always
volumes: volumes:
- ${MAUTRIX_WHATSAPP_POSTGRES_DATA_DIR}:/var/lib/postgresql/data - ${MAUTRIX_WHATSAPP_POSTGRES_DATA_DIR}:/var/lib/postgresql/data
@@ -73,7 +73,7 @@ services:
depends_on: depends_on:
- mas_db - mas_db
mas_db: mas_db:
image: docker.io/library/postgres:17 image: docker.io/library/postgres:18
restart: always restart: always
volumes: volumes:
- ${MAS_POSTGRES_DATA_DIR}:/var/lib/postgresql/data - ${MAS_POSTGRES_DATA_DIR}:/var/lib/postgresql/data
@@ -84,7 +84,7 @@ services:
ports: ports:
- 5441:5432 - 5441:5432
synapse_db: synapse_db:
image: docker.io/library/postgres:17 image: docker.io/library/postgres:18
restart: always restart: always
volumes: volumes:
- ${SYNAPSE_POSTGRES_DATA_DIR}:/var/lib/postgresql/data - ${SYNAPSE_POSTGRES_DATA_DIR}:/var/lib/postgresql/data
@@ -107,3 +107,10 @@ services:
- synapse_db - synapse_db
- mas - mas
- mautrix-whatsapp - mautrix-whatsapp
element-admin:
image: oci.element.io/element-admin:0.1.10
restart: unless-stopped
ports:
- "8079:8080"
environment:
- SERVER_NAME=${MATRIX_DOMAIN}

View File

@@ -1,7 +1,7 @@
services: services:
vaultwarden: vaultwarden:
container_name: vaultwarden container_name: vaultwarden
image: vaultwarden/server:1.35.1 image: vaultwarden/server:1.35.2
restart: always restart: always
volumes: volumes:
- ${VAULTWARDEN_DATA_LOCATION}:/data/ - ${VAULTWARDEN_DATA_LOCATION}:/data/