Split graphs for gauge and counter based metrics
Change-Id: I1969862d8f353be99fe912b9edb06e372820c944
PROD-related: PROD-28352 (PROD:28352)
diff --git a/grafana/files/dashboards/rabbitmq/rabbitmq_prometheus.json b/grafana/files/dashboards/rabbitmq/rabbitmq_prometheus.json
index d4600c5..00b7f9c 100644
--- a/grafana/files/dashboards/rabbitmq/rabbitmq_prometheus.json
+++ b/grafana/files/dashboards/rabbitmq/rabbitmq_prometheus.json
@@ -2278,7 +2278,7 @@
"dashLength": 10,
"dashes": false,
"datasource": null,
- "fill": 4,
+ "fill": 1,
"gridPos": {
"h": 6,
"w": 12,
@@ -2311,56 +2311,28 @@
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
- "stack": true,
+ "stack": false,
"steppedLine": false,
"targets": [
{
- "expr": "avg(rate(rabbitmq_overview_messages_acked{environment=\"$environment\", host=~\"$host\"}[$rate_interval]))",
- "format": "time_series",
- "hide": false,
- "intervalFactor": 2,
- "legendFormat": "acked",
- "refId": "A",
- "step": 4
- },
- {
- "expr": "avg(rate(rabbitmq_overview_messages_delivered{environment=\"$environment\", host=~\"$host\"}[$rate_interval]))",
- "format": "time_series",
- "hide": false,
- "intervalFactor": 2,
- "legendFormat": "delivered",
- "refId": "B",
- "step": 4
- },
- {
- "expr": "avg(rate(rabbitmq_overview_messages_published{environment=\"$environment\", host=~\"$host\"}[$rate_interval]))",
- "format": "time_series",
- "intervalFactor": 2,
- "legendFormat": "published",
- "refId": "C",
- "step": 4
- },
- {
- "expr": "avg(rate(rabbitmq_overview_messages_ready{environment=\"$environment\", host=~\"$host\"}[$rate_interval]))",
+ "expr": "max(rabbitmq_overview_messages_ready{environment=\"$environment\", host=~\"$host\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "ready",
- "refId": "D",
- "step": 4
+ "refId": "A"
},
{
- "expr": "avg(rate(rabbitmq_overview_messages_unacked{environment=\"$environment\", host=~\"$host\"}[$rate_interval]))",
+ "expr": "max(rabbitmq_overview_messages_unacked{environment=\"$environment\", host=~\"$host\"})",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "published",
- "refId": "E",
- "step": 4
+ "legendFormat": "unacked",
+ "refId": "B"
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
- "title": "Messages",
+ "title": "Queued messages",
"tooltip": {
"shared": true,
"sort": 0,
@@ -2410,6 +2382,122 @@
"x": 12,
"y": 15
},
+ "id": 137,
+ "legend": {
+ "alignAsTable": true,
+ "avg": true,
+ "current": false,
+ "hideEmpty": true,
+ "hideZero": true,
+ "max": false,
+ "min": false,
+ "rightSide": true,
+ "show": true,
+ "sort": "avg",
+ "sortDesc": true,
+ "total": false,
+ "values": true
+ },
+ "lines": true,
+ "linewidth": 1,
+ "links": [],
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "spaceLength": 10,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "expr": "avg(rate(rabbitmq_overview_messages_acked{environment=\"$environment\", host=~\"$host\"}[$rate_interval]))",
+ "format": "time_series",
+ "hide": false,
+ "intervalFactor": 2,
+ "legendFormat": "acked",
+ "refId": "A",
+ "step": 4
+ },
+ {
+ "expr": "avg(rate(rabbitmq_overview_messages_delivered{environment=\"$environment\", host=~\"$host\"}[$rate_interval]))",
+ "format": "time_series",
+ "hide": false,
+ "intervalFactor": 2,
+ "legendFormat": "delivered",
+ "refId": "B",
+ "step": 4
+ },
+ {
+ "expr": "avg(rate(rabbitmq_overview_messages_published{environment=\"$environment\", host=~\"$host\"}[$rate_interval]))",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "published",
+ "refId": "C",
+ "step": 4
+ },
+ {
+ "expr": "avg(rate(rabbitmq_overview_messages_delivered_get{environment=\"$environment\", host=~\"$host\"}[$rate_interval]))",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "get",
+ "refId": "D"
+ }
+ ],
+ "thresholds": [],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Message rates",
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "format": "none",
+ "label": null,
+ "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
+ }
+ },
+ {
+ "aliasColors": {},
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": null,
+ "fill": 1,
+ "gridPos": {
+ "h": 6,
+ "w": 24,
+ "x": 0,
+ "y": 21
+ },
"id": 52,
"legend": {
"alignAsTable": true,
@@ -2519,7 +2607,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 21
+ "y": 27
},
"id": 124,
"panels": [],
@@ -2537,7 +2625,7 @@
"h": 6,
"w": 12,
"x": 0,
- "y": 22
+ "y": 28
},
"id": 105,
"legend": {
@@ -2630,7 +2718,7 @@
"h": 6,
"w": 12,
"x": 12,
- "y": 22
+ "y": 28
},
"id": 107,
"legend": {
@@ -2723,7 +2811,7 @@
"h": 7,
"w": 12,
"x": 0,
- "y": 28
+ "y": 34
},
"id": 109,
"legend": {
@@ -2816,7 +2904,7 @@
"h": 7,
"w": 12,
"x": 12,
- "y": 28
+ "y": 34
},
"id": 110,
"legend": {
@@ -3028,6 +3116,6 @@
"timezone": "browser",
"title": "RabbitMQ",
"uid": null,
- "version": 27
+ "version": 28
}
-{% endraw %}
\ No newline at end of file
+{% endraw %}