further grafana dashboard improvements (#614)

- removed unused overrides
- addressed issue using $__interval which doesn't work as well as
$interval
- addressed issue where multiple channels may not give correct output
Signed-off-by: D <d_kelsey@uk.ibm.com>

Co-authored-by: D <d_kelsey@uk.ibm.com>

test-network/prometheus-grafana/grafana/provisioning/dashboards/hlf-performances.json

@@ -23,7 +23,7 @@
   "fiscalYearStartMonth": 0,
   "gnetId": 893,
   "graphTooltip": 1,
-	"iteration": 1643645866197,
+  "iteration": 1643752938992,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -79,7 +79,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "100 - (avg(rate(node_cpu_seconds_total{job=\"node\",mode=\"idle\"}[$__interval])) * 100)",
+          "expr": "100 - (avg(rate(node_cpu_seconds_total{job=\"node\",mode=\"idle\"}[$interval])) * 100)",
           "hide": false,
           "interval": "",
           "legendFormat": "",
@@ -127,35 +127,6 @@
       "dashes": false,
       "editable": true,
       "error": false,
-		"fieldConfig": {
-		  "defaults": {},
-		  "overrides": [
-			{
-			  "matcher": {
-				"id": "byRegexp",
-				"options": "dev-peer0.org1.example.com-fixed-asset-.*"
-			  },
-			  "properties": [
-				{
-				  "id": "displayName",
-				  "value": "dev-peer0.org1.example.com-fixed-asset"
-				}
-			  ]
-			},
-			{
-			  "matcher": {
-				"id": "byRegexp",
-				"options": "dev-peer0.org2.example.com-fixed-asset-.*"
-			  },
-			  "properties": [
-				{
-				  "id": "displayName",
-				  "value": "dev-peer0.org2.example.com-fixed-asset"
-				}
-			  ]
-			}
-		  ]
-		},
       "fill": 3,
       "fillGradient": 0,
       "grid": {},
@@ -504,35 +475,6 @@
       "dashes": false,
       "editable": true,
       "error": false,
-		"fieldConfig": {
-		  "defaults": {},
-		  "overrides": [
-			{
-			  "matcher": {
-				"id": "byRegexp",
-				"options": "dev-peer0.org1.example.com-fixed-asset-.*"
-			  },
-			  "properties": [
-				{
-				  "id": "displayName",
-				  "value": "dev-peer0.org1.example.com-fixed-asset"
-				}
-			  ]
-			},
-			{
-			  "matcher": {
-				"id": "byRegexp",
-				"options": "dev-peer0.org2.example.com-fixed-asset-.*"
-			  },
-			  "properties": [
-				{
-				  "id": "displayName",
-				  "value": "dev-peer0.org2.example.com-fixed-asset"
-				}
-			  ]
-			}
-		  ]
-		},
       "fill": 5,
       "fillGradient": 0,
       "grid": {},
@@ -550,7 +492,7 @@
         "current": false,
         "max": false,
         "min": false,
-		  "rightSide": true,
+        "rightSide": false,
         "show": true,
         "total": false,
         "values": false
@@ -578,7 +520,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "avg by (name)(rate(container_cpu_usage_seconds_total{name!~\"cadvisor|node-exporter|grafana|prometheus||\"}[$__interval])) * 100",
+          "expr": "avg by (name)(rate(container_cpu_usage_seconds_total{name!~\"cadvisor|node-exporter|grafana|prometheus||\"}[$interval])) * 100",
           "hide": false,
           "interval": "",
           "legendFormat": "{{name}}",
@@ -683,7 +625,7 @@
         "legend": {
           "calcs": [],
           "displayMode": "table",
-			"placement": "right"
+          "placement": "bottom"
         },
         "tooltip": {
           "mode": "single"
@@ -817,7 +759,7 @@
         "current": false,
         "max": false,
         "min": false,
-		  "rightSide": true,
+        "rightSide": false,
         "show": true,
         "total": false,
         "values": false
@@ -845,7 +787,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "avg by (name)(rate(container_cpu_usage_seconds_total{name!~\"cadvisor|node-exporter|grafana|prometheus||\"}[$__interval])) * 100",
+          "expr": "avg by (name)(rate(container_cpu_usage_seconds_total{name!~\"cadvisor|node-exporter|grafana|prometheus||\"}[$interval])) * 100",
           "hide": false,
           "interval": "",
           "legendFormat": "{{name}}",
@@ -893,35 +835,6 @@
       "dashes": false,
       "editable": true,
       "error": false,
-		"fieldConfig": {
-		  "defaults": {},
-		  "overrides": [
-			{
-			  "matcher": {
-				"id": "byRegexp",
-				"options": "dev-peer0.org1.example.com-fixed-asset-.*"
-			  },
-			  "properties": [
-				{
-				  "id": "displayName",
-				  "value": "dev-peer0.org1.example.com-fixed-asset"
-				}
-			  ]
-			},
-			{
-			  "matcher": {
-				"id": "byRegexp",
-				"options": "dev-peer0.org2.example.com-fixed-asset-.*"
-			  },
-			  "properties": [
-				{
-				  "id": "displayName",
-				  "value": "dev-peer0.org2.example.com-fixed-asset"
-				}
-			  ]
-			}
-		  ]
-		},
       "fill": 0,
       "fillGradient": 0,
       "grid": {},
@@ -939,7 +852,7 @@
         "current": false,
         "max": false,
         "min": false,
-		  "rightSide": true,
+        "rightSide": false,
         "show": true,
         "total": false,
         "values": false
@@ -1073,32 +986,7 @@
           },
           "unit": "s"
         },
