diff options
| author |   Tony Hansen <tony@att.com> | 2019-10-13 00:47:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-10-13 00:47:10 +0000 |
| commit | 60193c68343b50a2b9f5527e33fc6e50530591bc (patch) | |
| tree | ae935cae9c3570793b765f627b38504d81fa13ec /tools/performance | |
| parent | c09091a3586793b74351e908ab344af6aa2fd916 (diff) | |
| parent | b6ca050a957c3a0b9a6bc1fa703eab88d50e04df (diff) | |
Merge "Fix memory usage per pod table"
Diffstat (limited to 'tools/performance')
| -rw-r--r-- | tools/performance/local/docker-compose.yml | 21 | ||||
| -rw-r--r-- | tools/performance/local/grafana/dashboards/processing.json | 2 | ||||
| -rw-r--r-- | tools/performance/local/prometheus.yml | 4 |
3 files changed, 26 insertions, 1 deletions
diff --git a/tools/performance/local/docker-compose.yml b/tools/performance/local/docker-compose.yml index 97fecc73..386cdee0 100644 --- 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 d74968cb..fa34c377 100644 --- 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 074b2dca..7efb4a80 100644 --- 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 |