updating the generated dashboard

amnonh · amnonh · commit 90e31429872b · 2019-04-29T09:28:49.000+03:00
(cherry picked from commit 5466080)
diff --git a/grafana/build/ver_2019.1/scylla-cql-optimization.2019.1.json b/grafana/build/ver_2019.1/scylla-cql-optimization.2019.1.json
@@ -1119,7 +1119,7 @@
             },
             "targets": [
                 {
-                    "expr": "floor(100*sum(irate(scylla_storage_proxy_replica_cross_shard_ops{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]])/(sum(irate(scylla_storage_proxy_coordinator_reads_local_node{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]]) + sum(irate(scylla_storage_proxy_coordinator_total_write_attempts_local_node{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]])))",
+                    "expr": "floor(100*sum(irate(scylla_storage_proxy_replica_cross_shard_ops{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s]))/(sum(irate(scylla_storage_proxy_coordinator_reads_local_node{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) + sum(irate(scylla_storage_proxy_coordinator_total_write_attempts_local_node{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s]))))",
                     "format": "time_series",
                     "hide": false,
                     "intervalFactor": 1,
diff --git a/grafana/build/ver_3.0/scylla-cql-optimization.3.0.json b/grafana/build/ver_3.0/scylla-cql-optimization.3.0.json
@@ -966,7 +966,7 @@
             },
             "targets": [
                 {
-                    "expr": "floor(100*sum(irate(scylla_storage_proxy_replica_cross_shard_ops{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]])/(sum(irate(scylla_storage_proxy_coordinator_reads_local_node{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]]) + sum(irate(scylla_storage_proxy_coordinator_total_write_attempts_local_node{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]])))",
+                    "expr": "floor(100*sum(irate(scylla_storage_proxy_replica_cross_shard_ops{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s]))/(sum(irate(scylla_storage_proxy_coordinator_reads_local_node{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) + sum(irate(scylla_storage_proxy_coordinator_total_write_attempts_local_node{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s]))))",
                     "format": "time_series",
                     "hide": false,
                     "intervalFactor": 1,
diff --git a/grafana/build/ver_master/scylla-cql-optimization.master.json b/grafana/build/ver_master/scylla-cql-optimization.master.json
@@ -1119,7 +1119,7 @@
             },
             "targets": [
                 {
-                    "expr": "floor(100*sum(irate(scylla_storage_proxy_replica_cross_shard_ops{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]])/(sum(irate(scylla_storage_proxy_coordinator_reads_local_node{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]]) + sum(irate(scylla_storage_proxy_coordinator_total_write_attempts_local_node{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]])))",
+                    "expr": "floor(100*sum(irate(scylla_storage_proxy_replica_cross_shard_ops{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s]))/(sum(irate(scylla_storage_proxy_coordinator_reads_local_node{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) + sum(irate(scylla_storage_proxy_coordinator_total_write_attempts_local_node{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s]))))",
                     "format": "time_series",
                     "hide": false,
                     "intervalFactor": 1,

Original file line number	Diff line number	Diff line change
`@@ -1119,7 +1119,7 @@`
`1119`	`1119`	`},`
`1120`	`1120`	`"targets": [`
`1121`	`1121`	`{`
`1122`		- "expr": "floor(100*sum(irate(scylla_storage_proxy_replica_cross_shard_ops{instance=~\"[[node]]\",cluster=~\"$cluster\|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]])/(sum(irate(scylla_storage_proxy_coordinator_reads_local_node{instance=~\"[[node]]\",cluster=~\"$cluster\|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]]) + sum(irate(scylla_storage_proxy_coordinator_total_write_attempts_local_node{instance=~\"[[node]]\",cluster=~\"$cluster\|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]])))",
	`1122`	+ "expr": "floor(100*sum(irate(scylla_storage_proxy_replica_cross_shard_ops{instance=~\"[[node]]\",cluster=~\"$cluster\|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s]))/(sum(irate(scylla_storage_proxy_coordinator_reads_local_node{instance=~\"[[node]]\",cluster=~\"$cluster\|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) + sum(irate(scylla_storage_proxy_coordinator_total_write_attempts_local_node{instance=~\"[[node]]\",cluster=~\"$cluster\|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s]))))",
`1123`	`1123`	`"format": "time_series",`
`1124`	`1124`	`"hide": false,`
`1125`	`1125`	`"intervalFactor": 1,`
Original file line number	Diff line number	Diff line change
`@@ -966,7 +966,7 @@`
`966`	`966`	`},`
`967`	`967`	`"targets": [`
`968`	`968`	`{`
`969`		- "expr": "floor(100*sum(irate(scylla_storage_proxy_replica_cross_shard_ops{instance=~\"[[node]]\",cluster=~\"$cluster\|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]])/(sum(irate(scylla_storage_proxy_coordinator_reads_local_node{instance=~\"[[node]]\",cluster=~\"$cluster\|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]]) + sum(irate(scylla_storage_proxy_coordinator_total_write_attempts_local_node{instance=~\"[[node]]\",cluster=~\"$cluster\|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) by ([[by]])))",
	`969`	+ "expr": "floor(100*sum(irate(scylla_storage_proxy_replica_cross_shard_ops{instance=~\"[[node]]\",cluster=~\"$cluster\|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s]))/(sum(irate(scylla_storage_proxy_coordinator_reads_local_node{instance=~\"[[node]]\",cluster=~\"$cluster\|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s])) + sum(irate(scylla_storage_proxy_coordinator_total_write_attempts_local_node{instance=~\"[[node]]\",cluster=~\"$cluster\|$^\", dc=~\"$dc\", shard=~\"[[shard]]\"}[30s]))))",
`970`	`970`	`"format": "time_series",`
`971`	`971`	`"hide": false,`
`972`	`972`	`"intervalFactor": 1,`