arvicco-avalon 0.0.23 → 0.0.25

data/README.md

@@ -14,7 +14,7 @@ Scripts:
 
     $ monitor [environment]
 
-Monitors all the nodes (miners, pools, Internet connections) that are listed in config/monitor.yml file. Sounds alarm is anything is wrong with the monitored nodes. TODO: takes action to correct errors found (like restarting the failing miners etc).
+Monitors all the nodes (miners, pools, Internet connections) that are listed in config/monitor.yml file. Sounds alarm if anything goes wrong with the monitored nodes. Alarm sounds are configurable. TODO: takes action to correct errors found (like restarting the failing miners etc).
 
     $ reboot_miner 145 146 192.168.0.150
 
@@ -40,14 +40,17 @@ Monitor script is periodically polling the mining units and other types of objec
     # Prod configuration (default)
     prod:
       :alert_after:       2     # missed pings or status reports from a miner
-      :alert_temp_high:  52     # degrees C and above
+      :alert_temp_high:  55     # degrees C and above
       :alert_temp_low:   30     # degrees C and below, Avalon miners only
       :alert_last_share:  2     # minutes since last share hashed
       :alert_sounds:
-        :failure:       Glass.aiff                        # [] for no sound
         :restart:       Frog.aiff                         # [] for no sound
-        :temp_high:     Ping.aiff                         # [] for no sound
-        :block_found:   [Dog.aiff, Purr.aiff, Dog.aiff]   # [] for no sound
+        :failure:       Glass.aiff
+        :perf_low:      Glass.aiff
+        :last_share:    Glass.aiff
+        :temp_high:     Ping.aiff
+        :temp_low:      Ping.aiff
+        :block_found:   [Dog.aiff, Purr.aiff, Dog.aiff]
         :block_updated: [Purr.aiff, Purr.aiff, Purr.aiff] # [] for no alert sound
       :bitcoind:
         :ip: 192.168.1.13
@@ -56,9 +59,12 @@ Monitor script is periodically polling the mining units and other types of objec
       :monitor:
         :verbose: true
         :timeout: 30
+      :per_hour:  true  # If true, getworks, rejects... metrics will be displayed PER HOUR
         :nodes:
-          - [miner, 192.168.1.151, 70] # type, ip, gh/s
-          - [miner, 192.168.1.152, 70]
+          - [btcguild, stratum.btcguild.com, apikey] # ping url, your API key
+          - [miner, 192.168.1.151, 70, jbond_151] # type, ip, gh/s, pool_name(optional)
+          - [miner, 192.168.1.152, 82, jbond_15]
+          - [miner, 192.168.1.153, 40]
           - [internet, www.google.com, www.speedtest.net]
           - [eloipool, 192.168.1.13, 4] # frequency of old block updates (once per X polls)
 

data/bin/test_switch

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+# Script to reboot Avalon miner
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'avalon'
+
+Avalon::Config.load 'prod'
+
+monitor = Avalon::Monitor.new Avalon::Config[:monitor]
+
+monitor.switches.each do |sw|
+  sw.off
+  sleep 2
+  sw.on
+end
+
+exit
+
+ARGV.each do |id|
+  miner = monitor.nodes.find {|m| m.num == id}
+  miner ||= monitor.nodes.find {|m| m.ip =~ Regexp.new(id)}
+  if miner
+    miner.reset
+    puts "Miner #{id} reset"
+  else
+    puts "Unable to reset miner #{id}"
+  end
+end

data/lib/avalon.rb

@@ -10,7 +10,9 @@ require "avalon/config"
 require "avalon/extractable"
 
 require "avalon/block"
+require "avalon/switch"
 require "avalon/node"
+require "avalon/btcguild"
 require "avalon/miner"
 require "avalon/internet"
 require "avalon/eloipool"

data/lib/avalon/btcguild.rb

