Fix memory usage per pod table

(local deployment)

Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
Issue-ID: DCAEGEN2-1833
Change-Id: I242c3a9bac523997d91c218ec21b05e79006db96

diff --git a/tools/performance/local/docker-compose.yml b/tools/performance/local/docker-compose.yml
index 97fecc7..386cdee 100644 (file)
--- a/tools/performance/local/docker-compose.yml
+++ b/tools/performance/local/docker-compose.yml
@@ -122,6 +122,27 @@ services:
       - "9090:9090"
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
+    depends_on:
+      - cadvisor
+
+  cadvisor:
+    image: google/cadvisor:latest
+    container_name: cadvisor
+    ports:
+      - "8080:8080"
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:rw
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+    depends_on:
+      - redis
+
+  redis:
+    image: redis:latest
+    container_name: redis
+    ports:
+      - 6379:6379
 
   grafana:
       image: grafana/grafana

diff --git a/tools/performance/local/grafana/dashboards/processing.json b/tools/performance/local/grafana/dashboards/processing.json
index d74968c..fa34c37 100644 (file)
--- a/tools/performance/local/grafana/dashboards/processing.json
+++ b/tools/performance/local/grafana/dashboards/processing.json
@@ -706,7 +706,7 @@
       ],
       "targets": [
         {
-          "expr": "(sum(container_memory_usage_bytes{pod_name=~\"dep-dcae-hv-ves-collector.*\"}) by (pod_name)) / 1024 / 1024 / 1024",
+          "expr": "(sum(container_memory_usage_bytes{image=\"onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest\"}) by (image)) / 1024 / 1024 / 1024",
           "format": "time_series",
           "hide": false,
           "instant": true,

diff --git a/tools/performance/local/prometheus.yml b/tools/performance/local/prometheus.yml
index 074b2dc..7efb4a8 100644 (file)
--- a/tools/performance/local/prometheus.yml
+++ b/tools/performance/local/prometheus.yml
@@ -22,3 +22,7 @@ scrape_configs:
     metrics_path: '/monitoring/prometheus'
     static_configs:
       - targets: ['ves-hv-collector:6060']
+
+  - job_name: 'cadvisor'
+    static_configs:
+      - targets: ['cadvisor:8080']
\ No newline at end of file