From f1f4c0f67f0ab27b3203b98f757ceb89c4edf3a5 Mon Sep 17 00:00:00 2001 From: Christoph Califice Date: Sat, 8 Nov 2025 15:31:33 -0300 Subject: [PATCH] move grafana --- .gitignore | 2 +- grafana/docker-compose.yml | 78 ++++++++ .../grafana => grafana}/prometheus.yml | 0 immich-app/.env | 2 +- monitoring/docker-compose.yml | 170 +++++++++--------- monitoring/homepage/config/services.yaml | 8 +- 6 files changed, 167 insertions(+), 93 deletions(-) create mode 100644 grafana/docker-compose.yml rename {monitoring/grafana => grafana}/prometheus.yml (100%) diff --git a/.gitignore b/.gitignore index 46bbae9..3d242a4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ !monitoring/homepage/config/* !filebrowser/branding/** !.gitignore -!monitoring/grafana/prometheus.yml +!grafana/prometheus.yml !caddy/config/** !.gitea/**/* !gitea/runner/config.yaml diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml new file mode 100644 index 0000000..887d971 --- /dev/null +++ b/grafana/docker-compose.yml @@ -0,0 +1,78 @@ +services: + loki: + container_name: loki + image: grafana/loki:latest + ports: + - "3100:3100" + command: -config.file=/etc/loki/local-config.yaml + + promtail: + container_name: promtail + image: grafana/promtail:latest + volumes: + - ./var/log:/var/log + command: -config.file=/etc/promtail/config.yml + + alloy: + container_name: alloy + image: grafana/alloy:latest + profiles: ['alloy'] + volumes: + - ./config/alloy:/etc/alloy + + grafana: + environment: + - GF_PATHS_PROVISIONING=/etc/grafana/provisioning + # - GF_AUTH_ANONYMOUS_ENABLED=true + # - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin + - GF_SECURITY_ADMIN_USER=ccalifice + - GF_SECURITY_ADMIN_PASSWORD=asdf1234 + - GF_FEATURE_TOGGLES_ENABLE=alertingSimplifiedRouting,alertingQueryAndExpressionsStepMode + entrypoint: + - sh + - -euc + - | + mkdir -p /etc/grafana/provisioning/datasources + cat < /etc/grafana/provisioning/datasources/ds.yaml + apiVersion: 1 + datasources: + - name: Loki + type: loki + access: proxy + orgId: 1 + url: http://loki:3100 + basicAuth: false + isDefault: true + version: 1 + editable: false + EOF + /run.sh + image: grafana/grafana:latest + ports: + - "3003:3000" + volumes: + - ./data:/var/lib/grafana + user: "1000:1002" + container_name: grafana + + prometheus: + image: prom/prometheus + volumes: + - "./prometheus.yml:/etc/prometheus/prometheus.yml" + - ./prometheus-data:/prometheus + ports: + - 9090:9090 + user: "1000:1002" + container_name: prometheus + + +# sudo docker plugin install grafana/loki-docker-driver:3.3.2-amd64 --alias loki --grant-all-permissions +# { +# "debug" : true, +# "log-driver": "loki", +# "log-opts": { +# "loki-url": "http://192.168.1.202:3100/loki/api/v1/push", +# "loki-batch-size": "400" +# }, +# "insecure-registries":["192.168.1.202:6610"] +# } \ No newline at end of file diff --git a/monitoring/grafana/prometheus.yml b/grafana/prometheus.yml similarity index 100% rename from monitoring/grafana/prometheus.yml rename to grafana/prometheus.yml diff --git a/immich-app/.env b/immich-app/.env index e82cd2a..8740cd6 100644 --- a/immich-app/.env +++ b/immich-app/.env @@ -4,7 +4,7 @@ UPLOAD_LOCATION=/mnt/immich-library # The Immich version to use. You can pin this to a specific version like "v1.71.0" -IMMICH_VERSION=v2.0.1 +IMMICH_VERSION=v2.2.3 # Connection secret for postgres. You should change it to a random password DB_PASSWORD=asdf1234 diff --git a/monitoring/docker-compose.yml b/monitoring/docker-compose.yml index 6717ea2..7bb1afd 100644 --- a/monitoring/docker-compose.yml +++ b/monitoring/docker-compose.yml @@ -105,100 +105,98 @@ services: - 3000:3000 volumes: - ./homepage/config:/app/config # Make sure your local config directory exists - - /mnt/servarr:/servarr - - /mnt/hdd_1tb:/hdd_1tb restart: unless-stopped - glance: - container_name: glance - image: glanceapp/glance - restart: unless-stopped - volumes: - - ./glance/config:/app/config - - ./glance/assets:/app/assets - - /etc/localtime:/etc/localtime:ro - # Optionally, also mount docker socket if you want to use the docker containers widget - - /var/run/docker.sock:/var/run/docker.sock:ro - ports: - - 3099:8080 - env_file: .env + # glance: + # container_name: glance + # image: glanceapp/glance + # restart: unless-stopped + # volumes: + # - ./glance/config:/app/config + # - ./glance/assets:/app/assets + # - /etc/localtime:/etc/localtime:ro + # # Optionally, also mount docker socket if you want to use the docker containers widget + # - /var/run/docker.sock:/var/run/docker.sock:ro + # ports: + # - 3099:8080 + # env_file: .env ##### Grafana - loki: - container_name: loki - image: grafana/loki:latest - ports: - - "3100:3100" - command: -config.file=/etc/loki/local-config.yaml - networks: - - grafana +# loki: +# container_name: loki +# image: grafana/loki:latest +# ports: +# - "3100:3100" +# command: -config.file=/etc/loki/local-config.yaml +# networks: +# - grafana - promtail: - container_name: promtail - image: grafana/promtail:latest - volumes: - - /grafana/var/log:/var/log - command: -config.file=/etc/promtail/config.yml - networks: - - grafana +# promtail: +# container_name: promtail +# image: grafana/promtail:latest +# volumes: +# - /grafana/var/log:/var/log +# command: -config.file=/etc/promtail/config.yml +# networks: +# - grafana - alloy: - container_name: alloy - image: grafana/alloy:latest - profiles: ['alloy'] - volumes: - - ./grafana/config/alloy:/etc/alloy +# alloy: +# container_name: alloy +# image: grafana/alloy:latest +# profiles: ['alloy'] +# volumes: +# - ./grafana/config/alloy:/etc/alloy - grafana: - environment: - - GF_PATHS_PROVISIONING=/etc/grafana/provisioning -# - GF_AUTH_ANONYMOUS_ENABLED=true -# - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin - - GF_SECURITY_ADMIN_USER=ccalifice - - GF_SECURITY_ADMIN_PASSWORD=asdf1234 - - GF_FEATURE_TOGGLES_ENABLE=alertingSimplifiedRouting,alertingQueryAndExpressionsStepMode - entrypoint: - - sh - - -euc - - | - mkdir -p /etc/grafana/provisioning/datasources - cat < /etc/grafana/provisioning/datasources/ds.yaml - apiVersion: 1 - datasources: - - name: Loki - type: loki - access: proxy - orgId: 1 - url: http://loki:3100 - basicAuth: false - isDefault: true - version: 1 - editable: false - EOF - /run.sh - image: grafana/grafana:latest - ports: - - "3003:3000" - networks: - - grafana - volumes: - - ./grafana/data:/var/lib/grafana - user: "1000:1002" - container_name: grafana +# grafana: +# environment: +# - GF_PATHS_PROVISIONING=/etc/grafana/provisioning +# # - GF_AUTH_ANONYMOUS_ENABLED=true +# # - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin +# - GF_SECURITY_ADMIN_USER=ccalifice +# - GF_SECURITY_ADMIN_PASSWORD=asdf1234 +# - GF_FEATURE_TOGGLES_ENABLE=alertingSimplifiedRouting,alertingQueryAndExpressionsStepMode +# entrypoint: +# - sh +# - -euc +# - | +# mkdir -p /etc/grafana/provisioning/datasources +# cat < /etc/grafana/provisioning/datasources/ds.yaml +# apiVersion: 1 +# datasources: +# - name: Loki +# type: loki +# access: proxy +# orgId: 1 +# url: http://loki:3100 +# basicAuth: false +# isDefault: true +# version: 1 +# editable: false +# EOF +# /run.sh +# image: grafana/grafana:latest +# ports: +# - "3003:3000" +# networks: +# - grafana +# volumes: +# - ./grafana/data:/var/lib/grafana +# user: "1000:1002" +# container_name: grafana - prometheus: - image: prom/prometheus - volumes: - - "./grafana/prometheus.yml:/etc/prometheus/prometheus.yml" - - ./grafana/prometheus-data:/prometheus - networks: - - grafana - ports: - - 9090:9090 - user: "1000:1002" - container_name: prometheus +# prometheus: +# image: prom/prometheus +# volumes: +# - "./grafana/prometheus.yml:/etc/prometheus/prometheus.yml" +# - ./grafana/prometheus-data:/prometheus +# networks: +# - grafana +# ports: +# - 9090:9090 +# user: "1000:1002" +# container_name: prometheus #sudo docker plugin install grafana/loki-docker-driver:3.3.2-amd64 --alias loki --grant-all-permissions @@ -219,6 +217,4 @@ networks: name: caddy-net monitoring: name: monitoring-net - grafana: - name: grafana-net - \ No newline at end of file + diff --git a/monitoring/homepage/config/services.yaml b/monitoring/homepage/config/services.yaml index 36163d5..19bc9d3 100644 --- a/monitoring/homepage/config/services.yaml +++ b/monitoring/homepage/config/services.yaml @@ -307,10 +307,10 @@ href: https://n8n.sereiaguardia.com/ siteMonitor: https://n8n.sereiaguardia.com/ - - Vikunja: - icon: vikunja.svg - href: https://tasks.sereiaguardia.com/ - siteMonitor: https://tasks.sereiaguardia.com/ + # - Vikunja: + # icon: vikunja.svg + # href: https://tasks.sereiaguardia.com/ + # siteMonitor: https://tasks.sereiaguardia.com/ - Mautic: icon: mautic.svg