diff --git a/deploy/dashboards/metrics/ibm-websphere-liberty-grafana-dashboard-metrics-2.0.json b/deploy/dashboards/metrics/ibm-websphere-liberty-grafana-dashboard-metrics-2.0.json index c24cbee36..478f3b898 100644 --- a/deploy/dashboards/metrics/ibm-websphere-liberty-grafana-dashboard-metrics-2.0.json +++ b/deploy/dashboards/metrics/ibm-websphere-liberty-grafana-dashboard-metrics-2.0.json @@ -108,10 +108,10 @@ "steppedLine": false, "targets": [ { - "expr": "base_cpu_availableProcessors{service=~`[[service]]`}", + "expr": "base_cpu_availableProcessors{pod=~`[[pod]]`}", "format": "time_series", "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -199,10 +199,10 @@ "steppedLine": false, "targets": [ { - "expr": "base_cpu_processCpuLoad_percent{service=~`[[service]]`}", + "expr": "base_cpu_processCpuLoad_percent{pod=~`[[pod]]`}", "format": "time_series", "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -290,11 +290,11 @@ "steppedLine": false, "targets": [ { - "expr": "base_cpu_systemLoadAverage{service=~`[[service]]`}", + "expr": "base_cpu_systemLoadAverage{pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -430,7 +430,7 @@ ], "targets": [ { - "expr": "base_memory_maxHeap_bytes{service=~`[[service]]`}", + "expr": "base_memory_maxHeap_bytes{pod=~`[[pod]]`}", "format": "table", "instant": true, "intervalFactor": 1, @@ -485,12 +485,12 @@ "steppedLine": false, "targets": [ { - "expr": "base_memory_usedHeap_bytes{service=~`[[service]]`} / base_memory_maxHeap_bytes{service=~`[[service]]`}", + "expr": "base_memory_usedHeap_bytes{pod=~`[[pod]]`} / base_memory_maxHeap_bytes{pod=~`[[pod]]`}", "format": "time_series", "instant": false, "interval": "", "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -625,7 +625,7 @@ ], "targets": [ { - "expr": "vendor_servlet_request_total{service=~`[[service]]`}", + "expr": "vendor_servlet_request_total{pod=~`[[pod]]`}", "format": "table", "instant": true, "intervalFactor": 2, @@ -679,10 +679,10 @@ "steppedLine": false, "targets": [ { - "expr": "vendor_servlet_request_total{servlet=`[[servlet]]`, service=~`[[service]]`}", + "expr": "vendor_servlet_request_total{servlet=`[[servlet]]`, pod=~`[[pod]]`}", "format": "time_series", "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -770,12 +770,12 @@ "steppedLine": false, "targets": [ { - "expr": "rate(vendor_servlet_responseTime_total_seconds{servlet=`[[servlet]]`,service=~`[[service]]`}[[dur]])/rate(vendor_servlet_request_total{servlet=`[[servlet]]`,service=~`[[service]]`}[[dur]])", + "expr": "rate(vendor_servlet_responseTime_total_seconds{servlet=`[[servlet]]`,pod=~`[[pod]]`}[[dur]])/rate(vendor_servlet_request_total{servlet=`[[servlet]]`,pod=~`[[pod]]`}[[dur]])", "format": "time_series", "instant": false, "interval": "", "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -879,11 +879,11 @@ "steppedLine": false, "targets": [ { - "expr": "vendor_connectionpool_freeConnections{service=~`[[service]]`}", + "expr": "vendor_connectionpool_freeConnections{pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "datasource: {{datasource}} service: {{service}}, instance: {{instance}}", + "legendFormat": "datasource: {{datasource}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -972,11 +972,11 @@ "steppedLine": false, "targets": [ { - "expr": "vendor_connectionpool_connectionHandles{service=~`[[service]]`}", + "expr": "vendor_connectionpool_connectionHandles{pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "datasource: {{datasource}} service: {{service}}, instance: {{instance}}", + "legendFormat": "datasource: {{datasource}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1065,11 +1065,11 @@ "steppedLine": false, "targets": [ { - "expr": "vendor_connectionpool_create_total{service=~`[[service]]`}", + "expr": "vendor_connectionpool_create_total{pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "datasource: {{datasource}} service: {{service}}, instance: {{instance}}", + "legendFormat": "datasource: {{datasource}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1158,11 +1158,11 @@ "steppedLine": false, "targets": [ { - "expr": "vendor_connectionpool_destroy_total{service=~`[[service]]`}", + "expr": "vendor_connectionpool_destroy_total{pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "datasource: {{datasource}} service: {{service}}, instance: {{instance}}", + "legendFormat": "datasource: {{datasource}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1251,11 +1251,11 @@ "steppedLine": false, "targets": [ { - "expr": "vendor_connectionpool_managedConnections{service=~`[[service]]`}", + "expr": "vendor_connectionpool_managedConnections{pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "datasource: {{datasource}} service: {{service}}, instance: {{instance}}", + "legendFormat": "datasource: {{datasource}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1360,12 +1360,12 @@ "steppedLine": false, "targets": [ { - "expr": "vendor_session_activeSessions{service=~`[[service]]`}", + "expr": "vendor_session_activeSessions{pod=~`[[pod]]`}", "format": "time_series", "instant": false, "interval": "", "intervalFactor": 2, - "legendFormat": "appname: {{appname}} service: {{service}}, instance: {{instance}}", + "legendFormat": "appname: {{appname}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1456,11 +1456,11 @@ "steppedLine": false, "targets": [ { - "expr": "vendor_session_liveSessions{service=~`[[service]]`}", + "expr": "vendor_session_liveSessions{pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "appname: {{appname}} service: {{service}}, instance: {{instance}}", + "legendFormat": "appname: {{appname}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1563,11 +1563,11 @@ "steppedLine": false, "targets": [ { - "expr": "vendor_threadpool_activeThreads{service=~`[[service]]`}", + "expr": "vendor_threadpool_activeThreads{pod=~`[[pod]]`}", "format": "time_series", "hide": false, "intervalFactor": 2, - "legendFormat": "pool: {{pool}} service: {{service}}, instance: {{instance}}", + "legendFormat": "pool: {{pool}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1657,10 +1657,10 @@ "steppedLine": false, "targets": [ { - "expr": "vendor_threadpool_size{service=~`[[service]]`}", + "expr": "vendor_threadpool_size{pod=~`[[pod]]`}", "instant": false, "intervalFactor": 2, - "legendFormat": "pool: {{pool}} service: {{service}}, instance: {{instance}}", + "legendFormat": "pool: {{pool}} pod: {{pod}}, instance: {{instance}}", "refId": "B" } ], @@ -1762,12 +1762,12 @@ "steppedLine": false, "targets": [ { - "expr": "rate(base_gc_time_seconds{service=~`[[service]]`,name=\"global\"}[[dur]]) / rate(base_gc_total{service=~`[[service]]`,name=\"global\"}[[dur]])", + "expr": "rate(base_gc_time_seconds{pod=~`[[pod]]`,name=\"global\"}[[dur]]) / rate(base_gc_total{pod=~`[[pod]]`,name=\"global\"}[[dur]])", "format": "time_series", "instant": false, "interval": "", "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1854,11 +1854,11 @@ "steppedLine": false, "targets": [ { - "expr": "rate(base_gc_time_seconds{service=~`[[service]]`,name=\"scavenge\"}[[dur]]) / rate(base_gc_total{service=~`[[service]]`,name=\"scavenge\"}[[dur]])", + "expr": "rate(base_gc_time_seconds{pod=~`[[pod]]`,name=\"scavenge\"}[[dur]]) / rate(base_gc_total{pod=~`[[pod]]`,name=\"scavenge\"}[[dur]])", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1992,7 +1992,7 @@ ], "targets": [ { - "expr": "base_jvm_uptime_seconds {service=~`[[service]]`}", + "expr": "base_jvm_uptime_seconds {pod=~`[[pod]]`}", "format": "table", "instant": true, "intervalFactor": 2, @@ -2023,13 +2023,13 @@ "definition": "base_cpu_processCpuLoad_percent", "hide": 0, "includeAll": true, - "label": "service", + "label": "pod", "multi": true, - "name": "service", + "name": "pod", "options": [], "query": "base_cpu_processCpuLoad_percent", "refresh": 1, - "regex": "/base_cpu_processCpuLoad_percent{.*service=\"(.*)\"/", + "regex": "/base_cpu_processCpuLoad_percent{.*pod=\"(.*)\",service=.*/", "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", diff --git a/deploy/dashboards/metrics/ibm-websphere-liberty-grafana-dashboard.json b/deploy/dashboards/metrics/ibm-websphere-liberty-grafana-dashboard.json index c1f8ff441..cc1e86c27 100644 --- a/deploy/dashboards/metrics/ibm-websphere-liberty-grafana-dashboard.json +++ b/deploy/dashboards/metrics/ibm-websphere-liberty-grafana-dashboard.json @@ -107,10 +107,10 @@ "steppedLine": false, "targets": [ { - "expr": "base:cpu_available_processors{service=~`[[service]]`}", + "expr": "base:cpu_available_processors{pod=~`[[pod]]`}", "format": "time_series", "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -198,11 +198,11 @@ "steppedLine": false, "targets": [ { - "expr": "base:cpu_process_cpu_load_percent{service=~`[[service]]`}", + "expr": "base:cpu_process_cpu_load_percent{pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -290,11 +290,11 @@ "steppedLine": false, "targets": [ { - "expr": "base:cpu_system_load_average{service=~`[[service]]`}", + "expr": "base:cpu_system_load_average{pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -430,7 +430,7 @@ ], "targets": [ { - "expr": "base:memory_max_heap_bytes{service=~`[[service]]`}", + "expr": "base:memory_max_heap_bytes{pod=~`[[pod]]`}", "format": "table", "instant": true, "intervalFactor": 1, @@ -485,11 +485,11 @@ "steppedLine": false, "targets": [ { - "expr": "(base:memory_used_heap_bytes{service=~`[[service]]`}/base:memory_max_heap_bytes{service=~`[[service]]`})", + "expr": "(base:memory_used_heap_bytes{pod=~`[[pod]]`}/base:memory_max_heap_bytes{pod=~`[[pod]]`})", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -639,7 +639,7 @@ ], "targets": [ { - "expr": "{__name__=~\"vendor:servlet.*_request_total\",service=~`[[service]]`}", + "expr": "{__name__=~\"vendor:servlet.*_request_total\",pod=~`[[pod]]`}", "format": "table", "instant": true, "intervalFactor": 2, @@ -693,11 +693,11 @@ "steppedLine": false, "targets": [ { - "expr": "vendor:servlet_[[servlet]]_request_total{service=~`[[service]]`}", + "expr": "vendor:servlet_[[servlet]]_request_total{pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -785,11 +785,11 @@ "steppedLine": false, "targets": [ { - "expr": "rate(vendor:servlet_[[servlet]]_response_time_total_seconds{service=~`[[service]]`}[[dur]])/rate(vendor:servlet_[[servlet]]_request_total{service=~`[[service]]`}[[dur]])", + "expr": "rate(vendor:servlet_[[servlet]]_response_time_total_seconds{pod=~`[[pod]]`}[[dur]])/rate(vendor:servlet_[[servlet]]_request_total{pod=~`[[pod]]`}[[dur]])", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -893,11 +893,11 @@ "steppedLine": false, "targets": [ { - "expr": "{__name__=~\"vendor:connectionpool_.*_free_connections\",service=~`[[service]]`}", + "expr": "{__name__=~\"vendor:connectionpool_.*_free_connections\",pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "name: {{__name__}} service: {{service}}, instance: {{instance}}", + "legendFormat": "name: {{__name__}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -986,11 +986,11 @@ "steppedLine": false, "targets": [ { - "expr": "{__name__=~\"vendor:connectionpool_.*_connection_handles\",service=~`[[service]]`}", + "expr": "{__name__=~\"vendor:connectionpool_.*_connection_handles\",pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "name: {{__name__}} service: {{service}}, instance: {{instance}}", + "legendFormat": "name: {{__name__}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1079,11 +1079,11 @@ "steppedLine": false, "targets": [ { - "expr": "{__name__=~\"vendor:connectionpool_.*_create_total\",service=~`[[service]]`}", + "expr": "{__name__=~\"vendor:connectionpool_.*_create_total\",pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "name: {{__name__}} service: {{service}}, instance: {{instance}}", + "legendFormat": "name: {{__name__}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1172,11 +1172,11 @@ "steppedLine": false, "targets": [ { - "expr": "{__name__=~\"vendor:connectionpool_.*_destroy_total\",service=~`[[service]]`}", + "expr": "{__name__=~\"vendor:connectionpool_.*_destroy_total\",pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "name: {{__name__}} service: {{service}}, instance: {{instance}}", + "legendFormat": "name: {{__name__}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1265,11 +1265,11 @@ "steppedLine": false, "targets": [ { - "expr": "{__name__=~\"vendor:connectionpool_.*_managed_connections\",service=~`[[service]]`}", + "expr": "{__name__=~\"vendor:connectionpool_.*_managed_connections\",pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "name: {{__name__}} service: {{service}}, instance: {{instance}}", + "legendFormat": "name: {{__name__}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1374,11 +1374,11 @@ "steppedLine": false, "targets": [ { - "expr": "{__name__=~\"vendor:session_.*_active_sessions\",service=~`[[service]]`}", + "expr": "{__name__=~\"vendor:session_.*_active_sessions\",pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "name: {{__name__}} service: {{service}}, instance: {{instance}}", + "legendFormat": "name: {{__name__}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1469,11 +1469,11 @@ "steppedLine": false, "targets": [ { - "expr": "{__name__=~\"vendor:session_.*_live_sessions\",service=~`[[service]]`}", + "expr": "{__name__=~\"vendor:session_.*_live_sessions\",pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "name: {{__name__}} service: {{service}}, instance: {{instance}}", + "legendFormat": "name: {{__name__}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1576,11 +1576,11 @@ "steppedLine": false, "targets": [ { - "expr": "{__name__=~\"vendor:threadpool_.*_active_threads\",service=~`[[service]]`}", + "expr": "{__name__=~\"vendor:threadpool_.*_active_threads\",pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "name: {{__name__}} service: {{service}}, instance: {{instance}}", + "legendFormat": "name: {{__name__}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1670,11 +1670,11 @@ "steppedLine": false, "targets": [ { - "expr": "{__name__=~\"vendor:threadpool_.*_size\",service=~`[[service]]`}", + "expr": "{__name__=~\"vendor:threadpool_.*_size\",pod=~`[[pod]]`}", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "name: {{__name__}} service: {{service}}, instance: {{instance}}", + "legendFormat": "name: {{__name__}} pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1776,11 +1776,11 @@ "steppedLine": false, "targets": [ { - "expr": "rate(base:gc_global_time_seconds{service=~`[[service]]`}[[dur]]) / rate(base:gc_global_count{service=~`[[service]]`}[[dur]])", + "expr": "rate(base:gc_global_time_seconds{pod=~`[[pod]]`}[[dur]]) / rate(base:gc_global_count{pod=~`[[pod]]`}[[dur]])", "format": "time_series", "instant": false, "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -1867,10 +1867,10 @@ "steppedLine": false, "targets": [ { - "expr": "rate(base:gc_scavenge_time_seconds{service=~`[[service]]`}[[dur]]) / rate(base:gc_scavenge_count{service=~`[[service]]`}[[dur]])", + "expr": "rate(base:gc_scavenge_time_seconds{pod=~`[[pod]]`}[[dur]]) / rate(base:gc_scavenge_count{pod=~`[[pod]]`}[[dur]])", "format": "time_series", "intervalFactor": 2, - "legendFormat": "service: {{service}}, instance: {{instance}}", + "legendFormat": "pod: {{pod}}, instance: {{instance}}", "refId": "A" } ], @@ -2004,7 +2004,7 @@ ], "targets": [ { - "expr": "base:jvm_uptime_seconds{service=~`[[service]]`}", + "expr": "base:jvm_uptime_seconds{pod=~`[[pod]]`}", "format": "table", "instant": true, "intervalFactor": 2, @@ -2035,13 +2035,13 @@ "definition": "base:cpu_available_processors", "hide": 0, "includeAll": true, - "label": "service", + "label": "pod", "multi": true, - "name": "service", + "name": "pod", "options": [], "query": "base:cpu_available_processors", "refresh": 1, - "regex": "/base:cpu_available_processors{.*service=\"(.*)\"/", + "regex": "/base:cpu_available_processors{.*pod=\"(.*)\",service=.*/", "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", @@ -2054,14 +2054,14 @@ "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", - "definition": "{__name__=~\"vendor:servlet.*_response_time_total_seconds\",service=~`[[service]]`}", + "definition": "{__name__=~\"vendor:servlet.*_response_time_total_seconds\",pod=~`[[pod]]`}", "hide": 0, "includeAll": false, "label": null, "multi": false, "name": "servlet", "options": [], - "query": "{__name__=~\"vendor:servlet.*_response_time_total_seconds\",service=~`[[service]]`}", + "query": "{__name__=~\"vendor:servlet.*_response_time_total_seconds\",pod=~`[[pod]]`}", "refresh": 1, "regex": "/vendor:servlet_(.*)_response_time_total_seconds.*/", "skipUrlSync": false,