Fix metric listings for activemq / activemq_xml (DataDog#2487)

* Fix metric listings for activemq / activemq_xml

* Update based on comments

* Update activemq metadata based on comment

activemq/README.md

@@ -1,8 +1,8 @@
-# Activemq Integration
+# ActiveMQ Integration
 
 ## Overview
 
-The ActiveMQ check lets you collect metrics for brokers and queues, producers and consumers, and more.
+The ActiveMQ check collects metrics for brokers and queues, producers and consumers, and more.
 
 **Note**: If you are running a ActiveMQ version older than 5.8.0, see the [Agent 5.10.x released sample files][110].
 
@@ -16,7 +16,7 @@ The check collects metrics via JMX, so you need a JVM on each node so the Agent
 ### Configuration
 
 1. **Make sure that [JMX Remote is enabled][103] on your ActiveMQ server.**
-2. Configure the agent to connect to ActiveMQ. Edit `activemq.d/conf.yaml` file, in the `conf.d/` folder at the root of your [Agent's configuration directory][111]. See the [sample activemq.d/conf.yaml][104] for all available configuration options.
+2. Configure the agent to connect to ActiveMQ. Edit `activemq.d/conf.yaml`, in the `conf.d/` folder at the root of your [Agent's configuration directory][111]. See the [sample activemq.d/conf.yaml][104] for all available configuration options.
 
       ```yaml
       instances:
@@ -91,14 +91,13 @@ The check collects metrics via JMX, so you need a JVM on each node so the Agent
 
 ## Data Collected
 ### Metrics
-The ActiveMQ check does not include any metrics at this time.
+See [metadata.csv][112] for a list of metrics provided by this integration.
 
 ### Events
 The ActiveMQ check does not include any events at this time.
 
 ### Service Checks
-**activemq.can_connect**:
-
+**activemq.can_connect**:  
 Returns `CRITICAL` if the Agent is unable to connect to and collect metrics from the monitored ActiveMQ instance. Returns `OK` otherwise.
 
 ## Troubleshooting
@@ -119,3 +118,4 @@ Need help? Contact [Datadog Support][107].
 [109]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent
 [110]: https://raw.githubusercontent.com/DataDog/dd-agent/5.10.1/conf.d/activemq.yaml.example
 [111]: https://docs.datadoghq.com/agent/faq/agent-configuration-files/#agent-configuration-directory
+[112]: https://github.com/DataDog/integrations-core/blob/master/activemq/metadata.csv

activemq/metadata.csv

@@ -1 +1,16 @@
 metric_name,metric_type,interval,unit_name,per_unit_name,description,orientation,integration,short_name
+activemq.queue.avg_enqueue_time,gauge,10,millisecond,,On average  the amount of time (ms) that messages remained enqueued.,0,activemq,avg enq time
+activemq.queue.consumer_count,gauge,10,,,The number of consumers connected,0,activemq,cnsmr count
+activemq.queue.producer_count,gauge,10,,,The number of producers connected,0,activemq,prdcr count
+activemq.queue.max_enqueue_time,gauge,10,millisecond,,The max the amount of time (ms) that messages remained enqueued.,0,activemq,max enq time
+activemq.queue.min_enqueue_time,gauge,10,millisecond,,The min the amount of time (ms) that messages remained enqueued.,0,activemq,min enq time
+activemq.queue.memory_pct,gauge,10,percent,,The percentage of memory currently in use,0,activemq,mem pct
+activemq.queue.size,gauge,10,message,,The amount of messages that remained queued.,0,activemq,enq size
+activemq.queue.dequeue_count,gauge,10,message,,The amount of messages that remained dequeued.,0,activemq,deq size
+activemq.queue.dispatch_count,gauge,10,message,,The amount of messages that have been dispatched.,0,activemq,dsptch cnt
+activemq.queue.enqueue_count,gauge,10,message,,The amount of messages that have been enqueued.,0,activemq,enq cnt
+activemq.queue.expired_count,gauge,10,message,,The amount of messages that have been expired.,0,activemq,exp cnt
+activemq.queue.in_flight_count,gauge,10,message,,The amount of messages that have been in flight.,0,activemq,enq cnt
+activemq.broker.store_pct,gauge,10,percent,,The percentage of store in use.,0,activemq,str pct
+activemq.broker.temp_pct,gauge,10,percent,,The percentage of temporary in use.,0,activemq,temp pct
+activemq.broker.memory_pct,gauge,10,percent,,The percentage of memory in use.,0,activemq,mem pct

activemq_xml/README.md

@@ -10,11 +10,11 @@ Get metrics from ActiveMQ XML service in real time to:
 ## Setup
 ### Installation
 
-The Activemq XML check is included in the [Datadog Agent][1] package, so you don't need to install anything else on your servers.
+The ActiveMQ XML check is included in the [Datadog Agent][1] package, so you don't need to install anything else on your servers.
 
 ### Configuration
 
-1. Edit the `activemq_xml.d/conf.yaml` file, in the `conf.d/` folder at the root of your [Agent's configuration directory][9], to point to your server and port, set the masters to monitor.
+1. Edit `activemq_xml.d/conf.yaml`, in the `conf.d/` folder at the root of your [Agent's configuration directory][9] with your stats `url`.
 
     See the [sample activemq_xml.d/conf.yaml][2] for all available configuration options.
 

activemq_xml/metadata.csv

@@ -1,16 +1,12 @@
 metric_name,metric_type,interval,unit_name,per_unit_name,description,orientation,integration,short_name
-activemq.queue.avg_enqueue_time,gauge,10,millisecond,,On average  the amount of time (ms) that messages remained enqueued.,0,activemq,avg enq time
-activemq.queue.consumer_count,gauge,10,,,The number of consumers connected,0,activemq,cnsmr count
-activemq.queue.producer_count,gauge,10,,,The number of producers connected,0,activemq,prdcr count
-activemq.queue.max_enqueue_time,gauge,10,millisecond,,The max  the amount of time (ms) that messages remained enqueued.,0,activemq,max enq time
-activemq.queue.min_enqueue_time,gauge,10,millisecond,,The min  the amount of time (ms) that messages remained enqueued.,0,activemq,min enq time
-activemq.queue.memory_pct,gauge,10,percent,,The percentage of memory currently in use,0,activemq,mem pct
-activemq.queue.size,gauge,10,,,The amount of messages that remained queued.,0,activemq,enq size
-activemq.queue.dequeue_count,gauge,10,,,The amount of messages that remained dequeued.,0,activemq,deq size
-activemq.queue.dispatch_count,gauge,10,,,The amount of messages that have been dispatched.,0,activemq,dsptch cnt
-activemq.queue.enqueue_count,gauge,10,,,The amount of messages that have been enqueued.,0,activemq,enq cnt
-activemq.queue.expired_count,gauge,10,,,The amount of messages that have been expired.,0,activemq,exp cnt
-activemq.queue.in_flight_count,gauge,10,,,The amount of messages that have been in flight.,0,activemq,enq cnt
-activemq.broker.store_pct,gauge,10,percent,,The percentage of store in use.,0,activemq,str pct
-activemq.broker.temp_pct,gauge,10,percent,,The percentage of temporary in use.,0,activemq,temp pct
-activemq.broker.memory_pct,gauge,10,percent,,The percentage of memory in use.,0,activemq,mem pct
+activemq.topic.count,gauge,,,,The number of topics.,0,activemq_xml,topic count
+activemq.topic.consumer_count,gauge,10,,,The number of consumers.,0,activemq_xml,topic cnsmr count
+activemq.topic.dequeue_count,gauge,10,message,,The total number of messages sent to the queue since the last restart.,0,activemq_xml,topic deq count
+activemq.topic.enqueue_count,gauge,10,message,,The total number of messages removed from the queue (acknowledged by consumer) since the last restart.,0,activemq_xml,topic enq count
+activemq.topic.size,gauge,10,,,The size of the topic.,0,activemq_xml,topic size
+activemq.subscriber.count,gauge,,,,The number of subscribers.,0,activemq_xml,sub count
+activemq.subscriber.dequeue_counter,gauge,,message,,The number of messages sent to and acknowledged by the client.,0,activemq_xml,sub deq cntr
+activemq.subscriber.dispatched_counter,gauge,,message,,The number of messages sent to the client.,0,activemq_xml,sub disptchd cntr
+activemq.subscriber.dipatched_queue_size,gauge,,message,,The number of messages dispatched that are awaiting acknowledgement.,0,activemq_xml,sub disptchd que size
+activemq.subscriber.enqueue_counter,gauge,,message,,The number of messages that matched the subscription.,0,activemq_xml,sub enq cntr
+activemq.subscriber.pending_queue_size,gauge,,message,,The number of messages pending delivery.,0,activemq_xml,sub pend que size