add picture gallery container

update prometheus/grafana to be persistent, and have more collectors

dockerfiles/services/prometheus/docker-compose-prod.yml

@@ -4,10 +4,13 @@
 # docker login dkregistry.xai-corp.net:5000
 # docker-compose build && docker push dkregistry.xai-corp.net:5000/xaicorp/prometheus:latest
 
-# DOCKER_HOST=dkmanager:2376 docker stack deploy -c docker-compose.yml metrics
+# DOCKER_HOST=dkmanager:2376 docker stack deploy --prune --with-registry-auth -c docker-compose-prod.yml metrics
 # DOCKER_HOST=dkmanager:2376 docker stack ps metrics
 
 version: '3.4'
+volumes:
+  grafana-storage:
+
 services:
 
   prometheus:
@@ -16,13 +19,13 @@ services:
       - 9090:9090
     volumes:
       - /opt/prometheus/data:/prometheus-data
-
-    logging:
-      driver: fluentd
-      options:
-        fluentd-address: "logs.xai-corp.net:24224"
-        fluentd-async-connect: 'true'
-        tag: prometheus
+#
+#    logging:
+#      driver: fluentd
+#      options:
+#        fluentd-address: "logs.xai-corp.net:24224"
+#        fluentd-async-connect: 'true'
+#        tag: metrics
     deploy:
       mode: replicated
       replicas: 1
@@ -38,20 +41,35 @@ services:
         limits:
 #          cpus: '1'
           memory: 512M
-    networks:
-    - prod
 
   graphana:
     image: grafana/grafana
     ports:
       - 3001:3000
+    volumes:
+      - grafana-storage:/var/lib/grafana
     environment:
       GF_SECURITY_ADMIN_PASSWORD: sakas
-#    volumes:
-#      - /opt/shared/nextcloud/data:/var/www/html/data
+      GF_INSTALL_PLUGINS: 'grafana-clock-panel,grafana-simple-json-datasource,raintank-worldping-app'
+    deploy:
+      mode: replicated
+      replicas: 1
+      restart_policy:
+        condition: any
+        delay: "1m"
+        max_attempts: 1
+      update_config:
+        parallelism: 1
+        delay: 2s
+        order: start-first
+      resources:
+        limits:
+          memory: 512M
 
-  postgres_exported:
+  postgres_exporter:
     image: wrouesnel/postgres_exporter
+    ports:
+      - 9187:9187
     environment:
       DATA_SOURCE_NAME: "postgresql://xaicorp_admin:snqioxni1sw@tasks.postgres:5432/?sslmode=disable"
     deploy:
@@ -69,8 +87,7 @@ services:
         limits:
 #          cpus: '1'
           memory: 512M
-    networks:
-    - prod
+
 
   fluentd_exporter:
     image: vect0r/fluentd_exporter
@@ -96,8 +113,21 @@ services:
         limits:
 #          cpus: '1'
           memory: 512M
-    networks:
-    - prod
+
+
+  node_exporter:
+    image: quay.io/prometheus/node-exporter
+    ports:
+      - 9100:9100
+    command:
+      - --collector.tcpstat
+
+  statsd_exporter:
+    image: prom/statsd-exporter
+    ports:
+      - 9102:9102
+      - 9125:9125
+      - 9125:9125/udp
 
 networks:
   prod:

dockerfiles/services/prometheus/docker-compose.yml

@@ -4,7 +4,7 @@
 # docker login dkregistry.xai-corp.net:5000
 # docker-compose build && docker push dkregistry.xai-corp.net:5000/xaicorp/prometheus:latest
 
-# DOCKER_HOST=dkmanager:2376 docker stack deploy -c docker-compose.yml metrics
+# DOCKER_HOST=dkmanager:2376 docker stack deploy --prune --with-registry-auth -c docker-compose-prod.yml metrics
 # DOCKER_HOST=dkmanager:2376 docker stack ps metrics
 
 version: '3.4'
@@ -17,8 +17,8 @@ services:
       dockerfile: Dockerfile
     ports:
       - 9090:9090
-    volumes:
-      - ./prometheus.yml:/etc/prometheus/prometheus.yml
+#    volumes:
+#      - ./prometheus.yml:/etc/prometheus/prometheus.yml
 #    logging:
 #      driver: fluentd
 #      options:
@@ -50,3 +50,7 @@ services:
       - -scrape_uri
       - http://tasks.fluentd:24220/api/plugins.json
 
+  node_exporter:
+    image: quay.io/prometheus/node-exporter
+    pid: "host"
+

dockerfiles/services/prometheus/prometheus.yml

@@ -14,6 +14,11 @@ global:
 
 scrape_configs:
 
+- job_name: 'prometheus'
+  scrape_interval: 5s
+  static_configs:
+    - targets: ['prometheus:9090']
+
 - job_name: glusterfs
   metrics_path: /metrics
   scrape_interval: 120s
@@ -30,3 +35,27 @@ scrape_configs:
   static_configs:
     - targets:
       - 'fluentd_exporter:9309'
+
+- job_name: node
+  metrics_path: /metrics
+  scrape_interval: 60s
+  scrape_timeout:  9s
+  static_configs:
+    - targets:
+      - 'node_exporter:9100'
+
+- job_name: postresql
+  metrics_path: /metrics
+  scrape_interval: 60s
+  scrape_timeout:  9s
+  static_configs:
+    - targets:
+      - 'postgres_exporter:9187'
+
+- job_name: statsd
+  metrics_path: /metrics
+  scrape_interval: 60s
+  scrape_timeout:  9s
+  static_configs:
+    - targets:
+      - 'statsd_exporter:9102'