dns_one 0.4.36 → 0.4.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee8de62e1bba4beb93662df0810aa494f48094da
-  data.tar.gz: da8932c29eff61baa88bd3d938233aa8e515866b
+  metadata.gz: c2fc5f20cb89e4598dafa6f6629380674f751cb9
+  data.tar.gz: b607a3f8d376cd5f72c3f7a3fa19e7a8fa7efb18
 SHA512:
-  metadata.gz: 460098f009765a754856ab187c5db919a1b6806064d8e3da71302603919f5b8b7a375d8574401efc6bbb94b87d3f055ddaea34341640656664d6d9dd07c8a6ae
-  data.tar.gz: d82e6e8c62d83bf6a63b6077d27a52b8dd64c2611dfd6b2a363084267ed444f18d118d0490a70828c199e34f50f438584abf1bc82c5df603d0b473329522611e
+  metadata.gz: bd0c5a0208678999846c0832902699825e82e8bc9cfb301e8fbb2610f472b4bbf52462ca1714121e80b7833fefc1f19b3217660b6bc0f0457bd725e584002f2e
+  data.tar.gz: 0073ae574a4db7381f79bb11840924044f9b189dad97e775121bd5fec7ff52b91330aa6658d1a1aba6a594cb75d9cb34bef640dfedfb16b58d1f3f6c1ebb32bb

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.36"
+    VERSION = "0.4.37"
 end

data/util/dnsone_munin_

@@ -19,20 +19,29 @@ class MuninDnsOne
 
     GRAPHS = {
         rcode: {
-            vlabel: 'Return Code count',
-                fields: %w(not_imp refused yx_domain yxrr_set nxrr_set not_auth not_zone badvers no_error badsig badkey badtime badmode nx_domain badalg badname form_err serv_fail)
+            percent: true,
+            vlabel: '%',
+                fields: %w(not_imp refused yx_domain yxrr_set nxrr_set not_auth not_zone badvers no_error badsig badkey badtime badmode nx_domain badalg badname form_err serv_fail).sort
         },
         req_resource: {
-            vlabel: 'Request resource count',
+            percent: true,
+            vlabel: '%',
             fields: %w(a aaaa any cname hinfo minfo mx ns ptr soa txt wks)
         },
         cache: {
-            vlabel: 'count',
+            percent: true,
+            vlabel: '%',
             fields: {
                 hit: 'Domain found in cache.',
                 miss: 'Domain not found in cache, requiring a backend access.',
             },
         },
+        requests: {
+            vlabel: 'count',
+            fields: {
+                requests: 'requests',
+            },
+        }
     }
 
     def initialize argv
@@ -58,29 +67,49 @@ class MuninDnsOne
         GRAPHS[@param.graph]
     end
 
+    def fields
+        if graph[:fields].is_a? Hash
+            graph[:fields]
+        else
+            _fields = {}            
+            graph[:fields].each do |field|
+                _fields[field.to_sym] = field
+            end
+            _fields
+        end
+    end
+
     def config
         puts <<-CONFIG
-graph_category Passenger
+graph_category DnsOne
 graph_title #{@param.graph}
 graph_vlabel #{graph[:vlabel]}
 graph_args --base 1000 -l 0
-graph_info GI
 
 CONFIG
 
-        graph[:fields].each do |f|
-            k = Array === f ? f[0] : f
-            v = Array === f ? f[1] : f
-            puts "#{k}.label #{v}"
+        fields.each_pair do |k, v|
+            puts "#{k}.label #{k}"
         end
 
         exit 0
     end
 
     def run
-        get_stats[@param.graph.to_s].each_pair do |k, v|
-            puts "#{k}.value #{v}"
+        stats = get_stats[@param.graph.to_s]
+
+        if graph[:percent]
+            sum = stats.values.reduce(:+).to_f
+        end 
+        
+        fields.keys.each do |k|
+            value = stats[k] || 0.0
+            if graph[:percent]
+                value *= 100 / sum 
+            end
+            puts "#{k}.value #{ value }"
         end
+
         exit 0
     end
 
@@ -113,20 +142,27 @@ CONFIG
     def fetch_stats
         stat = {}
         section = nil
+
         `dns_one stats`.each_line do |l|
             if l =~ /---\s*(\S+)\s*---/
                 section = $1
             elsif l =~ /^(.*?)\s+(.*)$/
                 key = $1.to_sym
-                val = $2.strip
+                val = $2.strip.to_f
                 stat[section] ||= {}
                 stat[section][key] = val
             end
         end
+
+        stat["requests"] = {
+            requests: stat["cache"].values.reduce(:+).to_i
+        }
+
         stat
     end
 
     def install
+        # Links
         links = []
         GRAPHS.keys.each do |graph_key|
             links << graph_key
@@ -135,6 +171,10 @@ CONFIG
         links.each do |link|
             system "ln -s #{target} /etc/munin/plugins/dnsone_#{link}"
         end
+
+        # munin_node_conf
+        munin_node_conf = "[dnsone_*]\nuser root\n\n"
+        File.open('/etc/munin/plugin-conf.d/munin-node', 'a').write munin_node_conf
     end
 
     def error msg

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.36
+  version: 0.4.37
 platform: ruby
 authors:
 - Tom Lobato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler