diff options
| author | Mirah Gary <mgary@pivotal.io> | 2020-11-26 10:35:26 +0100 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2020-11-30 13:29:20 +0300 |
| commit | 86fc6ed4eff897f9ed4d49e740e7a88f69c6f1e0 (patch) | |
| tree | 4a17f95898a2432513e791b4e22dedd05a5f7a9a | |
| parent | de9c785b55ea269982a791b1bad84c5c6ee9537e (diff) | |
| download | rabbitmq-server-git-86fc6ed4eff897f9ed4d49e740e7a88f69c6f1e0.tar.gz | |
Change per-object endpoint to `/metrics/per-object`.
This conforms with other http endpoints.
5 files changed, 6 insertions, 6 deletions
diff --git a/deps/rabbitmq_prometheus/README.md b/deps/rabbitmq_prometheus/README.md index 2622134684..c65c2675bf 100644 --- a/deps/rabbitmq_prometheus/README.md +++ b/deps/rabbitmq_prometheus/README.md @@ -67,9 +67,9 @@ In order to not put unnecessary pressure on your metrics system, metrics are agg When debugging, it may be useful to return metrics per object (unaggregated). -This can be done by scraping the `/metrics/per_object` endpoint: +This can be done by scraping the `/metrics/per-object` endpoint: ```shell -curl -v -H "Accept:text/plain" "http://localhost:15692/metrics/per_object" +curl -v -H "Accept:text/plain" "http://localhost:15692/metrics/per-object" ``` This can also be enabled as the default behavior of the `/metrics` endpoint on-the-fly, diff --git a/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl b/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl index 724a50ee13..05dc8adaec 100644 --- a/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl +++ b/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl @@ -221,7 +221,7 @@ register() -> deregister_cleanup(_) -> ok. -collect_mf(per_object, Callback) -> +collect_mf('per-object', Callback) -> collect(true, Callback); collect_mf(_Registry, Callback) -> PerObjectMetrics = application:get_env(rabbitmq_prometheus, return_per_object_metrics, false), diff --git a/deps/rabbitmq_prometheus/src/rabbit_prometheus_dispatcher.erl b/deps/rabbitmq_prometheus/src/rabbit_prometheus_dispatcher.erl index 3ce40ee15c..e42f0567f5 100644 --- a/deps/rabbitmq_prometheus/src/rabbit_prometheus_dispatcher.erl +++ b/deps/rabbitmq_prometheus/src/rabbit_prometheus_dispatcher.erl @@ -14,7 +14,7 @@ build_dispatcher() -> {ok, _} = application:ensure_all_started(prometheus), prometheus_registry:register_collectors([prometheus_rabbitmq_core_metrics_collector]), - prometheus_registry:register_collectors(per_object, [ + prometheus_registry:register_collectors('per-object', [ prometheus_vm_system_info_collector, prometheus_vm_dist_collector, prometheus_vm_memory_collector, diff --git a/deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl b/deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl index c453749724..2e09b701c3 100644 --- a/deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl +++ b/deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl @@ -32,7 +32,7 @@ is_authorized(ReqData, Context) -> setup() -> setup_metrics(telemetry_registry()), - setup_metrics(per_object). + setup_metrics('per-object'). setup_metrics(Registry) -> ScrapeDuration = [{name, ?SCRAPE_DURATION}, diff --git a/deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl b/deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl index 634cbc10bb..8480ca2187 100644 --- a/deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl +++ b/deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl @@ -226,7 +226,7 @@ aggregated_metrics_test(Config) -> ?assertEqual(match, re:run(Body, "^rabbitmq_raft_entry_commit_latency_seconds ", [{capture, none}, multiline])). endpoint_per_object_metrics(Config) -> - per_object_metrics_test(Config, "/metrics/per_object"). + per_object_metrics_test(Config, "/metrics/per-object"). globally_configure_per_object_metrics_test(Config) -> per_object_metrics_test(Config, "/metrics"). |