Commit Graph

705 Commits

Author SHA1 Message Date
Luke Bakken e799248139 Make warning a bit more verbose
Fixes #67

[160936327]
2018-10-02 12:11:06 -07:00
Michael Klishin 213731e333 Merge pull request #65 from rabbitmq/get-empty-stats
Add basic.get_empty stats as a new counter
2018-09-25 19:24:26 +03:00
Jean-Sébastien Pédron 75fcd3c36b Update rabbitmq-components.mk 2018-09-19 10:38:16 +02:00
Diana Corbacho 54ccfef846 Add get empty stats as a new counter
Basic.get requests that return ok_empty used to be unaccounted for
[#160280626]
2018-09-17 11:21:12 +01:00
Jean-Sébastien Pédron 15a6efad3d Update rabbitmq-components.mk 2018-09-11 14:22:31 +02:00
Jean-Sébastien Pédron f80d2f9e19 Update rabbitmq-components.mk 2018-08-09 17:44:16 +02:00
Jean-Sébastien Pédron 0cc8e495c3 Update rabbitmq-components.mk 2018-08-09 12:17:02 +02:00
Michael Klishin 92d04790a3 Remove duplicates from proplists in one more case
Part of rabbitmq/rabbitmq-management#601.

[#159578855]
2018-08-07 02:13:38 +03:00
Michael Klishin 52837c2537 Avoid duplicate keys in rabbit_mgmt_format:strip_pids/1
For proplists that represent queues the key set is fixed,
so special casing 'node' should be good enough. For other entites
we take a heavier handed approach and remove all duplicates from
the input proplist. The overhead of this with 1K entities seems
to be low single digit % in an end-to-end test that involves an HTTP
client.

Once we switch that code to use maps, the workaround won't be
necessary at all.

Closes rabbitmq/rabbitmq-management#601.

[#159578855]
2018-08-07 01:59:22 +03:00
Michael Klishin c7a0e02656 Compile on OTP 21 from scratch
Part of rabbitmq/rabbitmq-server#1616.

[#157964874]
2018-06-08 01:45:00 +03:00
Jean-Sébastien Pédron d5ceda4fe5 Update rabbitmq-components.mk 2018-06-07 11:31:37 +02:00
Diana Corbacho aa6b96f282 Force events refresh when the management plugin is enabled
rabbitmq-management-agent#58
2018-05-23 17:35:50 +01:00
Michael Klishin 3be2102f1b Skip SNI option to avoid recursive TLS option formatting
Since every SNI map value is a set of TLS options, the solution
should be more involved. Our goal is not to present every single
option (we already intentionally hide some of them, e.g. configure
cipher suites), and SNI information does not really fit the UI.
So we can avoid the complexity and still fix the issue by
simply skipping the option.

References rabbitmq/rabbitmq-management#567.
2018-04-27 22:47:24 -05:00
Jean-Sébastien Pédron 69dc16c23f rabbit_mgmt_format: Convert `sni_hosts` to something compatible with jsx
jsx expects a proplist key to be an Erlang binary, an integer or an
atom. It doesn't accept an Erlang string, probably because it's
difficult to distinguish from a list of integers.

Therefore the patch consists of converting all hostnames under
`sni_hosts` from strings to binaries.

Fixes rabbitmq/rabbitmq-management#567.
2018-04-27 14:55:02 +02:00
Jean-Sébastien Pédron dc3e4a82ba Update erlang.mk 2018-04-11 10:53:26 +02:00
Jean-Sébastien Pédron aaa75bdb25 Update rabbitmq-components.mk 2018-04-11 10:51:22 +02:00
Jean-Sébastien Pédron b60db64682 Update rabbitmq-components.mk 2018-04-11 10:10:04 +02:00
Jean-Sébastien Pédron 0f3b6b2cab Travis CI: Update config from rabbitmq-common 2018-04-10 13:07:25 +02:00
Jean-Sébastien Pédron 816d7ddcc0 Update erlang.mk 2018-03-02 19:06:38 +01:00
Jean-Sébastien Pédron 52c3284c9f Update rabbitmq-components.mk 2018-01-30 15:23:42 +01:00
Luke Bakken 8e35aba740 Update rabbitmq-components.mk 2018-01-29 16:22:15 -08:00
Jean-Sébastien Pédron 5f9ca717ab Update rabbitmq-components.mk 2018-01-23 17:21:32 +01:00
Jean-Sébastien Pédron c871c1a03b Update rabbitmq-components.mk 2018-01-23 15:31:21 +01:00
Diana Corbacho 1aca2d36ff Update rabbitmq-components.mk 2018-01-22 22:13:24 +00:00
kjnilsson 93456ec48f Only return metrics_gc_queue_length metrics for the requested node.
This allows the data to be merged correctly further down.

[#153738257]
2017-12-20 10:23:44 +00:00
Jean-Sébastien Pédron 4cce5ca514 Travis CI: Update config from rabbitmq-common 2017-12-15 15:13:07 +01:00
Jean-Sébastien Pédron 3fbd503318 Update rabbitmq-components.mk 2017-12-01 11:06:36 +01:00
Jean-Sébastien Pédron d49aa6f638 Update rabbitmq-components.mk 2017-11-28 14:00:55 +01:00
Jean-Sébastien Pédron 20af883722 Update rabbitmq-components.mk 2017-11-28 13:35:56 +01:00
Jean-Sébastien Pédron 41f66d64bf Travis CI: Update config from rabbitmq-common 2017-11-08 09:52:31 +01:00
Diana Corbacho 682d7bfa7e Revert "Add erlang memory to node stats."
This reverts commit 470ef89014.
2017-10-31 11:44:36 +00:00
Diana Corbacho 8c2a8b14da Report memory calculation strategy on node stats 2017-10-31 11:41:56 +00:00
Daniil Fedotov 470ef89014 Add erlang memory to node stats.
Report both process memory (which can be rss) and erlang memory
to plot better stats.
2017-10-30 17:19:37 +00:00
Michael Klishin a3b076d4a1 Merge branch 'stable' 2017-10-25 21:29:47 +03:00
Diana Corbacho 8e5aebe8a1 Optimise formatting of channel stats
Avoids traversing the full list to format a single element

[#152240490]
2017-10-25 08:34:56 +01:00
Diana Corbacho 0d1987f0a0 Avoid the update of creation stats which have already been collected
Formatting utf8 info in connections is very expensive, and creation
data is never updated. Once collected for first time, there is no
need to write those stats again.

[#152240490]
2017-10-24 16:05:32 +01:00
Diana Corbacho 6f7446bb2f Performance enhancement: replace dict by maps
[#152240490]
2017-10-24 14:58:44 +01:00
Jean-Sébastien Pédron 441392f67c Merge branch 'stable' 2017-10-13 15:09:21 +02:00
Jean-Sébastien Pédron e85cd9f8bb Update rabbitmq-components.mk 2017-10-13 14:33:10 +02:00
Jean-Sébastien Pédron e03d2e0fa1 Update rabbitmq-components.mk 2017-10-13 14:13:12 +02:00
Jean-Sébastien Pédron 9430433600 Update rabbitmq-components.mk 2017-10-13 12:15:45 +02:00
Michael Klishin 87b7b3124e Update rabbitmq-components.mk 2017-09-13 17:54:25 -04:00
Michael Klishin 6d09969470 Update rabbitmq-components.mk 2017-09-13 17:45:34 -04:00
Michael Klishin cd6a85bcb7 Update rabbitmq-components.mk 2017-09-12 19:53:15 -04:00
Michael Klishin 36406aeb4e Update rabbitmq-components.mk 2017-09-12 12:41:54 -04:00
Daniil Fedotov 0a6a75564c Merge branch 'stable' 2017-08-30 19:20:39 +01:00
Daniil Fedotov 3e4177121a Update erlang.mk 2017-08-30 18:46:44 +01:00
Michael Klishin d2a4d814a1 Merge branch 'stable'
This adapts 9ae2e3658f for master (maps).

Conflicts:
	src/rabbit_mgmt_format.erl
2017-07-28 17:24:24 +03:00
Michael Klishin 9ae2e3658f Export one more formatting function
Needed by rabbitmq/rabbitmq-management#424.
2017-07-28 15:41:52 +03:00
kjnilsson 57a0b57652 Minor dialyzer fix 2017-07-27 09:57:09 +01:00
Michael Klishin c1b6c8b868 Erlang/OTP 19.2 is now the minimum supported version.
Part of rabbitmq/rabbitmq-server#1305.

[#149563549]
2017-07-26 19:02:59 +03:00
Michael Klishin 62b9a066e5 Update rabbitmq-components.mk 2017-07-26 03:48:27 +03:00
Michael Klishin 1bf2a7229a Update rabbitmq-components.mk 2017-07-26 02:27:08 +03:00
Michael Klishin 8af221a75c Merge branch 'rabbitmq-management-434' 2017-07-21 18:00:53 +03:00
Luke Bakken fc9609db84 whitespace 2017-07-21 07:05:17 -07:00
Luke Bakken 757994a2b9 Just use ets:tab2list 2017-07-20 15:01:07 -07:00
Luke Bakken 307abde5e6 Include node_node_metrics in node_data
This information is used in the "Cluster Links" section of the Management UI
2017-07-20 08:33:09 -07:00
Michael Klishin 4d8532bb8f Merge branch 'stable' 2017-07-10 11:39:47 -07:00
Michael Klishin 0a879c4a8e Merge branch 'stable' into rabbitmq-management-427 2017-07-10 07:22:57 -07:00
Michael Klishin 02c8614b0a Merge pull request #50 from rabbitmq/rabbitmq-management-421
Let already formatted AMQP tables pass through
2017-07-10 14:54:59 +03:00
kjnilsson 914269be31 Merge branch 'stable' 2017-07-10 11:26:47 +01:00
kjnilsson aeb6a0fdab Improve test assertion in metrics:node test.
Instead of trying to cover all connected nodes we
assert that there is a metric row from node A to node B.
2017-07-10 11:22:18 +01:00
Michael Klishin 1d21fe569b Merge branch 'master' into rabbitmq-management-421 2017-07-10 12:29:40 +03:00
Diana Corbacho acf448f04f Let already formatted AMQP tables pass through
rabbitmq-management#421
[#147429221]
2017-07-10 09:38:59 +01:00
Michael Klishin 901cfbbbba Remove unused function 2017-07-10 01:43:20 +03:00
Michael Klishin 6a4bfcd9c8 rabbit_mgmt_format: don't confuse format_args/1 and format_arguments/1
format_args/1 is meant to produce a list of triplets (an AMQP 0-9-1
attribute table).

format_arguments/1 converts an attribute table to a map.
2017-07-10 00:29:30 +03:00
kjnilsson 429ec2364c Fix xref issue.
rabbit_mgmt_util is defined in rabbitmq_management which isn't
referenced.
2017-07-07 17:07:37 +01:00
kjnilsson 245ad4dc78 remove stale comment 2017-07-06 15:15:04 +01:00
kjnilsson 0e836eb42b Create queue_msg_stats as non-incremental.
When zeroing out stats after deletion.

[#147753285]
2017-07-05 16:17:41 +01:00
kjnilsson 482664ad28 Revert ceil change 2017-07-05 09:43:47 +01:00
kjnilsson e5f76ff801 Clean up deleted queue metrics in collector.
Else we'd have to wait for a full stats background gc which can take a
very long time during which metrics may be duplicated in the UI.

[#147753285]
2017-07-04 11:59:06 +01:00
Jean-Sébastien Pédron 94f2be61ae Merge branch 'stable' 2017-07-03 12:20:33 +02:00
Jean-Sébastien Pédron 482bfc5ea1 rabbit_mgmt_metrics_collector: Do not auto-import ceil/1
We are using an local copy of ceil/1.

This fixes a warning reported with Erlang 20.
2017-07-03 12:19:28 +02:00
Jean-Sébastien Pédron 25b728abf7 metrics_SUITE: Use wait_until() in `node` testcase
... instead of a contstant timer. It takes more time to stabilize with
with some runs, so this avoids transient failures.
2017-07-03 12:18:15 +02:00
Jean-Sébastien Pédron 07922b5662 Merge branch 'stable' 2017-06-21 12:00:04 +02:00
Jean-Sébastien Pédron c213e6cd7b rabbit_mgmt_external_stats: Use vm_memory_monitor:get_process_memory()
... instead of rabbit_vm:total_memory() which was moved back to
vm_memory_monitor and renamed.

[#118490793, #145451399]
2017-06-21 11:58:40 +02:00
Michael Klishin bae397ffdd Merge branch 'stable' 2017-06-19 21:36:25 +03:00
Daniil Fedotov dede73ab7b Account for get_memory_use -> total_memory
re #1259

[#145451399]

Signed-off-by: Gerhard Lazu <gerhard@rabbitmq.com>
2017-06-15 10:28:54 +01:00
Michael Klishin d1292cc0bc Merge pull request #47 from rabbitmq/rabbitmq-server-1246-master
Replace term_to_binary with phash2 for args hash.
2017-06-14 20:19:31 +03:00
Daniil Fedotov 3886a8e9ec Use vm_memory_monitor when reporting total mem_used
[#145451399]

rabbitmq/rabbitmq-server#1259

Signed-off-by: Gerhard Lazu <gerhard@rabbitmq.com>
2017-06-14 13:54:35 +01:00
Daniil Fedotov a5ee6001ba Replace term_to_binary with phash2 for args hash.
term_to_binary can change in different OTP versions.
2017-06-13 15:33:36 +01:00
Michael Klishin 7c437b4aa2 Update rabbitmq-components.mk 2017-06-12 20:15:41 +03:00
Michael Klishin 279a9553b4 Update rabbitmq-components.mk 2017-06-12 18:35:41 +03:00
Daniil Fedotov 75f957546b Less compile warnings 2017-06-12 14:19:02 +01:00
Michael Klishin 47c074c491 Merge branch 'stable' 2017-06-02 18:10:49 +03:00
Michael Klishin 7978d3512b Update rabbitmq-components.mk 2017-06-02 17:51:29 +03:00
Daniil Fedotov c646d88f0f New CLI helpers API 2017-06-02 10:17:05 +01:00
Michael Klishin a50d284ee3 Update rabbitmq-components.mk 2017-06-02 00:43:24 +03:00
Michael Klishin dcfafde704 Update rabbitmq-components.mk 2017-06-01 18:01:40 +03:00
Jean-Sébastien Pédron 2f3665e3d4 Merge branch 'stable' 2017-05-16 18:09:17 +02:00
Jean-Sébastien Pédron 6fccc53d26 Makefile: Load the new `rabbitmq-early-plugin.mk` early-stage plugin
See the corresponding commit in rabbitmq-common for an explanation.

[#144697185]
2017-05-16 17:34:37 +02:00
Jean-Sébastien Pédron 3f557e37ce Update erlang.mk 2017-05-16 17:34:37 +02:00
Michael Klishin 41146f9e5c Merge branch 'stable' 2017-05-09 12:40:40 +03:00
Michael Klishin 936c1d1d4f Format ssl_opts in HTTP API listeners and Web contexts
Part of rabbitmq-management#393.

[#145067679]
2017-05-08 22:21:09 +03:00
Diana Corbacho 06f428eda0 Merge remote-tracking branch 'origin/stable' 2017-05-03 12:04:15 +01:00
Daniil Fedotov 823f5aab99 Replace dicts with maps 2017-04-24 18:25:38 +01:00
Diana Corbacho 3099726fc8 Use default value in config:get_env/2 2017-04-19 13:56:17 +01:00
Jean-Sébastien Pédron 586a17914a Merge branch 'stable' 2017-04-19 12:46:51 +02:00
Jean-Sébastien Pédron c983868162 Update erlang.mk 2017-04-19 12:02:57 +02:00
Diana Corbacho f7b034e802 Ensure numeric defaults, so atoms are not passed through
node_coarse_stats might ocassionally generate atoms, i.e. when disk
monitoring is not available, which should be filtered out.

rabbitmq-management#375
[#143489749]
2017-04-11 11:35:34 +01:00
Michael Klishin 369325422e Merge branch 'stable' 2017-04-08 08:25:31 +02:00
Diana Corbacho 31d7c724ab Throw an error if retention policies are missing
Node startup must fail if retention policies are missing, which from
3.6.7 are also required for collection. Instead of crash with a
function_clause, collectors now return a clear message.

rabbitmq-management-agent#41

[#143308479]
2017-04-07 11:55:10 +01:00
Michael Klishin 69bc7bc5cc Merge branch 'stable' 2017-04-02 22:01:36 +03:00
Michael Klishin 7247ffc5c1 (c) year 2017-04-02 21:48:27 +03:00
Michael Klishin 4206f032ba Merge branch 'stable'
Conflicts:
	src/rabbit_mgmt_format.erl
2017-03-23 20:37:26 +03:00
Michael Klishin 4aecd16927 Format consumer arguments in clean_consumer_details/1
References #39.
2017-03-23 16:44:54 +03:00
Michael Klishin df0507e556 Merge branch 'stable' 2017-03-23 01:45:20 +03:00
Michael Klishin 8eac00769b Shamelessly steal a tag escaping fn from Mochiweb
[#142213453]
2017-03-22 19:24:32 +03:00
Michael Klishin 8c97b652a9 Merge branch 'stable' 2017-03-21 12:45:05 +03:00
Michael Klishin e614cdff0c Filter out ciphers as well
Fixes rabbitmq/rabbitmq-management#364, references #36.
2017-03-21 12:37:17 +03:00
Michael Klishin 5ddbe9b52d Merge branch 'stable' 2017-03-20 13:21:06 +03:00
Michael Klishin 531625c838 Filter out two more options
References #36.
2017-03-18 18:59:19 +03:00
Michael Klishin 79c445e551 Wording 2017-03-18 18:48:33 +03:00
Michael Klishin d64da8c46b Filter out socket options that cannot be sensibly serialised to JSON
Some are functions, others contain deeply nested data structures that
nobody cares about in GET /api/overview output. It is easier to filter
them out than to find a way to convert them into something that
can serialise.

Fixes #36.
2017-03-18 18:45:07 +03:00
Michael Klishin 3bb7790e68 Merge branch 'stable' 2017-03-16 21:06:08 +03:00
Diana Corbacho 44a7d0aab4 Fix appending 2017-03-16 16:33:33 +00:00
Michael Klishin 0759d8c7bc Convert single atom options to {Option, true}
Fixes JSON serialisation e.g. when a TCP listener has
a single atom property such as "binary" configured.

Fixes #34.
2017-03-16 18:53:42 +03:00
Diana Corbacho c0a6801ab5 Test and clean up stats dependent on both process and entity
It leaked consumer_stats when the queue still existed, now both
entity and process must exist to keep the stats.
2017-03-10 15:48:34 +03:00
Diana Corbacho d3fd395f21 Test and clean up stats dependent on both process and entity
It leaked consumer_stats when the queue still existed, now both
entity and process must exist to keep the stats.
2017-03-07 10:17:59 +00:00
Michael Klishin aa061b50f7 Merge branch 'stable' 2017-03-07 00:04:49 +03:00
Michael Klishin 2c5ee14b5b Switch to rabbit_misc:is_process_alive/1 2017-03-06 23:07:01 +03:00
Diana Corbacho 7d6588a5d3 Check process aliveness on remote nodes 2017-03-06 15:58:31 +00:00
Michael Klishin 61b7a55152 Merge branch 'stable' 2017-03-03 15:01:20 +03:00
Michael Klishin 1edd08ed6e Merge pull request #30 from rabbitmq/rabbitmq-management-354
Make aggregate_entry a pure function
2017-03-03 14:49:42 +03:00
kjnilsson f7ca0b970a merge from stable 2017-03-02 16:12:31 +00:00
kjnilsson 558770374b Make aggregate_entry a pure function returning a set of
ets operations.

This avoids inserting into the same exometer slide data structure
multiple times each collection and thus reduces the amount of
unrealised rate data is kept around until the next interval.

[#140575873]
2017-03-02 15:56:25 +00:00
Michael Klishin 93dec034a0 Rename 2017-03-01 20:15:11 +03:00
kjnilsson bc59afd97e Remove unused argument 2017-03-01 15:54:54 +00:00
kjnilsson 2939c7fe0e Fix delayed first sample
When a new slide is created by the collector the first entry
added isn't realised up front. Here we artificially set the
start timestamp of the slide to be a full interval in the past.

[#140662033]
2017-03-01 15:17:55 +00:00
Diana Corbacho 434653e1c4 Delete marked core metrics during collection and propagate only aggregated ones 2017-03-01 15:17:55 +00:00
Diana Corbacho 3dae757873 Remove unused gc call
vhost_stats_coarse_conn_stats are indexed by vhost, no pid
2017-03-01 15:17:55 +00:00
kjnilsson 3de61fb2f9 dialyzer fixes 2017-03-01 09:00:28 +00:00
kjnilsson d697327f88 exometer_slide: normalise last_two
If a slide has been idle for some time then sees a single sample
the interval between the samples is much greater than the
slide interval which would result in an articifially low rate.
2017-03-01 08:34:27 +00:00
kjnilsson 69f530b873 exometer_slide:
adjust specs
    remove unused fields
    fix unlikely bug where FirstTS is undefined

[TrackerId]
2017-02-28 11:05:26 +00:00
Michael Klishin e0197b16d2 Merge branch 'stable' 2017-02-24 00:54:05 +03:00
Jean-Sébastien Pédron 777d89a8bc exometer_slide: Fix an "unused variable" warning
This should fix the build of the plugin.
2017-02-22 19:12:57 +01:00
Michael Klishin f5e0c57082 Merge branch 'stable' 2017-02-22 18:01:08 +03:00
Diana Corbacho 85a59629b9 Do not carry forward too old values from buffer2 2017-02-22 10:43:15 +00:00
Diana Corbacho 66d5a1c882 Remove unused variable 2017-02-21 16:56:35 +00:00
Diana Corbacho 19560487d4 Avoid filling towards the past when we have older values available 2017-02-21 16:56:35 +00:00
Diana Corbacho 66490bb80d Avoid filling range towards the past (that'd be TS-Interval < Start) 2017-02-21 16:56:27 +00:00
Michael Klishin 747cc97daa Merge branch 'stable' 2017-02-20 23:36:07 +03:00
Michael Klishin 60f2fba828 No real need to catch ets write exceptions
They are supposed to be truly exceptional cases in which case
we want a process termination and restart, which will leave
visible traces in the log.

Some experimentation with stats GC process termination
reveals no problems: the processes function as expected
after a streak of restarts.
2017-02-20 23:30:05 +03:00
Diana Corbacho 0623be32ba Test consumer stats 2017-02-20 14:37:55 +00:00
Diana Corbacho fece810e0f Avoid race condition between created/stats by reading directly from core metrics 2017-02-20 14:17:21 +00:00
Diana Corbacho 940b9e6b47 Use collect_statistics_interval for node stats 2017-02-20 14:15:24 +00:00
Diana Corbacho 5eaaf2ce1d Test stats gc 2017-02-20 14:14:51 +00:00
Gabriele Santomaggio 6e5d2363cb Changed gc_entities function 2017-02-17 11:13:47 +00:00
Diana Corbacho 7ab170ea5d GC queue-exchange stats 2017-02-17 11:13:47 +00:00
Diana Corbacho 79a1832ea9 Periodic garbage collection of leaked stats 2017-02-17 11:13:47 +00:00
Jean-Sébastien Pédron 5c278b0307 Merge branch 'stable' 2017-02-17 09:57:51 +01:00
kjnilsson bd5f0e54f3 Correct typo that caused the ExchangeFun to always return
false for channel_queue_exchange_metrics
2017-02-16 11:29:16 +00:00
Michael Klishin 50762b19de Update rabbitmq-components.mk 2017-02-11 23:29:30 +03:00
Michael Klishin f7ce6c348d Filter out verify_fun by name 2017-02-10 18:52:34 +03:00
Michael Klishin 410da64186 Filter out functions from listener options
They can't be serialised to JSON, that's why.
2017-02-10 18:38:11 +03:00
Michael Klishin 2a64e6b5c7 Update rabbitmq-components.mk 2017-02-10 11:16:32 +03:00
Michael Klishin 8041e273f5 Update rabbitmq-components.mk 2017-02-10 03:06:25 +03:00
Michael Klishin 697a6fe72e merge branch 'stable' 2017-02-08 16:55:47 +03:00
Michael Klishin 9366b02dc1 Update rabbitmq-components.mk 2017-02-08 16:38:17 +03:00
Michael Klishin 388251d77a merge branch 'stable' 2017-02-06 19:51:08 +03:00
Michael Klishin 65aba17232 Update rabbitmq-components.mk 2017-02-06 19:23:56 +03:00
Jean-Sébastien Pédron 813a092a1d Update rabbitmq-components.mk 2017-02-02 17:17:06 +01:00
Michael Klishin 9af93c2ee1 merge branch 'stable' 2017-01-31 18:19:08 +03:00
Michael Klishin 5b483f97b0 Update rabbitmq-components.mk 2017-01-31 18:06:29 +03:00
Jean-Sébastien Pédron b0483a3457 Merge branch 'stable' 2017-01-12 10:50:29 +01:00
Jean-Sébastien Pédron 8096ba744f Makefile: Add rabbitmq_ct_client_helpers to TEST_DEPS
metrics_SUITE depends on rabbitmq_ct_client_helpers and amqp_client now.
This fixes the testsuite.
2017-01-12 10:43:46 +01:00
Jean-Sébastien Pédron 2e1652efff metrics_SUITE: Fix an "unused variable" warning 2017-01-12 10:43:11 +01:00
Diana Corbacho 6b10a8edfd Merge branch 'stable' 2017-01-11 17:05:08 +01:00
Diana Corbacho a6c5e52ca4 Fix typo and add tests to verify stats recover after reset 2017-01-11 12:54:54 +01:00
Diana Corbacho ee65fdbe58 Merge remote-tracking branch 'origin/stable' 2016-12-22 13:03:22 +01:00
kjnilsson 61ce6bcf6a Remove unused code 2016-12-22 12:50:19 +01:00
Diana Corbacho 26957dde65 Reset old_aggr_stats 2016-12-21 16:47:51 +01:00
Jean-Sébastien Pédron e58a1cd36b Travis CI: Import changes from rabbitmq-auth-backend-amqp 2016-12-12 13:38:12 +01:00
Jean-Sébastien Pédron 58c0c8e29a Merge branch 'stable' 2016-12-09 19:23:29 +01:00
Jean-Sébastien Pédron 7028e832c2 Update rabbitmq-components.mk 2016-12-08 19:14:47 +01:00
Jean-Sébastien Pédron 76bdc6a409 Merge branch 'stable' 2016-12-08 18:00:26 +01:00
Jean-Sébastien Pédron 2ed8e7c97e Do not use -include_lib() with own headers
This fixes the build outside of an Umbrella-like setup, ie. when
dependencies of this plugin are put into the `deps` subdirectory.
2016-12-08 17:58:40 +01:00
Jean-Sébastien Pédron a0dcd0a84c Travis CI: Use Ubuntu Trusty image to have access to Elixir
Also, required `sudo` so a VM is used instead of a container. This makes
the test much longer, but allows us to install non-whitelisted packages
such as xsltproc.
2016-12-08 17:28:29 +01:00
Jean-Sébastien Pédron c77788b2b9 Merge branch 'stable' 2016-12-07 15:41:32 +01:00
Michael Klishin e04afc1a26 Drive by change: rabbit_log:warning/1 doesn't need a trailing new line 2016-12-06 20:41:51 +03:00
Michael Klishin 80c9b96d78 Merge branch 'master' into rabbitmq-management-295 2016-12-06 20:21:15 +03:00
Diana Corbacho 717028e8af CLI command to reset stats DB 2016-12-06 16:21:25 +00:00
kjnilsson 4ec823c36a Remove unused code 2016-12-06 15:54:02 +00:00
Jean-Sébastien Pédron f59dab0c14 Move from .app.src to Makefile variables
This is the recommended way with Erlang.mk.

By default, the version is inherited from rabbitmq-server-release when
the source archive is created, or computed from git-describe(1) (see
`rabbitmq-components.mk`). One can override the version from the command
line by setting the `PROJECT_VERSION` variable.

[#130992027]
2016-12-06 16:15:16 +01:00
Diana Corbacho 2be63383fd Fix merge 2016-12-05 16:28:23 +00:00
Jean-Sébastien Pédron 452a01e7d8 Move mochiweb_util to rabbitmq-common 2016-12-02 15:43:45 +01:00
kjnilsson 26a2d5449d Make it possible to purge the old_aggr_stats for testing purposes 2016-12-02 12:35:17 +00:00
Jean-Sébastien Pédron c806754b0f `time_compat` is gone in master, use os:system_time() directly 2016-12-02 13:00:31 +01:00
Diana Corbacho f2280ec241 Restore `log_files` lost during the merge 2016-12-01 17:20:41 +00:00
Michael Klishin 369a4a1a76 Merge branch 'stable'
Conflicts:
	src/rabbit_mgmt_external_stats.erl
	src/rabbitmq_management_agent.app.src
2016-12-01 14:14:58 +03:00
Diana Corbacho 5ad4ac491f Add top supervisor to restart the mgmt db 2016-12-01 08:33:10 +00:00
Michael Klishin c7275e89b3 Give preference to rabbitmq_management keys
for backwards compatibility, since rabbitmq_management_agent
has some of the commonly set keys in its .app file.
2016-12-01 03:47:50 +03:00
Michael Klishin d11cefdd7c Merge branch 'stable' 2016-11-30 18:55:47 +03:00
kjnilsson 2777343d2d Fix race condition where vhost_msg_stats were not updated after queue delete 2016-11-30 12:38:03 +00:00
Michael Klishin 37a3708b07 Merge branch 'stable' 2016-11-29 21:17:36 +03:00
Michael Klishin 0fec63c61a Update rabbitmq-components.mk 2016-11-29 20:59:32 +03:00
kjnilsson b1a4a2e6a1 Move rabbit_mgmt_format and mochiweb_util to rabbitmq_management_agent.
Dialyzer fixes
2016-11-29 16:32:19 +00:00
kjnilsson c45ec52f09 Move metrics collectors to agent 2016-11-29 13:00:50 +00:00
Diana Corbacho 5789de241a Return 0 if used fd is not available, log any error 2016-11-29 10:09:50 +00:00
Jean-Sébastien Pédron c6d82a2b85 Merge branch 'stable' 2016-11-25 11:47:00 +01:00
Jean-Sébastien Pédron ed21876052 Update rabbitmq-components.mk 2016-11-25 10:50:58 +01:00
Jean-Sébastien Pédron 7323b8e48c Merge branch 'stable' 2016-11-25 10:34:38 +01:00
Jean-Sébastien Pédron c592afc153 Update rabbitmq-components.mk 2016-11-25 10:08:19 +01:00
Jean-Sébastien Pédron 593292da50 Merge branch 'stable' into rabbitmq-management-236 2016-11-24 12:09:41 +01:00
Jean-Sébastien Pédron 876dafd6cf Merge branch 'stable' 2016-11-24 10:28:53 +01:00
Jean-Sébastien Pédron 3660b1d00d Update rabbitmq-components.mk 2016-11-23 18:06:03 +01:00
Gerhard Lazu bc7aa6ae43 Merge branch 'stable' 2016-11-22 16:50:39 +00:00
Gerhard Lazu 643b3cd155 Update erlang.mk 2016-11-22 16:19:27 +00:00
Gerhard Lazu cb69096d8e Update rabbitmq-components.mk 2016-11-22 16:16:35 +00:00
Jean-Sébastien Pédron 17787e6a52 Update erlang.mk 2016-11-14 11:56:17 +01:00
Jean-Sébastien Pédron b5f6043564 Update rabbitmq-components.mk 2016-11-10 16:56:38 +01:00
Jean-Sébastien Pédron 1f218d8534 Makefile: Add rabbitmq_ct_helpers to TEST_DEPS
[#130086871]
2016-09-27 15:55:51 +02:00
Jean-Sébastien Pédron cde27939f2 metrics_SUITE: Remove `amqp_client.hrl` inclusion 2016-09-27 12:43:38 +02:00
Jean-Sébastien Pédron 711cae5496 Merge branch 'stable' into rabbitmq-management-236 2016-09-27 12:42:04 +02:00
Jean-Sébastien Pédron 9c453bea49 Merge branch 'stable' 2016-09-23 16:13:42 +02:00
Jean-Sébastien Pédron 15854bf770 Update rabbitmq-components.mk 2016-09-23 11:23:06 +02:00
Jean-Sébastien Pédron 03967315e2 Update erlang.mk 2016-09-22 17:56:38 +02:00
Daniil Fedotov 7b4f2daacd Do not send metrics ETS tables to management collector 2016-09-20 13:16:38 +01:00
Jean-Sébastien Pédron 11a60f19a1 rabbitmq_management_agent.app: Depend on rabbit_common 2016-09-19 17:10:58 +02:00
Jean-Sébastien Pédron 2b792e3692 Makefile: Explicitely list all DEPS
Sync rabbitmq-components.mk with rabbitmq-common to remove automatic
DEPS handling.

[#130086871]
2016-09-19 17:10:34 +02:00
Jean-Sébastien Pédron 6490205ac8 Update erlang.mk 2016-09-19 16:22:45 +02:00
Jean-Sébastien Pédron 44401fb06a Merge branch 'stable' 2016-09-15 16:40:35 +02:00
Jean-Sébastien Pédron 7ac46c0b5e Update rabbitmq-components.mk 2016-09-15 15:46:31 +02:00
kjnilsson 6b768da48d Handle channel_consumer_deleted event 2016-09-14 09:10:23 +01:00
kjnilsson 83255f581e refresh node metrics multiple times
whitespace
2016-09-07 16:20:03 +01:00
kjnilsson 5cc21d7625 test for agent collector 2016-09-07 15:53:22 +01:00
kjnilsson 3ac9591a43 update external stats on init 2016-09-07 12:50:05 +01:00
Jean-Sébastien Pédron 1266b1dd9a Travis CI: Test on Erlang 18.3 and 19.0 only 2016-09-06 12:22:31 +02:00
Jean-Sébastien Pédron 204dea9982 Merge branch 'stable' 2016-09-06 12:22:20 +02:00
Jean-Sébastien Pédron 1f63315386 Travis CI: Initial configuration, copied from rabbitmq-shovel 2016-09-06 12:18:21 +02:00
kjnilsson d08fef8f35 lower excessive test sleep 2016-09-06 09:52:35 +01:00
kjnilsson 377db86c55 add basic metrics tests for external metrics 2016-09-06 09:34:41 +01:00
Jean-Sébastien Pédron f384aaf83a Merge branch 'stable' 2016-09-02 16:05:24 +02:00
kjnilsson 4a9c31a7db mqmt_agent_collector should stop when mgmt_metrics_collector goes down. 2016-09-02 13:45:54 +01:00
Jean-Sébastien Pédron be6b2e3976 Update rabbitmq-components.mk 2016-09-02 13:22:26 +02:00
Jean-Sébastien Pédron ed3525214e Update rabbitmq-components.mk 2016-09-02 12:03:31 +02:00
Diana Corbacho 7daacc029f Store raw node and node node metrics 2016-08-25 19:18:33 +01:00
Diana Corbacho 5426666a45 Raw metrics collector and notification of 'closed' events only 2016-08-10 11:31:50 +01:00
kjnilsson 507a920b13 filter out rabbitmq-test from TEST_DEPS 2016-07-18 12:00:31 +01:00
Michael Klishin 7e56eae5df Update rabbitmq-components.mk 2016-07-14 15:44:11 +03:00
Michael Klishin 9d6b6fdee9 Update rabbitmq-components.mk 2016-07-14 15:37:32 +03:00
Michael Klishin e85cb35e6b Update rabbitmq-components.mk 2016-07-14 13:39:58 +03:00
Michael Klishin fff336e6ed Update rabbitmq-components.mk 2016-07-14 13:20:00 +03:00
Michael Klishin a54ef8ee34 Merge branch 'stable' 2016-07-07 12:45:52 +03:00
Michael Klishin bff510c63f rate_per_second/3 is no longer used 2016-07-07 12:42:56 +03:00
Michael Klishin 70f53a515f Merge branch 'stable' 2016-07-07 12:41:07 +03:00
Diana Corbacho e6b7444480 Report GC and context switches stats in node_stats 2016-06-28 15:44:14 +01:00
Michael Klishin 31c6fa91f3 Merge branch 'stable' 2016-05-29 23:34:52 +03:00
Michael Klishin c0f864dc36 Update rabbitmq-components.mk 2016-05-29 23:21:55 +03:00
Michael Klishin 9dfc9b8e01 Update CONTRIBUTING.md, add CODE_OF_CONDUCT.md 2016-05-28 09:54:53 -07:00
Michael Klishin be05711b67 Update CONTRIBUTING.md, add CODE_OF_CONDUCT.md 2016-05-28 14:22:50 +03:00
kjnilsson 3d13bdff36 Merge branch 'stable' 2016-05-18 13:22:06 +01:00
Karl Nilsson ebb8be2175 Update rabbitmq-components.mk 2016-05-18 12:48:00 +01:00
Michael Klishin 4c7005b186 Update rabbitmq-components.mk 2016-05-17 11:17:53 +03:00
Michael Klishin 139f6ed9bd Update rabbitmq-components.mk 2016-05-17 10:16:09 +03:00
Daniil Fedotov 3b03e7f057 Stub for broker_version_requirements 2016-04-22 14:42:18 +01:00
Michael Klishin 3b170e07de Merge branch 'stable' 2016-04-08 22:38:50 +03:00
Diana Corbacho 91ff9f6286 Send channel and queue stats to their own collectors to avoid race conditions 2016-04-08 14:58:02 +01:00
Michael Klishin cc39b3cfbf Merge branch 'stable' 2016-03-23 17:20:54 +03:00
Michael Klishin 4e89a4bb57 Update rabbitmq-components.mk 2016-03-23 17:13:40 +03:00
Michael Klishin b31ca95913 Merge branch 'stable' 2016-03-10 02:41:20 +03:00
Michael Klishin bba8aab7a5 Compile 2016-03-09 12:01:25 +03:00
Diana Corbacho ee191133ba Avoid average operation time calculations in the agent 2016-03-08 09:02:13 +00:00
Michael Klishin a6df45741d Merge branch 'stable' 2016-03-03 21:26:34 +03:00
Michael Klishin 1448ca5661 Merge branch 'stable' into rabbitmq-management-41 2016-02-09 02:30:25 +03:00
Michael Klishin 612ce57212 Add license files 2016-01-17 01:31:41 +03:00
Michael Klishin 06a82dbc36 Add license files 2016-01-17 01:31:14 +03:00
Jean-Sébastien Pédron e4f891d220 Use the new rabbit:log_locations/0 API
Keys `log_file` and `sasl_log_file` are replaced by a single key
`log_files` which returns a list.

References rabbitmq/rabbitmq-server#94.
2016-01-15 11:13:55 +01:00
Diana Corbacho 97ad4b0798 Send events to queue and channel collectors 2016-01-06 09:32:07 +01:00
Diana Corbacho ad2e0a3954 Send events to new collector rabbit_mgmt_event_collector 2016-01-06 09:32:07 +01:00
Michael Klishin c525715066 Update (c) info 2016-01-01 12:59:18 +03:00
Pierre Fenoll 823314ac7d .gitignore: make absolute paths relative 2015-12-28 19:07:20 +03:00
Jean-Sébastien Pédron 58ff949234 Update erlang.mk 2015-12-18 20:34:02 +01:00
Jean-Sébastien Pédron a6f7e50b12 Update rabbitmq-components.mk 2015-12-18 19:08:08 +01:00
Michael Klishin 4116fb04f1 Update rabbitmq-components.mk 2015-12-18 19:48:46 +03:00
Jean-Sébastien Pédron 0777aa9870 Update rabbitmq-components.mk 2015-12-03 15:38:49 +01:00
Jean-Sébastien Pédron 1d34e0a8d8 Update rabbitmq-components.mk 2015-12-01 18:36:22 +01:00
Jean-Sébastien Pédron 576fb8a918 Update rabbitmq-components.mk 2015-12-01 16:17:18 +01:00
Jean-Sébastien Pédron 54f2787e39 Update rabbitmq-components.mk 2015-11-30 09:14:11 +01:00
Jean-Sébastien Pédron edb87d6fa6 Update rabbitmq-components.mk 2015-11-26 08:54:10 +01:00
Jean-Sébastien Pédron 504e677e6a Update rabbitmq-components.mk 2015-11-26 08:41:23 +01:00
Jean-Sébastien Pédron 1d6eac1ddf Update erlang.mk 2015-11-25 10:36:03 +01:00
Jean-Sébastien Pédron 19687ae9f4 Update rabbitmq-components.mk 2015-11-25 10:35:23 +01:00
Jean-Sébastien Pédron dac0331518 Update rabbitmq-components.mk 2015-11-20 10:52:05 +01:00
Jean-Sébastien Pédron 84e40642e7 Update erlang.mk 2015-11-19 14:31:52 +01:00
Jean-Sébastien Pédron 29f8a8626b Update erlang.mk 2015-11-18 19:14:35 +01:00
Jean-Sébastien Pédron d8b029b437 Update erlang.mk 2015-11-18 17:39:36 +01:00
Jean-Sébastien Pédron bc3c35aafa Update erlang.mk 2015-11-10 13:12:20 +01:00
Jean-Sébastien Pédron 94e2054482 Update rabbitmq-components.mk 2015-11-10 13:11:16 +01:00
Jean-Sébastien Pédron 3f4a5ba0df Update rabbitmq-components.mk 2015-11-05 20:51:34 +00:00
Jean-Sébastien Pédron 752cd809c3 Update rabbitmq-components.mk 2015-11-03 15:12:29 +01:00
Jean-Sébastien Pédron a1b11bdfe5 Update rabbitmq-components.mk 2015-11-02 10:20:50 +01:00
Jean-Sébastien Pédron cb8e36b1b9 Update rabbitmq-components.mk 2015-10-30 17:32:56 +01:00
Jean-Sébastien Pédron 02f06d0ca6 Update erlang.mk 2015-10-28 11:16:01 +01:00
Jean-Sébastien Pédron 523c49e3b0 Update rabbitmq-components.mk 2015-10-28 11:10:36 +01:00
Jean-Sébastien Pédron 6e0a48a05a Update erlang.mk 2015-10-26 15:33:27 +01:00
Jean-Sébastien Pédron ce237f3264 Update rabbitmq-components.mk 2015-10-26 11:15:29 +01:00
Jean-Sébastien Pédron 3ef682fa89 Update rabbitmq-components.mk 2015-10-26 10:21:18 +01:00
Jean-Sébastien Pédron 1e01b68529 Update erlang.mk 2015-10-23 18:32:48 +02:00
Jean-Sébastien Pédron 6045a6e1a2 Update rabbitmq-components.mk 2015-10-23 16:05:44 +02:00