X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fdocker%2Fdocker-compose.yaml;h=3fdfbc1aec241fc32ffed7daba609b76cbeaa14a;hb=b9fb8a347949a0012ba298333418e7965184c30e;hp=6675e97c78633ea77867f305f2f30dc3ae5d4ef5;hpb=e64b95dd9f1b09520f9dd3aded62c84b8c998540;p=osm%2Fdevops.git

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index 6675e97c..3fdfbc1a 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -88,8 +88,11 @@ services:
     ports:
       - "${OSM_PROM_PORTS:-9091:9090}"
     volumes:
-      - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+      - ./prometheus/:/etc/prometheus/
       - prom_db:/prometheus
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--web.enable-lifecycle'
     networks:
       - netOSM
     logging:
@@ -97,8 +100,20 @@ services:
       options:
         max-size: "100m"
         max-file: "2"
+  prometheus-cadvisor:
+    image: google/cadvisor:${PROMETHEUS_CADVISOR_TAG:-latest}
+    ports:
+      - "${OSM_PROM_CADVISOR_PORTS:-8080:8080}"
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:ro
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+      - /dev/disk/:/dev/disk:ro
+    networks:
+      - netOSM
   keystone:
-    image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-7}
     networks:
       - netOSM
     environment:
@@ -113,7 +128,7 @@ services:
         max-size: "100m"
         max-file: "2"
   nbi:
-    image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-7}
     networks:
       - netOSM
     volumes:
@@ -134,7 +149,7 @@ services:
     #  - kafka
     #  - mongo
   lcm:
-    image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-7}
     networks:
       - netOSM
     volumes:
@@ -172,7 +187,7 @@ services:
 #    ports:
 #      - "3306:3306"
   ro:
-    image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-7}
     networks:
       - netOSM
     environment:
@@ -191,7 +206,7 @@ services:
         max-size: "100m"
         max-file: "2"
   mon:
-    image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-7}
     networks:
       - netOSM
     volumes:
@@ -211,7 +226,7 @@ services:
             max-file: 5
             max-size: 10m
   pol:
-    image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-7}
     networks:
       - netOSM
     volumes:
@@ -230,7 +245,7 @@ services:
         max-file: 5
         max-size: 10m
   light-ui:
-    image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-6}
+    image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-7}
     networks:
       - netOSM
     environment:
@@ -246,3 +261,21 @@ services:
       options:
         max-size: "100m"
         max-file: "2"
+  grafana:
+    image: grafana/grafana
+    volumes:
+      - ./files/dashboards-osm.yml:/etc/grafana/provisioning/dashboards/dashboards-osm.yml
+      - ./files/osm-sample-dashboard.json:/etc/grafana/provisioning/dashboards/osm-sample-dashboard.json
+      - ./files/osm-system-dashboard.json:/etc/grafana/provisioning/dashboards/osm-system-dashboard.json
+      - ./files/datasource-prometheus.yml:/etc/grafana/provisioning/datasources/datasource-prometheus.yml
+    hostname: grafana
+    ports:
+      - "${OSM_GRAFANA_PORTS:-3000:3000}"
+    networks:
+      - netOSM
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "2"
+