dns_one 0.4.34 → 0.4.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a71e4738e469dca6259edb0d2f8cf63b758d655f
-  data.tar.gz: 4f625bf190b16ca76effd3d4dac4c7a763c92b4d
+  metadata.gz: d90cfd8e37c93aa0ffb5110110aabcf5e7a28eea
+  data.tar.gz: bc22d9dd4b5c9aab56a9546bbc5b45a65454862d
 SHA512:
-  metadata.gz: '018db44416746224cdcf73bbd5ab8a0362195cbfc24a62a2d262a7ec2ed9d924e5dba77dde4359b6b914e54bb36a66f34a9a5cc04a8400ec2f8c941b7ef96230'
-  data.tar.gz: ec3ae33290c5b58a58acf2beacba8850f4e8879240be891631394448c74eb0f5c40a9f207a42cf0bf00a8aece9433132602d7fae06e640799b2edb201fe65ff5
+  metadata.gz: 8d9ac4198ba572f9016c1d42451c812e5cafb288a7a7670d6eaf52427a57551ec2bdc6fac97f3fdd15856d06dd79fdce54ee88248841e1a825833ac639046e28
+  data.tar.gz: d9b7f7d590339a1708f8a513614e8fbed2f0db8c9e4e88f2305a5a8da514423a6e14a89fb145a840422a2c8b04e2f37dbbf86f0c4bd2c3105d110543c9ea64ca

data/lib/dns_one/stat.rb

@@ -11,7 +11,7 @@ module DnsOne; class Stat
     end
 
     def save rcode, req_resource, cache
-    	Log.i "saving stat (user: #{ `id -un #{Process.uid}` })"
+    	Log.i "saving stat (user: #{ `id -un #{Process.uid}`.strip })"
         @db.execute(
             "INSERT INTO responses (time, rcode, req_resource, cache) VALUES (?, ?, ?, ?)", 
             [

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.34"
+    VERSION = "0.4.35"
 end

data/util/dnsone_munin

@@ -0,0 +1,146 @@
+#!/root/.rbenv/shims/ruby
+
+# Install
+
+# wget https://raw.githubusercontent.com/tomlobato/dns_one/master/util/dnsone_munin_ -O /usr/local/sbin/dnsone_munin_
+# chmod 755 /usr/local/sbin/dnsone_munin_
+# dnsone_munin_ install
+# /etc/init.d/munin-node restart
+
+require 'active_support/core_ext/hash/conversions'
+require 'msgpack'
+require 'ostruct'
+require 'resolv'
+
+class MuninDnsOne
+
+    CACHE_FILE = '/tmp/dns_one_cache'
+    CACHE_EXPIRE = 30
+
+    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)
+        },
+        req_resource: {
+            vlabel: 'Request resource count',
+            fields: %w(a aaaa any cname hinfo minfo mx ns ptr soa txt wks)
+        },
+        cache: {
+            vlabel: 'count',
+            fields: {
+                hit: 'Domain found in cache.',
+                miss: 'Domain not found in cache, requiring a backend access.',
+            },
+        },
+    }
+
+    def initialize argv
+        @argv = argv
+    end
+        
+    def cli 
+        case @argv[0]
+        when 'config'
+            @param = get_params
+            config
+        when 'install'
+            install
+        else
+            @param = get_params
+            run
+        end
+    end
+
+    private
+
+    def graph
+        GRAPHS[@param.graph]
+    end
+
+    def config
+        puts <<-CONFIG
+graph_category Passenger
+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}"
+        end
+
+        exit 0
+    end
+
+    def run
+        get_stats[@param.graph.to_s].each_pair do |k, v|
+            puts "#{k}.value #{v}"
+        end
+        exit 0
+    end
+
+    # Util
+
+    def get_params        
+        filename = File.basename __FILE__
+
+        if filename =~ /^dnsone_(#{ GRAPHS.keys.join '|' })/
+            graph_key = $1
+            OpenStruct.new(
+                graph: graph_key.to_sym,
+            )
+        else
+            error "Invalid graph type for filename #{filename}."
+        end
+    end
+
+    def get_stats
+        if false and File.exists?(CACHE_FILE) and
+            (Time.now - File.stat(CACHE_FILE).ctime) < CACHE_EXPIRE
+            MessagePack.unpack File.open(CACHE_FILE, 'rb').read
+         else
+            stat = fetch_stats
+            File.open(CACHE_FILE, 'wb', 0600).write MessagePack.pack(stat)
+            stat
+        end
+    end
+
+    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
+                stat[section] ||= {}
+                stat[section][key] = val
+            end
+        end
+        stat
+    end
+
+    def install
+        links = []
+        GRAPHS.keys.each do |graph_key|
+            links << graph_key
+        end
+        target = File.expand_path(__FILE__)
+        links.each do |link|
+            system "ln -s #{target} /etc/munin/plugins/dnsone_#{link}"
+        end
+    end
+
+    def error msg
+        STDERR.puts msg
+        exit 1
+    end
+end
+
+MuninDnsOne.new(ARGV).cli

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.34
+  version: 0.4.35
 platform: ruby
 authors:
 - Tom Lobato
@@ -177,6 +177,7 @@ files:
 - lib/dns_one/zone_search.rb
 - util/benchmark-cache_store.rb
 - util/dns_one.service
+- util/dnsone_munin
 - util/sample_conf.yml
 homepage: https://tomlobato.github.io/dns_one/
 licenses: