From 790f838a91951f12b5dca7f88cd3b324588f7a2e Mon Sep 17 00:00:00 2001
From: Richard Morgan <r_morgan@sympatico.ca>
Date: Sat, 3 Nov 2018 20:29:51 -0400
Subject: [PATCH] add dockerfile building for prometheus to jenkinsfile

---
 dockerfiles/services/prometheus/Jenkinsfile   | 10 ++++++---
 .../prometheus/docker-compose-prod.yml        | 21 ++++++++++++-------
 .../services/prometheus/prometheus.yml        | 17 +++++++--------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/dockerfiles/services/prometheus/Jenkinsfile b/dockerfiles/services/prometheus/Jenkinsfile
index 38f1381..892b614 100644
--- a/dockerfiles/services/prometheus/Jenkinsfile
+++ b/dockerfiles/services/prometheus/Jenkinsfile
@@ -13,10 +13,10 @@ node('docker') {
     stage('build') {
         dir(workdir) {
             docker.withRegistry('http://dkregistry.xai-corp.net:5000') {
-                def customImage = docker.build("dkregistry.xai-corp.net:5000/${app_name}:latest", "-f Dockerfile .")
+                def customImage = docker.build("dkregistry.xai-corp.net:5000/xaicorp/${app_name}:latest", "-f Dockerfile .")
                 customImage.push()
             }
-            sh "docker-compose -f ${build_file} pull"
+            sh "docker-compose -f ${deployment_file} pull"
         }
     }
 
@@ -24,7 +24,11 @@ node('docker') {
         dir(workdir) {
             sh """
                 docker stack deploy -c ${deployment_file} ${service_name}
-                docker service update -q ${service_name}_${app_name}
+                docker service update -q ${service_name}_prometheus
+                docker service update -q ${service_name}_statsd_exporter
+                docker service update -q ${service_name}_fluentd_exporter
+                docker service update -q ${service_name}_node_exporter
+                docker service update -q ${service_name}_graphana
             """
         }
     }
diff --git a/dockerfiles/services/prometheus/docker-compose-prod.yml b/dockerfiles/services/prometheus/docker-compose-prod.yml
index d49e464..49327c1 100644
--- a/dockerfiles/services/prometheus/docker-compose-prod.yml
+++ b/dockerfiles/services/prometheus/docker-compose-prod.yml
@@ -20,13 +20,12 @@ services:
       - 9090:9090
     volumes:
       - prometheus-storage:/prometheus
-
-#    logging:
-#      driver: fluentd
-#      options:
-#        fluentd-address: "logs.xai-corp.net:24224"
-#        fluentd-async-connect: 'true'
-#        tag: metrics
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "http://localhost:9090/metrics"]
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+      start_period: 3m
     deploy:
       mode: replicated
       replicas: 1
@@ -66,6 +65,12 @@ services:
       resources:
         limits:
           memory: 512M
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000/metrics"]
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+      start_period: 3m
 
   postgres_exporter:
     image: wrouesnel/postgres_exporter
@@ -75,7 +80,7 @@ services:
       DATA_SOURCE_NAME: "postgresql://xaicorp_admin:snqioxni1sw@tasks.postgres:5432/?sslmode=disable"
     deploy:
       mode: replicated
-      replicas: 0
+      replicas: 1
       restart_policy:
         condition: any
         delay: "1s"
diff --git a/dockerfiles/services/prometheus/prometheus.yml b/dockerfiles/services/prometheus/prometheus.yml
index 57611c3..924d7e9 100644
--- a/dockerfiles/services/prometheus/prometheus.yml
+++ b/dockerfiles/services/prometheus/prometheus.yml
@@ -19,13 +19,13 @@ scrape_configs:
   static_configs:
     - targets: ['prometheus:9090']
 
-- job_name: glusterfs
-  metrics_path: /metrics
-  scrape_interval: 120s
-  scrape_timeout:  14s
-  static_configs:
-    - targets:
-      - 'cubox-i.xai-corp.net:9189'
+#- job_name: glusterfs
+#  metrics_path: /metrics
+#  scrape_interval: 120s
+#  scrape_timeout:  14s
+#  static_configs:
+#    - targets:
+#      - 'cubox-i.xai-corp.net:9189'
 #      - 'home.xai-corp.net:9189'
 
 - job_name: fluentd
@@ -73,7 +73,6 @@ scrape_configs:
   metrics_path: '/metrics'
   scrape_interval: 60s
   scrape_timeout:  9s
-  scheme: https
   static_configs:
     - targets:
-      - 'metrics.xai-corp.net'
+      - 'metrics_graphana:3000'