summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorTony Hansen <tony@att.com>2019-11-12 04:04:43 +0000
committerGerrit Code Review <gerrit@onap.org>2019-11-12 04:04:43 +0000
commit3f83acafc7cdf14022b2ac02665e73b80ee608c4 (patch)
treefabbd60c8ff385542e0037f3019a1fd5a0dd99b4 /tools
parent4f24529aef0b32ed7e3a721b805fa5de20b82d3d (diff)
parent25bda9375368252b0754d970c1949a15d016bac1 (diff)
Merge "Revert - Fix memory usage per pod table"
Diffstat (limited to 'tools')
-rw-r--r--tools/performance/local/docker-compose.yml21
-rw-r--r--tools/performance/local/grafana/dashboards/processing.json2
-rw-r--r--tools/performance/local/prometheus.yml4
3 files changed, 1 insertions, 26 deletions
diff --git a/tools/performance/local/docker-compose.yml b/tools/performance/local/docker-compose.yml
index 386cdee0..97fecc73 100644
--- a/tools/performance/local/docker-compose.yml
+++ b/tools/performance/local/docker-compose.yml
@@ -122,27 +122,6 @@ 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 fa34c377..d74968cb 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{image=\"onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest\"}) by (image)) / 1024 / 1024 / 1024",
+ "expr": "(sum(container_memory_usage_bytes{pod_name=~\"dep-dcae-hv-ves-collector.*\"}) by (pod_name)) / 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 7efb4a80..074b2dca 100644
--- a/tools/performance/local/prometheus.yml
+++ b/tools/performance/local/prometheus.yml
@@ -22,7 +22,3 @@ 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