-		  "overrides": [
+        "overrides": []
-			{
-			  "__systemRef": "hideSeriesFrom",
-			  "matcher": {
-				"id": "byNames",
-				"options": {
-				  "mode": "exclude",
-				  "names": [
-					" peer0_org2 fixed-asset_1.0:a8a7611b4fb90446320b6bcf140ec68be0e14321f176dde56ac2418c584a3250"
-				  ],
-				  "prefix": "All except:",
-				  "readOnly": true
-				}
-			  },
-			  "properties": [
-				{
-				  "id": "custom.hideFrom",
-				  "value": {
-					"legend": false,
-					"tooltip": false,
-					"viz": true
-				  }
-				}
-			  ]
-			}
-		  ]
       },
       "gridPos": {
         "h": 11,
@@ -1124,7 +1012,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "sum by(job, chaincode) (rate(chaincode_shim_request_duration_sum{chaincode!~\"_.*\"}[$__interval]) / rate(chaincode_shim_request_duration_count{chaincode!~\"_.*\"}[$__interval]))",
+          "expr": "sum by(job, chaincode) (rate(chaincode_shim_request_duration_sum{chaincode!~\"_lifecycle.*|cscc|qscc\"}[$interval])) / sum by(job, chaincode) (rate(chaincode_shim_request_duration_count{chaincode!~\"_lifecycle.*|cscc|qscc\"}[$interval]))",
           "hide": false,
           "interval": "0.01m",
           "legendFormat": " {{job}} {{chaincode}}",
@@ -1210,7 +1098,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "sum without(channel,type)(rate(chaincode_shim_requests_received{chaincode!~\"_.*\"}[$__interval]))",
+          "expr": "sum without(channel,type) (rate(chaincode_shim_requests_received{chaincode!~\"_lifecycle.*|cscc|qscc\"}[$interval]))",
           "hide": false,
           "interval": "0.01m",
           "legendFormat": "{{job}} {{chaincode}}",
@@ -1270,32 +1158,7 @@
           },
           "unit": "none"
         },
