diff --git a/src/common/method_wrappers/Decorator.py b/src/common/method_wrappers/Decorator.py
index c7ddfa2314e5859e4bdbb5dfb463f408477af1e8..01c256ff6a1815e8a3d027afed897cf2e3878550 100644
--- a/src/common/method_wrappers/Decorator.py
+++ b/src/common/method_wrappers/Decorator.py
@@ -33,11 +33,11 @@ METRIC_TO_CLASS_PARAMS = {
MetricTypeEnum.HISTOGRAM_DURATION: (Histogram, {
'buckets': (
# .005, .01, .025, .05, .075, .1, .25, .5, .75, 1.0, INF
- 0.001, 0.002, 0.003, 0.004, 0.005, 0.0075,
- 0.010, 0.025, 0.050, 0.075,
- 0.100, 0.250, 0.500, 0.750,
- 1.000, 2.500, 5.000, 7.500,
- 10.00, INF)
+ 0.0010, 0.0025, 0.0050, 0.0075,
+ 0.0100, 0.0250, 0.0500, 0.0750,
+ 0.1000, 0.2500, 0.5000, 0.7500,
+ 1.0000, 2.5000, 5.0000, 7.5000,
+ INF)
})
}
diff --git a/src/common/method_wrappers/tests/deploy_specs.sh b/src/common/method_wrappers/tests/deploy_specs.sh
index 3e4883251323a2c9fb17cf27dceb30634dd20207..238918480ae857e64efb52f652b20ab08a21c2df 100644
--- a/src/common/method_wrappers/tests/deploy_specs.sh
+++ b/src/common/method_wrappers/tests/deploy_specs.sh
@@ -7,7 +7,7 @@ export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
# interdomain slice pathcomp dlt
# dbscanserving opticalattackmitigator opticalattackdetector
# l3_attackmitigator l3_centralizedattackdetector l3_distributedattackdetector
-export TFS_COMPONENTS="context device monitoring pathcomp service slice compute webui" # automation
+export TFS_COMPONENTS="context device pathcomp service slice webui" # automation monitoring compute
# Set the tag you want to use for your images.
export TFS_IMAGE_TAG="dev"
@@ -16,7 +16,7 @@ export TFS_IMAGE_TAG="dev"
export TFS_K8S_NAMESPACE="tfs"
# Set additional manifest files to be applied after the deployment
-export TFS_EXTRA_MANIFESTS="manifests/nginx_ingress_http.yaml src/common/method_wrappers/tests/servicemonitors.yaml"
+export TFS_EXTRA_MANIFESTS="manifests/nginx_ingress_http.yaml manifests/servicemonitors.yaml"
# Set the new Grafana admin password
export TFS_GRAFANA_PASSWORD="admin123+"
diff --git a/src/common/method_wrappers/tests/grafana_prometheus_component_rpc.json b/src/common/method_wrappers/tests/grafana_prometheus_component_rpc.json
index 33aba15b607b40de23f59fd2060ea0f2c56e2dba..ba088252afe222032d25ed7d87d5dea40b65eb66 100644
--- a/src/common/method_wrappers/tests/grafana_prometheus_component_rpc.json
+++ b/src/common/method_wrappers/tests/grafana_prometheus_component_rpc.json
@@ -16,7 +16,7 @@
"gnetId": null,
"graphTooltip": 0,
"id": 27,
- "iteration": 1669834289148,
+ "iteration": 1669995219512,
"links": [],
"panels": [
{
@@ -40,11 +40,13 @@
"hiddenSeries": false,
"id": 4,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
"total": false,
"values": false
},
@@ -66,26 +68,26 @@
"targets": [
{
"exemplar": true,
- "expr": "tfs_[[component]]_rpc_[[method]]_counter_requests_started_total",
+ "expr": "sum(tfs_[[component]]_rpc_[[method]]_counter_requests_started_total{pod=~\"[[pod]]\"})",
"interval": "",
- "legendFormat": "{{__name__}}",
+ "legendFormat": "started",
"queryType": "randomWalk",
"refId": "A"
},
{
"exemplar": true,
- "expr": "tfs_[[component]]_rpc_[[method]]_counter_requests_completed_total",
+ "expr": "sum(tfs_[[component]]_rpc_[[method]]_counter_requests_completed_total{pod=~\"[[pod]]\"})",
"hide": false,
"interval": "",
- "legendFormat": "{{__name__}}",
+ "legendFormat": "completed",
"refId": "B"
},
{
"exemplar": true,
- "expr": "tfs_[[component]]_rpc_[[method]]_counter_requests_failed_total",
+ "expr": "sum(tfs_[[component]]_rpc_[[method]]_counter_requests_started_total{pod=~\"[[pod]]\"})",
"hide": false,
"interval": "",
- "legendFormat": "{{__name__}}",
+ "legendFormat": "failed",
"refId": "C"
}
],
@@ -99,15 +101,7 @@
"sort": 0,
"value_type": "individual"
},
- "transformations": [
- {
- "id": "renameByRegex",
- "options": {
- "regex": "service_.*_counter_requests_(.*)_total",
- "renamePattern": "$1"
- }
- }
- ],
+ "transformations": [],
"type": "graph",
"xaxis": {
"buckets": null,
@@ -141,6 +135,79 @@
"alignLevel": null
}
},
+ {
+ "cards": {
+ "cardPadding": null,
+ "cardRound": null
+ },
+ "color": {
+ "cardColor": "#b4ff00",
+ "colorScale": "linear",
+ "colorScheme": "interpolateRdYlGn",
+ "exponent": 0.5,
+ "max": null,
+ "min": 0,
+ "mode": "opacity"
+ },
+ "dataFormat": "tsbuckets",
+ "datasource": "prometheus",
+ "fieldConfig": {
+ "defaults": {},
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 8,
+ "w": 24,
+ "x": 0,
+ "y": 6
+ },
+ "heatmap": {},
+ "hideZeroBuckets": true,
+ "highlightCards": true,
+ "id": 2,
+ "interval": "60s",
+ "legend": {
+ "show": true
+ },
+ "pluginVersion": "7.5.4",
+ "reverseYBuckets": false,
+ "targets": [
+ {
+ "exemplar": true,
+ "expr": "sum(increase(tfs_[[component]]_rpc_[[method]]_histogram_duration_bucket{pod=~\"[[pod]]\"}[$__rate_interval])) by (le)",
+ "format": "heatmap",
+ "instant": false,
+ "interval": "10s",
+ "intervalFactor": 1,
+ "legendFormat": "{{le}}",
+ "queryType": "randomWalk",
+ "refId": "A"
+ }
+ ],
+ "title": "Histogram",
+ "tooltip": {
+ "show": true,
+ "showHistogram": true
+ },
+ "type": "heatmap",
+ "xAxis": {
+ "show": true
+ },
+ "xBucketNumber": null,
+ "xBucketSize": null,
+ "yAxis": {
+ "decimals": null,
+ "format": "s",
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true,
+ "splitFactor": null
+ },
+ "yBucketBound": "auto",
+ "yBucketNumber": null,
+ "yBucketSize": null
+ },
{
"aliasColors": {},
"bars": false,
@@ -157,15 +224,17 @@
"h": 6,
"w": 24,
"x": 0,
- "y": 6
+ "y": 14
},
"hiddenSeries": false,
"id": 5,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": false,
"total": false,
"values": false
@@ -188,7 +257,7 @@
"targets": [
{
"exemplar": true,
- "expr": "tfs_[[component]]_rpc_[[method]]_histogram_duration_sum",
+ "expr": "sum(tfs_[[component]]_rpc_[[method]]_histogram_duration_sum{pod=~\"[[pod]]\"})",
"hide": false,
"interval": "",
"legendFormat": "total time",
@@ -238,81 +307,9 @@
"align": false,
"alignLevel": null
}
- },
- {
- "cards": {
- "cardPadding": null,
- "cardRound": null
- },
- "color": {
- "cardColor": "#b4ff00",
- "colorScale": "sqrt",
- "colorScheme": "interpolateRdYlGn",
- "exponent": 0.5,
- "max": null,
- "min": 0,
- "mode": "opacity"
- },
- "dataFormat": "tsbuckets",
- "datasource": "prometheus",
- "fieldConfig": {
- "defaults": {},
- "overrides": []
- },
- "gridPos": {
- "h": 8,
- "w": 24,
- "x": 0,
- "y": 12
- },
- "heatmap": {},
- "hideZeroBuckets": true,
- "highlightCards": true,
- "id": 2,
- "legend": {
- "show": false
- },
- "pluginVersion": "7.5.4",
- "reverseYBuckets": false,
- "targets": [
- {
- "exemplar": true,
- "expr": "sum(increase(tfs_[[component]]_rpc_[[method]]_histogram_duration_bucket[$__rate_interval])) by (le)",
- "format": "heatmap",
- "instant": false,
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "{{le}}",
- "queryType": "randomWalk",
- "refId": "A"
- }
- ],
- "title": "Histogram",
- "tooltip": {
- "show": true,
- "showHistogram": true
- },
- "type": "heatmap",
- "xAxis": {
- "show": true
- },
- "xBucketNumber": null,
- "xBucketSize": null,
- "yAxis": {
- "decimals": null,
- "format": "s",
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true,
- "splitFactor": null
- },
- "yBucketBound": "auto",
- "yBucketNumber": null,
- "yBucketSize": null
}
],
- "refresh": false,
+ "refresh": "5s",
"schemaVersion": 27,
"style": "dark",
"tags": [],
@@ -322,8 +319,8 @@
"allValue": null,
"current": {
"selected": false,
- "text": "device",
- "value": "device"
+ "text": "context",
+ "value": "context"
},
"datasource": "prometheus",
"definition": "metrics(tfs_)",
@@ -350,11 +347,11 @@
"useTags": false
},
{
- "allValue": null,
+ "allValue": "",
"current": {
"selected": false,
- "text": "adddevice",
- "value": "adddevice"
+ "text": "getcontext",
+ "value": "getcontext"
},
"datasource": "prometheus",
"definition": "metrics(tfs_[[component]]_rpc_)",
@@ -379,6 +376,41 @@
"tagsQuery": "",
"type": "query",
"useTags": false
+ },
+ {
+ "allValue": ".*",
+ "current": {
+ "selected": true,
+ "text": [
+ "All"
+ ],
+ "value": [
+ "$__all"
+ ]
+ },
+ "datasource": "prometheus",
+ "definition": "label_values(tfs_[[component]]_rpc_[[method]]_histogram_duration_bucket, pod)",
+ "description": null,
+ "error": null,
+ "hide": 0,
+ "includeAll": true,
+ "label": "Pod",
+ "multi": true,
+ "name": "pod",
+ "options": [],
+ "query": {
+ "query": "label_values(tfs_[[component]]_rpc_[[method]]_histogram_duration_bucket, pod)",
+ "refId": "StandardVariableQuery"
+ },
+ "refresh": 2,
+ "regex": "",
+ "skipUrlSync": false,
+ "sort": 0,
+ "tagValuesQuery": "",
+ "tags": [],
+ "tagsQuery": "",
+ "type": "query",
+ "useTags": false
}
]
},
@@ -390,5 +422,5 @@
"timezone": "",
"title": "TFS / Component RPCs",
"uid": "KKxzxIFVz",
- "version": 7
+ "version": 21
}
\ No newline at end of file
diff --git a/src/common/method_wrappers/tests/grafana_prometheus_device_driver.json b/src/common/method_wrappers/tests/grafana_prometheus_device_driver.json
index 629cf014051827c9250944587ea3b74ce0f16376..a8663239b947e22472bbd98a5933d48ff6430a99 100644
--- a/src/common/method_wrappers/tests/grafana_prometheus_device_driver.json
+++ b/src/common/method_wrappers/tests/grafana_prometheus_device_driver.json
@@ -16,7 +16,7 @@
"gnetId": null,
"graphTooltip": 0,
"id": 25,
- "iteration": 1669834795409,
+ "iteration": 1669993886467,
"links": [],
"panels": [
{
@@ -40,11 +40,13 @@
"hiddenSeries": false,
"id": 4,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
"total": false,
"values": false
},
@@ -66,26 +68,26 @@
"targets": [
{
"exemplar": true,
- "expr": "tfs_device_driver_[[method]]_counter_requests_started_total{driver=\"[[driver]]\"}",
+ "expr": "sum(tfs_device_driver_[[method]]_counter_requests_started_total{driver=~\"[[driver]]\", pod=~\"deviceservice-[[pod]]\"})",
"interval": "",
- "legendFormat": "{{__name__}}",
+ "legendFormat": "started",
"queryType": "randomWalk",
"refId": "A"
},
{
"exemplar": true,
- "expr": "tfs_device_driver_[[method]]_counter_requests_completed_total{driver=\"[[driver]]\"}",
+ "expr": "sum(tfs_device_driver_[[method]]_counter_requests_completed_total{driver=~\"[[driver]]\", pod=~\"deviceservice-[[pod]]\"})",
"hide": false,
"interval": "",
- "legendFormat": "{{__name__}}",
+ "legendFormat": "completed",
"refId": "B"
},
{
"exemplar": true,
- "expr": "tfs_device_driver_[[method]]_counter_requests_failed_total{driver=\"[[driver]]\"}",
+ "expr": "sum(tfs_device_driver_[[method]]_counter_requests_failed_total{driver=~\"[[driver]]\", pod=~\"deviceservice-[[pod]]\"})",
"hide": false,
"interval": "",
- "legendFormat": "{{__name__}}",
+ "legendFormat": "failed",
"refId": "C"
}
],
@@ -99,15 +101,7 @@
"sort": 0,
"value_type": "individual"
},
- "transformations": [
- {
- "id": "renameByRegex",
- "options": {
- "regex": "tfs_device_driver_.*_counter_requests_(.*)_total",
- "renamePattern": "$1"
- }
- }
- ],
+ "transformations": [],
"type": "graph",
"xaxis": {
"buckets": null,
@@ -141,6 +135,80 @@
"alignLevel": null
}
},
+ {
+ "cards": {
+ "cardPadding": null,
+ "cardRound": null
+ },
+ "color": {
+ "cardColor": "#b4ff00",
+ "colorScale": "linear",
+ "colorScheme": "interpolateRdYlGn",
+ "exponent": 0.5,
+ "max": null,
+ "min": 0,
+ "mode": "opacity"
+ },
+ "dataFormat": "tsbuckets",
+ "datasource": "prometheus",
+ "fieldConfig": {
+ "defaults": {},
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 8,
+ "w": 24,
+ "x": 0,
+ "y": 6
+ },
+ "heatmap": {},
+ "hideZeroBuckets": true,
+ "highlightCards": true,
+ "id": 2,
+ "interval": "60s",
+ "legend": {
+ "show": true
+ },
+ "pluginVersion": "7.5.4",
+ "reverseYBuckets": false,
+ "targets": [
+ {
+ "exemplar": true,
+ "expr": "sum(increase(tfs_device_driver_[[method]]_histogram_duration_bucket{driver=~\"[[driver]]\", pod=~\"deviceservice-[[pod]]\"}[$__rate_interval])) by (le)",
+ "format": "heatmap",
+ "instant": false,
+ "interval": "10s",
+ "intervalFactor": 1,
+ "legendFormat": "{{le}}",
+ "queryType": "randomWalk",
+ "refId": "A"
+ }
+ ],
+ "timeFrom": null,
+ "title": "Histogram",
+ "tooltip": {
+ "show": true,
+ "showHistogram": true
+ },
+ "type": "heatmap",
+ "xAxis": {
+ "show": true
+ },
+ "xBucketNumber": null,
+ "xBucketSize": null,
+ "yAxis": {
+ "decimals": null,
+ "format": "s",
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true,
+ "splitFactor": null
+ },
+ "yBucketBound": "auto",
+ "yBucketNumber": null,
+ "yBucketSize": null
+ },
{
"aliasColors": {},
"bars": false,
@@ -157,15 +225,17 @@
"h": 6,
"w": 24,
"x": 0,
- "y": 6
+ "y": 14
},
"hiddenSeries": false,
"id": 5,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": false,
"total": false,
"values": false
@@ -188,7 +258,7 @@
"targets": [
{
"exemplar": true,
- "expr": "tfs_device_driver_[[method]]_histogram_duration_sum{driver=\"[[driver]]\"}",
+ "expr": "sum(tfs_device_driver_[[method]]_histogram_duration_sum{driver=~\"[[driver]]\", pod=~\"deviceservice-[[pod]]\"})",
"hide": false,
"interval": "",
"legendFormat": "total time",
@@ -238,78 +308,6 @@
"align": false,
"alignLevel": null
}
- },
- {
- "cards": {
- "cardPadding": null,
- "cardRound": null
- },
- "color": {
- "cardColor": "#b4ff00",
- "colorScale": "sqrt",
- "colorScheme": "interpolateRdYlGn",
- "exponent": 0.5,
- "max": null,
- "min": 0,
- "mode": "opacity"
- },
- "dataFormat": "tsbuckets",
- "datasource": "prometheus",
- "fieldConfig": {
- "defaults": {},
- "overrides": []
- },
- "gridPos": {
- "h": 8,
- "w": 24,
- "x": 0,
- "y": 12
- },
- "heatmap": {},
- "hideZeroBuckets": true,
- "highlightCards": true,
- "id": 2,
- "legend": {
- "show": false
- },
- "pluginVersion": "7.5.4",
- "reverseYBuckets": false,
- "targets": [
- {
- "exemplar": true,
- "expr": "sum(increase(tfs_device_driver_[[method]]_histogram_duration_bucket{driver=\"[[driver]]\"}[$__rate_interval])) by (le)",
- "format": "heatmap",
- "instant": false,
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "{{le}}",
- "queryType": "randomWalk",
- "refId": "A"
- }
- ],
- "title": "Histogram",
- "tooltip": {
- "show": true,
- "showHistogram": true
- },
- "type": "heatmap",
- "xAxis": {
- "show": true
- },
- "xBucketNumber": null,
- "xBucketSize": null,
- "yAxis": {
- "decimals": null,
- "format": "s",
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true,
- "splitFactor": null
- },
- "yBucketBound": "auto",
- "yBucketNumber": null,
- "yBucketSize": null
}
],
"refresh": "5s",
@@ -319,7 +317,7 @@
"templating": {
"list": [
{
- "allValue": null,
+ "allValue": "",
"current": {
"selected": false,
"text": "setconfig",
@@ -350,20 +348,24 @@
"useTags": false
},
{
- "allValue": null,
+ "allValue": ".*",
"current": {
- "selected": false,
- "text": "emulated",
- "value": "emulated"
+ "selected": true,
+ "text": [
+ "All"
+ ],
+ "value": [
+ "$__all"
+ ]
},
"datasource": "prometheus",
"definition": "label_values(tfs_device_driver_[[method]]_histogram_duration_bucket, driver)",
"description": null,
"error": null,
"hide": 0,
- "includeAll": false,
+ "includeAll": true,
"label": "Driver",
- "multi": false,
+ "multi": true,
"name": "driver",
"options": [],
"query": {
@@ -379,16 +381,51 @@
"tagsQuery": "",
"type": "query",
"useTags": false
+ },
+ {
+ "allValue": ".*",
+ "current": {
+ "selected": true,
+ "text": [
+ "All"
+ ],
+ "value": [
+ "$__all"
+ ]
+ },
+ "datasource": "prometheus",
+ "definition": "label_values(tfs_device_driver_[[method]]_histogram_duration_bucket, pod)",
+ "description": null,
+ "error": null,
+ "hide": 0,
+ "includeAll": true,
+ "label": "Pod",
+ "multi": true,
+ "name": "pod",
+ "options": [],
+ "query": {
+ "query": "label_values(tfs_device_driver_[[method]]_histogram_duration_bucket, pod)",
+ "refId": "StandardVariableQuery"
+ },
+ "refresh": 2,
+ "regex": "/deviceservice-(.*)/",
+ "skipUrlSync": false,
+ "sort": 0,
+ "tagValuesQuery": "",
+ "tags": [],
+ "tagsQuery": "",
+ "type": "query",
+ "useTags": false
}
]
},
"time": {
- "from": "now-30m",
+ "from": "now-15m",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "TFS / Device / Driver",
"uid": "eAg-wsOVk",
- "version": 17
+ "version": 30
}
\ No newline at end of file
diff --git a/src/common/method_wrappers/tests/grafana_prometheus_service_handler.json b/src/common/method_wrappers/tests/grafana_prometheus_service_handler.json
index 299b01a7b06826980fc9d269569435f216befb98..6f65a78b22e3afd537cbc28078e980a7534d640e 100644
--- a/src/common/method_wrappers/tests/grafana_prometheus_service_handler.json
+++ b/src/common/method_wrappers/tests/grafana_prometheus_service_handler.json
@@ -16,7 +16,7 @@
"gnetId": null,
"graphTooltip": 0,
"id": 26,
- "iteration": 1669834937164,
+ "iteration": 1669992491077,
"links": [],
"panels": [
{
@@ -40,11 +40,13 @@
"hiddenSeries": false,
"id": 4,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
- "show": true,
+ "rightSide": false,
+ "show": false,
"total": false,
"values": false
},
@@ -66,26 +68,27 @@
"targets": [
{
"exemplar": true,
- "expr": "tfs_service_handler_[[method]]_counter_requests_started_total{handler=\"[[handler]]\"} ",
+ "expr": "sum(tfs_service_handler_[[method]]_counter_requests_started_total{handler=~\"[[handler]]\", pod=~\"serviceservice-[[pod]]\"})",
+ "instant": false,
"interval": "",
- "legendFormat": "{{__name__}}",
+ "legendFormat": "started",
"queryType": "randomWalk",
"refId": "A"
},
{
"exemplar": true,
- "expr": "tfs_service_handler_[[method]]_counter_requests_completed_total{handler=\"[[handler]]\"}",
+ "expr": "sum(tfs_service_handler_[[method]]_counter_requests_completed_total{handler=~\"[[handler]]\", pod=~\"serviceservice-[[pod]]\"})",
"hide": false,
"interval": "",
- "legendFormat": "{{__name__}}",
+ "legendFormat": "completed",
"refId": "B"
},
{
"exemplar": true,
- "expr": "tfs_service_handler_[[method]]_counter_requests_failed_total{handler=\"[[handler]]\"}",
+ "expr": "sum(tfs_service_handler_[[method]]_counter_requests_failed_total{handler=~\"[[handler]]\", pod=~\"serviceservice-[[pod]]\"})",
"hide": false,
"interval": "",
- "legendFormat": "{{__name__}}",
+ "legendFormat": "failed",
"refId": "C"
}
],
@@ -99,15 +102,7 @@
"sort": 0,
"value_type": "individual"
},
- "transformations": [
- {
- "id": "renameByRegex",
- "options": {
- "regex": "tfs_service_handler_.*_counter_requests_(.*)_total",
- "renamePattern": "$1"
- }
- }
- ],
+ "transformations": [],
"type": "graph",
"xaxis": {
"buckets": null,
@@ -141,6 +136,80 @@
"alignLevel": null
}
},
+ {
+ "cards": {
+ "cardPadding": null,
+ "cardRound": null
+ },
+ "color": {
+ "cardColor": "#b4ff00",
+ "colorScale": "linear",
+ "colorScheme": "interpolateRdYlGn",
+ "exponent": 0.5,
+ "max": null,
+ "min": 0,
+ "mode": "opacity"
+ },
+ "dataFormat": "tsbuckets",
+ "datasource": "prometheus",
+ "fieldConfig": {
+ "defaults": {},
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 8,
+ "w": 24,
+ "x": 0,
+ "y": 6
+ },
+ "heatmap": {},
+ "hideZeroBuckets": true,
+ "highlightCards": true,
+ "id": 2,
+ "interval": "60s",
+ "legend": {
+ "show": true
+ },
+ "pluginVersion": "7.5.4",
+ "reverseYBuckets": false,
+ "targets": [
+ {
+ "exemplar": true,
+ "expr": "sum(increase(tfs_service_handler_[[method]]_histogram_duration_bucket{handler=~\"[[handler]]\", pod=~\"serviceservice-[[pod]]\"}[$__rate_interval])) by (le)",
+ "format": "heatmap",
+ "instant": false,
+ "interval": "10s",
+ "intervalFactor": 1,
+ "legendFormat": "{{le}}",
+ "queryType": "randomWalk",
+ "refId": "A"
+ }
+ ],
+ "timeFrom": null,
+ "title": "Histogram",
+ "tooltip": {
+ "show": true,
+ "showHistogram": true
+ },
+ "type": "heatmap",
+ "xAxis": {
+ "show": true
+ },
+ "xBucketNumber": null,
+ "xBucketSize": null,
+ "yAxis": {
+ "decimals": null,
+ "format": "s",
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true,
+ "splitFactor": null
+ },
+ "yBucketBound": "auto",
+ "yBucketNumber": null,
+ "yBucketSize": null
+ },
{
"aliasColors": {},
"bars": false,
@@ -157,15 +226,17 @@
"h": 6,
"w": 24,
"x": 0,
- "y": 6
+ "y": 14
},
"hiddenSeries": false,
"id": 5,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": false,
"total": false,
"values": false
@@ -188,7 +259,7 @@
"targets": [
{
"exemplar": true,
- "expr": "tfs_service_handler_[[method]]_histogram_duration_sum{handler=\"[[handler]]\"}",
+ "expr": "sum(tfs_service_handler_[[method]]_histogram_duration_sum{handler=~\"[[handler]]\", pod=~\"serviceservice-[[pod]]\"})",
"hide": false,
"interval": "",
"legendFormat": "total time",
@@ -238,78 +309,6 @@
"align": false,
"alignLevel": null
}
- },
- {
- "cards": {
- "cardPadding": null,
- "cardRound": null
- },
- "color": {
- "cardColor": "#b4ff00",
- "colorScale": "sqrt",
- "colorScheme": "interpolateRdYlGn",
- "exponent": 0.5,
- "max": null,
- "min": 0,
- "mode": "opacity"
- },
- "dataFormat": "tsbuckets",
- "datasource": "prometheus",
- "fieldConfig": {
- "defaults": {},
- "overrides": []
- },
- "gridPos": {
- "h": 8,
- "w": 24,
- "x": 0,
- "y": 12
- },
- "heatmap": {},
- "hideZeroBuckets": true,
- "highlightCards": true,
- "id": 2,
- "legend": {
- "show": false
- },
- "pluginVersion": "7.5.4",
- "reverseYBuckets": false,
- "targets": [
- {
- "exemplar": true,
- "expr": "sum(increase(tfs_service_handler_[[method]]_histogram_duration_bucket{handler=\"[[handler]]\"}[$__rate_interval])) by (le)",
- "format": "heatmap",
- "instant": false,
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "{{le}}",
- "queryType": "randomWalk",
- "refId": "A"
- }
- ],
- "title": "Histogram",
- "tooltip": {
- "show": true,
- "showHistogram": true
- },
- "type": "heatmap",
- "xAxis": {
- "show": true
- },
- "xBucketNumber": null,
- "xBucketSize": null,
- "yAxis": {
- "decimals": null,
- "format": "s",
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true,
- "splitFactor": null
- },
- "yBucketBound": "auto",
- "yBucketNumber": null,
- "yBucketSize": null
}
],
"refresh": "5s",
@@ -319,11 +318,11 @@
"templating": {
"list": [
{
- "allValue": null,
+ "allValue": "",
"current": {
"selected": false,
- "text": "setconfig",
- "value": "setconfig"
+ "text": "setendpoint",
+ "value": "setendpoint"
},
"datasource": "prometheus",
"definition": "metrics(tfs_service_handler_.+)",
@@ -340,7 +339,7 @@
"refId": "StandardVariableQuery"
},
"refresh": 2,
- "regex": "/tfs_service_handler_(.+config)_histogram_duration_bucket/",
+ "regex": "/tfs_service_handler_(.+)_histogram_duration_bucket/",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
@@ -350,20 +349,24 @@
"useTags": false
},
{
- "allValue": null,
+ "allValue": ".*",
"current": {
- "selected": false,
- "text": "l2nm_emulated",
- "value": "l2nm_emulated"
+ "selected": true,
+ "text": [
+ "All"
+ ],
+ "value": [
+ "$__all"
+ ]
},
"datasource": "prometheus",
"definition": "label_values(tfs_service_handler_[[method]]_histogram_duration_bucket, handler)",
"description": null,
"error": null,
"hide": 0,
- "includeAll": false,
+ "includeAll": true,
"label": "Handler",
- "multi": false,
+ "multi": true,
"name": "handler",
"options": [],
"query": {
@@ -379,16 +382,51 @@
"tagsQuery": "",
"type": "query",
"useTags": false
+ },
+ {
+ "allValue": ".*",
+ "current": {
+ "selected": true,
+ "text": [
+ "All"
+ ],
+ "value": [
+ "$__all"
+ ]
+ },
+ "datasource": "prometheus",
+ "definition": "label_values(tfs_service_handler_[[method]]_histogram_duration_bucket, pod)",
+ "description": null,
+ "error": null,
+ "hide": 0,
+ "includeAll": true,
+ "label": "Pod",
+ "multi": true,
+ "name": "pod",
+ "options": [],
+ "query": {
+ "query": "label_values(tfs_service_handler_[[method]]_histogram_duration_bucket, pod)",
+ "refId": "StandardVariableQuery"
+ },
+ "refresh": 2,
+ "regex": "/serviceservice-(.*)/",
+ "skipUrlSync": false,
+ "sort": 0,
+ "tagValuesQuery": "",
+ "tags": [],
+ "tagsQuery": "",
+ "type": "query",
+ "useTags": false
}
]
},
"time": {
- "from": "now-30m",
+ "from": "now-15m",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "TFS / Service / Handler",
"uid": "DNOhOIF4k",
- "version": 10
+ "version": 16
}
\ No newline at end of file