@@ -0,0 +1,93 @@
+require 'faraday'
+require 'json'
+
+module Avalon
+
+  # Extracts Btcguild pool info
+  class Btcguild < Node
+
+    API_URL = 'http://www.btcguild.com'
+    API_PATH = 'api.php?api_key='
+
+    def initialize monitor, ping_url, api_key
+      @ping_url, @api_key = ping_url, api_key
+
+      @conn ||= Faraday.new(:url => API_URL) do |faraday|
+        # faraday.response :logger                  # log requests to STDOUT
+        faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+      end
+
+      super()
+    end
+
+    def get
+      reply = @conn.get "#{API_PATH}#{@api_key}"
+      if reply.success? && !(reply.body =~ /too many API requests/)
+        JSON.parse(reply.body, :symbolize_names => true)
+      else
+        {}
+      end
+    end
+
+    def poll verbose=true
+      @data[:ping] = ping @ping_url
+
+      if @data[:ping]
+        @data.merge!(get || {})
+        if @data[:workers] && @data[:workers].keys.include?(:'1')
+          @data[:workers] = Hash[*@data[:workers].map {|_, h| [h.delete(:worker_name), h]}.flatten]
+        end
+      end
+      puts "#{self}" if verbose
+    end
+
+    # Check for any exceptional situations, sound alarm if any
+    def report
+      if self[:ping].nil?
+        alarm "BTC Guild not responding to ping"
+      else
+      end
+    end
+
+    def to_s
+      "\nBTC Guild: #{pool_speed}TH/s ping:#{self[:ping]} diff:#{diff}M " +
+        "unpaid(24h) btc: #{unpaid}(#{past24}) nmc: #{unpaid_nmc}(#{past24_nmc})"
+        end
+
+    ### Convenience data accessors
+    def access key1, key2, precision=nil, divider=1
+      if @data[key1] && @data[key1][key2]
+        if precision
+          (@data[key1][key2]/divider).round(precision)
+        else
+          (@data[key1][key2]/divider)
+        end
+      end
+    end
+
+    def past24
+      access :user, :past_24h_rewards, 2
+    end
+
+    def unpaid
+      access :user, :unpaid_rewards, 3
+    end
+
+    def past24_nmc
+      access :user, :past_24h_rewards_nmc, 1
+    end
+
+    def unpaid_nmc
+      access :user, :unpaid_rewards_nmc, 2
+    end
+
+    def pool_speed
+      access :pool, :pool_speed, 1, 1000.0
+    end
+
+    def diff
+      access :pool, :difficulty, 1, 1000_000.0
+    end
+
+  end
+end

data/lib/avalon/eloipool.rb

@@ -2,9 +2,8 @@ module Avalon
   # Pool is a node encapsulating pool software
   class Eloipool < Node
 
-    def initialize ip, frequency
-      @ip = ip
-      @update_frequency = frequency
+    def initialize monitor, ip, frequency
+      @ip, @frequency = ip, frequency
       @update_num = 0
       @block_file = Avalon::Config[:block_file]
       @blocks = load_blocks || {}
@@ -55,7 +54,7 @@ module Avalon
     end
 
     def update_old_block
-      if rand(@update_frequency) == 0 # update once per @frequency polls
+      if rand(@frequency) == 0 # update once per @frequency polls
         hash = @blocks.keys[@update_num]
         if @blocks[hash]
           @update_num += 1

data/lib/avalon/extractable.rb

@@ -5,7 +5,8 @@ module Avalon
 
     # type = :absolute_time | :absolute_date | :relative_time
     def my_time t, type=:absolute_time
-      time = Time.at(t.to_f)
+      t = t.to_f < 0 ? 0 : t.to_f
+      time = Time.at(t)
       case type
       when :absolute_date
         time.getlocal.strftime("%Y-%m-%d %H:%M:%S")

data/lib/avalon/internet.rb

@@ -3,8 +3,14 @@ module Avalon
   # Internet is a node encapsulating information about Internet connectivity
   class Internet < Node
 
-    def initialize *sites
-      @sites = Hash[ *sites.map {|site| [site.split(/\./)[-2].to_sym, site]}.flatten ]
+    IP_REGEXP = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/
+
+    def initialize monitor, *sites
+      sites.map! do |site|
+        name = site =~ IP_REGEXP ? site : site.split(/\./)[-2]
+        [name.to_sym, site]
+      end
+      @sites = Hash[ *sites.flatten ]
       super()
     end
 

data/lib/avalon/miner.rb

@@ -15,8 +15,10 @@ module Avalon
 
     # Field formats: name => [width, pattern, type/conversion]
     FIELDS = {
-      :ping => [8, /./, nil],  # not in miner status string...
-      :mhs => [6, /(?<=MHS av=)[\d\.]*/, :i],
+      :unit => [6, /(?<=MHS av=)[\d\.]*/, :i],
+      :pool => [6, /./, nil], # not in miner status string...
+      :ping => [6, /./, nil],  # not in miner status string...
+      :rst => [3, /./, nil],  # not in miner status string...
       :uptime => [9, /(?<=Elapsed=)[\d\.]*/, ->(x){ my_time(x, :relative_time)}],
       :last => [8, /(?<=Status=Alive,).*?Last Share Time=[\d\.]*/,
                 ->(x){ convert_last(x)}],
@@ -25,35 +27,36 @@ module Avalon
       :'°C' => [2, /(?<=Temperature=)[\d\.]*/, :i],
       :fan2 => [4, /(?<=fan2=)[\d\.]*/, :i],
       :fan3 => [4, /(?<=fan3=)[\d\.]*/, :i],
-      :wu => [4, /(?<=,Work Utility=)[\d\.]*/, :i],
-      :getworks => [8, /(?<=Getworks=)[\d\.]*/, :i],
-      :accepted => [8, /(?<=,Accepted=)[\d\.]*/, :i],
-      :rejected => [8, /(?<=Rejected=)[\d\.]*/, :i],
-      :stale => [6, /(?<=Stale=)[\d\.]*/, :i],
-      :errors => [6, /(?<=Hardware Errors=)[\d\.]*/, :i],
-      :blocks => [6, /(?<=Network Blocks=)[\d\.]*/, :i],
+      :WU => [4, /(?<=,Work Utility=)[\d\.]*/, :i],
+      :getwork => [7, /(?<=Getworks=)[\d\.]*/, :i],
+      :accept => [6, /(?<=,Accepted=)[\d\.]*/, :i],
+      :reject => [6, /(?<=Rejected=)[\d\.]*/, :i],
+      :stale => [5, /(?<=Stale=)[\d\.]*/, :i],
+      :error => [6, /(?<=Hardware Errors=)[\d\.]*/, :i],
+      # :block => [5, /(?<=Network Blocks=)[\d\.]*/, :i],
       #      :found => [2, /(?<=Found Blocks=)[\d\.]*/, :i],
     }
 
     # Last share converter (Miner-specific)
     def self.convert_last x
       y = x[/(?<=Last Share Time=)[\d\.]*/]
+
       if y.nil? || y == '0'
         "never"
       else
-        my_time(Time.now.getgm-y.to_i, :relative_time)
+        my_time(Time.now.getgm.to_i-y.to_i, :relative_time)
       end
     end
 
     def self.print_headers
-      puts "\nMiner status as of #{Time.now.getlocal.asctime}:\n#    " +
-        FIELDS.map {|name, (width,_,_ )| name.to_s.ljust(width)}.join(' ')
+      puts "\nMiner status as of #{Time.now.getlocal.asctime}:\nmhs: " +
+        FIELDS.map {|name, (width,_,_ )| name.to_s.rjust(width)}.join(' ')
     end
 
-    def initialize ip, min_speed, config=Avalon::Config.config
-      @ip = ip
-      @min_speed = min_speed * 1000 # Gh/s to Mh/s
-      @config = config
+    def initialize monitor, ip, min_mhs, worker_name=nil
+      @ip, @min_mhs, @worker_name = ip, min_mhs*1000 , worker_name
+      @monitor = monitor
+      @config = Avalon::Config.config # TODO: monitor.config?
       @fails = 0
       super()
     end
@@ -66,20 +69,24 @@ module Avalon
       self[:ping] = ping @ip
 
       status = get_api('summary') + get_api('pools') + get_api('devs') + get_api('stats')
+      @poll_time = Time.now
       # p get_api('summary')
