From 57328ba54f148a87a21e1cafcbef3aa5317dee6a Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Thu, 15 Dec 2022 10:15:08 +0000 Subject: Update on SLA metrics dashboard to reflect deployment stats Issue-ID: POLICY-4469 Change-Id: Ide93bd46e8452ddc7453b8ad8347cea6ec0144ac Signed-off-by: adheli.tavares --- .gitignore | 1 + csit/compose-grafana.yml | 48 ++- csit/metrics/dashboards/sla-metrics.json | 665 +++++++++++++++++++++---------- csit/metrics/prometheus.yml | 10 +- 4 files changed, 491 insertions(+), 233 deletions(-) diff --git a/.gitignore b/.gitignore index 31bf3819..d4aa5c29 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ csit/archives env.properties .pydevproject models +.vscode/ diff --git a/csit/compose-grafana.yml b/csit/compose-grafana.yml index 65781e53..65106b18 100644 --- a/csit/compose-grafana.yml +++ b/csit/compose-grafana.yml @@ -71,14 +71,16 @@ services: - 6670 - 3904 - 6680 + ports: + - 30227:3904 api: image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION} container_name: policy-api depends_on: - policy-db-migrator hostname: policy-api - expose: - - 6969 + ports: + - 30440:6969 volumes: - ./config/api/apiParameters.yaml:/opt/app/policy/api/etc/apiParameters.yaml:ro - ./wait_for_port.sh:/opt/app/policy/api/bin/wait_for_port.sh:ro @@ -96,8 +98,8 @@ services: - simulator - api hostname: policy-pap - expose: - - 6969 + ports: + - 30442:6969 volumes: - ./config/pap/papParameters.yaml:/opt/app/policy/pap/etc/papParameters.yaml:ro - ./config/pap/groups.json:/opt/app/policy/pap/etc/mounted/groups.json:ro @@ -117,8 +119,9 @@ services: - simulator - pap hostname: policy-xacml-pdp - expose: - - 6969 + ports: + - 30441:6969 + - 30999:3904 volumes: - ./config/xacml-pdp/defaultConfig.json:/opt/app/policy/pdpx/etc/defaultConfig.json:ro - ./wait_for_port.sh:/opt/app/policy/pdpx/bin/wait_for_port.sh:ro @@ -137,11 +140,11 @@ services: - simulator - pap hostname: drools - expose: - - 6969 - - 9696 + ports: + - 30217:6969 + - 30216:9696 volumes: - - ./config/drools/custom:/tmp/policy-install/config:ro + - ./config/drools-pdp/custom:/tmp/policy-install/config:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro env_file: - config/drools-pdp/env/base.conf @@ -160,11 +163,11 @@ services: - pap - xacml-pdp hostname: drools-apps - expose: - - 6969 - - 9696 + ports: + - 30221:6969 + - 30219:9696 volumes: - - ./config/drools-apps/custom:/tmp/policy-install/config:ro + - ./config/drools-applications/custom:/tmp/policy-install/config:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro env_file: - config/drools-applications/env/base.conf @@ -189,8 +192,9 @@ services: - simulator - pap hostname: policy-apex-pdp + ports: + - 30237:6969 expose: - - 6969 - 23324 volumes: - ./config/apex-pdp/OnapPfConfig.json:/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json:ro @@ -211,6 +215,8 @@ services: - pap - apex-pdp hostname: policy-distribution + ports: + - 30238:6969 volumes: - ./config/distribution/defaultConfig.json:/opt/app/policy/distribution/etc/defaultConfig.json:ro - ./distribution/config/temp/:/opt/app/policy/distribution/etc/temp/:ro @@ -230,8 +236,8 @@ services: - mariadb - simulator hostname: policy-clamp-runtime-acm - expose: - - 6969 + ports: + - 30258:6969 volumes: - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro - ./config/clamp/AcRuntimeParameters.yaml:/opt/app/policy/clamp/etc/AcRuntimeParameters.yaml:ro @@ -244,8 +250,8 @@ services: image: prom/prometheus:v2.32.1 container_name: prometheus hostname: prometheus - expose: - - 9090 + ports: + - 30259:9090 volumes: - ./metrics/prometheus.yml:/etc/prometheus/prometheus.yml grafana: @@ -254,8 +260,8 @@ services: depends_on: - prometheus hostname: grafana - expose: - - 3000 + ports: + - 30269:3000 volumes: - ./metrics/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml - ./metrics/datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yaml diff --git a/csit/metrics/dashboards/sla-metrics.json b/csit/metrics/dashboards/sla-metrics.json index bee6bc06..7b96c935 100644 --- a/csit/metrics/dashboards/sla-metrics.json +++ b/csit/metrics/dashboards/sla-metrics.json @@ -24,7 +24,7 @@ "gnetId": 14430, "graphTooltip": 0, "id": 3, - "iteration": 1655133658474, + "iteration": 1671098389991, "links": [], "liveNow": false, "panels": [ @@ -42,10 +42,6 @@ "type": "row" }, { - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, "fieldConfig": { "defaults": { "color": { @@ -106,10 +102,16 @@ "pluginVersion": "8.3.4", "targets": [ { - "expr": "process_uptime_seconds{application=\"$application\", instance=\"$instance\"}", + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "process_uptime_seconds", "format": "time_series", + "interval": "", "intervalFactor": 2, - "legendFormat": "", + "legendFormat": "{{job}}", "metric": "", "refId": "A", "step": 14400 @@ -119,10 +121,6 @@ "type": "stat" }, { - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, "fieldConfig": { "defaults": { "color": { @@ -182,10 +180,16 @@ "pluginVersion": "8.3.4", "targets": [ { - "expr": "process_start_time_seconds{application=\"$application\", instance=\"$instance\"}*1000", + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "process_start_time_seconds{job=~\"api-metrics|acm-metrics|pap-metrics\"}*1000", "format": "time_series", + "interval": "", "intervalFactor": 2, - "legendFormat": "", + "legendFormat": "{{instance}}", "metric": "", "refId": "A", "step": 14400 @@ -195,10 +199,6 @@ "type": "stat" }, { - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, "fieldConfig": { "defaults": { "color": { @@ -242,8 +242,8 @@ "gridPos": { "h": 6, "w": 6, - "x": 12, - "y": 1 + "x": 0, + "y": 7 }, "id": 58, "links": [], @@ -263,8 +263,14 @@ "pluginVersion": "8.3.4", "targets": [ { - "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})*100/sum(jvm_memory_max_bytes{application=\"$application\",instance=\"$instance\", area=\"heap\"})", + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "sum(jvm_memory_used_bytes{job=~\"api-metrics|acm-metrics|pap-metrics\", area=\"heap\"})*100/sum(jvm_memory_max_bytes{job=~\"api-metrics|acm-metrics|pap-metrics\", area=\"heap\"})", "format": "time_series", + "interval": "", "intervalFactor": 1, "legendFormat": "", "refId": "A", @@ -275,10 +281,6 @@ "type": "gauge" }, { - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, "fieldConfig": { "defaults": { "color": { @@ -332,8 +334,8 @@ "gridPos": { "h": 6, "w": 6, - "x": 18, - "y": 1 + "x": 6, + "y": 7 }, "id": 60, "links": [], @@ -353,8 +355,14 @@ "pluginVersion": "8.3.4", "targets": [ { - "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})*100/sum(jvm_memory_max_bytes{application=\"$application\",instance=\"$instance\", area=\"nonheap\"})", + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "sum(jvm_memory_used_bytes{job=~\"api-metrics|acm-metrics|pap-metrics\", area=\"nonheap\"})*100/sum(jvm_memory_max_bytes{job=~\"api-metrics|acm-metrics|pap-metrics\", area=\"nonheap\"})", "format": "time_series", + "interval": "", "intervalFactor": 2, "legendFormat": "", "refId": "A", @@ -365,10 +373,6 @@ "type": "gauge" }, { - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, "fieldConfig": { "defaults": { "color": { @@ -417,17 +421,17 @@ } ] }, - "unit": "percentunit" + "unit": "short" }, "overrides": [] }, "gridPos": { - "h": 7, + "h": 8, "w": 12, "x": 0, - "y": 7 + "y": 13 }, - "id": 95, + "id": 96, "links": [], "options": { "legend": { @@ -447,28 +451,36 @@ "pluginVersion": "8.3.4", "targets": [ { - "expr": "system_cpu_usage{instance=\"$instance\", application=\"$application\"}", + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "avg(system_load_average_1m{job=~\"api-metrics|acm-metrics|pap-metrics\"})", "format": "time_series", + "interval": "", "intervalFactor": 1, - "legendFormat": "System CPU Usage", + "legendFormat": "Load Average [1m] ", "refId": "A" }, { - "expr": "process_cpu_usage{instance=\"$instance\", application=\"$application\"}", + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "avg(system_cpu_count{job=~\"api-metrics|acm-metrics|pap-metrics\"})", "format": "time_series", + "interval": "", "intervalFactor": 1, - "legendFormat": "Process CPU Usage", + "legendFormat": "CPU Core Size", "refId": "B" } ], - "title": "CPU Usage", + "title": "Load Average", "type": "timeseries" }, { - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, "fieldConfig": { "defaults": { "color": { @@ -517,17 +529,17 @@ } ] }, - "unit": "short" + "unit": "percentunit" }, "overrides": [] }, "gridPos": { "h": 7, "w": 12, - "x": 12, - "y": 7 + "x": 0, + "y": 21 }, - "id": 96, + "id": 95, "links": [], "options": { "legend": { @@ -547,21 +559,33 @@ "pluginVersion": "8.3.4", "targets": [ { - "expr": "system_load_average_1m{instance=\"$instance\", application=\"$application\"}", + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "avg(system_cpu_usage{job=~\"api-metrics|acm-metrics|pap-metrics\"})", "format": "time_series", + "interval": "", "intervalFactor": 1, - "legendFormat": "Load Average [1m]", + "legendFormat": "System CPU Usage", "refId": "A" }, { - "expr": "system_cpu_count{instance=\"$instance\", application=\"$application\"}", + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "avg(process_cpu_usage{job=~\"api-metrics|acm-metrics|pap-metrics\"})", "format": "time_series", + "interval": "", "intervalFactor": 1, - "legendFormat": "CPU Core Size", + "legendFormat": "Process CPU Usage", "refId": "B" } ], - "title": "Load Average", + "title": "CPU Usage", "type": "timeseries" }, { @@ -620,7 +644,7 @@ "h": 8, "w": 12, "x": 0, - "y": 14 + "y": 28 }, "id": 113, "options": { @@ -644,7 +668,7 @@ "uid": "dkSf71fnz" }, "exemplar": true, - "expr": "jvm_memory_used_bytes{instance=\"$instance\"}", + "expr": "avg by (id) (jvm_memory_used_bytes{job=~\"api-metrics|acm-metrics|pap-metrics\"})", "interval": "", "legendFormat": "{{id}}", "refId": "A" @@ -659,7 +683,7 @@ "h": 1, "w": 24, "x": 0, - "y": 22 + "y": 36 }, "id": 18, "panels": [], @@ -667,10 +691,6 @@ "type": "row" }, { - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, "fieldConfig": { "defaults": { "color": { @@ -724,16 +744,19 @@ "overrides": [] }, "gridPos": { - "h": 9, - "w": 13, + "h": 10, + "w": 18, "x": 0, - "y": 23 + "y": 37 }, "id": 4, "links": [], "options": { "legend": { - "calcs": [], + "calcs": [ + "lastNotNull", + "sum" + ], "displayMode": "table", "placement": "right" }, @@ -744,11 +767,16 @@ "pluginVersion": "8.3.4", "targets": [ { - "expr": "irate(http_server_requests_seconds_count{instance=\"$instance\", application=\"$application\", uri!~\".*actuator.*\"}[5m])", + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "rate(http_server_requests_seconds_count[5m])", "format": "time_series", "interval": "", "intervalFactor": 1, - "legendFormat": "{{method}} [{{status}}] - {{uri}}", + "legendFormat": "{{method}} [{{status}}] - {{instance}}{{uri}}", "refId": "A" } ], @@ -756,10 +784,6 @@ "type": "timeseries" }, { - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, "fieldConfig": { "defaults": { "color": { @@ -814,9 +838,9 @@ }, "gridPos": { "h": 10, - "w": 13, + "w": 18, "x": 0, - "y": 32 + "y": 47 }, "id": 2, "links": [], @@ -837,10 +861,16 @@ "pluginVersion": "8.3.4", "targets": [ { - "expr": "irate(http_server_requests_seconds_sum{instance=\"$instance\", application=\"$application\", exception=\"None\", uri!~\".*actuator.*\"}[5m]) / irate(http_server_requests_seconds_count{instance=\"$instance\", application=\"$application\", exception=\"None\", uri!~\".*actuator.*\"}[5m])", + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "irate(http_server_requests_seconds_sum{job=~\"api-metrics|acm-metrics|pap-metrics\", exception=\"None\", uri!~\".*metrics.*\"}[5m]) / irate(http_server_requests_seconds_count{job=~\"api-metrics|acm-metrics|pap-metrics\", exception=\"None\", uri!~\".*metrics.*\"}[5m])", "format": "time_series", + "interval": "", "intervalFactor": 1, - "legendFormat": "{{method}} [{{status}}] - {{uri}}", + "legendFormat": "{{method}} [{{status}}] - {{instance}}{{uri}}", "refId": "A" } ], @@ -848,10 +878,6 @@ "type": "timeseries" }, { - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, "fieldConfig": { "defaults": { "color": { @@ -908,15 +934,18 @@ "h": 8, "w": 13, "x": 0, - "y": 42 + "y": 57 }, "id": 111, "links": [], "options": { "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom" + "calcs": [ + "lastNotNull", + "max" + ], + "displayMode": "table", + "placement": "right" }, "tooltip": { "mode": "single" @@ -925,16 +954,359 @@ "pluginVersion": "8.3.4", "targets": [ { - "expr": "http_server_requests_seconds_max{instance=\"$instance\", application=\"$application\"}", + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "http_server_requests_seconds_max{job=~\"api-metrics|acm-metrics|pap-metrics\", uri!~\".*metrics.*\"}", "format": "time_series", "interval": "", "intervalFactor": 1, - "legendFormat": "{{method}} [{{status}}] - {{uri}}", + "legendFormat": "{{method}} [{{status}}] - {{instance}}{{uri}}", "refId": "A" } ], "title": "HTTP Server Requests Max", "type": "timeseries" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 65 + }, + "id": 115, + "panels": [], + "title": "Deployment statistics", + "type": "row" + }, + { + "fieldConfig": { + "defaults": { + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 3, + "x": 0, + "y": 66 + }, + "id": 117, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.4", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "pap_policy_deployments_total{operation=\"deploy\", status=\"SUCCESS\"}", + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Successful deployments", + "type": "stat" + }, + { + "fieldConfig": { + "defaults": { + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 3, + "x": 3, + "y": 66 + }, + "id": 118, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.4", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "pap_policy_deployments_total{operation=\"undeploy\", status=\"SUCCESS\"}", + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Successful undeployments", + "type": "stat" + }, + { + "fieldConfig": { + "defaults": { + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 1 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 3, + "x": 6, + "y": 66 + }, + "id": 119, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.4", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "pap_policy_deployments_total{operation=\"deploy\", status=\"FAILURE\"}", + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Failed deployments", + "type": "stat" + }, + { + "fieldConfig": { + "defaults": { + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 1 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 3, + "x": 9, + "y": 66 + }, + "id": 120, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "8.3.4", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "pap_policy_deployments_total{operation=\"undeploy\", status=\"FAILURE\"}", + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Failed undeployments", + "type": "stat" + }, + { + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 400 + } + ] + }, + "unit": "ms" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 72 + }, + "id": 122, + "options": { + "legend": { + "calcs": [ + "lastNotNull", + "min", + "max" + ], + "displayMode": "table", + "placement": "right" + }, + "tooltip": { + "mode": "single" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "dkSf71fnz" + }, + "exemplar": true, + "expr": "irate(pap_policy_deployments_seconds_sum[5m])/irate(pap_policy_deployments_seconds_count[5m])", + "interval": "", + "legendFormat": "{{operation}} - {{status}}", + "refId": "A" + } + ], + "title": "Deployment timing", + "type": "timeseries" } ], "refresh": "10s", @@ -972,132 +1344,11 @@ "tagsQuery": "", "type": "query", "useTags": false - }, - { - "current": { - "isNone": true, - "selected": false, - "text": "None", - "value": "" - }, - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, - "definition": "", - "hide": 0, - "includeAll": false, - "label": "Application", - "multi": false, - "name": "application", - "options": [], - "query": { - "query": "label_values(jvm_classes_loaded{instance=\"$instance\"}, application)", - "refId": "Prometheus-application-Variable-Query" - }, - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "current": { - "selected": false, - "text": "HikariPool-1", - "value": "HikariPool-1" - }, - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, - "definition": "", - "hide": 0, - "includeAll": false, - "label": "HikariCP-Pool", - "multi": false, - "name": "hikaricp", - "options": [], - "query": { - "query": "label_values(hikaricp_connections{instance=\"$instance\", application=\"$application\"}, pool)", - "refId": "Prometheus-hikaricp-Variable-Query" - }, - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "current": { - "selected": false, - "text": "All", - "value": "$__all" - }, - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, - "definition": "", - "hide": 0, - "includeAll": true, - "label": "Memory Pool (heap)", - "multi": false, - "name": "memory_pool_heap", - "options": [], - "query": { - "query": "label_values(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"},id)", - "refId": "Prometheus-memory_pool_heap-Variable-Query" - }, - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "current": { - "selected": false, - "text": "All", - "value": "$__all" - }, - "datasource": { - "type": "prometheus", - "uid": "dkSf71fnz" - }, - "definition": "", - "hide": 0, - "includeAll": true, - "label": "Memory Pool (nonheap)", - "multi": false, - "name": "memory_pool_nonheap", - "options": [], - "query": { - "query": "label_values(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"},id)", - "refId": "Prometheus-memory_pool_nonheap-Variable-Query" - }, - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false } ] }, "time": { - "from": "now-15m", + "from": "now-5m", "to": "now" }, "timepicker": { @@ -1127,6 +1378,6 @@ "timezone": "", "title": "SLA's Metrics", "uid": "ySoel0jnk", - "version": 2, + "version": 3, "weekStart": "" } \ No newline at end of file diff --git a/csit/metrics/prometheus.yml b/csit/metrics/prometheus.yml index 4ad11752..a5e1680a 100644 --- a/csit/metrics/prometheus.yml +++ b/csit/metrics/prometheus.yml @@ -35,14 +35,14 @@ scrape_configs: static_configs: - targets: ["policy-api:6969"] basic_auth: - username: policyadmin + username: "policyadmin" password: "zb!XztG34" - job_name: "pap-metrics" static_configs: - targets: ["policy-pap:6969"] basic_auth: - username: policyadmin + username: "policyadmin" password: "zb!XztG34" - job_name: "apex-pdp-metrics" @@ -50,7 +50,7 @@ scrape_configs: - targets: - "policy-apex-pdp:6969" basic_auth: - username: "healthcheck" + username: "policyadmin" password: "zb!XztG34" - job_name: "drools-apps-metrics" @@ -74,7 +74,7 @@ scrape_configs: - targets: - "policy-distribution:6969" basic_auth: - username: "healthcheck" + username: "policyadmin" password: "zb!XztG34" - job_name: "xacml-pdp-metrics" @@ -82,7 +82,7 @@ scrape_configs: - targets: - "policy-xacml-pdp:6969" basic_auth: - username: "healthcheck" + username: "policyadmin" password: "zb!XztG34" - job_name: "acm-metrics" -- cgit 1.2.3-korg