Skip to content

Commit

Permalink
Merge pull request #563 from tmiddlet2666/coh-26779
Browse files Browse the repository at this point in the history 
Grafana dashboards do not load when cluster name contains single quote
  • Loading branch information
@thegridman
thegridman committed Nov 25, 2022
2 parents efac100 + 71713dd commit 08449ac
Show file tree
Hide file tree
Showing 19 changed files with 334 additions and 334 deletions.
86 changes: 43 additions & 43 deletions dashboards/grafana/cache-details-dashboard.json
View file

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions dashboards/grafana/cache-store-details-dashboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(vendor:coherence_cache_size{cluster=\"$ClusterName\",coherence_service='$ServiceName',name=\"$CacheName\"})",
"expr": "sum(vendor:coherence_cache_size{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName',name=\"$CacheName\"})",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "",
Expand Down Expand Up @@ -211,7 +211,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(vendor:coherence_cache_queue_size{cluster=\"$ClusterName\",coherence_service='$ServiceName',name=\"$CacheName\"}) ",
"expr": "sum(vendor:coherence_cache_queue_size{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName',name=\"$CacheName\"}) ",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
Expand Down Expand Up @@ -294,7 +294,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(vendor:coherence_cache_store_writes{cluster=\"$ClusterName\",coherence_service='$ServiceName',name=\"$CacheName\"})",
"expr": "sum(vendor:coherence_cache_store_writes{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName',name=\"$CacheName\"})",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
Expand Down Expand Up @@ -377,7 +377,7 @@
"tableColumn": "",
"targets": [
{
"expr": "avg(vendor:coherence_cache_store_average_batch_size{cluster=\"$ClusterName\",coherence_service='$ServiceName',name=\"$CacheName\"})",
"expr": "avg(vendor:coherence_cache_store_average_batch_size{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName',name=\"$CacheName\"})",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
Expand Down Expand Up @@ -460,7 +460,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(vendor:coherence_cache_store_failures{cluster=\"$ClusterName\",coherence_service='$ServiceName',cache=\"$CacheName\"})",
"expr": "sum(vendor:coherence_cache_store_failures{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName',cache=\"$CacheName\"})",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
Expand Down Expand Up @@ -543,7 +543,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(vendor:coherence_cache_store_reads{cluster=\"$ClusterName\",coherence_service='$ServiceName',name=\"$CacheName\"})",
"expr": "sum(vendor:coherence_cache_store_reads{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName',name=\"$CacheName\"})",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
Expand Down Expand Up @@ -607,7 +607,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(vendor:coherence_cache_store_writes{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\"}) - \nsum(vendor:coherence_cache_store_writes{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\"} offset $__interval)",
"expr": "sum(vendor:coherence_cache_store_writes{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\"}) - \nsum(vendor:coherence_cache_store_writes{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\"} offset $__interval)",
"format": "time_series",
"instant": false,
"interval": "",
Expand Down Expand Up @@ -700,7 +700,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(vendor:coherence_cache_store_reads{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\"}) - \nsum(vendor:coherence_cache_store_reads{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\"} offset $__interval)",
"expr": "sum(vendor:coherence_cache_store_reads{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\"}) - \nsum(vendor:coherence_cache_store_reads{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\"} offset $__interval)",
"format": "time_series",
"instant": false,
"interval": "",
Expand Down Expand Up @@ -968,63 +968,63 @@
],
"targets": [
{
"expr": "avg(vendor:coherence_cache_queue_size{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"expr": "avg(vendor:coherence_cache_queue_size{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"format": "table",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "A"
},
{
"expr": "avg(vendor:coherence_cache_store_writes{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"expr": "avg(vendor:coherence_cache_store_writes{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"format": "table",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "B"
},
{
"expr": "avg(vendor:coherence_cache_store_average_batch_size{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"expr": "avg(vendor:coherence_cache_store_average_batch_size{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"format": "table",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "C"
},
{
"expr": "avg(vendor:coherence_cache_store_write_millis{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"} / \n vendor:coherence_cache_store_writes{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"expr": "avg(vendor:coherence_cache_store_write_millis{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"} / \n vendor:coherence_cache_store_writes{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"format": "table",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "G"
},
{
"expr": "avg(vendor:coherence_cache_store_write_millis{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"expr": "avg(vendor:coherence_cache_store_write_millis{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"format": "table",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "D"
},
{
"expr": "avg(vendor:coherence_cache_store_reads{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)\n",
"expr": "avg(vendor:coherence_cache_store_reads{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)\n",
"format": "table",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "E"
},
{
"expr": "avg(vendor:coherence_cache_store_read_millis{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"} / \n vendor:coherence_cache_store_reads{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"expr": "avg(vendor:coherence_cache_store_read_millis{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"} / \n vendor:coherence_cache_store_reads{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"format": "table",
"instant": true,
"interval": "",
"legendFormat": "",
"refId": "H"
},
{
"expr": "avg(vendor:coherence_cache_store_read_millis{cluster=\"$ClusterName\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"expr": "avg(vendor:coherence_cache_store_read_millis{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName', name=\"$CacheName\", tier=\"back\"}) by (member)",
"format": "table",
"instant": true,
"interval": "",
Expand Down Expand Up @@ -1084,7 +1084,7 @@
"multi": false,
"name": "ServiceName",
"options": [],
"query": "label_values(vendor:coherence_service_member_count{cluster=\"$ClusterName\"}, name)",
"query": "label_values(vendor:coherence_service_member_count{cluster=\"${ClusterName:raw}\"}, name)",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
Expand All @@ -1108,7 +1108,7 @@
"multi": false,
"name": "CacheName",
"options": [],
"query": "label_values(vendor:coherence_cache_units_bytes{cluster=\"$ClusterName\",coherence_service='$ServiceName'}, name)",
"query": "label_values(vendor:coherence_cache_units_bytes{cluster=\"${ClusterName:raw}\",coherence_service='$ServiceName'}, name)",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
Expand Down
18 changes: 9 additions & 9 deletions dashboards/grafana/caches-summary-dashboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,15 +182,15 @@
],
"targets": [
{
"expr": "sum(vendor:coherence_cache_units_bytes{cluster=\"$ClusterName\",tier=\"back\"}) by (coherence_service, name)",
"expr": "sum(vendor:coherence_cache_units_bytes{cluster=\"${ClusterName:raw}\",tier=\"back\"}) by (coherence_service, name)",
"format": "table",
"instant": true,
"intervalFactor": 1,
"legendFormat": "",
"refId": "A"
},
{
"expr": "sum(vendor:coherence_cache_size{cluster=\"$ClusterName\",tier=\"back\"}) by (coherence_service, name)",
"expr": "sum(vendor:coherence_cache_size{cluster=\"${ClusterName:raw}\",tier=\"back\"}) by (coherence_service, name)",
"format": "table",
"instant": true,
"intervalFactor": 1,
Expand Down Expand Up @@ -241,7 +241,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(vendor:coherence_cache_units_bytes{cluster=\"$ClusterName\",tier=\"back\"})",
"expr": "sum(vendor:coherence_cache_units_bytes{cluster=\"${ClusterName:raw}\",tier=\"back\"})",
"format": "time_series",
"instant": false,
"interval": "",
Expand All @@ -250,7 +250,7 @@
"refId": "A"
},
{
"expr": "sum(vendor:coherence_storage_manager_index_total_units{cluster=\"$ClusterName\"})",
"expr": "sum(vendor:coherence_storage_manager_index_total_units{cluster=\"${ClusterName:raw}\"})",
"format": "time_series",
"instant": false,
"intervalFactor": 1,
Expand Down Expand Up @@ -413,7 +413,7 @@
],
"targets": [
{
"expr": "sum(vendor:coherence_storage_manager_index_total_units{cluster=\"$ClusterName\"}) by (coherence_service, cache )",
"expr": "sum(vendor:coherence_storage_manager_index_total_units{cluster=\"${ClusterName:raw}\"}) by (coherence_service, cache )",
"format": "table",
"instant": true,
"intervalFactor": 1,
Expand Down Expand Up @@ -470,7 +470,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(vendor:coherence_storage_manager_eviction_count{cluster=\"$ClusterName\"}) - sum(vendor:coherence_storage_manager_eviction_count{cluster=\"$ClusterName\"} offset $__interval)",
"expr": "sum(vendor:coherence_storage_manager_eviction_count{cluster=\"${ClusterName:raw}\"}) - sum(vendor:coherence_storage_manager_eviction_count{cluster=\"${ClusterName:raw}\"} offset $__interval)",
"format": "time_series",
"instant": false,
"interval": "",
Expand Down Expand Up @@ -564,7 +564,7 @@
"multi": false,
"name": "CoherenceVersion",
"options": [],
"query": "label_values(vendor:coherence_cluster_size{cluster=\"$ClusterName\"}, version)",
"query": "label_values(vendor:coherence_cluster_size{cluster=\"${ClusterName:raw}\"}, version)",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
Expand All @@ -589,7 +589,7 @@
"multi": false,
"name": "Services",
"options": [],
"query": "label_values(vendor:coherence_service_request_max_duration{cluster=\"$ClusterName\"}, name)",
"query": "label_values(vendor:coherence_service_request_max_duration{cluster=\"${ClusterName:raw}\"}, name)",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
Expand All @@ -614,7 +614,7 @@
"multi": true,
"name": "Caches",
"options": [],
"query": "label_values(vendor:coherence_cache_size{cluster=\"$ClusterName\"}, name) ",
"query": "label_values(vendor:coherence_cache_size{cluster=\"${ClusterName:raw}\"}, name) ",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
Expand Down

0 comments on commit 08449ac

Please sign in to comment.