Merge pull request #421 from Paraphraser/20211005-prometheus-self-repair-experimental

20211005 Prometheus revamp - experimental branch - PR 3 of 3

Author: Slyke

.internal/templates/services/prometheus/buildFiles/Dockerfile

@@ -0,0 +1,25 @@
+# Download base image
+FROM prom/prometheus:latest
+
+USER root
+
+# where IOTstack template files are stored
+ENV IOTSTACK_DEFAULTS_DIR="iotstack_defaults"
+ENV IOTSTACK_CONFIG_DIR="/prometheus/config/"
+
+# copy template files to image
+COPY --chown=nobody:nobody ${IOTSTACK_DEFAULTS_DIR} /${IOTSTACK_DEFAULTS_DIR}
+
+# add default config from image to template
+RUN cp /etc/prometheus/prometheus.yml /${IOTSTACK_DEFAULTS_DIR}
+
+# replace the docker entry-point script
+ENV IOTSTACK_ENTRY_POINT="docker-entrypoint.sh"
+COPY ${IOTSTACK_ENTRY_POINT} /${IOTSTACK_ENTRY_POINT}
+RUN chmod 755 /${IOTSTACK_ENTRY_POINT}
+ENTRYPOINT ["/docker-entrypoint.sh"]
+ENV IOTSTACK_ENTRY_POINT=
+
+USER nobody
+
+# EOF

.internal/templates/services/prometheus/buildFiles/build.sh

@@ -0,0 +1,33 @@
+#!/bin/ash
+set -e
+
+# set defaults for config structure ownership
+UID="${IOTSTACK_UID:-nobody}"
+GID="${IOTSTACK_GID:-nobody}"
+
+# were we launched as root?
+if [ "$(id -u)" = "0" -a -d /"$IOTSTACK_DEFAULTS_DIR" ]; then
+
+   # yes! ensure that the IOTSTACK_CONFIG_DIR exists
+   mkdir -p "$IOTSTACK_CONFIG_DIR"
+   
+   # populate runtime directory from the defaults
+   for P in /"$IOTSTACK_DEFAULTS_DIR"/* ; do
+
+      C=$(basename "$P")
+
+      if [ ! -e "$IOTSTACK_CONFIG_DIR/$C" ] ; then
+
+         cp -a "$P" "$IOTSTACK_CONFIG_DIR/$C"
+
+      fi
+
+   done
+
+   # enforce correct ownership
+   chown -R "$UID":"$GID" "$IOTSTACK_CONFIG_DIR"
+   
+fi
+
+# launch prometheus with supplied arguments
+exec /bin/prometheus "$@"

.internal/templates/services/prometheus/buildFiles/docker-entrypoint.sh

@@ -0,0 +1,12 @@
+global:
+  scrape_interval: 10s
+  evaluation_interval: 10s
+
+scrape_configs:
+  - job_name: "iotstack"
+    static_configs:
+      - targets:
+        - localhost:9090
+        - cadvisor:8080
+        - nodeexporter:9100
+

.internal/templates/services/prometheus/buildFiles/iotstack_defaults/config.yml

@@ -1,15 +1,47 @@
 prometheus:
   container_name: prometheus
-  image: prom/prometheus:latest
+  build: ./.templates/prometheus/.
   restart: unless-stopped
   user: "0"
   ports:
     - "9090:9090"
+  environment:
+    - IOTSTACK_UID=1000
+    - IOTSTACK_GID=1000
   volumes:
-    - ./services/prometheus/config.yml:/etc/prometheus/config.yml
-    - ./volumes/prometheus/data:/data
+    - ./volumes/prometheus/data:/prometheus
   command:
-    - '--config.file=/etc/prometheus/config.yml'
-    - '--storage.tsdb.path=/data'
+    - '--config.file=/prometheus/config/config.yml'
+    #    defaults are:
+    #    - --config.file=/etc/prometheus/prometheus.yml
+    #    - --storage.tsdb.path=/prometheus
+    #    - --web.console.libraries=/usr/share/prometheus/console_libraries
+    #    - --web.console.templates=/usr/share/prometheus/consoles
+  depends_on:
+    - cadvisor
+    - nodeexporter
+  networks:
+    - iotstack_nw
+
+cadvisor:
+  container_name: cadvisor
+  image: zcube/cadvisor:latest
+  restart: unless-stopped
+  ports:
+    - "8082:8080"
+  volumes:
+    - /:/rootfs:ro
+    - /var/run:/var/run:rw
+    - /sys:/sys:ro
+    - /var/lib/docker/:/var/lib/docker:ro
+  networks:
+    - iotstack_nw
+
+nodeexporter:
+  container_name: nodeexporter
+  image: prom/node-exporter:latest
+  restart: unless-stopped
+  expose:
+    - "9100"
   networks:
     - iotstack_nw