dns_one 0.4.37 → 0.4.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2fc5f20cb89e4598dafa6f6629380674f751cb9
-  data.tar.gz: b607a3f8d376cd5f72c3f7a3fa19e7a8fa7efb18
+  metadata.gz: 296dafdbba064fefc2ab86745dd516d80c0eee93
+  data.tar.gz: b20222d54553e1bb9c95bc7e1fd6d31594480470
 SHA512:
-  metadata.gz: bd0c5a0208678999846c0832902699825e82e8bc9cfb301e8fbb2610f472b4bbf52462ca1714121e80b7833fefc1f19b3217660b6bc0f0457bd725e584002f2e
-  data.tar.gz: 0073ae574a4db7381f79bb11840924044f9b189dad97e775121bd5fec7ff52b91330aa6658d1a1aba6a594cb75d9cb34bef640dfedfb16b58d1f3f6c1ebb32bb
+  metadata.gz: e06fdebdd04f7f013d606beeb25370531049fbaea8af66490b0c7ec5d1bc84ae3eb1cf6d890c1dec6a99e70685d500d4d83c8829d80a6ea21e032f86876ea503
+  data.tar.gz: 30abb3413dbcaacbc16a9d673f9151f0dc2b8645261d77742536faa273125949ffc2d6fe5afadb62be8fb80e3922ad28f6238772343a500fe6d0331c79e7dd73

data/lib/dns_one/stat.rb

@@ -1,5 +1,6 @@
 module DnsOne; class Stat
     DB_FNAME = "stat.db"
+    SQL_PROF = false
 
     def initialize conf = {}
         @conf = conf
@@ -12,7 +13,7 @@ module DnsOne; class Stat
 
     def save rcode, req_resource, cache
     	Log.i "saving stat (user: #{ `id -un #{Process.uid}`.strip })"
-        @db.execute(
+        rsql(
             "INSERT INTO responses (time, rcode, req_resource, cache) VALUES (?, ?, ?, ?)", 
             [
                 Time.now.to_i, 
@@ -25,6 +26,7 @@ module DnsOne; class Stat
         Log.e e
     end
 
+    # select rcode, count(*) from responses where time > strftime('%s', 'now') - 300 group by rcode
     def get_counts counter, from = nil
         validate_counter counter
         validate_from from
@@ -40,7 +42,7 @@ module DnsOne; class Stat
 
         counts = {}
 
-        @db.execute(s) do |row|
+        rsql(s) do |row|
             _counter, count = row
             counts[_counter] = count
         end
@@ -128,30 +130,17 @@ module DnsOne; class Stat
     end
     
     def create_tables
-        sqls = []
-
-        sqls << <<-SQL
+        @db.execute_batch <<-SQL
             create table responses (
                 time int,
                 rcode int,
                 req_resource int,
                 cache int
             );
-        SQL
-        
-        sqls << <<-SQL
             CREATE INDEX responses_time_rcode ON responses (time, rcode);
-        SQL
-
-        sqls << <<-SQL
             CREATE INDEX responses_time_req_resource ON responses (time, req_resource);
-        SQL
-
-        sqls << <<-SQL
             CREATE INDEX responses_time_cache ON responses (time, cache);
         SQL
-
-        sqls.each{|sql| @db.execute sql }
     end
 
 
@@ -169,5 +158,23 @@ module DnsOne; class Stat
         name
     end
 
+    def rsql sql
+        if SQL_PROF
+            t0 = Time.now
+        end
+
+        res = @db.execute sql
+
+        if SQL_PROF
+            @sql_profiler ||= Logger.new '/tmp/dnsone_sql_prof.log'
+            time = Time.now.strftime '%y%m%d-%H%M%S.%L'
+            dur = "%.3f" % ((Time.now - t0) * 1000.0)
+            _sql = sql.gsub /\n+/, ' '
+            @sql_profiler.info "#{time} #{dur} #{_sql}"
+        end
+
+        res
+    end
+
 end; end
 

data/lib/dns_one/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.37
+  version: 0.4.39
 platform: ruby
 authors:
 - Tom Lobato
@@ -177,7 +177,6 @@ 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:

data/util/dnsone_munin_

@@ -1,186 +0,0 @@
-#!/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: {
-            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: {
-            percent: true,
-            vlabel: '%',
-            fields: %w(a aaaa any cname hinfo minfo mx ns ptr soa txt wks)
-        },
-        cache: {
-            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
-        @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 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 DnsOne
-graph_title #{@param.graph}
-graph_vlabel #{graph[:vlabel]}
-graph_args --base 1000 -l 0
-
-CONFIG
-
-        fields.each_pair do |k, v|
-            puts "#{k}.label #{k}"
-        end
-
-        exit 0
-    end
-
-    def run
-        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
-
-    # 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.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
-        end
-        target = File.expand_path(__FILE__)
-        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
-        STDERR.puts msg
-        exit 1
-    end
-end
-
-MuninDnsOne.new(ARGV).cli