Skip to content

Revert "Add dynamic and static promethues metric gauge (backport #11892) (backport #11893)" #11908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions deps/rabbitmq_prometheus/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ rabbitmq_app(
"//deps/rabbit:erlang_app",
"//deps/rabbitmq_federation:erlang_app",
"//deps/rabbitmq_management_agent:erlang_app",
"//deps/rabbitmq_shovel:erlang_app",
"//deps/rabbitmq_web_dispatch:erlang_app",
"@accept//:erlang_app",
"@cowboy//:erlang_app",
Expand Down Expand Up @@ -109,14 +108,6 @@ rabbitmq_integration_suite(
],
)

rabbitmq_integration_suite(
name = "prometheus_rabbitmq_shovel_collector_SUITE",
size = "small",
additional_beam = [
"test/rabbitmq_prometheus_collector_test_proxy.beam", #keep
],
)

assert_suites()

alias(
Expand Down
2 changes: 1 addition & 1 deletion deps/rabbitmq_prometheus/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ endef
PROJECT := rabbitmq_prometheus
PROJECT_DESCRIPTION = Prometheus metrics for RabbitMQ
PROJECT_MOD := rabbit_prometheus_app
DEPS = accept cowboy rabbit rabbitmq_management_agent prometheus rabbitmq_web_dispatch rabbitmq_federation rabbitmq_shovel
DEPS = accept cowboy rabbit rabbitmq_management_agent prometheus rabbitmq_web_dispatch rabbitmq_federation
BUILD_DEPS = amqp_client rabbit_common rabbitmq_management
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers eunit_formatters

Expand Down
12 changes: 0 additions & 12 deletions deps/rabbitmq_prometheus/app.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ def all_beam_files(name = "all_beam_files"):
"src/collectors/prometheus_rabbitmq_dynamic_collector.erl",
"src/collectors/prometheus_rabbitmq_federation_collector.erl",
"src/collectors/prometheus_rabbitmq_global_metrics_collector.erl",
"src/collectors/prometheus_rabbitmq_shovel_collector.erl",
"src/rabbit_prometheus_app.erl",
"src/rabbit_prometheus_dispatcher.erl",
"src/rabbit_prometheus_handler.erl",
Expand Down Expand Up @@ -48,7 +47,6 @@ def all_test_beam_files(name = "all_test_beam_files"):
"src/collectors/prometheus_rabbitmq_dynamic_collector.erl",
"src/collectors/prometheus_rabbitmq_federation_collector.erl",
"src/collectors/prometheus_rabbitmq_global_metrics_collector.erl",
"src/collectors/prometheus_rabbitmq_shovel_collector.erl",
"src/rabbit_prometheus_app.erl",
"src/rabbit_prometheus_dispatcher.erl",
"src/rabbit_prometheus_handler.erl",
Expand Down Expand Up @@ -92,7 +90,6 @@ def all_srcs(name = "all_srcs"):
"src/collectors/prometheus_rabbitmq_dynamic_collector.erl",
"src/collectors/prometheus_rabbitmq_federation_collector.erl",
"src/collectors/prometheus_rabbitmq_global_metrics_collector.erl",
"src/collectors/prometheus_rabbitmq_shovel_collector.erl",
"src/rabbit_prometheus_app.erl",
"src/rabbit_prometheus_dispatcher.erl",
"src/rabbit_prometheus_handler.erl",
Expand Down Expand Up @@ -147,12 +144,3 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
app_name = "rabbitmq_prometheus",
erlc_opts = "//:test_erlc_opts",
)
erlang_bytecode(
name = "prometheus_rabbitmq_shovel_collector_SUITE_beam_files",
testonly = True,
srcs = ["test/prometheus_rabbitmq_shovel_collector_SUITE.erl"],
outs = ["test/prometheus_rabbitmq_shovel_collector_SUITE.beam"],
app_name = "rabbitmq_prometheus",
erlc_opts = "//:test_erlc_opts",
deps = ["//deps/amqp_client:erlang_app", "@prometheus//:erlang_app"],
)

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ build_dispatcher() ->
prometheus_rabbitmq_alarm_metrics_collector,
prometheus_rabbitmq_dynamic_collector,
prometheus_rabbitmq_federation_collector,
prometheus_rabbitmq_shovel_collector,
prometheus_process_collector]),
prometheus_registry:register_collectors('per-object', [
prometheus_vm_system_info_collector,
Expand Down

This file was deleted.

Loading
Loading