-		  "overrides": [
+        "overrides": []
-			{
-			  "__systemRef": "hideSeriesFrom",
-			  "matcher": {
-				"id": "byNames",
-				"options": {
-				  "mode": "exclude",
-				  "names": [
-					"peer0_org2 simple_1.0:fa575b6f4cc225b509c579775fdf3f3d96f6420477570cde0b1a27036f7357dd"
-				  ],
-				  "prefix": "All except:",
-				  "readOnly": true
-				}
-			  },
-			  "properties": [
-				{
-				  "id": "custom.hideFrom",
-				  "value": {
-					"legend": false,
-					"tooltip": false,
-					"viz": true
-				  }
-				}
-			  ]
-			}
-		  ]
       },
       "gridPos": {
         "h": 11,
@@ -1321,9 +1184,10 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "sum without(channel, type, success) (rate(chaincode_shim_requests_completed{chaincode!~\"_.*\"}[$__interval]))",
+          "expr": "sum by (chaincode,job) (rate(chaincode_shim_requests_completed{chaincode!~\"_lifecycle.*|cscc|qscc\"}[$interval]))",
           "hide": false,
           "interval": "0.01m",
+          "intervalFactor": 1,
           "legendFormat": "{{job}} {{chaincode}}",
           "refId": "A"
         }
@@ -1394,32 +1258,7 @@
           },
           "unit": "s"
         },
-		  "overrides": [
+        "overrides": []
-			{
-			  "matcher": {
-				"id": "byRegexp",
-				"options": "fixed-asset.* peer0.org2.example.com.*"
-			  },
-			  "properties": [
-				{
-				  "id": "displayName",
-				  "value": "fixed-asset-peer0.org2"
-				}
-			  ]
-			},
-			{
-			  "matcher": {
-				"id": "byRegexp",
-				"options": "fixed-asset.* peer0.org1.example.com.*"
-			  },
-			  "properties": [
-				{
-				  "id": "displayName",
-				  "value": "fixed-asset-peer0.org1"
-				}
-			  ]
-			}
-		  ]
       },
       "gridPos": {
         "h": 11,
@@ -1445,7 +1284,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "avg without(channel, chaincode) (rate(endorser_proposal_duration_sum{chaincode!~\"cscc|qscc|_lifecycle\",success=\"true\"}[$__interval]) / rate(endorser_proposal_duration_count{chaincode!~\"cscc|qscc|_lifecycle\",success=\"true\"}[$__interval]))",
+          "expr": "sum without(channel, chaincode) (rate(endorser_proposal_duration_sum{chaincode!~\"cscc|qscc|_lifecycle.*\",success=\"true\"}[$interval])) / sum without(channel, chaincode) (rate(endorser_proposal_duration_count{chaincode!~\"cscc|qscc|_lifecycle.*\",success=\"true\"}[$interval]))",
           "hide": false,
           "interval": "0.01m",
           "legendFormat": "{{job}}",
@@ -1505,32 +1344,7 @@
           },
           "unit": "none"
         },