-      # pools = get_api('pools')
-      # p pools[FIELDS[:last][1]]
-      # devs = get_api('devs')
-      # p devs
 
       data = self.class.extract_data_from(status)
 
       if data.empty?
-        @data = {}
+        @data = {:ping => self[:ping], :rst => self[:rst]}
       else
         @data.merge! data
+        if @config[:monitor][:per_hour]
+          [:getwork, :accept, :reject, :stale, :error].each do |key|
+            self[key] = (self[key]/upminutes*60).round(1) if self[key]
+          end
+        end
       end
 
+      self[:pool] = pool_hash
+
       puts "#{self}" if verbose
     end
 
@@ -87,26 +94,49 @@ module Avalon
       duration(self[:uptime])
     end
 
+    def last
+      duration(self[:last])
+    end
+
+    def restart_time
+      @poll_time - upminutes * 60.0
+    end
+
     def temp
       self[:'°C']
     end
 
+    def unit_hash
+      self[:unit] || 0
+    end
+
+    def pool_hash
+      if @monitor.pool && @worker_name && @monitor.pool[:workers] && @monitor.pool[:workers][@worker_name]
+        @monitor.pool[:workers][@worker_name][:hash_rate].round(0)
+      end
+    end
+
     # Check for any exceptional situations in stats, sound alarm if any
     def report
-      if data[:ping].nil?
+      if data[:ping].nil? || data[:unit].nil?
         @fails += 1
         if @fails >= @config[:alert_after]
           alarm "Miner #{num} did not respond to status query", :failure
         end
       else
         @fails = 0
-        if duration(self[:uptime]) < 2
+        @last_restart ||= restart_time
+
+        # Detect Miner reset correctly
+        if (restart_time - @last_restart) > 20
+          @last_restart = restart_time
+          self[:rst] = (self[:rst] || 0) + 1
           alarm "Miner #{num} restarted", :restart
-        elsif duration(self[:uptime]) > 5 # Miner settled down
-          if self[:mhs] < @min_speed
-            alarm "Miner #{num} performance is #{self[:mhs]}, should be #{@min_speed}", :perf_low
-          elsif self[:last] == 'never' || duration(self[:last]) > @config[:alert_last_share]
-            alarm "Miner #{num} last shares was #{duration(self[:last])} min ago", :last_share
+        elsif upminutes > 5 # Miner settled down
+          if unit_hash < @min_mhs
+            alarm "Miner #{num} performance is #{unit_hash}, should be #{@min_mhs}", :perf_low
+          elsif last == 'never' || last > @config[:alert_last_share]
+            alarm "Miner #{num} last shares was #{last} min ago", :last_share
           elsif temp >= @config[:alert_temp_high]
             alarm "Miner #{num} too hot at #{temp}°C, needs cooling", :temp_high
           elsif self[:freq] && temp <= @config[:alert_temp_low]
@@ -122,7 +152,7 @@ module Avalon
     end
 
     def to_s
-      "#{num}: " + FIELDS.map {|key, (width, _, _ )| @data[key].to_s.ljust(width)}.join(" ")
+      "#{num}: " + FIELDS.map {|key, (width, _, _ )| @data[key].to_s.rjust(width)}.join(" ")
     end
 
   end

data/lib/avalon/monitor.rb

@@ -2,29 +2,38 @@ module Avalon
 
   class Monitor
 
-    attr_reader :nodes
+    attr_reader :nodes, :switches, :pool
 
     # List of nodes to monitor
     def initialize opts
-      @nodes = opts[:nodes].map {|args| Avalon::Node.create(*args)}
       @timeout = opts[:timeout] || 30
       @verbose = opts[:verbose]
+      @switches = (opts[:switches] || []).map {|args| Avalon::Switch.new(*args)}
+      @nodes = opts[:nodes].map {|args| Avalon::Node.create(self, *args)}
+      @pool = @nodes.find {|node| node.is_a?(Avalon::Btcguild)}
     end
 
     def run
       loop do
 
-        Avalon::Miner.print_headers if @verbose
-
         # Check status for all nodes
