fix docker for monitoring on Ubuntu 16

smartemission · Jun 19, 2018 · 9efa781 · 9efa781
1 parent d9cfd84
commit 9efa781
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 68 deletions.
diff --git a/services/monitoring/docker-compose.yml b/services/monitoring/docker-compose.yml
@@ -16,40 +16,50 @@ volumes:
 
 services:
 
-  grafana:
-    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
+  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
+      - /:/rootfs:ro
+    command:
+      - '--path.procfs=/host/proc'
+      - '--path.sysfs=/host/sys'
+      - --collector.filesystem.ignored-mount-points
+      - "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)"
+#      - '--collector.textfile.directory /etc/node-exporter/'
 #    ports:
-#      - 3000:3000
+#      - 9100:9100
+    networks:
+      - se_back
+    restart: unless-stopped
 
+  cadvisor:
+    # image: google/cadvisor
+    image: smartemission/se-cadvisor:v0.28.3
+    container_name: cadvisor
     volumes:
-      - ./grafana/provisioning:/etc/grafana/provisioning:ro
-      # - grafana_data:/var/lib/grafana
-    env_file:
-      - grafana/grafana.conf
+     - /:/rootfs:ro
+     - /var/run:/var/run:rw
+     - /sys:/sys:ro
+     - /var/lib/docker/:/var/lib/docker:ro
+    #    ports:
+    #      - 8080:8080
+    command:
+      - '--port=8081'
     networks:
-      # Visible in SE backend and frontend Docker network
       - se_back
+    restart: unless-stopped
 
   prometheus:
     # image: prom/prometheus:v2.0.0
     image: prom/prometheus:v2.2.1
     container_name: prometheus
+    depends_on:
+      - cadvisor
+      - node-exporter
     labels:
       - "traefik.backend=prometheus"
       - "traefik.enable=true"
@@ -67,24 +77,51 @@ services:
       - '--web.console.libraries=/usr/share/prometheus/console_libraries'
       - '--web.console.templates=/usr/share/prometheus/consoles'
       - "--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
-      - alertmanager:alertmanager
-    # depends_on:
-      # - cadvisor
-      # - node-exporter
+#    links:
+#      # - cadvisor:cadvisor
+#      # - node-exporter:node-exporter
+#      - alertmanager:alertmanager
 
     networks:
       # Visible in SE backend and frontend Docker network
       - se_back
     restart: unless-stopped
 
+  grafana:
+    image: grafana/grafana:5.1.3
+    container_name: grafanamon
+    depends_on:
+      - prometheus
+    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"
+
+#    links:
+#      - prometheus:prometheus
+#    ports:
+#      - 3000:3000
+
+    volumes:
+      - ./grafana/provisioning:/etc/grafana/provisioning:ro
+      # - 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
     container_name: alertmanager
@@ -100,42 +137,6 @@ services:
       - '--config.file=/etc/alertmanager/config-gen.yml'
       - '--storage.path=/alertmanager'
 
-  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
-      - /:/rootfs:ro
-    command:
-      - '--path.procfs=/host/proc'
-      - '--path.sysfs=/host/sys'
-      - --collector.filesystem.ignored-mount-points
-      - "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)"
-#      - '--collector.textfile.directory /etc/node-exporter/'
-#    ports:
-#      - 9100:9100
-    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
-    networks:
-      # Visible in SE backend and frontend Docker network
-      - se_back
-    restart: unless-stopped
 
 networks:
   se_back:

diff --git a/services/monitoring/grafana/provisioning/dashboards/node-exporter-full-1860.json b/services/monitoring/grafana/provisioning/dashboards/node-exporter-full-1860.json
@@ -1,7 +1,7 @@
 {
   "__inputs": [
     {
-      "name": "Prometheus",
+      "name": "DS_PROMETHEUS",
       "label": "Prometheus",
       "description": "",
       "type": "datasource",