Skip to content

Commit 69c13f8

Browse files
committed
Rename raft_term_total -> raft_term
The _total suffix never made sense...
1 parent 37b85cb commit 69c13f8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

deps/rabbitmq_prometheus/docker/grafana/dashboards/RabbitMQ-Quorum-Queues-Raft.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@
935935
"type": "prometheus",
936936
"uid": "${DS_PROMETHEUS}"
937937
},
938-
"expr": "sum(rate(rabbitmq_raft_term_total[60s]) * on(instance, job) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\",rabbitmq_endpoint=\"$endpoint\"}) by(rabbitmq_node)",
938+
"expr": "sum(rate(rabbitmq_raft_term[60s]) * on(instance, job) group_left(rabbitmq_cluster, rabbitmq_node) rabbitmq_identity_info{rabbitmq_cluster=\"$rabbitmq_cluster\", namespace=\"$namespace\",rabbitmq_endpoint=\"$endpoint\"}) by(rabbitmq_node)",
939939
"format": "time_series",
940940
"instant": false,
941941
"intervalFactor": 1,

deps/rabbitmq_prometheus/metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ These metrics are specific to the stream protocol.
254254
| rabbitmq_raft_log_last_applied_index | Raft log last applied index |
255255
| rabbitmq_raft_log_last_written_index | Raft log last written index |
256256
| rabbitmq_raft_log_snapshot_index | Raft log snapshot index |
257-
| rabbitmq_raft_term_total | Current Raft term number |
257+
| rabbitmq_raft_term | Current Raft term number |
258258

259259
### Federation
260260

deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ aggregated_metrics_test(Config) ->
392392
?assertEqual(match, re:run(Body, "^rabbitmq_process_open_fds ", [{capture, none}, multiline])),
393393
?assertEqual(match, re:run(Body, "^rabbitmq_process_max_fds ", [{capture, none}, multiline])),
394394
?assertEqual(match, re:run(Body, "^rabbitmq_io_read_ops_total ", [{capture, none}, multiline])),
395-
?assertEqual(match, re:run(Body, "^rabbitmq_raft_term_total ", [{capture, none}, multiline])),
395+
?assertEqual(match, re:run(Body, "^rabbitmq_raft_term ", [{capture, none}, multiline])),
396396
?assertEqual(match, re:run(Body, "^rabbitmq_queue_messages_ready ", [{capture, none}, multiline])),
397397
?assertEqual(match, re:run(Body, "^rabbitmq_queue_consumers ", [{capture, none}, multiline])),
398398
?assertEqual(match, re:run(Body, "TYPE rabbitmq_auth_attempts_total", [{capture, none}, multiline])),
@@ -431,7 +431,7 @@ per_object_metrics_test(Config, Path) ->
431431
?assertEqual(match, re:run(Body, "^rabbitmq_process_open_fds ", [{capture, none}, multiline])),
432432
?assertEqual(match, re:run(Body, "^rabbitmq_process_max_fds ", [{capture, none}, multiline])),
433433
?assertEqual(match, re:run(Body, "^rabbitmq_io_read_ops_total ", [{capture, none}, multiline])),
434-
?assertEqual(match, re:run(Body, "^rabbitmq_raft_term_total{", [{capture, none}, multiline])),
434+
?assertEqual(match, re:run(Body, "^rabbitmq_raft_term{", [{capture, none}, multiline])),
435435
?assertEqual(match, re:run(Body, "^rabbitmq_queue_messages_ready{", [{capture, none}, multiline])),
436436
?assertEqual(match, re:run(Body, "^rabbitmq_queue_consumers{", [{capture, none}, multiline])),
437437
?assertEqual(match, re:run(Body, "TYPE rabbitmq_auth_attempts_total", [{capture, none}, multiline])),

0 commit comments

Comments
 (0)