summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordcorbacho <dparracorbacho@piotal.io>2021-11-16 16:53:17 +0100
committerdcorbacho <dparracorbacho@piotal.io>2021-11-16 16:53:17 +0100
commita7c9b666533b7bf95030fc5a632c7038f593fb46 (patch)
treec555d40fcbde71a9e3bf44492d0b407e424634c8
parent242cb539b32dadda74106d689b404d46f454cd82 (diff)
downloadrabbitmq-server-git-a7c9b666533b7bf95030fc5a632c7038f593fb46.tar.gz
Use own key to exclude queues
-rw-r--r--deps/rabbitmq_prometheus/priv/schema/rabbitmq_prometheus.schema2
-rw-r--r--deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl2
2 files changed, 3 insertions, 1 deletions
diff --git a/deps/rabbitmq_prometheus/priv/schema/rabbitmq_prometheus.schema b/deps/rabbitmq_prometheus/priv/schema/rabbitmq_prometheus.schema
index a406f604fd..0ba11713f6 100644
--- a/deps/rabbitmq_prometheus/priv/schema/rabbitmq_prometheus.schema
+++ b/deps/rabbitmq_prometheus/priv/schema/rabbitmq_prometheus.schema
@@ -126,3 +126,5 @@ end}.
[{datatype, integer}, {validators, ["non_negative_integer"]}]}.
{mapping, "prometheus.ssl.max_keepalive", "rabbitmq_prometheus.ssl_config.cowboy_opts.max_keepalive",
[{datatype, integer}, {validators, ["non_negative_integer"]}]}.
+
+{mapping, "prometheus.filter_aggregated_queue_metrics_pattern", "rabbitmq_prometheus.filter_aggregated_queue_metrics_pattern", [{datatype, string}]}. \ No newline at end of file
diff --git a/deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl b/deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl
index 9b1d6540e9..8db1ef3f3f 100644
--- a/deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl
+++ b/deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl
@@ -163,7 +163,7 @@ put_filtering_options_into_process_dictionary(Request) ->
put(prometheus_mf_filter, Fs);
_ -> ok
end,
- case rabbit_mgmt_agent_config:get_env(filter_aggregated_queue_metrics_pattern) of
+ case application:get_env(rabbitmq_prometheus, filter_aggregated_queue_metrics_pattern, undefined) of
undefined -> ok;
Pattern ->
put(prometheus_queue_filter, Pattern)