Skip to content

Commit

Permalink
fix grafana dashboard issue (#303)
Browse files Browse the repository at this point in the history 
Signed-off-by: Addo.Zhang <[email protected]>
  • Loading branch information
@addozhang @reaver-flomesh
addozhang authored and reaver-flomesh committed Jul 11, 2024
1 parent db78fad commit 9bca557
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 270 deletions.
26 changes: 13 additions & 13 deletions charts/fsm/grafana/pipy/dashboards/fsm-control-plane.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
"steppedLine": false,
"targets": [
{
"expr": "irate(sidecar_cluster_upstream_rq_xx{sidecar_response_code_class=\"2\",source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"}[1m])",
"expr": "irate(sidecar_cluster_upstream_rq_xx{sidecar_response_code_class=\"2\",source_service=\"$source_service\",source_namespace=\"$source_namespace\"}[1m])",
"interval": "1m",
"legendFormat": "Time (per minute)",
"refId": "A"
Expand Down Expand Up @@ -252,7 +252,7 @@
"steppedLine": false,
"targets": [
{
"expr": "irate(sidecar_cluster_upstream_rq_xx{sidecar_response_code_class!=\"2\",source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"}[1m])",
"expr": "irate(sidecar_cluster_upstream_rq_xx{sidecar_response_code_class!=\"2\",source_service=\"$source_service\",source_namespace=\"$source_namespace\"}[1m])",
"interval": "1m",
"legendFormat": "Time (per minute)",
"refId": "A"
Expand Down Expand Up @@ -347,7 +347,7 @@
"pluginVersion": "8.2.2",
"targets": [
{
"expr": "sum(sidecar_cluster_upstream_cx_active{source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"})",
"expr": "sum(sidecar_cluster_upstream_cx_active{source_service=\"$source_service\",source_namespace=\"$source_namespace\"})",
"legendFormat": "Connections",
"refId": "A"
}
Expand Down Expand Up @@ -468,12 +468,12 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(irate(sidecar_cluster_upstream_cx_tx_bytes_total{source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"}[1m]))",
"expr": "sum(irate(sidecar_cluster_upstream_cx_tx_bytes_total{source_service=\"$source_service\",source_namespace=\"$source_namespace\"}[1m]))",
"legendFormat": "Bytes sent",
"refId": "A"
},
{
"expr": "sum(irate(sidecar_cluster_upstream_cx_rx_bytes_total{source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"}[1m]))",
"expr": "sum(irate(sidecar_cluster_upstream_cx_rx_bytes_total{source_service=\"$source_service\",source_namespace=\"$source_namespace\"}[1m]))",
"legendFormat": "Bytes received",
"refId": "B"
}
Expand Down Expand Up @@ -570,42 +570,42 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(irate(sidecar_cluster_upstream_cx_destroy_remote_with_active_rq{source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"}[1m]))",
"expr": "sum(irate(sidecar_cluster_upstream_cx_destroy_remote_with_active_rq{source_service=\"$source_service\",source_namespace=\"$source_namespace\"}[1m]))",
"legendFormat": "Connection destroyed by the client",
"refId": "A"
},
{
"expr": "sum(irate(sidecar_cluster_upstream_cx_connect_timeout{source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"}[1m]))",
"expr": "sum(irate(sidecar_cluster_upstream_cx_connect_timeout{source_service=\"$source_service\",source_namespace=\"$source_namespace\"}[1m]))",
"legendFormat": "Connection timeout",
"refId": "B"
},
{
"expr": "sum(irate(sidecar_cluster_upstream_cx_destroy_local_with_active_rq{source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"}[1m]))",
"expr": "sum(irate(sidecar_cluster_upstream_cx_destroy_local_with_active_rq{source_service=\"$source_service\",source_namespace=\"$source_namespace\"}[1m]))",
"legendFormat": "Connection destroyed by local Sidecar",
"refId": "C"
},
{
"expr": "sum(irate(sidecar_cluster_upstream_rq_pending_failure_eject{source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"}[1m]))",
"expr": "sum(irate(sidecar_cluster_upstream_rq_pending_failure_eject{source_service=\"$source_service\",source_namespace=\"$source_namespace\"}[1m]))",
"legendFormat": "Pending failure ejection",
"refId": "D"
},
{
"expr": "sum(irate(sidecar_cluster_upstream_rq_pending_overflow{source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"}[1m]))",
"expr": "sum(irate(sidecar_cluster_upstream_rq_pending_overflow{source_service=\"$source_service\",source_namespace=\"$source_namespace\"}[1m]))",
"legendFormat": "Pending overflow",
"refId": "E"
},
{
"expr": "sum(irate(sidecar_cluster_upstream_rq_timeout{source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"}[1m]))",
"expr": "sum(irate(sidecar_cluster_upstream_rq_timeout{source_service=\"$source_service\",source_namespace=\"$source_namespace\"}[1m]))",
"legendFormat": "Request timeout",
"refId": "F"
},
{
"expr": "sum(irate(sidecar_cluster_upstream_rq_rx_reset{source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"}[1m]))",
"expr": "sum(irate(sidecar_cluster_upstream_rq_rx_reset{source_service=\"$source_service\",source_namespace=\"$source_namespace\"}[1m]))",
"legendFormat": "Response reset",
"refId": "G"
},
{
"expr": "sum(irate(sidecar_cluster_upstream_rq_tx_reset{source_service=\"$source_service\",source_namespace=\"$source_namespace\",sidecar_cluster_name=\"fsm-controller\"}[1m]))",
"expr": "sum(irate(sidecar_cluster_upstream_rq_tx_reset{source_service=\"$source_service\",source_namespace=\"$source_namespace\"}[1m]))",
"legendFormat": "Request reset",
"refId": "H"
}
Expand Down
8 changes: 4 additions & 4 deletions charts/fsm/grafana/pipy/dashboards/fsm-data-plane-performance.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
"steppedLine": false,
"targets": [
{
"expr": "irate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", pod=~\"$pod\", container=\"sidecar\"}[1m])",
"expr": "irate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", pod=~\"$pod\"}[1m])",
"interval": "",
"legendFormat": "{{pod}}:{{container}}",
"refId": "A"
Expand Down Expand Up @@ -226,7 +226,7 @@
"steppedLine": false,
"targets": [
{
"expr": "container_memory_rss{namespace=~\"$namespace\", pod=~\"$pod\", container=\"sidecar\"}",
"expr": "container_memory_rss{namespace=~\"$namespace\", pod=~\"$pod\"}",
"interval": "",
"legendFormat": "{{pod}}:{{container}}",
"refId": "A"
Expand Down Expand Up @@ -334,7 +334,7 @@
"steppedLine": false,
"targets": [
{
"expr": "irate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", pod=~\"$pod\", container=~\"$container\"}[1m])",
"expr": "irate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", pod=~\"$pod\"}[1m])",
"interval": "",
"legendFormat": "{{pod}}:{{container}}",
"refId": "A"
Expand Down Expand Up @@ -428,7 +428,7 @@
"steppedLine": false,
"targets": [
{
"expr": "container_memory_rss{namespace=~\"$namespace\", pod=~\"$pod\", container=~\"$container\"}",
"expr": "container_memory_rss{namespace=~\"$namespace\", pod=~\"$pod\"}",
"interval": "",
"legendFormat": "{{pod}}:{{container}}",
"refId": "A"
Expand Down
235 changes: 2 additions & 233 deletions charts/fsm/grafana/pipy/dashboards/fsm-mesh-sidecar-details.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
"steppedLine": false,
"targets": [
{
"expr": "irate(container_cpu_usage_seconds_total{namespace=\"${CONTROL_PLANE_NAMESPACE}\", container!~\"POD\", container!~\"\"}[1m])",
"expr": "irate(container_cpu_usage_seconds_total{namespace=\"${CONTROL_PLANE_NAMESPACE}\"}[1m])",
"interval": "",
"legendFormat": "{{pod}}",
"refId": "A"
Expand Down Expand Up @@ -420,7 +420,7 @@
"steppedLine": false,
"targets": [
{
"expr": "container_memory_rss{namespace=\"${CONTROL_PLANE_NAMESPACE}\", container!=\"\", container!=\"POD\"}",
"expr": "container_memory_rss{namespace=\"${CONTROL_PLANE_NAMESPACE}\"}",
"interval": "",
"legendFormat": "{{pod}}",
"refId": "A"
Expand Down Expand Up @@ -783,95 +783,6 @@
"timeFrom": null,
"timeShift": null
},
{
"cards": {
"cardPadding": null,
"cardRound": null
},
"color": {
"cardColor": "#73BF69",
"colorScale": "sqrt",
"colorScheme": "interpolateOranges",
"exponent": 0.5,
"mode": "opacity"
},
"dataFormat": "tsbuckets",
"datasource": "${DS_PROMETHEUS}",
"fieldConfig": {
"defaults": {
"custom": {
"align": null
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 10,
"w": 18,
"x": 0,
"y": 36
},
"heatmap": {},
"hideZeroBuckets": true,
"highlightCards": true,
"id": 28,
"interval": "10s",
"legend": {
"show": false
},
"pluginVersion": "8.2.2",
"reverseYBuckets": false,
"targets": [
{
"expr": "sum(rate(fsm_proxy_config_update_time_bucket{resource_type=\"$xds_path\", source_pod_name=~\"$fsm_controller_instance\"}[1m])) by (le)",
"format": "heatmap",
"hide": false,
"interval": "",
"intervalFactor": 1,
"legendFormat": "{{le}}",
"refId": "A"
}
],
"timeFrom": null,
"timeShift": null,
"title": "xDS Path histogram",
"tooltip": {
"show": true,
"showHistogram": false
},
"type": "heatmap",
"xAxis": {
"show": true
},
"xBucketNumber": null,
"xBucketSize": null,
"yAxis": {
"decimals": null,
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true,
"splitFactor": null
},
"yBucketBound": "auto",
"yBucketNumber": null,
"yBucketSize": null
},
{
"aliasColors": {},
"bars": true,
Expand Down Expand Up @@ -988,122 +899,6 @@
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": true,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_PROMETHEUS}",
"fieldConfig": {
"defaults": {
"custom": {},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 9,
"x": 9,
"y": 46
},
"hiddenSeries": false,
"id": 37,
"interval": "10s",
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": false,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pluginVersion": "8.2.2",
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": true,
"steppedLine": false,
"targets": [
{
"expr": "idelta(fsm_proxy_config_update_time_count{success=\"true\", resource_type=~\"$xds_path\", source_pod_name=~\"$fsm_controller_instance\"}[1m])\n",
"interval": "",
"legendFormat": "{{resource_type}}-{{source_pod_name}}-Success",
"refId": "A"
},
{
"expr": "idelta(fsm_proxy_config_update_time_count{success=\"false\", resource_type=~\"$xds_path\", source_pod_name=~\"$fsm_controller_instance\"}[1m])",
"interval": "",
"legendFormat": "{{resource_type}}-{{source_pod_name}}-Failure",
"refId": "B"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "xDS Updates",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "timeseries",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "count",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"collapsed": false,
"datasource": null,
Expand Down Expand Up @@ -1478,32 +1273,6 @@
"type": "query",
"useTags": false
},
{
"allValue": null,
"current": {
"selected": false,
"text": "ADS",
"value": "ADS"
},
"datasource": "${DS_PROMETHEUS}",
"definition": "label_values(fsm_proxy_config_update_time_bucket, resource_type)",
"hide": 0,
"includeAll": false,
"label": "xDS Path",
"multi": false,
"name": "xds_path",
"options": [],
"query": "label_values(fsm_proxy_config_update_time_bucket, resource_type)",
"refresh": 2,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
},
{
"allValue": null,
"current": {
Expand Down
Loading

0 comments on commit 9bca557

Please sign in to comment.