fix docker for monitoring on Ubuntu 16

smartemission · Jun 14, 2018 · d9cfd84 · d9cfd84
1 parent 5f05a28
commit d9cfd84
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 27 deletions.
diff --git a/platform/bootstrap.sh b/platform/bootstrap.sh
@@ -59,9 +59,11 @@ mkdir -p /opt/geonovum/smartem
 git clone https://github.com/smartemission/smartemission.git /opt/geonovum/smartem/git
 
 # Mount disk Azure
-https://docs.microsoft.com/en-us/azure/virtual-machines/linux/add-disk
+# https://docs.microsoft.com/en-us/azure/virtual-machines/linux/add-disk
 
-echo "READY: now run ./build.sh and ./install.sh to build and run SE Data Platform"
+./init-databases.sh
+
+echo "READY: now run  to build and run SE Data Platform"
 
 # OLD STUFF
 # Need 9.4 version of PG client, not in Ubuntu 14.4, so get from PG Repo

diff --git a/platform/cronfile.txt b/platform/cronfile.txt
@@ -39,7 +39,7 @@ SMARTEM=/opt/geonovum/smartem/git
 # */4 * * * * cd $SMARTEM; ./refresh-git.sh
 
 # Backup
-0 0 * * * cd $SMARTEM/platform; ./backup.sh > /var/smartem/backup/backup.log 2>&1
+# 0 0 * * * cd $SMARTEM/platform; ./backup.sh > /var/smartem/backup/backup.log 2>&1
 
 # Fix SOS Station locations (see issue https://github.com/smartemission/smartemission/issues/72)
 0 * * * * $SMARTEM/database/util/sos-update-feature-geom.sh
diff --git a/platform/init-databases.sh b/platform/init-databases.sh
@@ -7,6 +7,8 @@
 # Just van den Broecke - 2016
 #
 
+docker network create --driver=bridge se_back
+
 pushd ../services/postgis
   ./run.sh
 popd
@@ -22,4 +24,10 @@ pushd ../database
   ./db-init-gost.sh
 popd
 
+docker network rm se_back se_front
+
+pushd ../services/postgis
+  ./stop.sh
+popd
+
 echo "READY: now run ./install.sh install SE Data Platform system daemon"
diff --git a/services/monitoring/docker-compose.yml b/services/monitoring/docker-compose.yml
@@ -17,21 +17,47 @@ volumes:
 services:
 
   grafana:
-    image: grafana/grafana:4.6.3
+    image: grafana/grafana:5.1.3
+    # 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
+      - ./grafana/provisioning:/etc/grafana/provisioning:ro
+      # - grafana_data:/var/lib/grafana
     env_file:
       - grafana/grafana.conf
-    network_mode: bridge
+    networks:
+      # Visible in SE backend and frontend Docker network
+      - se_back
 
   prometheus:
-    image: prom/prometheus:v2.1.0
+    # image: prom/prometheus:v2.0.0
+    image: prom/prometheus:v2.2.1
+    container_name: prometheus
+    labels:
+      - "traefik.backend=prometheus"
+      - "traefik.enable=true"
+      - "traefik.frontend.priority=600"
+      - "traefik.frontend.rule=Method:GET"
+      - "traefik.frontend.rule=PathPrefix:/adm/prometheus"
+      # - "traefik.frontend.auth.basic=sadmin:$$apr1$$gVo/HcPx$$2AudzGfyX7Xxg7aD/b1zf."
+      - "traefik.docker.network=se_back"
     volumes:
       - ./prometheus/:/etc/prometheus/
       - prometheus_data:/prometheus
@@ -40,46 +66,44 @@ services:
       - '--storage.tsdb.path=/prometheus'
       - '--web.console.libraries=/usr/share/prometheus/console_libraries'
       - '--web.console.templates=/usr/share/prometheus/consoles'
-      - "--web.external-url=http://${se_host}/adm/prometheus"
+      - "--web.external-url=http://${se_host}${se_port}/adm/prometheus"
      # - '--storage.tsdb.retention=200h'
      # - '--web.route-prefix=/prometheus'
 
 #    ports:
 #      - 9090:9090
     links:
-      - cadvisor:cadvisor
-      - node-exporter:node-exporter
+      # - cadvisor:cadvisor
+      # - node-exporter:node-exporter
       - alertmanager:alertmanager
-    depends_on:
-      - cadvisor
-      - node-exporter
-
-    network_mode: bridge
+    # depends_on:
+      # - cadvisor
+      # - node-exporter
+
+    networks:
+      # Visible in SE backend and frontend Docker network
+      - se_back
     restart: unless-stopped
-#    deploy:
-#      placement:
-#        constraints:
-#          - node.hostname == moby
 
   alertmanager:
     image: prom/alertmanager
+    container_name: alertmanager
 #    ports:
 #      - 9093:9093
     volumes:
       - ./alertmanager/:/etc/alertmanager/
-    network_mode: bridge
+    networks:
+      # Visible in SE backend and frontend Docker network
+      - se_back
     restart: unless-stopped
     command:
       - '--config.file=/etc/alertmanager/config-gen.yml'
       - '--storage.path=/alertmanager'
-#    deploy:
-#      placement:
-#        constraints:
-#          - node.hostname == moby
 
   node-exporter:
     # See https://github.com/vegasbrianc/docker-pulls/blob/master/docker-compose.yml
     image: prom/node-exporter
+    container_name: node-exporter
     volumes:
       - /proc:/host/proc:ro
       - /sys:/host/sys:ro
@@ -92,19 +116,27 @@ services:
 #      - '--collector.textfile.directory /etc/node-exporter/'
 #    ports:
 #      - 9100:9100
-    network_mode: bridge
+    networks:
+      # Visible in SE backend and frontend Docker network
+      - se_back
     restart: unless-stopped
 
   cadvisor:
      # image: google/cadvisor
      image: smartemission/se-cadvisor:v0.28.3
+     container_name: cadvisor
      volumes:
        - /:/rootfs:ro
        - /var/run:/var/run:rw
        - /sys:/sys:ro
        - /var/lib/docker/:/var/lib/docker:ro
 #    ports:
 #      - 8080:8080
-     network_mode: bridge
-     restart: unless-stopped
+    networks:
+      # Visible in SE backend and frontend Docker network
+      - se_back
+    restart: unless-stopped
 
+networks:
+  se_back:
+    external: true