arvicco-avalon 0.0.14 → 0.0.15

data/README.md

@@ -4,9 +4,9 @@ Helper scripts for Bitcoin mining units management...
 
 ## Description
 
-Congrats, you've got a few Bitcoin miners. It's all nice and dandy, but now you need to keep an eye on them to make sure they are always online and their valuable hashes are not wasted. This set of scripts is written to do just that. You run a monitor scipt non-stop and it keeps an eye on your mining units, your (private) pool and your Internet connection, and alerts you in case of any problems. The scripts should work on OSX and Linux (Windows users, move on).
+Congrats, you've got a few Bitcoin miners. It's all nice and dandy, but now you need to keep an eye on them to make sure they are always online and their valuable hashes are not wasted. This set of scripts is written to do just that. You run a monitor script non-stop and it keeps an eye on your mining units, your (private) pool and your Internet connection, and alerts you in case of any problems. The scripts should work on OSX and Linux. Windows users, just spend $30 on Raspberry Pi, it's so much fun.
 
-Initially, the scripts were used to manage an installation of Avalon miners, but they work just as well with any cgminer (or bfgminer) based device with known IP address and cgminer API enabled. It's been proven to work on such exotic devices as Raspberry Pi attached to Block Eruptor Blades as well as normal computers with FPGA or GPU attached. So, you can easily monitor all your mining zoo from one central location.
+Initially, the scripts were used to manage an installation of Avalon miners, but they work just as well with any cgminer (or bfgminer) based device with known IP address and cgminer API enabled. It's been proven to work on such exotic devices as RPi attached to Block Eruptor Blades as well as normal computers with FPGA or GPU attached. So, you can easily monitor your mining zoo from one central location.
 
 ## Usage
 
@@ -14,11 +14,11 @@ 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 is anything is wrong with the monitored nodes. TODO: takes action to correct errors found (like restarting the failing miners etc).
 
     $ mtgox_tx
 
-- Transcodes raw transaction from base64 (mtgox) to hex (blockchain) format
+Transcodes raw transaction from base64 (mtgox) to hex (blockchain) format
 
 ## Script Installation
 
@@ -35,8 +35,9 @@ Monitor script is periodically polling the mining units and other types of objec
     ------- ~/.avalon/monitor.yml --------
     # Prod configuration (default)
     prod:
-      :alert_after: 2      # missed pings or status reports from a miner
       :alert_sound: :aiff  # :none for silent alerts
+      :alert_after: 2      # missed pings or status reports from a miner
+      :alert_temp:  52     # degrees C and above
       :bitcoind:
         :ip: 192.168.1.13
         :rpcuser: jbond
@@ -57,7 +58,7 @@ The Mining units need to be configured so that monitor is able to poll them. Spe
 Detailed description of cgminer API and relevant startup options can be found here:
 https://github.com/ckolivas/cgminer/blob/master/API-README
 
-For any Pool or Bitcoind nodes you'd like to monitor, you need to be able to ssh with public keys (that is, no password required) into this Node, otherwise the Monitor won't be able to poll it. How to make it work is beyound the scope of this Readme, just google 'ssh without password'.
+For any Pool or Bitcoind nodes you'd like to monitor, you need to be able to ssh with public keys (that is, no password required) into this Node, otherwise the Monitor won't be able to poll it. How to make it work is beyond the scope of this Readme, just google 'ssh without password'.
 
 ## License
 

data/lib/avalon/miner.rb

@@ -16,8 +16,8 @@ module Avalon
       :ping => [8, /./, nil],  # not in miner status string...
       :mhs => [6, /(?<=MHS av=)[\d\.]*/, :i],
       :uptime => [9, /(?<=Elapsed=)[\d\.]*/, ->(x){ my_time(x, :relative_time)}],
-      :last => [8, /(?<=Last Share Time=)[\d\.]*/,
-                ->(x){ my_time(Time.now.getgm-x.to_i, :relative_time)}],
+      :last => [8, /(?<=Status=Alive,).*?Last Share Time=[\d\.]*/,
+                ->(x){ convert_last(x)}],
       :temp => [5, /(?<=Temperature=)[\d\.]*/, :f],
       :utility => [7, /(?<=,Utility=)[\d\.]*/, :f],
       :getworks => [8, /(?<=Getworks=)[\d\.]*/, :i],
@@ -29,6 +29,16 @@ module Avalon
       :found => [2, /(?<=Found Blocks=)[\d\.]*/, :i],
     }
 
+    # Last share converter (Miner-specific)
+    def self.convert_last x
+      y = x[/(?<=Last Share Time=)[\d\.]*/]
+      if y
+        my_time(Time.now.getgm-y.to_i, :relative_time)
+      else
+        "never"
+      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(' ')
@@ -41,6 +51,7 @@ module Avalon
       @fails = 0
       @alert_after = Avalon::Config[:alert_after] ||
         Avalon::Config[:status_fails_to_alarm] || 2
+      @alert_temp = Avalon::Config[:alert_temp] || 55
       super()
     end
 
@@ -53,8 +64,8 @@ module Avalon
 
       status = get_api('summary') + get_api('pools') + get_api('devs')
       # pools = get_api('pools')
+      # p pools[FIELDS[:last][1]]
       # devs = get_api('devs')
-      # p pools, pools[FIELDS[:last][1]]
       # p devs
 
       data = self.class.extract_data_from(status)
@@ -82,8 +93,10 @@ module Avalon
         end
       else
         @fails = 0
-        if self[:mhs] < @min_speed*0.95 and upminutes > 5
+        if self[:mhs] < @min_speed and upminutes > 5
           alarm "Miner #{@num} performance is #{self[:mhs]}, should be #{@min_speed}"
+        elsif self[:temp] >= @alert_temp
+          alarm "Miner #{@num} too hot at #{self[:temp]}C, needs cooling", "Ping.aiff"
         elsif upminutes < 2
           alarm "Miner #{@num} restarted", "Frog.aiff"
         end

data/lib/avalon/monitor.rb

@@ -22,7 +22,7 @@ module Avalon
 
         if @verbose
           total_hash = @nodes.reduce(0) {|hash, node| hash + (node[:mhs] || 0)}
-          puts "Total hash rate: #{total_hash}"
+          puts "Total hash rate: #{total_hash} MHash/sec"
         end
 
         sleep @timeout

data/lib/avalon/version.rb

@@ -1,3 +1,3 @@
 module Avalon
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvicco-avalon
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday