move grafana

2025-11-08 15:31:33 -03:00
parent 92784fcbd5
commit f1f4c0f67f
6 changed files with 167 additions and 93 deletions
--- 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
--- a/grafana/docker-compose.yml
+++ 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 <<EOF > /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"]
+# }
--- a/monitoring/grafana/prometheus.yml
+++ b/monitoring/grafana/prometheus.yml
--- 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
--- 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 <<EOF > /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 <<EOF > /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
-  
+  
--- 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