-		  "overrides": [
+        "overrides": []
-			{
-			  "matcher": {
-				"id": "byRegexp",
-				"options": "fixed-asset.* peer0.org2.example.com.*"
-			  },
-			  "properties": [
-				{
-				  "id": "displayName",
-				  "value": "fixed-asset-peer0.org2"
-				}
-			  ]
-			},
-			{
-			  "matcher": {
-				"id": "byRegexp",
-				"options": "fixed-asset.* peer0.org1.example.com.*"
-			  },
-			  "properties": [
-				{
-				  "id": "displayName",
-				  "value": "fixed-asset-peer0.org1"
-				}
-			  ]
-			}
-		  ]
       },
       "gridPos": {
         "h": 11,
@@ -1556,7 +1370,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "rate(endorser_proposals_received[$__interval])",
+          "expr": "rate(endorser_proposals_received[$interval])",
           "hide": false,
           "interval": "0.01m",
           "legendFormat": "{{job}}",
@@ -1642,7 +1456,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "rate(endorser_successful_proposals[$__interval])",
+          "expr": "rate(endorser_successful_proposals[$interval])",
           "hide": false,
           "interval": "0.01m",
           "legendFormat": "{{job}}",
@@ -1741,7 +1555,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "avg without(channel) (rate(ledger_block_processing_time_sum{}[$__interval]) / rate(ledger_block_processing_time_count[$__interval]))",
+          "expr": "sum without(channel) (rate(ledger_block_processing_time_sum[$interval])) / sum without(channel) (rate(ledger_block_processing_time_count[$interval]))",
           "hide": false,
           "interval": "0.01m",
           "legendFormat": "{{job}}",
@@ -1827,35 +1641,11 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "avg without(channel) (rate(ledger_blockstorage_commit_time_sum{}[$__interval]) / rate(ledger_blockstorage_commit_time_count[$__interval]))",
+          "expr": "sum without(channel) (rate(ledger_blockstorage_commit_time_sum[$interval])) / sum without(channel) (rate(ledger_blockstorage_commit_time_count[$interval]))",
           "hide": false,
           "interval": "0.01m",
           "legendFormat": "{{job}}",
           "refId": "A"
-		  },
-		  {
-			"datasource": {
-			  "type": "prometheus",
-			  "uid": "PBFA97CFB590B2093"
-			},
-			"exemplar": true,
-			"expr": "ledger_blockstorage_commit_time_count{}",
-			"hide": true,
-			"interval": "",
-			"legendFormat": "{{job}}",
-			"refId": "B"
-		  },
-		  {
-			"datasource": {
-			  "type": "prometheus",
-			  "uid": "PBFA97CFB590B2093"
-			},
-			"exemplar": true,
-			"expr": "ledger_blockstorage_commit_time_bucket{}",
-			"hide": true,
-			"interval": "",
-			"legendFormat": "{{job}}",
-			"refId": "C"
         }
       ],
       "title": "Block  Storage Commit Time",
@@ -1911,32 +1701,7 @@
           },
           "unit": "s"
         },
-		  "overrides": [
+        "overrides": []
-			{
-			  "__systemRef": "hideSeriesFrom",
-			  "matcher": {
-				"id": "byNames",
-				"options": {
-				  "mode": "exclude",
-				  "names": [
-					"peer0_org1"
-				  ],
-				  "prefix": "All except:",
-				  "readOnly": true
-				}
-			  },
-			  "properties": [
-				{
-				  "id": "custom.hideFrom",
-				  "value": {
-					"legend": false,
-					"tooltip": false,
-					"viz": true
-				  }
-				}
-			  ]
-			}
-		  ]
       },
       "gridPos": {
         "h": 11,
@@ -1962,7 +1727,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "avg without(channel) (rate(ledger_statedb_commit_time_sum{}[$__interval]) / rate(ledger_statedb_commit_time_count[$__interval]))",
+          "expr": "sum without(channel) (rate(ledger_statedb_commit_time_sum[$interval])) / sum without(channel) (rate(ledger_statedb_commit_time_count[$interval]))",
           "hide": false,
           "interval": "0.01m",
           "legendFormat": "{{job}}",
@@ -2021,32 +1786,7 @@
             ]
           }
         },
-		  "overrides": [
+        "overrides": []
-			{
-			  "__systemRef": "hideSeriesFrom",
-			  "matcher": {
-				"id": "byNames",
-				"options": {
-				  "mode": "exclude",
-				  "names": [
-					"peer0_org2"
-				  ],
-				  "prefix": "All except:",
-				  "readOnly": true
-				}
-			  },
-			  "properties": [
-				{
-				  "id": "custom.hideFrom",
-				  "value": {
-					"legend": false,
-					"tooltip": false,
-					"viz": true
-				  }
-				}
-			  ]
-			}
-		  ]
       },
       "gridPos": {
         "h": 11,
@@ -2072,7 +1812,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-			"expr": "ledger_blockchain_height{}",
+          "expr": "ledger_blockchain_height",
           "interval": "",
           "legendFormat": "{{job}}",
           "refId": "A"
@@ -2258,7 +1998,7 @@
     ]
   },
   "time": {
-	  "from": "now-30m",
+    "from": "now-1h",
     "to": "now"
   },
   "timepicker": {
@@ -2289,6 +2029,6 @@
   "timezone": "browser",
   "title": "HLF Performances Review",
   "uid": "UeOYeJpWy",
-	"version": 1,
+  "version": 6,
   "weekStart": ""
 }