From ce7a8d6fc843629ce7415a6a45d1b881c9f66ef5 Mon Sep 17 00:00:00 2001
From: Matthias <matthias.mitscherlich@gmail.com>
Date: Mon, 23 Jan 2023 15:26:39 +0000
Subject: [PATCH] added registrybrowser (functional) and cadvisor (unfunctional
 without influxDB working)

---
 cadvisor/docker-compose.yml        | 22 ++++++++++++++++++
 grafana/docker-compose.yml         | 36 +++++++++++++++++++++++++++++-
 registrybrowser/docker-compose.yml | 12 ++++++++++
 tado-exporter/docker-compose.yml   | 12 ++--------
 4 files changed, 71 insertions(+), 11 deletions(-)
 create mode 100644 cadvisor/docker-compose.yml
 create mode 100644 registrybrowser/docker-compose.yml

diff --git a/cadvisor/docker-compose.yml b/cadvisor/docker-compose.yml
new file mode 100644
index 0000000..798ddac
--- /dev/null
+++ b/cadvisor/docker-compose.yml
@@ -0,0 +1,22 @@
+version: "3.7"
+
+services:
+  cadvisor:
+      user: "0:0"
+      image: zcube/cadvisor:latest
+      hostname: '{{.Node.ID}}'
+      command: -logtostderr -docker_only -storage_driver=influxdb -storage_driver_db=cadvisor -storage_driver_host=influx:8086
+      volumes:
+        - /:/rootfs:ro
+        - /var/run:/var/run:rw
+        - /sys:/sys:ro
+        - /sys/fs/cgroup:/sys/fs/cgroup:ro
+        - /var/lib/docker/:/var/lib/docker:ro
+        - /dev/disk/:/dev/disk:ro
+      ports:
+        - 8081:8080
+      deploy:
+        mode: global
+        restart_policy:
+          condition: on-failure
+          
diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml
index 1146dc9..5e3231a 100644
--- a/grafana/docker-compose.yml
+++ b/grafana/docker-compose.yml
@@ -18,7 +18,6 @@ volumes:
       o: addr=dockerstorage,nfsvers=4
       device: :/swarm/stacks/grafana/grafana_config
 
-
   prometheus_data:
     driver_opts:
       type: nfs
@@ -31,12 +30,45 @@ volumes:
       o: addr=dockerstorage,nfsvers=4
       device: :/swarm/stacks/grafana/grafana_data
 
+  loki_data:
+    driver_opts:
+      type: nfs
+      o: addr=dockerstorage,nfsvers=4
+      device: :/swarm/stacks/grafana/loki_data
+
+  influxdb_data:
+    driver_opts:
+      type: nfs
+      o: addr=dockerstorage,nfsvers=4
+      device: :/swarm/stacks/grafana/influxdb_data
 
 
 services:
 #  redis:
 #
 
+  loki:
+    image: grafana/loki:2.6.1
+    user: "0:0"
+    volumes:
+      - loki_data:/loki
+    ports:
+      - "3100:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+
+  promtail:
+    image: grafana/promtail:2.6.1
+    user: "0:0"
+    volumes:
+      - /var/log:/var/log
+    command: -config.file=/etc/promtail/config.yml
+
+  influx:
+    user: "0:0"   
+    image: influxdb   
+    volumes:     
+      - influxdb_data:/var/lib/influxdb
+
   alertmanager:
     user: "0:0"
     hostname: alertmanager
@@ -71,6 +103,8 @@ services:
     user: "0:0"
     hostname: grafana
     image: grafana/grafana
+    depends_on:
+      - influx
     environment:
       - TZ=Europe/Amsterdam
     volumes:
diff --git a/registrybrowser/docker-compose.yml b/registrybrowser/docker-compose.yml
new file mode 100644
index 0000000..14322ae
--- /dev/null
+++ b/registrybrowser/docker-compose.yml
@@ -0,0 +1,12 @@
+version: '3'
+
+services:
+  registrybrowser:
+    image: klausmeyer/docker-registry-browser
+    ports:
+      - 8082:8080
+    environment:
+      - 'DOCKER_REGISTRY_URL=http://docker:5000'
+      - 'NO_SSL_VERIFICATION=true'
+
+ 
diff --git a/tado-exporter/docker-compose.yml b/tado-exporter/docker-compose.yml
index ed646ca..39b39a0 100644
--- a/tado-exporter/docker-compose.yml
+++ b/tado-exporter/docker-compose.yml
@@ -6,20 +6,12 @@ services:
   tado-exporter:
     user: "1000:1000"
     image: docker:5000/tado-exporter:arm64
-    container_name: tado-exporter
-    restart: unless-stopped
+    hostname: tado-exporter
+
     environment:
       EXPORTER_USERNAME: matthias.mitscherlich@gmail.com
       EXPORTER_PASSWORD: 14Mai1984
 
-#    logging:
-#      driver: loki
-#      options:
-#        loki-url: "http://loki:3100/loki/api/v1/push"
-#        mode: non-blocking
-#        max-buffer-size: 4m
-#        loki-retries: "3"
-
     ports:
       - "9898:9898"