Skip to content

Commit 552da47

Browse files
technovangelisttechnovangelist
committed
Merge pull request DataDog#652 from DataDog/mattw/autometricupdate
more metrics pulled from metadata
2 parents 92ce851 + 6f94af7 commit 552da47

File tree

8 files changed

+27
-255
lines changed

8 files changed

+27
-255
lines changed

‎content/integrations/cacti.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Datadog-Cacti Integration
33
integration_title: Cacti
44
kind: integration
55
doclevel: basic
6+
git_integration_title: cacti
67
---
78
### Overview
89

@@ -21,4 +22,6 @@ From the open-source Agent:
2122

2223

2324

25+
## Metrics
2426

27+
<%= get_metrics_from_git() %>

‎content/integrations/cassandra.md

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: Datadog-Cassandra Integration
33
integration_title: Cassandra
44
kind: integration
5+
git_integration_title: cassandra
56
---
67

78
![Cassandra default dashboard](/static/images/cassandra.png)
@@ -11,39 +12,6 @@ Learn more about how to monitor Cassandra performance metrics thanks to [our ser
1112

1213
For information on JMX Checks, please see <a href="http://docs.datadoghq.com/integrations/java/">here</a>.
1314

14-
The following metrics are collected by default with the Cassandra integration:
15-
16-
cassandra.ActiveCount
17-
cassandra.BloomFilterDiskSpaceUsed
18-
cassandra.BloomFilterFalsePositives
19-
cassandra.BloomFilterFalseRatio
20-
cassandra.Capacity
21-
cassandra.CompletedTasks
22-
cassandra.CompletedTasks
23-
cassandra.CompressionRatio
24-
cassandra.CurrentlyBlockedTasks
25-
cassandra.ExceptionCount
26-
cassandra.Hits
27-
cassandra.LiveDiskSpaceUsed
28-
cassandra.LiveSSTableCount
29-
cassandra.Load
30-
cassandra.MaxRowSize
31-
cassandra.MeanRowSize
32-
cassandra.MemtableColumnsCount
33-
cassandra.MemtableDataSize
34-
cassandra.MemtableSwitchCount
35-
cassandra.MinRowSize
36-
cassandra.PendingTasks
37-
cassandra.ReadCount
38-
cassandra.RecentHitRate
39-
cassandra.Requests
40-
cassandra.Size
41-
cassandra.TotalBlockedTasks
42-
cassandra.TotalDiskSpaceUsed
43-
cassandra.TotalReadLatencyMicros
44-
cassandra.TotalTimeouts
45-
cassandra.TotalWriteLatencyMicros
46-
cassandra.UpdateInterval
47-
cassandra.WriteCount
48-
15+
## Metrics
4916

17+
<%= get_metrics_from_git() %>

‎content/integrations/chef.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Datadog-Chef Integration
33
integration_title: Chef
44
kind: integration
55
doclevel: basic
6+
git_integration_title: chef
67
---
78
### Overview
89

@@ -17,4 +18,6 @@ To install the Datadog Agent via Chef, please see [here][1].
1718
[1]: http://docs.datadoghq.com/guides/chef/
1819

1920

21+
## Metrics
2022

23+
<%= get_metrics_from_git() %>

‎content/integrations/consul.md

Lines changed: 3 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: Datadog-Consul Integration
33
integration_title: Consul
44
kind: integration
5+
git_integration_title: consul
56
---
67

78
### Overview
@@ -18,119 +19,9 @@ From the open-source Agent:
1819
* [Consul checks.d][2]
1920

2021

21-
The following metrics are collected by default with the Consul integration:
22-
23-
consul.peers
24-
consul.catalog.nodes_up
25-
consul.consul.rpc.query
26-
consul.raft.apply
27-
consul.raft.barrier
28-
consul.raft.commitTime.avg
29-
consul.raft.commitTime.count
30-
consul.raft.commitTime.max
31-
consul.raft.commitTime.median
32-
consul.raft.compactLogs.avg
33-
consul.raft.compactLogs.count
34-
consul.raft.compactLogs.max
35-
consul.raft.compactLogs.median
36-
consul.raft.leader.dispatchLog.avg
37-
consul.raft.leader.dispatchLog.count
38-
consul.raft.leader.dispatchLog.max
39-
consul.raft.leader.dispatchLog.95percentile
40-
consul.raft.lastContact.avg
41-
consul.raft.lastContact.count
42-
consul.raft.lastContact.max
43-
consul.raft.lastContact.median
44-
consul.raft.lastContact.95percentile
45-
consul.raft.rpc.appendEntries.avg
46-
consul.raft.rpc.appendEntries.count
47-
consul.raft.rpc.appendEntries.max
48-
consul.raft.rpc.appendEntries.median
49-
consul.raft.rpc.appendEntries.95percentile
50-
consul.raft.rpc.processHeartbeat.avg
51-
consul.raft.rpc.processHeartbeat.count
52-
consul.raft.rpc.processHeartbeat.max
53-
consul.raft.rpc.processHeartbeat.median
54-
consul.raft.rpc.processHeartbeat.95percentile
55-
consul.raft.verify_leader
56-
consul.serf.events
57-
consul.serf.member.join
58-
consul.serf.member.left
59-
consul.catalog.services_up
60-
consul.consul.acl.cache_miss
61-
consul.consul.acl.fault.avg
62-
consul.consul.acl.fault.count
63-
consul.consul.acl.fault.max
64-
consul.consul.acl.fault.median
65-
consul.consul.acl.resolveToken.avg
66-
consul.consul.acl.resolveToken.max
67-
consul.consul.catalog.register.avg
68-
consul.consul.catalog.register.max
69-
consul.consul.fsm.deregister.avg
70-
consul.consul.fsm.deregister.count
71-
consul.consul.fsm.deregister.max
72-
consul.consul.fsm.deregister.median
73-
consul.consul.fsm.kvs.set.avg
74-
consul.consul.fsm.kvs.set.count
75-
consul.consul.fsm.kvs.set.max
76-
consul.consul.fsm.kvs.set.median
77-
consul.consul.fsm.persist.avg
78-
consul.consul.fsm.persist.count
79-
consul.consul.fsm.persist.max
80-
consul.consul.fsm.persist.median
81-
consul.consul.fsm.register.count
82-
consul.consul.fsm.register.max
83-
consul.consul.fsm.register.median
84-
consul.consul.kvs.apply.avg
85-
consul.consul.kvs.apply.count
86-
consul.consul.kvs.apply.max
87-
consul.consul.kvs.apply.median
88-
consul.consul.leader.barrier.avg
89-
consul.consul.leader.barrier.count
90-
consul.consul.leader.barrier.max
91-
consul.consul.leader.barrier.median
92-
consul.consul.leader.reapTombstones.avg
93-
consul.consul.leader.reapTombstones.count
94-
consul.consul.leader.reapTombstones.max
95-
consul.consul.leader.reapTombstones.median
96-
consul.consul.leader.reapTombstones.95percentile
97-
consul.consul.leader.reconcile.avg
98-
consul.consul.leader.reconcile.count
99-
consul.consul.leader.reconcile.max
100-
consul.consul.leader.reconcile.median
101-
consul.consul.leader.reconcile.95percentile
102-
consul.consul.leader.reconcileMember.avg
103-
consul.consul.leader.reconcileMember.count
104-
consul.consul.leader.reconcileMember.max
105-
consul.consul.leader.reconcileMember.median
106-
consul.consul.leader.reconcileMember.95percentile
107-
consul.consul.rpc.accept_conn
108-
consul.consul.rpc.raft_handoff
109-
consul.consul.rpc.request
110-
consul.consul.session.apply.avg
111-
consul.consul.session.apply.count
112-
consul.consul.session.apply.max
113-
consul.consul.session.apply.median
114-
consul.consul.session.renew.avg
115-
consul.consul.session.renew.count
116-
consul.consul.session.renew.max
117-
consul.consul.session.renew.median
118-
consul.serf.queue.Event.avg
119-
consul.serf.queue.Event.count
120-
consul.serf.queue.Event.max
121-
consul.serf.queue.Event.median
122-
consul.serf.queue.Event.95percentile
123-
consul.serf.queue.Intent.avg
124-
consul.serf.queue.Intent.count
125-
consul.serf.queue.Intent.max
126-
consul.serf.queue.Intent.median
127-
consul.serf.queue.Intent.95percentile
128-
consul.serf.queue.Query.avg
129-
consul.serf.queue.Query.count
130-
consul.serf.queue.Query.max
131-
consul.serf.queue.Query.95percentile
132-
22+
## Metrics
13323

24+
<%= get_metrics_from_git() %>
13425

13526
For each service that you're monitoring we'll create the `consul.catalog.nodes_up` gauge metric tagged by `consul_service_id` that will let you know how many Consul nodes are running each service. We'll also collect `consul.catalog.service_u` tagged by `consul_node_id` that measures how many services a node is running.
13627
Finally, we perform a service check `consul.check` that will report on the state of each service.

‎content/integrations/couchdb.md

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: Datadog-CouchDB Integration
33
integration_title: CouchDB
44
kind: integration
5+
git_integration_title: couchdb
56
---
67

78
### Overview
@@ -16,22 +17,11 @@ From the open-source Agent:
1617
* [ CouchDB YAML example][1]
1718
* [ CouchDB checks.d][2]
1819

19-
The following metrics are collected by default with the CouchDB integration:
20-
21-
22-
23-
couchdb.database_writes
24-
couchdb.database_reads
25-
couchdb.httpd.requests
26-
couchdb.httpd_request_methods
27-
couchdb.httpd_status_codes
28-
couchdb.httpd.temporary_view_reads
29-
couchdb.httpd.view_reads
30-
couchdb.open_databases
31-
couchdb.open_os_files
32-
couchdb.request_time
3320

3421
[1]: https://github.com/DataDog/dd-agent/blob/master/conf.d/couch.yaml.example
3522
[2]: https://github.com/DataDog/dd-agent/blob/master/checks.d/couch.py
3623

3724

25+
## Metrics
26+
27+
<%= get_metrics_from_git() %>

‎content/integrations/desk.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: Datadog-Desk Integration
33
integration_title: Desk
44
kind: integration
5+
git_integration_title: desk
56
---
67
## Overview
78

@@ -27,3 +28,6 @@ Hit the install button, and then you're all set! You will soon be able to select
2728
[4]: https://www.datadoghq.com/2015/02/keep-support-team-page-salesforce-desk-integration/
2829

2930

31+
## Metrics
32+
33+
<%= get_metrics_from_git() %>

‎content/integrations/dyn.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Datadog-Dyn Integration
33
integration_title: Dyn
44
kind: integration
55
doclevel: basic
6+
git_integration_title: dyn
67
---
78

89

@@ -11,3 +12,7 @@ Monitor your zones with advanced graphs and events.
1112

1213
* Keep track of the changes made when a zone is updated
1314
* Analyze the QPS made by zone or record type thanks to advanced graphing tools
15+
16+
## Metrics
17+
18+
<%= get_metrics_from_git() %>

‎content/integrations/elasticsearch.md

Lines changed: 2 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Datadog-Elasticsearch Integration
33
integration_title: ElasticSearch
44
kind: integration
55
newhlevel: true
6+
git_integration_title: elasticsearch
67
---
78

89
# Overview
@@ -57,101 +58,8 @@ To validate that the integration is working, run ```datadog-agent info```. You s
5758
- Collected 97 metrics, 0 events & 3 service checks
5859

5960
# Metrics
61+
<%= get_metrics_from_git()%>
6062

61-
The following metrics are collected by default with the ElasticSearch integration:
62-
63-
| ElasticSearch metrics |
64-
|-------------------|
65-
|elasticsearch.active_primary_shards|
66-
|elasticsearch.active_shards|
67-
|elasticsearch.cache.field.evictions|
68-
|elasticsearch.cache.field.size|
69-
|elasticsearch.cache.filter.count|
70-
|elasticsearch.cache.filter.evictions|
71-
|elasticsearch.cache.filter.size|
72-
|elasticsearch.docs.count|
73-
|elasticsearch.docs.deleted|
74-
|elasticsearch.flush.total|
75-
|elasticsearch.flush.total.time|
76-
|elasticsearch.get.current|
77-
|elasticsearch.get.exists.time|
78-
|elasticsearch.get.exists.total|
79-
|elasticsearch.get.missing.time|
80-
|elasticsearch.get.missing.total|
81-
|elasticsearch.get.time|
82-
|elasticsearch.get.total|
83-
|elasticsearch.http.current_open|
84-
|elasticsearch.http.total_opened|
85-
|elasticsearch.indexing.delete.current|
86-
|elasticsearch.indexing.delete.time|
87-
|elasticsearch.indexing.delete.total|
88-
|elasticsearch.indexing.index.current|
89-
|elasticsearch.indexing.index.time|
90-
|elasticsearch.indexing.index.total|
91-
|elasticsearch.initializing_shards|
92-
|elasticsearch.merges.current|
93-
|elasticsearch.merges.current.docs|
94-
|elasticsearch.merges.current.size|
95-
|elasticsearch.merges.total|
96-
|elasticsearch.merges.total.docs|
97-
|elasticsearch.merges.total.size|
98-
|elasticsearch.merges.total.time|
99-
|elasticsearch.number_of_data_nodes|
100-
|elasticsearch.number_of_nodes|
101-
|elasticsearch.process.open_fd|
102-
|elasticsearch.refresh.total|
103-
|elasticsearch.refresh.total.time|
104-
|elasticsearch.relocating_shards|
105-
|elasticsearch.search.fetch.current|
106-
|elasticsearch.search.fetch.time|
107-
|elasticsearch.search.fetch.total|
108-
|elasticsearch.search.query.current|
109-
|elasticsearch.search.query.time|
110-
|elasticsearch.search.query.total|
111-
|elasticsearch.store.size|
112-
|elasticsearch.thread_pool.bulk.active|
113-
|elasticsearch.thread_pool.bulk.queue|
114-
|elasticsearch.thread_pool.bulk.threads|
115-
|elasticsearch.thread_pool.cache.active|
116-
|elasticsearch.thread_pool.cache.queue|
117-
|elasticsearch.thread_pool.cache.threads|
118-
|elasticsearch.thread_pool.flush.active|
119-
|elasticsearch.thread_pool.flush.queue|
120-
|elasticsearch.thread_pool.flush.threads|
121-
|elasticsearch.thread_pool.generic.active|
122-
|elasticsearch.thread_pool.generic.queue|
123-
|elasticsearch.thread_pool.generic.threads|
124-
|elasticsearch.thread_pool.get.active|
125-
|elasticsearch.thread_pool.get.queue|
126-
|elasticsearch.thread_pool.get.threads|
127-
|elasticsearch.thread_pool.index.active|
128-
|elasticsearch.thread_pool.index.queue|
129-
|elasticsearch.thread_pool.index.threads|
130-
|elasticsearch.thread_pool.management.active|
131-
|elasticsearch.thread_pool.management.queue|
132-
|elasticsearch.thread_pool.management.threads|
133-
|elasticsearch.thread_pool.merge.active|
134-
|elasticsearch.thread_pool.merge.queue|
135-
|elasticsearch.thread_pool.merge.threads|
136-
|elasticsearch.thread_pool.percolate.active|
137-
|elasticsearch.thread_pool.percolate.queue|
138-
|elasticsearch.thread_pool.percolate.threads|
139-
|elasticsearch.thread_pool.refresh.active|
140-
|elasticsearch.thread_pool.refresh.queue|
141-
|elasticsearch.thread_pool.refresh.threads|
142-
|elasticsearch.thread_pool.search.active|
143-
|elasticsearch.thread_pool.search.queue|
144-
|elasticsearch.thread_pool.search.threads|
145-
|elasticsearch.thread_pool.snapshot.active|
146-
|elasticsearch.thread_pool.snapshot.queue|
147-
|elasticsearch.thread_pool.snapshot.threads|
148-
|elasticsearch.transport.rx_count|
149-
|elasticsearch.transport.rx_size|
150-
|elasticsearch.transport.server_open|
151-
|elasticsearch.transport.tx_count|
152-
|elasticsearch.transport.tx_size|
153-
|elasticsearch.unassigned_shards|
154-
{:.table}
15563

15664

15765
[1]: https://github.com/DataDog/dd-agent/blob/master/conf.d/elastic.yaml.example

0 commit comments

Comments
 (0)