Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392424 )
Change subject: Remove incomplete query/node/* metrics
......................................................................
Remove incomplete query/node/* metrics
While testing in production the exporter a bug came up,
namely that the query/node/* metrics are missing a label,
the 'server' one. These metrics are broker specific and are
meant to give more information to pin point latencies between
a broker and a historical to fulfill a query. This information
is redundand since the exporter already collects separated
latency/size metrics for broker and historical, and can always
be found in the logs emitted by default if a specific investigation
needs to be done.
Bug: T177459
Change-Id: Ic22cb3bda825c4b6d00a65aafc188d7bf19a2b15
---
M README.md
M druid_exporter/collector.py
M test/test_collector.py
3 files changed, 1 insertion(+), 39 deletions(-)
Approvals:
Ottomata: Looks good to me, but someone else must approve
Elukey: Verified; Looks good to me, approved
diff --git a/README.md b/README.md
index 9cf3d80..b81150c 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,6 @@
### Broker, Historical (histograms)
* `query/time` [datasource]
* `query/bytes` [datasource]
-* `query/node/time` [datasource, server]
-* `query/node/bytes` [datasource, server]
* `query/cache/total/numEntries`
* `query/cache/total/sizeBytes`
* `query/cache/total/hits`
diff --git a/druid_exporter/collector.py b/druid_exporter/collector.py
index 6b4319f..02e0c4e 100644
--- a/druid_exporter/collector.py
+++ b/druid_exporter/collector.py
@@ -38,8 +38,6 @@
# Broker, Historical
'query/time': ['dataSource'],
'query/bytes': ['dataSource'],
- 'query/node/time': ['dataSource', 'server'],
- 'query/node/bytes': ['dataSource', 'server'],
'query/cache/total/numEntries': None,
'query/cache/total/sizeBytes': None,
'query/cache/total/hits': None,
@@ -74,8 +72,6 @@
self.metric_buckets = {
'query/time': ['10', '100', '500', '1000', '10000', 'inf', 'sum'],
'query/bytes': ['10', '100', '500', '1000', '10000', 'inf', 'sum'],
- 'query/node/time': ['10', '100', '500', '1000', '10000', 'inf',
'sum'],
- 'query/node/bytes': ['10', '100', '500', '1000', '10000', 'inf',
'sum'],
}
# Data structure holding histogram data
@@ -84,8 +80,6 @@
self.histograms_metrics = set([
'query/time',
'query/bytes',
- 'query/node/time',
- 'query/node/bytes',
])
# Data structure holding counters data
@@ -137,17 +131,7 @@
'druid_' + daemon + '_query_bytes',
'Number of bytes returned in query response.',
labels=['datasource']),
- 'query/node/time': HistogramMetricFamily(
- 'druid_' + daemon + '_query_node_time_ms',
- 'Milliseconds taken to query individual '
- 'historical/realtime nodes.',
- labels=['datasource', 'server']),
- 'query/node/bytes': HistogramMetricFamily(
- 'druid_' + daemon + '_query_node_bytes',
- 'number of bytes returned from querying individual '
- 'historical/realtime nodes.',
- labels=['datasource', 'server']),
- }
+ }
def _get_cache_counters(self, daemon):
return {
diff --git a/test/test_collector.py b/test/test_collector.py
index 7e42256..58fa34b 100644
--- a/test/test_collector.py
+++ b/test/test_collector.py
@@ -214,26 +214,6 @@
"remoteAddress": "10.64.5.101", "type": "segmentMetadata",
"version": "0.9.2"},
- {"feed": "metrics", "timestamp": "2017-11-14T16:25:19.437Z",
- "service": "druid/broker", "host": "druid1001.eqiad.wmnet:8082",
- "metric": "query/node/time", "value": 15,
- "dataSource": "banner_activity_minutely",
- "duration": "PT3600S", "hasFilters": "false",
- "id": "39fbcfd5-d616-4313-9df0-5f2deb46ccb9",
- "interval": ["2017-11-14T16:00:00.000Z/2017-11-14T17:00:00.000Z"],
- "server": "druid1003.eqiad.wmnet:8103", "type": "timeBoundary",
- "version": "0.9.2"},
-
- {"feed": "metrics", "timestamp": "2017-11-14T16:25:19.437Z",
- "service": "druid/historical", "host":
"druid1001.eqiad.wmnet:8082",
- "metric": "query/node/time", "value": 135,
- "dataSource": "banner_activity_minutely",
- "duration": "PT3600S", "hasFilters": "false",
- "id": "39fbcfd5-d616-4313-9df0-5f2deb46ccb9",
- "interval": ["2017-11-14T16:00:00.000Z/2017-11-14T17:00:00.000Z"],
- "server": "druid1003.eqiad.wmnet:8103", "type": "timeBoundary",
- "version": "0.9.2"},
-
{"feed": "metrics", "timestamp": "2017-11-14T16:25:39.217Z",
"service": "druid/broker", "host": "druid1001.eqiad.wmnet:8082",
"metric": "query/cache/total/numEntries", "value": 5350},
--
To view, visit https://gerrit.wikimedia.org/r/392424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic22cb3bda825c4b6d00a65aafc188d7bf19a2b15
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/druid_exporter
Gerrit-Branch: master
Gerrit-Owner: Elukey <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Joal <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
