Add Traefik dashboard (#151)

Add Traefik dashboard to Grafana #130. Additionally remove preselection of dev values in all other dashboards.
marein · Oct 14, 2022 · 0c4e271 · 0c4e271
1 parent 937be51
commit 0c4e271
Show file tree

Hide file tree

Showing 6 changed files with 714 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -73,8 +73,7 @@ Following urls are accessible after the project is successfully started.
 | [http://localhost:8081/](http://localhost:8081/) | MySQL management interface.    |
 | [http://localhost:8082/](http://localhost:8082/) | Redis management interface.    |
 | [http://localhost:8083/](http://localhost:8083/) | RabbitMq management interface. |
-| [http://localhost:8084/](http://localhost:8084/) | Traefik management interface.  |
-| [http://localhost:8085/](http://localhost:8085/) | Grafana management interface.  |
+| [http://localhost:8084/](http://localhost:8084/) | Grafana management interface.  |
 
 ### Production
 

diff --git a/docker-compose.production.yml b/docker-compose.production.yml
@@ -23,7 +23,7 @@ services:
     traefik:
         image: marein/php-gaming-website:traefik
         command:
-            - --api.insecure=true
+            - --metrics.prometheus=true
             - --providers.docker
             - --providers.docker.exposedbydefault=false
         ports:
@@ -34,6 +34,9 @@ services:
             - php-fpm
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock
+        labels:
+            - "prometheus-job=traefik"
+            - "prometheus-port=8080"
     grafana:
         image: marein/php-gaming-website:grafana
         restart: on-failure
@@ -42,7 +45,7 @@ services:
             GF_AUTH_ANONYMOUS_ENABLED: 1
             GF_AUTH_ANONYMOUS_ORG_ROLE: Admin
         ports:
-            - "8085:3000"
+            - "8084:3000"
     prometheus:
         image: marein/php-gaming-website:prometheus
         restart: on-failure

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,18 +30,20 @@ services:
             context: .
             dockerfile: ./docker/traefik/Dockerfile
         command:
-            - --api.insecure=true
+            - --metrics.prometheus=true
             - --providers.docker
             - --providers.docker.exposedbydefault=false
         ports:
             - "80:80"
-            - "8084:8080"
         depends_on:
             - nchan
             - service-js-polyfill
             - php-fpm
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock
+        labels:
+            - "prometheus-job=traefik"
+            - "prometheus-port=8080"
     grafana:
         build:
             context: .
@@ -51,7 +53,7 @@ services:
             GF_AUTH_ANONYMOUS_ENABLED: 1
             GF_AUTH_ANONYMOUS_ORG_ROLE: Admin
         ports:
-            - "8085:3000"
+            - "8084:3000"
         volumes:
             - ./docker/grafana/provisioning:/etc/grafana/provisioning
             - ./docker/grafana/dashboards:/var/lib/grafana/dashboards

diff --git a/docker/grafana/dashboards/mysql.json b/docker/grafana/dashboards/mysql.json
@@ -3030,8 +3030,8 @@
         "allFormat": "glob",
         "current": {
           "selected": false,
-          "text": "192.168.80.11:9104",
-          "value": "192.168.80.11:9104"
+          "text": "None",
+          "value": "–"
         },
         "datasource": {
           "type": "prometheus",

diff --git a/docker/grafana/dashboards/nchan.json b/docker/grafana/dashboards/nchan.json
@@ -318,8 +318,8 @@
       {
         "current": {
           "selected": false,
-          "text": "php-gaming-website_nchan_1",
-          "value": "php-gaming-website_nchan_1"
+          "text": "None",
+          "value": "–"
         },
         "datasource": {
           "type": "prometheus",