brigade-monitor 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 725c47ae64b6715dd78930c859eba9e9f3cf1477
-  data.tar.gz: e017244bf346f07b9e28b9755ab0a1dbdf02b8d9
+  metadata.gz: 541b7e15bc3c7d4fcf2d1643e457bc5c3399d725
+  data.tar.gz: ba6ce1e6c378812cd9651888ef7340d5c29035f2
 SHA512:
-  metadata.gz: 9fb21622c9c8453ce2c3d9af88dffb1fdea9ce3a8a2a6cd4bf0f0b235aa14f3839e277f95cd4020baed20203d685a1064fe3a60213887b705636a436d65ce382
-  data.tar.gz: d4d1c0b4a45649a41502a2e035d41075d2df149360291de6ab08acd8d63926ec71a78ca5d643355c969500561daf315d522bfe80590a123bbcc5511a440a999f
+  metadata.gz: 6b63dc9d5d2fed69b21527d410df93a34b335f8ee3e71cf8f1ad5f8ba4ac91d82488c477ab7b0d2fe226ec0a279fd3dd8eba368579e1c519ce5e8d78f8361d76
+  data.tar.gz: 0eb27cdfaaf50951a5dd6b4f242469a1a31bf7d1995a91a290ae03ea08ed6c8f496c29ccb00f999ff8b07fa54eec413e91e2ac1b2b30066dd42cc82873003dc1

data/lib/brigade/monitor/monitor.rb

@@ -72,10 +72,10 @@ module Brigade
           host: miner[:name],
           uptime: summary.body[0]['Elapsed'],
           mhash: summary.body[0]['MHS av'],
-          rejectpct: summary.body[0]['Pool Rejected%'],
-          'api-version' => version.body[0]['API'],
-          'cgminer-version' => version.body[0]['CGMiner'],
-          'sgminer-version' => version.body[0]['SGMiner'],
+          rejected_percent: summary.body[0]['Pool Rejected%'],
+          api_version: version.body[0]['API'],
+          cgminer_version: version.body[0]['CGMiner'],
+          sgminer_version: version.body[0]['SGMiner'],
           asics: [],
           fpgas: [],
           gpus: [],
@@ -92,12 +92,32 @@ module Brigade
             update[:gpus] << {
               index: dev['GPU'],
               temperature: dev['Temperature'],
+              fan_speed: dev['Fan Speed'],
+              fan_percent: dev['Fan Percent'],
+              gpu_clock: dev['GPU Clock'],
+              memory_clock: dev['Memory Clock'],
+              gpu_voltage: dev['GPU Voltage'],
+              gpu_activity: dev['GPU Activity'],
+              powertune: dev['Powertune'],
               enabled: dev['Enabled'] == 'Y',
               status: dev['Status'],
               uptime: dev['Device Elapsed'],
-              mhash: dev['MHS av'],
-              hwerrors: dev['Hardware Errors'],
-              rejectpct: dev['Device Rejected%']
+              mhash_average: dev['MHS av'],
+              mhash_current: dev['MHS 5s'],
+              accepted: dev['Accepted'],
+              rejected: dev['Rejected'],
+              hardware_errors: dev['Hardware Errors'],
+              utility: dev['Utility'],
+              intensity: dev['Intensity'],
+              rejected_percent: dev['Device Rejected%'],
+              last_share_pool: dev['Last Share Pool'],
+              last_share_time: dev['Last Share Time'],
+              total_mhash: dev['Total MH'],
+              diff1_work: dev['Diff1 Work'],
+              difficulty_accepted: dev['Difficulty Accepted'],
+              difficulty_rejected: dev['Difficulty Rejected'],
+              last_share_difficulty: dev['Last Share Difficulty'],
+              last_valid_work: dev['Last Valid Work'],
             }
           elsif dev.has_key? 'ASC'
             update[:asics] << {
@@ -106,9 +126,21 @@ module Brigade
               enabled: dev['Enabled'] == 'Y',
               status: dev['Status'],
               uptime: dev['Device Elapsed'],
-              mhash: dev['MHS av'],
-              hwerrors: dev['Hardware Errors'],
-              rejectpct: dev['Device Rejected%']
+              mhash_average: dev['MHS av'],
+              mhash_current: dev['MHS 5s'],
+              accepted: dev['Accepted'],
+              rejected: dev['Rejected'],
+              hardware_errors: dev['Hardware Errors'],
+              utility: dev['Utility'],
+              rejected_percent: dev['Device Rejected%'],
+              last_share_pool: dev['Last Share Pool'],
+              last_share_time: dev['Last Share Time'],
+              total_mhash: dev['Total MH'],
+              diff1_work: dev['Diff1 Work'],
+              difficulty_accepted: dev['Difficulty Accepted'],
+              difficulty_rejected: dev['Difficulty Rejected'],
+              last_share_difficulty: dev['Last Share Difficulty'],
+              last_valid_work: dev['Last Valid Work'],
             }
           elsif dev.has_key? 'PGA'
             update[:fpgas] << {
@@ -117,9 +149,22 @@ module Brigade
               enabled: dev['Enabled'] == 'Y',
               status: dev['Status'],
               uptime: dev['Device Elapsed'],
-              mhash: dev['MHS av'],
-              hwerrors: dev['Hardware Errors'],
-              rejectpct: dev['Device Rejected%']
+              mhash_average: dev['MHS av'],
+              mhash_current: dev['MHS 5s'],
+              accepted: dev['Accepted'],
+              rejected: dev['Rejected'],
+              hardware_errors: dev['Hardware Errors'],
+              utility: dev['Utility'],
+              rejected_percent: dev['Device Rejected%'],
+              last_share_pool: dev['Last Share Pool'],
+              last_share_time: dev['Last Share Time'],
+              total_mhash: dev['Total MH'],
+              frequency: dev['Frequency'],
+              diff1_work: dev['Diff1 Work'],
+              difficulty_accepted: dev['Difficulty Accepted'],
+              difficulty_rejected: dev['Difficulty Rejected'],
+              last_share_difficulty: dev['Last Share Difficulty'],
+              last_valid_work: dev['Last Valid Work'],
             }
           else
             @log.warn("Skipped unknown device: #{dev}")
@@ -141,7 +186,7 @@ module Brigade
             discarded: pool['Discarded'],
             stale: pool['Stale'],
             active: pool['Stratum Active'],
-            rejectpct: pool['Pool Rejected%']
+            rejected_percent: pool['Pool Rejected%']
           }
         end
 

data/lib/brigade/monitor/version.rb

@@ -1,5 +1,5 @@
 module Brigade
   module Monitor
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brigade-monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nick Veys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler