From 485cd66566f24e37012c41f80b2e3bb2970b1b51 Mon Sep 17 00:00:00 2001
From: xcad2k <28359525+xcad2k@users.noreply.github.com>
Date: Sun, 2 Jan 2022 13:25:19 +0100
Subject: [PATCH] monitoring stack updates

---
 docker-compose/influxdb/README.md             |  2 +-
 docker-compose/prometheus-grafana/README.md   |  0
 .../prometheus-grafana/docker-compose.yml     | 29 -------------------
 .../exporters/cadvisor/docker-compose.yml     | 17 -----------
 .../node_exporter/docker-compose.yml          | 13 ---------
 docker-compose/prometheus/README.md           | 26 +++++++++++++++++
 .../config/prometheus.yml                     |  0
 7 files changed, 27 insertions(+), 60 deletions(-)
 delete mode 100755 docker-compose/prometheus-grafana/README.md
 delete mode 100755 docker-compose/prometheus-grafana/docker-compose.yml
 delete mode 100755 docker-compose/prometheus-grafana/exporters/cadvisor/docker-compose.yml
 delete mode 100755 docker-compose/prometheus-grafana/exporters/node_exporter/docker-compose.yml
 rename docker-compose/{prometheus-grafana => prometheus}/config/prometheus.yml (100%)

diff --git a/docker-compose/influxdb/README.md b/docker-compose/influxdb/README.md
index 4ddd87b..f362259 100644
--- a/docker-compose/influxdb/README.md
+++ b/docker-compose/influxdb/README.md
@@ -8,7 +8,7 @@ Copy the `docker-compose.yml` template into your project folder and start the co
 
 The initial configuration can be done automatically through docker instructions, or post-installation via the InfluxDB UI or CLI setup.
 
-*For more info visit:* [Official InfluxDB Installation Documentation](ttps://docs.influxdata.com/influxdb/v2.1/install/)
+*For more info visit:* [Official InfluxDB Installation Documentation](https://docs.influxdata.com/influxdb/v2.1/install/)
 
 # Best-Practices & Post-Installation
 
diff --git a/docker-compose/prometheus-grafana/README.md b/docker-compose/prometheus-grafana/README.md
deleted file mode 100755
index e69de29..0000000
diff --git a/docker-compose/prometheus-grafana/docker-compose.yml b/docker-compose/prometheus-grafana/docker-compose.yml
deleted file mode 100755
index 6610347..0000000
--- a/docker-compose/prometheus-grafana/docker-compose.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-version: '3'
-
-volumes:
-  prometheus-data:
-    driver: local
-  grafana-data:
-    driver: local
-
-services:
-  prometheus:
-    image: prom/prometheus:latest
-    container_name: prometheus
-    ports:
-      - "9090:9090"
-    volumes:
-      - /etc/prometheus:/etc/prometheus
-      - prometheus-data:/prometheus
-    restart: unless-stopped
-    command:
-      - "--config.file=/etc/prometheus/prometheus.yml"
-
-  grafana:
-    image: grafana/grafana-oss:latest
-    container_name: grafana
-    ports:
-      - "3000:3000"
-    volumes:
-      - grafana-data:/var/lib/grafana
-    restart: unless-stopped
diff --git a/docker-compose/prometheus-grafana/exporters/cadvisor/docker-compose.yml b/docker-compose/prometheus-grafana/exporters/cadvisor/docker-compose.yml
deleted file mode 100755
index 6f015e2..0000000
--- a/docker-compose/prometheus-grafana/exporters/cadvisor/docker-compose.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-version: '3'
-
-services:
-  cadvisor:
-    image: google/cadvisor:latest
-    container_name: cadvisor
-    # ports:
-    #   - "8080:8080"
-    volumes:
-      - /:/rootfs:ro
-      - /var/run:/var/run:ro
-      - /sys:/sys:ro
-      - /var/lib/docker/:/var/lib/docker:ro
-      - /dev/disk/:/dev/disk:ro
-    devices:
-      - /dev/kmsg
\ No newline at end of file
diff --git a/docker-compose/prometheus-grafana/exporters/node_exporter/docker-compose.yml b/docker-compose/prometheus-grafana/exporters/node_exporter/docker-compose.yml
deleted file mode 100755
index 07ff1ef..0000000
--- a/docker-compose/prometheus-grafana/exporters/node_exporter/docker-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-version: '3.8'
-
-services:
-  node_exporter:
-    image: quay.io/prometheus/node-exporter:latest
-    container_name: node_exporter
-    command:
-      - '--path.rootfs=/host'
-    pid: host
-    restart: unless-stopped
-    volumes:
-      - '/:/host:ro,rslave'
\ No newline at end of file
diff --git a/docker-compose/prometheus/README.md b/docker-compose/prometheus/README.md
index e69de29..d84052d 100644
--- a/docker-compose/prometheus/README.md
+++ b/docker-compose/prometheus/README.md
@@ -0,0 +1,26 @@
+# Installation
+
+## Deployment
+
+1. Copy the configuration template into the `/etc/prometheus/prometheus.yml` location.
+2. Copy the `docker-compose.yml` template into your project folder and start the container.
+
+## Configuration
+
+Configure your settings in the `/etc/prometheus/prometheus.yml` file.
+
+*For more info visit:* [Official Prometheus Installation Documentation](https://prometheus.io/docs/prometheus/latest/installation/)
+
+# Best-Practices & Post-Installation
+
+## Disable HTTP
+
+It's not secure to expose Prometheus via the HTTP protocol. 
+
+### Use a Reverse Proxy
+
+- [] Use a Reverse Proxy to securely expose administrative services.
+
+# Additional Referfences
+
+[Official Prometheus Documentation](https://prometheus.io/docs/introduction/overview/)
\ No newline at end of file
diff --git a/docker-compose/prometheus-grafana/config/prometheus.yml b/docker-compose/prometheus/config/prometheus.yml
similarity index 100%
rename from docker-compose/prometheus-grafana/config/prometheus.yml
rename to docker-compose/prometheus/config/prometheus.yml