arvicco-avalon 0.0.2 → 0.0.3

data/README.md

@@ -6,9 +6,9 @@ Helper scripts for Bitcoin and Avalon miners management...
 
 Scripts:
 
-$ bin/monitor [last_ip]
+$ bin/monitor [environment]
 
-- Monitors all miners from 151 to last_ip (default 182)
+- 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 miners etc).
 
 $ mtgox_tx
 
@@ -16,23 +16,23 @@ $ mtgox_tx
 
 ## Configuration
 
-Sample monitor config file for production environment below. Modify it, add your own nodes to be monitored.
-
-------- config/monitor.yml --------
-# Prod configuration
-prod:
-  :bitcoind:
-    :ip: 192.168.1.13
-    :rpcuser: jbond
-    :rpcpassword: youcannotguessitdonteventry
-  :monitor:
-    :verbose: true
-    :timeout: 30
-    :nodes:
-      - [miner, 192.168.1.151, 70] # type, ip, gh/s
-      - [miner, 192.168.1.152, 70]
-      - [eloipool, 192.168.1.13, 4] # frequency of old block updates (once per X polls)
-      - [internet, www.google.com, www.speedtest.net]
+Sample monitor config file for production environment below. Modify it, add your own nodes to be monitored (for Avalon miners, you have to set their IP address and min hashrate in Gh/s):
+
+    ------- config/monitor.yml --------
+    # Prod configuration (default)
+    prod:
+      :bitcoind:
+        :ip: 192.168.1.13
+        :rpcuser: jbond
+        :rpcpassword: youcannotguessitdonteventry
+      :monitor:
+        :verbose: true
+        :timeout: 30
+        :nodes:
+          - [miner, 192.168.1.151, 70] # type, ip, gh/s
+          - [miner, 192.168.1.152, 70]
+          - [eloipool, 192.168.1.13, 4] # frequency of old block updates (once per X polls)
+          - [internet, www.google.com, www.speedtest.net]
 
 ## License
 

data/lib/avalon.rb

@@ -2,6 +2,7 @@ require 'pp'
 require 'time'
 
 require "avalon/version"
+require "avalon/utils"
 require "avalon/blockchain"
 require "avalon/bitcoind"
 require "avalon/config"

data/lib/avalon/miner.rb

@@ -39,7 +39,7 @@ module Avalon
       @ip = ip
       @num = ip.split('.').last.to_i
       @min_speed = min_speed * 1000 # Gh/s to Mh/s
-      @blanks = 0
+      @fails = 0
       super()
     end
 
@@ -70,10 +70,12 @@ module Avalon
     # Check for any exceptional situations in stats, sound alarm if any
     def report
       if data[:ping].nil?
-        @blanks += 1
-        alarm "Miner #{@num} did not respond to status query" if @blanks > 2
+        @fails += 1
+        if @fails >= Avalon::Config[:status_fails_to_alarm] || 1
+          alarm "Miner #{@num} did not respond to status query"
+        end
       else
-        @blanks = 0
+        @fails = 0
         if self[:mhs] < @min_speed*0.95 and upminutes > 5
           alarm "Miner #{@num} performance is #{self[:mhs]}, should be #{@min_speed}"
         elsif upminutes < 2

data/lib/avalon/monitor.rb

@@ -20,6 +20,7 @@ module Avalon
         # Report node errors (if any)
         @nodes.each {|node| node.report}
 
+        @nodes.first.alarm 'Poll completed', 'Purr.aiff'
         sleep @timeout
 
       end

data/lib/avalon/node.rb

@@ -3,6 +3,7 @@ module Avalon
   # Node is a single object to be monitored
   # It should implement simple interface, only 2 required methods: #poll and #report
   class Node
+    include Utils # Helper methods
 
     # Builder method for creating Node subclasses from config arrays
     def Node.create *args
@@ -26,25 +27,6 @@ module Avalon
       @data[key] = value
     end
 
-    # Helper method: sound alarm with message
-    def alarm message, *tunes
-      puts message
-
-      tunes.push('Glass.aiff') if tunes.empty?
-
-      tunes.each do |tune|
-        File.exist?(tune) ? `afplay #{tune}` : `afplay /System/Library/Sounds/#{tune}`
-      end
-    end
-
-    # Helper method: ping the Node
-    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
-      end
-    end
-
     # Abstract: Check node status
     # If verbose, the Node should print out its state after the status update
     def poll verbose

data/lib/avalon/utils.rb

@@ -0,0 +1,43 @@
+module Avalon
+  module Utils
+
+    def system
+      @system = `uname -a`.match(/^\w*/).to_s
+    end
+
+    # Helper method: play a sound file
+    def play tune
+      file = [ tune,
+               File.expand_path("../../../sound/#{tune}", __FILE__),
+               File.expand_path("~/sound/#{tune}", __FILE__),
+               File.expand_path("/System/Library/Sounds/#{tune}")
+               ].find {|f| File.exist?(f)}
+
+      case system
+      when 'Darwin'
+        `afplay #{file}`
+      when 'Linux'
+        raise 'Please install sox package: sudo apt-get install sox' if `which sox`.empty?
+        `play #{file}`
+      end
+    end
+
+    # Helper method: sound alarm with message
+    def alarm message, *tunes
+      puts message
+
+      tunes.push('Glass.aiff') if tunes.empty?
+
+      tunes.each {|tune| play tune }
+    end
+
+    # Helper method: ping the Node, return ping time in ms
+    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
+      end
+    end
+
+  end
+end

data/lib/avalon/version.rb

@@ -1,3 +1,3 @@
 module Avalon
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvicco-avalon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -55,7 +55,13 @@ files:
 - lib/avalon/miner.rb
 - lib/avalon/monitor.rb
 - lib/avalon/node.rb
+- lib/avalon/utils.rb
 - lib/avalon/version.rb
+- sound/Dog.aiff
+- sound/Frog.aiff
+- sound/Glass.aiff
+- sound/Ping.aiff
+- sound/Purr.aiff
 homepage: https://github.com/arvicco/avalon
 licenses: []
 post_install_message: