sensu-plugins-pdns 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4336ea124eea0e92a7b79307d7a72a637e4b90a3
-  data.tar.gz: 40b408ca1b9ece4e9f1017506f0ce3c1c5f2f2f8
+  metadata.gz: 05e1e1c5734632df327366c589c4e3457d9298c0
+  data.tar.gz: d7601f43eef2cb18d27b8ca8a8cf3d28f00ae465
 SHA512:
-  metadata.gz: 8ca7508ffacaac0acd09ae03fa2a9bd6bef0d60f8976ed8910c2b08ec4be4053b00dbda5907e803872935c3ec8a1b3c0e2a67bcd84cb62cf163fe52f83d59960
-  data.tar.gz: 7e49054bfc34161922c2fc22f2e2d61297ebed9e2a7c6fc76f0f98ac345e9e7b3dc20896b0a7f2d681e549646195c572c05797b77fe23c25ae227c9b67d1c57f
+  metadata.gz: 6004dd6093fe520179a43887d9192f5c239c6f5bb9f75a9f4496b2478321f9c9e599066021eebf764637125a30535b1077318f493f7e2562dd4d86922f1e1cc0
+  data.tar.gz: 7e4062d6a695efc8c37e0e261bf4c51eeaffb306c7522f6f16a2c2a70f7b1719a248a187459fcc84272bd28d071e41751e74266e880b912b45a7976c18724aae

data/CHANGELOG.md

@@ -3,8 +3,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.1.0] - 2017-08-31
+### Added
+- Add support to capture more PowerDNS metrics like queries/second (@haashah)
+
 ## 0.0.1 - 2017-08-27
 ### Added
 - Initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-pdns/compare/0.0.1...HEAD
+[0.1.0]: https://github.com/sensu-plugins/sensu-plugins-pdns/compare/0.0.1...0.1.0

data/README.md

@@ -7,6 +7,10 @@
 ## Functionality
 metrics-pdns.rb - Query PowerDNS for statistics. Record stats as metrics and output in Graphite plaintext format
 
+Arguments:
+* --syslog: specify the path to syslog to fetch the extra pdns stats from. default: /var/log/messages
+* --extra: flag to enable sending of stats collected from syslog. default value is false.
+
 Details:
  [PowerDNS statistics](https://doc.powerdns.com/recursor/metrics.html)
 

data/bin/metrics-pdns.rb

@@ -19,6 +19,8 @@
 #
 # NOTES:
 #   Requires sudo permissions for the sensu user to run rec_control
+#   Requires sudo permissions for the sensu user to run tail and pkill commands
+#   when using the extra flag for syslog stats.
 #
 # LICENSE:
 #   <Hammad Shah>  <haashah@gmail.com>
@@ -37,15 +39,52 @@ class PdnsGraphite < Sensu::Plugin::Metric::CLI::Graphite
          long: '--scheme SCHEME',
          default: "#{Socket.gethostname}.pdns"
 
-  def run
-    metrics = `sudo rec_control get-all`.split("\n")
+  option :syslog_path,
+         description: 'Path to the syslog',
+         long: '--syslog SYSLOG',
+         default: '/var/log/messages'
+
+  option :extra_stats,
+         description: 'flag to send stats collected from syslog like qps',
+         boolean: true,
+         short: '-e',
+         long: '--extra',
+         default: false
+
+  def cmd_run(cmd)
+    result = `#{cmd}`.split("\n")
     if $CHILD_STATUS.exitstatus > 0
-      critical 'Failed to dump pdns statistics. Check that the pdns process is running!'
+      critical "Failed to execute #{cmd}"
+    end
+    result
+  end
+
+  def parse_syslog
+    # send signal to pdns process to dump stats
+    cmd_run('sudo pkill -SIGUSR1 pdns_recursor')
+    # parse stats from syslog
+    metrics = cmd_run("sudo tail #{config[:syslog_path]} -n 6 | grep pdns_recursor")
+    return if metrics.nil?
+    metrics.each do |metric|
+      next unless metric.include?('stats:')
+      (_jargon, stats) = metric.split('stats:')
+      keyvalues = stats.split(',')
+      keyvalues.each do |keyvalue|
+        key = keyvalue.strip!.scan(/\D+/)[0].strip
+        key.gsub!(/[()]|\s/, '-')
+        value = keyvalue.scan(/\d+/)[0]
+        output([config[:scheme], key].join('.'), value)
+      end
     end
+  end
+
+  def run
+    metrics = cmd_run('sudo rec_control get-all')
     metrics.each do |metric|
       (key, value) = metric.split("\t")
       output([config[:scheme], key].join('.'), value)
     end
+    parse_syslog if config[:extra_stats]
     ok
   end
 end

data/lib/sensu-plugins-pdns/version.rb

@@ -1,8 +1,8 @@
 module SensuPluginsPdns
   module Version
     MAJOR = 0
-    MINOR = 0
-    PATCH = 1
+    MINOR = 1
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-pdns
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Hammad Shah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-27 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Sensu Plugins for PowerDNS metrics