brigade-monitor 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 559852384cd9682471cc0e1b66b29027f54c0ddc
-  data.tar.gz: df0c6103d1f6fd82781ff94e31264a4e5b3ec510
+  metadata.gz: 439db741beda30b6a882ca90026065dc80a25f09
+  data.tar.gz: 142266d55add8598bb3e931161386dc3469135c3
 SHA512:
-  metadata.gz: b6edc47df29a772e188f63f8013ca7e6098f81eb7fad7913da8b96b02518a3b5d97551ad9eb48010bc95a3bfda5068558574a23621834ea96a66cf73c103be40
-  data.tar.gz: 5391c99ee89fe35019c0eea2d520bfd28c7586546ec777f6ea53af1723db55a23d6eaa91bf51e2f1e39dacabb5f5add69579e3f39a77638663c261634d72b8b2
+  metadata.gz: 0f50085d2b8ea5175bb968e1f8172bb3329c3e7c5db6df4ce6822189c453ee7f759ffc7c8aab1e56ddd7269f17e7e417a8268d8faab0abedcbcbf55ba3b80582
+  data.tar.gz: 574eb633147bf56cfa419752b2d32176dbcb46aecd19cef7fd0032ba512d1b9ddf89d113d3b60660081c3ea4d8586fb317ea4499198c918e606d7431a6dec000

data/lib/brigade/monitor/fetcher.rb

@@ -86,9 +86,8 @@ module Brigade
         }
       end
 
-      def asic_info(device)
+      def device_info(device)
         {
-          index: device['ASC'],
           temperature: device['Temperature'],
           enabled: device['Enabled'] == 'Y',
           status: device['Status'],
@@ -111,36 +110,22 @@ module Brigade
         }
       end
 
+      def asic_info(device)
+        {
+          index: device['ASC'],
+        }.merge(device_info(device))
+      end
+
       def fpga_info(device)
         {
           index: device['PGA'],
-          temperature: device['Temperature'],
-          enabled: device['Enabled'] == 'Y',
-          status: device['Status'],
-          uptime: device['Device Elapsed'],
-          mhash_average: device['MHS av'],
-          mhash_current: device['MHS 5s'],
-          accepted: device['Accepted'],
-          rejected: device['Rejected'],
-          hardware_errors: device['Hardware Errors'],
-          utility: device['Utility'],
-          rejected_percent: device['Device Rejected%'],
-          last_share_pool: device['Last Share Pool'],
-          last_share_time: device['Last Share Time'],
-          total_mhash: device['Total MH'],
           frequency: device['Frequency'],
-          diff1_work: device['Diff1 Work'],
-          difficulty_accepted: device['Difficulty Accepted'],
-          difficulty_rejected: device['Difficulty Rejected'],
-          last_share_difficulty: device['Last Share Difficulty'],
-          last_valid_work: device['Last Valid Work'],
-        }
+        }.merge(device_info(device))
       end
 
       def gpu_info(device)
         {
           index: device['GPU'],
-          temperature: device['Temperature'],
           fan_speed: device['Fan Speed'],
           fan_percent: device['Fan Percent'],
           gpu_clock: device['GPU Clock'],
@@ -148,26 +133,8 @@ module Brigade
           gpu_voltage: device['GPU Voltage'],
           gpu_activity: device['GPU Activity'],
           powertune: device['Powertune'],
-          enabled: device['Enabled'] == 'Y',
-          status: device['Status'],
-          uptime: device['Device Elapsed'],
-          mhash_average: device['MHS av'],
-          mhash_current: device['MHS 5s'],
-          accepted: device['Accepted'],
-          rejected: device['Rejected'],
-          hardware_errors: device['Hardware Errors'],
-          utility: device['Utility'],
           intensity: device['Intensity'],
-          rejected_percent: device['Device Rejected%'],
-          last_share_pool: device['Last Share Pool'],
-          last_share_time: device['Last Share Time'],
-          total_mhash: device['Total MH'],
-          diff1_work: device['Diff1 Work'],
-          difficulty_accepted: device['Difficulty Accepted'],
-          difficulty_rejected: device['Difficulty Rejected'],
-          last_share_difficulty: device['Last Share Difficulty'],
-          last_valid_work: device['Last Valid Work'],
-        }
+        }.merge(device_info(device))
       end
 
       def pool_info(pool)

data/lib/brigade/monitor/monitor.rb

@@ -11,7 +11,6 @@ module Brigade
           fetcher = Brigade::Monitor::Fetcher.new(m[:client], m[:name], logger)
           { fetcher: fetcher }.merge(m)
         end
-        puts @miners.inspect
         @log = logger
       end
 

data/lib/brigade/monitor/version.rb

@@ -1,5 +1,5 @@
 module Brigade
   module Monitor
-    VERSION = '0.4.2'
+    VERSION = '0.4.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brigade-monitor
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Nick Veys