brigade-monitor 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c22255304de44a5cedddd0d171d0eb866d1ca05c
-  data.tar.gz: 4a4bb8e175b22587ec8407b3483799089b42cf35
+  metadata.gz: ac7f27e1e0e2de078f7de3da327945558eb33116
+  data.tar.gz: a8481f3d979e38e7e79a5f4330cb480f21815744
 SHA512:
-  metadata.gz: 6225c2002e86843999905208a071a1ffe7c0c609b50407688cd51d442309809ffd1257b8d8812fe03e6bbb51494dc754f392c7bf8678777b368d6c838fad920a
-  data.tar.gz: 042c517279a3f034f9fd760da843d0791869ec5a3d1fa6b7bdf3282f224d1e1b8ae260159a1272ae8aaca9a3d271f7d92afa5adcfc68e6c7a615d6b43fb815db
+  metadata.gz: 6a139c80c18a5cdcdcdb20097d0eff81e373f5d24ed938796e517b4e2412e42cdca33198f76e0c800031b1201f86b562f5e6c4001f3e369c6ed4112549cc636f
+  data.tar.gz: 3ab51d862b928e344bcd073f8dadda58793d9940ecd970efd9affc1e9efcb79c90d462a367cf9d9a7f60cabb8c30baed341977cd0720233860520937b351bf2a

data/bin/brigade-monitor

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'awesome_print'
+require 'brigade/monitor'
 require 'cgminer/api'
-require 'httparty'
 require 'optparse'
 require 'yaml'
 
@@ -38,27 +38,70 @@ fail 'Brigade API key is required' if key.nil?
 
 # build a hash-o-miner clients
 miners = config['miners'].map do |miner|
-  name = miner[0]
-  client = CGMiner::API::Client.new(miner[1]['host'], miner[1]['port'])
-  { name: name, client: client }
-end
-
-class BrigadeAPI
-  include HTTParty
-  base_uri 'https://app.brigade.io/api/v1'
+  {
+    name: miner[0],
+    client: CGMiner::API::Client.new(miner[1]['host'], miner[1]['port'])
+  }
 end
 
+api = Brigade::Monitor::API.new(key)
 loop do
+
+  updates = []
+
   miners.each do |miner|
     begin
-      cg_response = miner[:client].devs
-      puts cg_response.body
+      summary = miner[:client].summary
+      devs = miner[:client].devs
+      pools = miner[:client].pools
+
+      # XXX check status replies on each command?
+
+      update = {
+        host: miner[:name],
+        uptime: summary.body[0]['Elapsed'] / 60,
+        mhash: summary.body[0]['MHS 5s'],
+        rejectpct: summary.body[0]['Pool Rejected%'],
+        asics: [],
+        fpgas: [],
+        gpus: [],
+        pools: []
+      }
 
-      api_response = BrigadeAPI.post("/hosts", query: { token: key, body: cg_response.body.to_s }, verify: false)
-      puts api_response
+      devs.body.each do |dev|
+        if dev.has_key? 'GPU'
+          update[:gpus] << {
+            temperature: dev['Temperature'],
+            enabled: dev['Enabled'] == 'Y',
+            status: :ok,                            # XXX enumerate statuses
+            uptime: dev['Device Elapsed'] / 60,
+            mhash: dev['MHS 5s'],
+            rejectpct: dev['Device Rejected%']
+          }
+        else
+          puts "Skipped device: #{dev}"
+        end
+      end
+
+      pools.body.each do |pool|
+        update[:pools] << {
+          url: pool['URL'],
+          status: :ok,                              # XXX enumerate statuses
+          active: pool['Stratum Active'],
+          rejectpct: pool['Pool Rejected%']
+        }
+      end
+
+      updates << update
     rescue Net::OpenTimeout
       puts "Timed out: #{miner}"
+      # XXX put something in the update to indicate it barfed
     end
   end
-  sleep 5
+
+  response = api.hosts(updates)
+  puts response.code
+
+  sleep 60
+
 end

data/lib/brigade/monitor/api.rb

@@ -0,0 +1,29 @@
+require 'httparty'
+
+module Brigade
+  module Monitor
+
+    class API
+
+      include HTTParty
+      base_uri 'https://app.brigade.io/api/v1'
+
+      def initialize(key)
+        @key = key
+      end
+
+      def hosts(data)
+        command('/hosts', updates: data)
+      end
+
+      private
+
+      def command(command, params)
+        params.merge!({ token: @key })
+        self.class.post(command, query: params, verify: false)
+      end
+
+    end
+
+  end
+end

data/lib/brigade/monitor/version.rb

@@ -1,5 +1,5 @@
 module Brigade
   module Monitor
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/lib/brigade/monitor.rb

@@ -1 +1,2 @@
+require 'brigade/monitor/api'
 require 'brigade/monitor/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brigade-monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nick Veys
@@ -167,6 +167,7 @@ files:
 - bin/brigade-monitor
 - brigade-monitor.gemspec
 - lib/brigade/monitor.rb
+- lib/brigade/monitor/api.rb
 - lib/brigade/monitor/version.rb
 - sample-config.yaml
 - spec/spec_helper.rb