Skip to content

Commit d2be0e9

Browse files
gerhardgerhard
committed
Ensure RabbitMQ-Stream dashboard works correctly after import
This breaks the docker-compose integration, but we need to move away from it anyways, the whole dev flow needs revisiting after our focus on K8s. $__rate_interval does not work with irate, dropping it in favour of 60s, same as all other dashboards. This is a follow-up to #3250 Thanks @ansd for mentioning about the post-import issues. It was uploaded as https://grafana.com/api/dashboards/14798/revisions/3/download Signed-off-by: Gerhard Lazu <[email protected]> (cherry picked from commit 65afbb9)
1 parent 008e458 commit d2be0e9

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

‎deps/rabbitmq_prometheus/docker/grafana/dashboards/RabbitMQ-Stream.json‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"type": "grafana",
55
"id": "grafana",
66
"name": "Grafana",
7-
"version": "8.0.3"
7+
"version": "8.0.6"
88
},
99
{
1010
"type": "panel",
@@ -52,14 +52,14 @@
5252
},
5353
"description": "Stream protocol message rates and errors",
5454
"editable": true,
55-
"gnetId": null,
55+
"gnetId": 14798,
5656
"graphTooltip": 1,
5757
"id": null,
58-
"iteration": 1627568060829,
58+
"iteration": 1627648233032,
5959
"links": [],
6060
"panels": [
6161
{
62-
"datasource": null,
62+
"datasource": "${DS_PROMETHEUS}",
6363
"fieldConfig": {
6464
"defaults": {
6565
"color": {
@@ -103,7 +103,7 @@
103103
"text": {},
104104
"textMode": "auto"
105105
},
106-
"pluginVersion": "8.0.3",
106+
"pluginVersion": "8.0.6",
107107
"targets": [
108108
{
109109
"exemplar": true,
@@ -117,7 +117,7 @@
117117
"type": "stat"
118118
},
119119
{
120-
"datasource": null,
120+
"datasource": "${DS_PROMETHEUS}",
121121
"fieldConfig": {
122122
"defaults": {
123123
"color": {
@@ -161,11 +161,11 @@
161161
"text": {},
162162
"textMode": "value"
163163
},
164-
"pluginVersion": "8.0.3",
164+
"pluginVersion": "8.0.6",
165165
"targets": [
166166
{
167167
"exemplar": true,
168-
"expr": "sum by(rabbitmq_cluster) (irate(rabbitmq_global_messages_received_total{protocol=\"stream\"}[$__rate_interval]) * on(instance) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\"})",
168+
"expr": "sum by(rabbitmq_cluster) (irate(rabbitmq_global_messages_received_total{protocol=\"stream\"}[60s]) * on(instance) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\"})",
169169
"instant": false,
170170
"interval": "",
171171
"legendFormat": "",
@@ -176,7 +176,7 @@
176176
"type": "stat"
177177
},
178178
{
179-
"datasource": null,
179+
"datasource": "${DS_PROMETHEUS}",
180180
"description": "",
181181
"fieldConfig": {
182182
"defaults": {
@@ -221,11 +221,11 @@
221221
"text": {},
222222
"textMode": "value"
223223
},
224-
"pluginVersion": "8.0.3",
224+
"pluginVersion": "8.0.6",
225225
"targets": [
226226
{
227227
"exemplar": true,
228-
"expr": "sum by(rabbitmq_cluster) (irate(rabbitmq_global_messages_confirmed_total{protocol=\"stream\"}[$__rate_interval]) * on(instance) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\"})",
228+
"expr": "sum by(rabbitmq_cluster) (irate(rabbitmq_global_messages_confirmed_total{protocol=\"stream\"}[60s]) * on(instance) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\"})",
229229
"instant": false,
230230
"interval": "",
231231
"legendFormat": "",
@@ -236,7 +236,7 @@
236236
"type": "stat"
237237
},
238238
{
239-
"datasource": null,
239+
"datasource": "${DS_PROMETHEUS}",
240240
"fieldConfig": {
241241
"defaults": {
242242
"color": {
@@ -280,7 +280,7 @@
280280
"text": {},
281281
"textMode": "auto"
282282
},
283-
"pluginVersion": "8.0.3",
283+
"pluginVersion": "8.0.6",
284284
"targets": [
285285
{
286286
"exemplar": true,
@@ -294,7 +294,7 @@
294294
"type": "stat"
295295
},
296296
{
297-
"datasource": null,
297+
"datasource": "${DS_PROMETHEUS}",
298298
"fieldConfig": {
299299
"defaults": {
300300
"color": {
@@ -338,7 +338,7 @@
338338
"text": {},
339339
"textMode": "value"
340340
},
341-
"pluginVersion": "8.0.3",
341+
"pluginVersion": "8.0.6",
342342
"targets": [
343343
{
344344
"exemplar": true,
@@ -353,7 +353,7 @@
353353
"type": "stat"
354354
},
355355
{
356-
"datasource": null,
356+
"datasource": "${DS_PROMETHEUS}",
357357
"description": "",
358358
"fieldConfig": {
359359
"defaults": {
@@ -398,7 +398,7 @@
398398
"text": {},
399399
"textMode": "value"
400400
},
401-
"pluginVersion": "8.0.3",
401+
"pluginVersion": "8.0.6",
402402
"targets": [
403403
{
404404
"exemplar": true,
@@ -414,7 +414,7 @@
414414
},
415415
{
416416
"cacheTimeout": null,
417-
"datasource": null,
417+
"datasource": "${DS_PROMETHEUS}",
418418
"fieldConfig": {
419419
"defaults": {
420420
"color": {
@@ -632,7 +632,7 @@
632632
"type": "piechart"
633633
},
634634
{
635-
"datasource": null,
635+
"datasource": "${DS_PROMETHEUS}",
636636
"fieldConfig": {
637637
"defaults": {
638638
"color": {
@@ -833,7 +833,7 @@
833833
"targets": [
834834
{
835835
"exemplar": true,
836-
"expr": "sort_desc(sum by(rabbitmq_node) (irate(rabbitmq_global_messages_received_total{protocol=\"stream\"}[$__rate_interval]) * on(instance) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\"}))",
836+
"expr": "sort_desc(sum by(rabbitmq_cluster) (irate(rabbitmq_global_messages_received_total{protocol=\"stream\"}[60s]) * on(instance) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\"}))",
837837
"format": "time_series",
838838
"instant": false,
839839
"interval": "",
@@ -844,7 +844,7 @@
844844
"type": "piechart"
845845
},
846846
{
847-
"datasource": null,
847+
"datasource": "${DS_PROMETHEUS}",
848848
"fieldConfig": {
849849
"defaults": {
850850
"color": {
@@ -1046,7 +1046,7 @@
10461046
"targets": [
10471047
{
10481048
"exemplar": true,
1049-
"expr": "sort_desc(sum by(rabbitmq_node) (irate(rabbitmq_global_messages_confirmed_total{protocol=\"stream\"}[$__rate_interval]) * on(instance) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\"}))",
1049+
"expr": "sort_desc(sum by(rabbitmq_cluster) (irate(rabbitmq_global_messages_confirmed_total{protocol=\"stream\"}[60s]) * on(instance) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\"}))",
10501050
"format": "time_series",
10511051
"instant": false,
10521052
"interval": "",
@@ -1057,7 +1057,7 @@
10571057
"type": "piechart"
10581058
},
10591059
{
1060-
"datasource": null,
1060+
"datasource": "${DS_PROMETHEUS}",
10611061
"fieldConfig": {
10621062
"defaults": {
10631063
"color": {
@@ -1269,7 +1269,7 @@
12691269
"type": "piechart"
12701270
},
12711271
{
1272-
"datasource": null,
1272+
"datasource": "${DS_PROMETHEUS}",
12731273
"fieldConfig": {
12741274
"defaults": {
12751275
"color": {
@@ -1470,7 +1470,7 @@
14701470
"targets": [
14711471
{
14721472
"exemplar": true,
1473-
"expr": "sort_desc(sum by(rabbitmq_node) (irate(rabbitmq_global_messages_delivered_total{protocol=\"stream\"}[$__rate_interval]) * on(instance) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\"}))",
1473+
"expr": "sort_desc(sum by(rabbitmq_cluster) (irate(rabbitmq_global_messages_delivered_total{protocol=\"stream\"}[60s]) * on(instance) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\"}))",
14741474
"format": "time_series",
14751475
"instant": false,
14761476
"interval": "",
@@ -1481,7 +1481,7 @@
14811481
"type": "piechart"
14821482
},
14831483
{
1484-
"datasource": null,
1484+
"datasource": "${DS_PROMETHEUS}",
14851485
"gridPos": {
14861486
"h": 6,
14871487
"w": 4,
@@ -1493,7 +1493,7 @@
14931493
"content": "&nbsp; [What are Streams?](https://www.rabbitmq.com/streams.html)\n\n&nbsp; [Streams Overview + slides](https://blog.rabbitmq.com/posts/2021/07/rabbitmq-streams-overview/)\n\n&nbsp; [First Application + video](https://blog.rabbitmq.com/posts/2021/07/rabbitmq-streams-first-application/)\n\n&nbsp; [Using Stream protocol + diagrams](https://blog.rabbitmq.com/posts/2021/07/connecting-to-streams/)",
14941494
"mode": "markdown"
14951495
},
1496-
"pluginVersion": "8.0.3",
1496+
"pluginVersion": "8.0.6",
14971497
"title": "Learn more",
14981498
"transparent": true,
14991499
"type": "text"
@@ -2692,7 +2692,7 @@
26922692
"type": "timeseries"
26932693
},
26942694
{
2695-
"datasource": null,
2695+
"datasource": "${DS_PROMETHEUS}",
26962696
"fieldConfig": {
26972697
"defaults": {
26982698
"color": {
@@ -2915,7 +2915,7 @@
29152915
{
29162916
"allValue": null,
29172917
"current": {},
2918-
"datasource": null,
2918+
"datasource": "${DS_PROMETHEUS}",
29192919
"definition": "label_values(rabbitmq_identity_info, namespace)",
29202920
"description": null,
29212921
"error": null,
@@ -2941,7 +2941,7 @@
29412941
{
29422942
"allValue": null,
29432943
"current": {},
2944-
"datasource": null,
2944+
"datasource": "${DS_PROMETHEUS}",
29452945
"definition": "label_values(rabbitmq_identity_info{namespace=\"$namespace\"}, rabbitmq_cluster)",
29462946
"description": null,
29472947
"error": null,
@@ -2981,6 +2981,6 @@
29812981
},
29822982
"timezone": "",
29832983
"title": "RabbitMQ-Stream",
2984-
"uid": "4aWNt73Mk",
2985-
"version": 20210729
2984+
"uid": "j7MCpqZ7k",
2985+
"version": 20210730
29862986
}

0 commit comments

Comments
 (0)