From 4b562d2cffd090bf184b73d12dca7e48d96112a8 Mon Sep 17 00:00:00 2001 From: Mike Garabedian Date: Tue, 23 Feb 2021 18:15:37 -0500 Subject: [PATCH] Update metric types --- .../datadog_checks/activemq/data/metrics.yaml | 29 ++++++++++--------- activemq/metadata.csv | 28 +++++++++--------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/activemq/datadog_checks/activemq/data/metrics.yaml b/activemq/datadog_checks/activemq/data/metrics.yaml index 3935109ad586c..3f66c665ca667 100644 --- a/activemq/datadog_checks/activemq/data/metrics.yaml +++ b/activemq/datadog_checks/activemq/data/metrics.yaml @@ -72,22 +72,22 @@ jmx_metrics: metric_type: gauge ConnectionCount: alias: activemq.artemis.connection_count - metric_type: gauge + metric_type: counter TotalConnectionCount: alias: activemq.artemis.total_connection_count - metric_type: gauge + metric_type: monotonic_count TotalMessageCount: alias: activemq.artemis.total_message_count - metric_type: gauge + metric_type: monotonic_count TotalMessagesAdded: alias: activemq.artemis.total_messages_added - metric_type: gauge + metric_type: monotonic_count TotalMessagesAcknowledged: alias: activemq.artemis.total_messages_acknowledged - metric_type: gauge + metric_type: monotonic_count TotalConsumerCount: alias: activemq.artemis.total_consumer_count - metric_type: gauge + metric_type: monotonic_count - include: domain: org.apache.activemq.artemis @@ -98,19 +98,19 @@ jmx_metrics: metric_type: gauge NumberOfPages: alias: activemq.artemis.address.pages_count - metric_type: gauge + metric_type: counter NumberOfMessages: alias: activemq.artemis.address.number_of_messages - metric_type: gauge + metric_type: monotonic_count NumberOfBytesPerPage: alias: activemq.artemis.address.bytes_per_page metric_type: gauge RoutedMessageCount: alias: activemq.artemis.address.routed_messages - metric_type: gauge + metric_type: monotonic_count UnRoutedMessageCount: alias: activemq.artemis.address.unrouted_messages - metric_type: gauge + metric_type: monotonic_count - include: domain: org.apache.activemq.artemis @@ -118,7 +118,7 @@ jmx_metrics: attribute: MessageCount: alias: activemq.artemis.queue.message_count - metric_type: gauge + metric_type: monotonic_count ConsumerCount: alias: activemq.artemis.queue.consumer_count metric_type: gauge @@ -127,13 +127,14 @@ jmx_metrics: metric_type: gauge MessagesAdded: alias: activemq.artemis.queue.messages_added - metric_type: gauge + metric_type: monotonic_count MessagesExpired: + # implied as monotonic count, reports as gauge alias: activemq.artemis.queue.messages_expired metric_type: gauge MessagesAcknowledged: alias: activemq.artemis.queue.messages_acknowledged - metric_type: gauge + metric_type: monotonic_count MessagesKilled: alias: activemq.artemis.queue.messages_killed - metric_type: gauge + metric_type: monotonic_count diff --git a/activemq/metadata.csv b/activemq/metadata.csv index e721cc241e7ac..d63ed26255c68 100644 --- a/activemq/metadata.csv +++ b/activemq/metadata.csv @@ -18,22 +18,22 @@ activemq.artemis.address_memory_usage,gauge,,,,(Artemis only) Memory used by all activemq.artemis.address_memory_usage_pct,gauge,,,,(Artemis only) Memory used by all the addresses on broker as a percentage of the global-max-size,0,activemq,art mem pct activemq.artemis.max_disk_usage,gauge,,,,(Artemis only) Maximum limit for disk use in percentage,0,activemq,art max disk activemq.artemis.disk_store_usage_pct,gauge,,,,(Artemis only) Percentage of total disk store used,0,activemq,art disk pct -activemq.artemis.connection_count,gauge,,,,(Artemis only) Number of clients connected to this server,0,activemq,art conn count -activemq.artemis.total_connection_count,gauge,,,,(Artemis only) Number of clients which have connected to this server since it was started,0,activemq,art total conns -activemq.artemis.total_message_count,gauge,,,,(Artemis only) Number of messages in all queues on the server,0,activemq,art total messages -activemq.artemis.total_messages_added,gauge,,,,(Artemis only) Number of messages sent to this server since it was started,0,activemq,art total mess added -activemq.artemis.total_messages_acknowledged,gauge,,,,(Artemis only) Number of messages acknowledged from all the queues on this server since it was started,0,activemq,art total mess acked -activemq.artemis.total_consumer_count,gauge,,,,(Artemis only) Number of consumers consuming messages from all the queues on this server,0,activemq,art total consumers +activemq.artemis.connection_count,counter,,,,(Artemis only) Number of clients connected to this server,0,activemq,art conn count +activemq.artemis.total_connection_count,monotonic_count,,,,(Artemis only) Number of clients which have connected to this server since it was started,0,activemq,art total conns +activemq.artemis.total_message_count,monotonic_count,,,,(Artemis only) Number of messages in all queues on the server,0,activemq,art total messages +activemq.artemis.total_messages_added,monotonic_count,,,,(Artemis only) Number of messages sent to this server since it was started,0,activemq,art total mess added +activemq.artemis.total_messages_acknowledged,monotonic_count,,,,(Artemis only) Number of messages acknowledged from all the queues on this server since it was started,0,activemq,art total mess acked +activemq.artemis.total_consumer_count,monotonic_count,,,,(Artemis only) Number of consumers consuming messages from all the queues on this server,0,activemq,art total consumers activemq.artemis.address.size,gauge,,,,(Artemis only) Number of estimated bytes being used by all the queue(s) bound to this address; used to control paging and blocking,0,activemq,add size -activemq.artemis.address.pages_count,gauge,,,,(Artemis only) Number of pages used by this address,0,activemq,add pages -activemq.artemis.address.number_of_messages,gauge,,,,"(Artemis only) The sum of messages on queue(s), including messages in delivery",0,activemq,add num mess +activemq.artemis.address.pages_count,counter,,,,(Artemis only) Number of pages used by this address,0,activemq,add pages +activemq.artemis.address.number_of_messages,monotonic_count,,,,"(Artemis only) The sum of messages on queue(s), including messages in delivery",0,activemq,add num mess activemq.artemis.address.bytes_per_page,gauge,,,,(Artemis only) Number of bytes used by each page for this address,0,activemq,add bytes page -activemq.artemis.address.routed_messages,gauge,,,,(Artemis only) Number of messages routed to one or more bindings,0,activemq,add routed -activemq.artemis.address.unrouted_messages,gauge,,,,(Artemis only) Number of messages not routed to any bindings,0,activemq,add unrouted -activemq.artemis.queue.message_count,gauge,,,,"(Artemis only) Number of messages currently in this queue (includes scheduled, paged, and in-delivery messages)",0,activemq,art q mess count +activemq.artemis.address.routed_messages,monotonic_count,,,,(Artemis only) Number of messages routed to one or more bindings,0,activemq,add routed +activemq.artemis.address.unrouted_messages,monotonic_count,,,,(Artemis only) Number of messages not routed to any bindings,0,activemq,add unrouted +activemq.artemis.queue.message_count,monotonic_count,,,,"(Artemis only) Number of messages currently in this queue (includes scheduled, paged, and in-delivery messages)",0,activemq,art q mess count activemq.artemis.queue.consumer_count,gauge,,,,(Artemis only) Number of consumers consuming messages from this queue,0,activemq,art q consumers activemq.artemis.queue.max_consumers,gauge,,,,(Artemis only) Maximum number of consumers allowed on this queue at any one time,0,activemq,art q max consumers -activemq.artemis.queue.messages_added,gauge,,,,(Artemis only) Number of messages added to this queue since it was created,0,activemq,art q mess added +activemq.artemis.queue.messages_added,monotonic_count,,,,(Artemis only) Number of messages added to this queue since it was created,0,activemq,art q mess added activemq.artemis.queue.messages_expired,gauge,,,,(Artemis only) Number of messages expired from this queue since it was created,0,activemq,art q mess exp -activemq.artemis.queue.messages_acknowledged,gauge,,,,(Artemis only) Number of messages acknowledged from this queue since it was created,0,activemq,art q mess acked -activemq.artemis.queue.messages_killed,gauge,,,,(Artemis only) Number of messages removed from this queue since it was created due to exceeding the max delivery attempts,0,activemq,art q mess killed +activemq.artemis.queue.messages_acknowledged,monotonic_count,,,,(Artemis only) Number of messages acknowledged from this queue since it was created,0,activemq,art q mess acked +activemq.artemis.queue.messages_killed,monotonic_count,,,,(Artemis only) Number of messages removed from this queue since it was created due to exceeding the max delivery attempts,0,activemq,art q mess killed