From e298355e72be08fef60752492b0e6388bea19414 Mon Sep 17 00:00:00 2001 From: Diana Corbacho Date: Thu, 19 Apr 2018 10:34:37 +0100 Subject: Format follower/leader details into mirroring format Allows uniform representation in the UI [#154472407] --- deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl index dc17dad2b6..ac8524da78 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl @@ -61,6 +61,10 @@ format_queue_stats({slave_pids, ''}) -> []; format_queue_stats({slave_pids, Pids}) -> [{slave_nodes, [node(Pid) || Pid <- Pids]}]; +format_queue_stats({followers, Nodes}) -> + [{slave_nodes, Nodes}, {synchronised_slave_nodes, Nodes}]; +format_queue_stats({leader, Leader}) -> + [{node, Leader}]; format_queue_stats({synchronised_slave_pids, ''}) -> []; format_queue_stats({synchronised_slave_pids, Pids}) -> -- cgit v1.2.1 From d1799645f5d3c71f63dddac6e2e73e0cec02aea3 Mon Sep 17 00:00:00 2001 From: Diana Corbacho Date: Thu, 17 May 2018 12:07:41 +0100 Subject: Retrieve quorum status from amqqueue record Allows information to be displayed when the custer is in minority [#157146500] --- deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl index ac8524da78..f46faf5e23 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl @@ -61,8 +61,6 @@ format_queue_stats({slave_pids, ''}) -> []; format_queue_stats({slave_pids, Pids}) -> [{slave_nodes, [node(Pid) || Pid <- Pids]}]; -format_queue_stats({followers, Nodes}) -> - [{slave_nodes, Nodes}, {synchronised_slave_nodes, Nodes}]; format_queue_stats({leader, Leader}) -> [{node, Leader}]; format_queue_stats({synchronised_slave_pids, ''}) -> @@ -381,7 +379,7 @@ queue(#amqqueue{name = Name, exclusive_owner = ExclusiveOwner, arguments = Arguments, pid = Pid, - state = State}) -> + state = State} = Q) -> format( [{name, Name}, {durable, Durable}, @@ -390,7 +388,7 @@ queue(#amqqueue{name = Name, {owner_pid, ExclusiveOwner}, {arguments, Arguments}, {pid, Pid}, - {state, State}], + {state, State}] ++ rabbit_amqqueue:format(Q), {fun format_exchange_and_queue/1, false}). queue_state({syncing, Msgs}) -> [{state, syncing}, -- cgit v1.2.1 From a845fcfdddbfe48dbfb66035c44cfb266290c37d Mon Sep 17 00:00:00 2001 From: Diana Corbacho Date: Wed, 6 Jun 2018 21:55:50 +0100 Subject: Collect ra open file stats [#157193081] --- .../src/rabbit_mgmt_external_stats.erl | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl index d3f485cfc7..0e7e099c7d 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl @@ -42,7 +42,7 @@ rates_mode, uptime, run_queue, processors, exchange_types, auth_mechanisms, applications, contexts, log_files, db_dir, config_files, net_ticktime, enabled_plugins, - mem_calculation_strategy]). + mem_calculation_strategy, ra_open_file_metrics]). %%-------------------------------------------------------------------- @@ -230,7 +230,22 @@ i(gc_bytes_reclaimed, _State) -> Words * erlang:system_info(wordsize); i(context_switches, _State) -> {Sw, 0} = erlang:statistics(context_switches), - Sw. + Sw; +i(ra_open_file_metrics, _State) -> + [{ra_log_wal, ra_metrics(ra_log_wal)}, + {ra_log_file_segment_writer, ra_metrics(ra_log_file_segment_writer)}]. + +ra_metrics(K) -> + try + case ets:lookup(ra_open_file_metrics, whereis(K)) of + [] -> 0; + [{_, C}] -> C + end + catch + error:badarg -> + %% On startup the mgmt might start before ra does + 0 + end. resource_alarm_set(Source) -> lists:member({{resource_limit, Source, node()},[]}, -- cgit v1.2.1 From 564df7798b5bb1353047872ba31cd9d77fd5c7d6 Mon Sep 17 00:00:00 2001 From: Diana Corbacho Date: Thu, 7 Jun 2018 12:27:55 +0100 Subject: Revert "Collect ra open file stats" This reverts commit 7ee57c0b001eefd2a57d8eab97e3a32d6adbb117. --- .../src/rabbit_mgmt_external_stats.erl | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl index 0e7e099c7d..d3f485cfc7 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl @@ -42,7 +42,7 @@ rates_mode, uptime, run_queue, processors, exchange_types, auth_mechanisms, applications, contexts, log_files, db_dir, config_files, net_ticktime, enabled_plugins, - mem_calculation_strategy, ra_open_file_metrics]). + mem_calculation_strategy]). %%-------------------------------------------------------------------- @@ -230,22 +230,7 @@ i(gc_bytes_reclaimed, _State) -> Words * erlang:system_info(wordsize); i(context_switches, _State) -> {Sw, 0} = erlang:statistics(context_switches), - Sw; -i(ra_open_file_metrics, _State) -> - [{ra_log_wal, ra_metrics(ra_log_wal)}, - {ra_log_file_segment_writer, ra_metrics(ra_log_file_segment_writer)}]. - -ra_metrics(K) -> - try - case ets:lookup(ra_open_file_metrics, whereis(K)) of - [] -> 0; - [{_, C}] -> C - end - catch - error:badarg -> - %% On startup the mgmt might start before ra does - 0 - end. + Sw. resource_alarm_set(Source) -> lists:member({{resource_limit, Source, node()},[]}, -- cgit v1.2.1 From 85cab2d3c30ad680322d9a2e54c82db3a4c012a4 Mon Sep 17 00:00:00 2001 From: Diana Corbacho Date: Thu, 14 Jun 2018 08:51:03 +0100 Subject: Collect ra io stats [#157193081] --- .../src/rabbit_mgmt_external_stats.erl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl index d3f485cfc7..4be9b17dd4 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl @@ -340,7 +340,7 @@ format_mochiweb_option(_K, V) -> init([]) -> {ok, Interval} = application:get_env(rabbit, collect_statistics_interval), State = #state{fd_total = file_handle_cache:ulimit(), - fhc_stats = file_handle_cache_stats:get(), + fhc_stats = get_fhc_stats(), node_owners = sets:new(), interval = Interval}, %% We can update stats straight away as they need to be available @@ -395,5 +395,13 @@ emit_node_node_stats(State = #state{node_owners = Owners}) -> update_state(State0) -> %% Store raw data, the average operation time is calculated during querying %% from the accumulated total - FHC = file_handle_cache_stats:get(), + FHC = get_fhc_stats(), State0#state{fhc_stats = FHC}. + +get_fhc_stats() -> + dict:to_list(dict:merge(fun(_, V1, V2) -> V1 + V2 end, + dict:from_list(file_handle_cache_stats:get()), + dict:from_list(get_ra_io_metrics()))). + +get_ra_io_metrics() -> + lists:sort(ets:tab2list(ra_io_metrics)). -- cgit v1.2.1 From 85265430e5b8be55c1cb9d229f0b553b74ada0b3 Mon Sep 17 00:00:00 2001 From: Diana Corbacho Date: Thu, 14 Jun 2018 09:08:05 +0100 Subject: Revert "Revert "Collect ra open file stats"" This reverts commit 1770a2178e4f778f9c99847a5159459ffbdace0e. --- .../src/rabbit_mgmt_external_stats.erl | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl index 4be9b17dd4..12fa46c9eb 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl @@ -42,7 +42,7 @@ rates_mode, uptime, run_queue, processors, exchange_types, auth_mechanisms, applications, contexts, log_files, db_dir, config_files, net_ticktime, enabled_plugins, - mem_calculation_strategy]). + mem_calculation_strategy, ra_open_file_metrics]). %%-------------------------------------------------------------------- @@ -230,7 +230,22 @@ i(gc_bytes_reclaimed, _State) -> Words * erlang:system_info(wordsize); i(context_switches, _State) -> {Sw, 0} = erlang:statistics(context_switches), - Sw. + Sw; +i(ra_open_file_metrics, _State) -> + [{ra_log_wal, ra_metrics(ra_log_wal)}, + {ra_log_file_segment_writer, ra_metrics(ra_log_file_segment_writer)}]. + +ra_metrics(K) -> + try + case ets:lookup(ra_open_file_metrics, whereis(K)) of + [] -> 0; + [{_, C}] -> C + end + catch + error:badarg -> + %% On startup the mgmt might start before ra does + 0 + end. resource_alarm_set(Source) -> lists:member({{resource_limit, Source, node()},[]}, -- cgit v1.2.1 From 02a144aa8353bf52b522ced372dcc809cc666be3 Mon Sep 17 00:00:00 2001 From: Diana Corbacho Date: Wed, 4 Jul 2018 12:18:13 +0100 Subject: Update ra_log_segment_writer name --- deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl index 12fa46c9eb..1c4a79f3e5 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl @@ -233,7 +233,7 @@ i(context_switches, _State) -> Sw; i(ra_open_file_metrics, _State) -> [{ra_log_wal, ra_metrics(ra_log_wal)}, - {ra_log_file_segment_writer, ra_metrics(ra_log_file_segment_writer)}]. + {ra_log_segment_writer, ra_metrics(ra_log_segment_writer)}]. ra_metrics(K) -> try -- cgit v1.2.1 From a5dd65cb75038e982f1e3d248949fe739e2e8366 Mon Sep 17 00:00:00 2001 From: Diana Corbacho Date: Thu, 19 Apr 2018 10:34:37 +0100 Subject: Format follower/leader details into mirroring format Allows uniform representation in the UI [#154472407] --- deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl index f46faf5e23..db2bcaa316 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl @@ -61,6 +61,8 @@ format_queue_stats({slave_pids, ''}) -> []; format_queue_stats({slave_pids, Pids}) -> [{slave_nodes, [node(Pid) || Pid <- Pids]}]; +format_queue_stats({followers, Nodes}) -> + [{slave_nodes, Nodes}, {synchronised_slave_nodes, Nodes}]; format_queue_stats({leader, Leader}) -> [{node, Leader}]; format_queue_stats({synchronised_slave_pids, ''}) -> -- cgit v1.2.1 From 8ce199b4b24c613af6d9e709a04a71f921430df7 Mon Sep 17 00:00:00 2001 From: Diana Corbacho Date: Thu, 17 May 2018 12:07:41 +0100 Subject: Retrieve quorum status from amqqueue record Allows information to be displayed when the custer is in minority [#157146500] --- deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl | 2 -- 1 file changed, 2 deletions(-) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl index db2bcaa316..f46faf5e23 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl @@ -61,8 +61,6 @@ format_queue_stats({slave_pids, ''}) -> []; format_queue_stats({slave_pids, Pids}) -> [{slave_nodes, [node(Pid) || Pid <- Pids]}]; -format_queue_stats({followers, Nodes}) -> - [{slave_nodes, Nodes}, {synchronised_slave_nodes, Nodes}]; format_queue_stats({leader, Leader}) -> [{node, Leader}]; format_queue_stats({synchronised_slave_pids, ''}) -> -- cgit v1.2.1 From 9958a25a0236cbc64ec94af50bbea57f8c1da4fa Mon Sep 17 00:00:00 2001 From: Diana Corbacho Date: Thu, 7 Jun 2018 12:27:55 +0100 Subject: Revert "Collect ra open file stats" This reverts commit 7ee57c0b001eefd2a57d8eab97e3a32d6adbb117. --- deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl index 1c4a79f3e5..eb6afc94f6 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl @@ -42,7 +42,7 @@ rates_mode, uptime, run_queue, processors, exchange_types, auth_mechanisms, applications, contexts, log_files, db_dir, config_files, net_ticktime, enabled_plugins, - mem_calculation_strategy, ra_open_file_metrics]). + mem_calculation_strategy]). %%-------------------------------------------------------------------- -- cgit v1.2.1 From 77b0c5da67d49c9e3e3ae1d8d410298a45c46507 Mon Sep 17 00:00:00 2001 From: Diana Corbacho Date: Thu, 14 Jun 2018 09:08:05 +0100 Subject: Revert "Revert "Collect ra open file stats"" This reverts commit 1770a2178e4f778f9c99847a5159459ffbdace0e. --- deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl index eb6afc94f6..1c4a79f3e5 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl @@ -42,7 +42,7 @@ rates_mode, uptime, run_queue, processors, exchange_types, auth_mechanisms, applications, contexts, log_files, db_dir, config_files, net_ticktime, enabled_plugins, - mem_calculation_strategy]). + mem_calculation_strategy, ra_open_file_metrics]). %%-------------------------------------------------------------------- -- cgit v1.2.1 From 5cbc03787f2e3a1613d77c774d5c5c8a39c905d6 Mon Sep 17 00:00:00 2001 From: kjnilsson Date: Fri, 19 Oct 2018 14:06:50 +0100 Subject: Remove forced event refresh As the management no longer relies on event data to build up the stats database this function does not need to be called. The only time the management needs to handle events is to trigger stats gc in a more timely fashion when events are deleted. --- deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl | 1 - 1 file changed, 1 deletion(-) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl index 0240c2386a..2e2ce3015e 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl @@ -78,7 +78,6 @@ ensure_statistics_enabled() -> {_, _} -> ok end, - rabbit:force_event_refresh(erlang:make_ref()), ok. %%---------------------------------------------------------------------------- -- cgit v1.2.1 From 09b0e90c98ac6b5e6666c38cf47948b725aafe83 Mon Sep 17 00:00:00 2001 From: kjnilsson Date: Mon, 29 Oct 2018 12:43:21 +0000 Subject: Update rabbitmq-components.mk --- deps/rabbitmq_management_agent/rabbitmq-components.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'deps/rabbitmq_management_agent') diff --git a/deps/rabbitmq_management_agent/rabbitmq-components.mk b/deps/rabbitmq_management_agent/rabbitmq-components.mk index bf47b3bec8..b440169d0d 100644 --- a/deps/rabbitmq_management_agent/rabbitmq-components.mk +++ b/deps/rabbitmq_management_agent/rabbitmq-components.mk @@ -40,7 +40,6 @@ endif dep_amqp_client = git_rmq rabbitmq-erlang-client $(current_rmq_ref) $(base_rmq_ref) master dep_amqp10_client = git_rmq rabbitmq-amqp1.0-client $(current_rmq_ref) $(base_rmq_ref) master dep_amqp10_common = git_rmq rabbitmq-amqp1.0-common $(current_rmq_ref) $(base_rmq_ref) master -dep_ra = git_rmq ra $(current_rmq_ref) $(base_rmq_ref) master dep_rabbit = git_rmq rabbitmq-server $(current_rmq_ref) $(base_rmq_ref) master dep_rabbit_common = git_rmq rabbitmq-common $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_amqp1_0 = git_rmq rabbitmq-amqp1.0 $(current_rmq_ref) $(base_rmq_ref) master @@ -115,6 +114,7 @@ dep_cowboy = hex 2.4.0 dep_cowlib = hex 2.3.0 dep_jsx = hex 2.9.0 dep_lager = hex 3.6.5 +dep_ra = git https://github.com/rabbitmq/ra.git master dep_ranch = hex 1.6.2 dep_ranch_proxy_protocol = hex 2.1.1 dep_recon = hex 2.3.6 @@ -124,7 +124,6 @@ dep_sockjs = git https://github.com/rabbitmq/sockjs-erlang.git 405990ea62353d98d RABBITMQ_COMPONENTS = amqp_client \ amqp10_common \ amqp10_client \ - ra \ rabbit \ rabbit_common \ rabbitmq_amqp1_0 \ -- cgit v1.2.1