Muehlenhoff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399411 )

Change subject: Parse two additional metrics (used by the PDNS recursor in WMCS)
......................................................................

Parse two additional metrics (used by the PDNS recursor in WMCS)

Change-Id: Ibc560b3fde15e6f068b83c34a308ae26dfd155a7
---
M debian/changelog
M debian/upstart
M prometheus-pdns-rec-exporter
3 files changed, 10 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/prometheus-pdns-rec-exporter 
refs/changes/11/399411/1

diff --git a/debian/changelog b/debian/changelog
index aa5e183..413406d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+prometheus-pdns-rec-exporter (0.5) jessie-wikimedia; urgency=medium
+
+  * Parse two additional metrics (used by the PDNS recursor in WMCS)
+
+ -- Moritz Muehlenhoff <mmuhlenh...@wikimedia.org>  Wed, 20 Dec 2017 16:02:56 
+0100
+
 prometheus-pdns-rec-exporter (0.4) jessie-wikimedia; urgency=medium
 
   * Add upstart job, we now also need the exporter on labservices1001/trusty
diff --git a/debian/upstart b/debian/upstart
index 5e16bb2..1653c7a 100644
--- a/debian/upstart
+++ b/debian/upstart
@@ -7,5 +7,5 @@
 setuid prometheus
 
 script
-    exec /usr/bin/prometheus-pdns-exporter
+    exec /usr/bin/prometheus-pdns-rec-exporter
 end script
diff --git a/prometheus-pdns-rec-exporter b/prometheus-pdns-rec-exporter
index 0972de2..cf00ced 100644
--- a/prometheus-pdns-rec-exporter
+++ b/prometheus-pdns-rec-exporter
@@ -52,6 +52,7 @@
             'auth6-answers1-10': 
GaugeMetricFamily('pdns_rec_auth6_answers_ms_1_10', 'counts the number of 
queries answered by auth6s within 10 milliseconds'),
             'auth6-answers10-100': 
GaugeMetricFamily('pdns_rec_auth6_answers_ms_10_100', 'counts the number of 
queries answered by auth6s within 100 milliseconds'),
             'auth6-answers100-1000': 
GaugeMetricFamily('pdns_rec_auth6_answers_ms_100_1000', 'counts the number of 
queries answered by auth6s within 1 second'),
+            'cache-bytes': GaugeMetricFamily('pdns_rec_cache_bytes', 'size of 
the cache in bytes'),
             'cache-entries': GaugeMetricFamily('pdns_rec_cache_entries', 
'shows the number of entries in the cache'),
             'cache-hits': GaugeMetricFamily('pdns_rec_cache_hits', 'counts the 
number of cache hits since starting, this does not include hits that got 
answered from the packet-cache'),
             'cache-misses': GaugeMetricFamily('pdns_rec_cache_misses', 'counts 
the number of cache misses since starting'),
@@ -89,7 +90,8 @@
             'outgoing4-timeouts': 
GaugeMetricFamily('pdns_rec_outgoing4_timeouts', 'counts the number of timeouts 
on outgoing UDP IPv4 queries since starting (since 4.0)'),
             'outgoing6-timeouts': 
GaugeMetricFamily('pdns_rec_outgoing6_timeouts', 'counts the number of timeouts 
on outgoing UDP IPv6 queries since starting (since 4.0)'),
             'over-capacity-drops': 
GaugeMetricFamily('pdns_rec_over_capacity_drops', 'questions dropped because 
over maximum concurrent query limit (since 3.2)'),
-            'packetcache-entries': 
GaugeMetricFamily('pdns_rec_packetcache_entries', 'size of the packet cache in 
bytes'),
+            'packetcache-bytes': 
GaugeMetricFamily('pdns_rec_packetcache_bytes', 'size of the packet cache in 
bytes'),
+            'packetcache-entries': 
GaugeMetricFamily('pdns_rec_packetcache_entries', 'size of the packet cache'),
             'packetcache-hits': GaugeMetricFamily('pdns_rec_packetcache_hits', 
'packet cache hits'),
             'packetcache-misses': 
GaugeMetricFamily('pdns_rec_packetcache_misses', 'packet cache misses'),
             'policy-drops': GaugeMetricFamily('pdns_rec_policy_drops ', 
'packets dropped because of (Lua) policy decision'),

-- 
To view, visit https://gerrit.wikimedia.org/r/399411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc560b3fde15e6f068b83c34a308ae26dfd155a7
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/prometheus-pdns-rec-exporter
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to