-        @nodes.each {|node| node.poll(@verbose)}
+        @nodes.inject(false) do |headers_printed, node|
+          # Print miners headers once first miner encountered
+          if @verbose && node.is_a?(Avalon::Miner) && !headers_printed
+            Avalon::Miner.print_headers
+            headers_printed = true
+          end
+          node.poll(@verbose)
+          headers_printed
+        end
 
         # Report node errors (if any)
         @nodes.each {|node| node.report}
 
         if @verbose
-          total_hash = @nodes.reduce(0) {|hash, node| hash + (node[:mhs] || 0)}
-          puts "Total hash rate: #{total_hash} MHash/sec"
+          unit_hash = @nodes.reduce(0) {|hash, node| hash + (node.unit_hash || 0)}
+          pool_hash = @nodes.reduce(0) {|hash, node| hash + (node.pool_hash || 0)}
+          puts "Total hash rate (from pool): #{unit_hash} (#{pool_hash}) MH/s"
         end
 
         sleep @timeout

data/lib/avalon/node.rb

@@ -6,9 +6,9 @@ module Avalon
     include Utils # Helper methods
 
     # Builder method for creating Node subclasses from config arrays
-    def Node.create *args
+    def Node.create monitor, *args
       subclass = Avalon.const_get(args.first.capitalize)
-      subclass.new *args.drop(1)
+      subclass.new monitor, *args.drop(1)
     end
 
     attr_reader :ip, :data
@@ -31,6 +31,14 @@ module Avalon
       @data[key] = value
     end
 
+    ### Node API: following methods should be defined:
+
+    def unit_hash
+    end
+
+    def pool_hash
+    end
+
     # Abstract: Check node status
     # If verbose, the Node should print out its state after the status update
     def poll verbose

data/lib/avalon/switch.rb

@@ -0,0 +1,20 @@
+module Avalon
+
+  # Encapsulates DLI Web Power Switch
+  class Switch
+
+    def initialize user, pass, ip, outlet
+      @user, @pass, @ip, @outlet = user, pass, ip, outlet
+      raise 'Please install curl: sudo apt-get install curl' if `which curl`.empty?
+    end
+
+    def on
+      `curl -s http://#{@user}:#{@pass}@#{@ip}/outlet?#{@outlet}=ON`
+    end
+
+    def off
+      `curl -s http://#{@user}:#{@pass}@#{@ip}/outlet?#{@outlet}=OFF`
+    end
+
+  end
+end

data/lib/avalon/utils.rb

@@ -38,7 +38,7 @@ module Avalon
         'never'
       else
         hour, min, sec = *time_string.split(/:/).map(&:to_i)
-        hour*60.0 + min + sec/60.0
+        (hour*60.0 + min + sec/60.0).round(2)
       end
     end
 
@@ -46,7 +46,7 @@ module Avalon
     def ping ip
       ping_result = `ping -c 1 #{ip}`
       if ping_result =~ /( | 0.)0% packet loss/
-        ping_result.match(/time=([\.\d]*) ms/)[1].to_f
+        ping_result.match(/time=([\.\d]*) ms/)[1].to_f.round(1)
       end
     end
 

data/lib/avalon/version.rb

@@ -1,3 +1,3 @@
 module Avalon
-  VERSION = "0.0.23"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvicco-avalon
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -34,6 +34,7 @@ executables:
 - monitor
 - mtgox_tx
 - reboot_miner
+- test_switch
 extensions: []
 extra_rdoc_files: []
 files:
@@ -46,10 +47,12 @@ files:
 - bin/monitor
 - bin/mtgox_tx
 - bin/reboot_miner
+- bin/test_switch
 - lib/avalon.rb
 - lib/avalon/bitcoind.rb
 - lib/avalon/block.rb
 - lib/avalon/blockchain.rb
+- lib/avalon/btcguild.rb
 - lib/avalon/config.rb
 - lib/avalon/eloipool.rb
 - lib/avalon/extractable.rb
@@ -57,6 +60,7 @@ files:
 - lib/avalon/miner.rb
 - lib/avalon/monitor.rb
 - lib/avalon/node.rb
+- lib/avalon/switch.rb
 - lib/avalon/utils.rb
 - lib/avalon/version.rb
 - sound/Dog.aiff