#73 upgrade Docker images to latest versions and fix monitoring

smartemission · May 28, 2018 · 6906b59 · 6906b59
1 parent 6f836f4
commit 6906b59
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 30 deletions.
diff --git a/services/geoserver/docker-compose.yml b/services/geoserver/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.1'
 
 services:
   geoserver:
-    image: smartemission/se-geoserver:2.12.1-1
+    image: smartemission/se-geoserver:2.12.1-2
 
     container_name: geoserver
 

diff --git a/services/grafana/docker-compose.yml b/services/grafana/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     container_name: grafana
 
     environment:
-      - GF_INFLUX_URL=http://influxdb:8086
+      - SE_INFLUX_URL=http://influxdb:8086
       - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s:%(http_port)s/grafana
 
     env_file:

diff --git a/services/monitoring/cadvisor/run.sh b/services/monitoring/cadvisor/run.sh
@@ -6,4 +6,4 @@ export GOPATH="/opt/cadvisor/src/github.com/google/cadvisor"
 export PATH="${GOPATH}:${GOROOT}/bin:${PATH}"
 
 cd ${GOPATH}
-./cadvisor -listen_ip ${PARENT_HOST} -port 8080
+./cadvisor -listen_ip ${PARENT_HOST} -port 8081
diff --git a/services/monitoring/docker-compose-14.4.yml b/services/monitoring/docker-compose-14.4.yml
@@ -21,34 +21,10 @@ volumes:
 
 services:
 
-  grafana:
-    image: grafana/grafana:4.6.3
-    labels:
-      - "traefik.backend=grafanamon"
-      - "traefik.enable=true"
-      - "traefik.frontend.priority=600"
-      - "traefik.frontend.rule=Method:GET"
-      - "traefik.frontend.rule=PathPrefixStrip:/adm/grafanamon"
-      # - "traefik.frontend.auth.basic=sadmin:$$apr1$$gVo/HcPx$$2AudzGfyX7Xxg7aD/b1zf."
-      - "traefik.docker.network=se_back"
-
-    depends_on:
-      - prometheus
-    links:
-      - prometheus:prometheus
-#    ports:
-#      - 3000:3000
-    volumes:
-      - grafana_data:/var/lib/grafana
-    env_file:
-      - grafana/grafana.conf
-    networks:
-      # Visible in SE backend and frontend Docker network
-      - se_back
-
   prometheus:
     # image: prom/prometheus:v2.0.0
     image: prom/prometheus:latest
+    container_name: prometheus
     labels:
       - "traefik.backend=prometheus"
       - "traefik.enable=true"
@@ -88,6 +64,32 @@ services:
 #        constraints:
 #          - node.hostname == moby
 
+  grafana:
+    image: grafana/grafana:4.6.3
+    container_name: grafanamon
+    labels:
+      - "traefik.backend=grafanamon"
+      - "traefik.enable=true"
+      - "traefik.frontend.priority=600"
+      - "traefik.frontend.rule=Method:GET"
+      - "traefik.frontend.rule=PathPrefixStrip:/adm/grafanamon"
+      # - "traefik.frontend.auth.basic=sadmin:$$apr1$$gVo/HcPx$$2AudzGfyX7Xxg7aD/b1zf."
+      - "traefik.docker.network=se_back"
+
+    depends_on:
+      - prometheus
+    links:
+      - prometheus:prometheus
+#    ports:
+#      - 3000:3000
+    volumes:
+      - grafana_data:/var/lib/grafana
+    env_file:
+      - grafana/grafana.conf
+    networks:
+      # Visible in SE backend and frontend Docker network
+      - se_back
+
   alertmanager:
     image: prom/alertmanager
 #    ports:

diff --git a/services/monitoring/prometheus/prometheus.yml b/services/monitoring/prometheus/prometheus.yml
@@ -43,4 +43,4 @@ scrape_configs:
     # scheme defaults to 'http'.
 
     static_configs:
-         - targets: ['$CADVISOR_HOST:8080','$NODE_EXPORTER_HOST:9100']
+         - targets: ['$CADVISOR_HOST:8081','$NODE_EXPORTER_HOST:9100']
diff --git a/services/sos52n/docker-compose.yml b/services/sos52n/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.1'
 
 services:
   sos52n:
-    image: smartemission/se-sos52n:4.3.7-4
+    image: smartemission/se-sos52n:4.3.7-3
 
     container_name: sos52n