Добавление фильтраций

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

SetupMinersClass.py

@@ -5,6 +5,7 @@ import telnetlib
 import json
 import paramiko
 import time
+import os
 
 
 class SSHSetup:
@@ -108,7 +109,9 @@ class SetupMiner:
 
 
 def read_conf():
-    with open('config.json') as f:
+    path = os.path.dirname(os.path.realpath(__file__))
+    conf_file = os.path.join(path, 'config.json')
+    with open(conf_file) as f:
         conf = json.load(f)
     return conf
 

aw_sender.py

@@ -5,10 +5,8 @@ import requests
 import json
 import sys
 from pyzabbix import ZabbixMetric, ZabbixSender
-
-hostname = 'hostname1'
-zabbix_server = '10.3.2.5'
-aw_url = 'http://10.5.0.1:17790/api/miners'
+import os
+import re
 
 
 class AwZabbix:
@@ -25,27 +23,43 @@ class AwZabbix:
         if len(self.data) == 0:
             self.data = requests.get(self.url).json()
 
+    def hashrate_str_to_int(self, hashrate_raw):
+        if "H" in hashrate_raw:
+            m = hashrate_raw[-4:-3]
+            if m[0] == ' ':
+                hashrate_mult = 1
+            else:
+                hashrate_mult = self.mult_dict[hashrate_raw[-4:-3]]
+            hashrate_raw = "".join(hashrate_raw.split())
+            a = float(hashrate_raw[:-5].replace(',', '.')) * hashrate_mult
+        else:
+            a = 0
+        return int(a)
+
     def make_packet(self):
         self.get_data()
         if len(self.packet) != 0:
             return self.packet
         total_hashrate_raw = self.data['totalHashrate5s']
         if total_hashrate_raw:
-            hashrate_mult = self.mult_dict[total_hashrate_raw[-4:-3]]
-            total_hashrate = float(total_hashrate_raw[:-5].replace(',', '.')) * hashrate_mult
-            total_hashrate = int(total_hashrate)
+            total_hashrate = self.hashrate_str_to_int(total_hashrate_raw)
         self.packet.append(ZabbixMetric(self.host, 'total[hashrate]', total_hashrate))
         for group in self.data['groupList']:
             for miner in group['minerList']:
                 hashrate_raw = miner['speedInfo']['hashrate']
                 if hashrate_raw:
-                    hashrate_mult = self.mult_dict[hashrate_raw[-4:-3]]
-                    hashrate = float(hashrate_raw[:-5].replace(',', '.')) * hashrate_mult
-                    hashrate = int(hashrate)
+                    hashrate = self.hashrate_str_to_int(hashrate_raw)
                 else:
                     hashrate = 0
+                hashrate_avg_raw = miner['speedInfo']['avgHashrate']
+                if hashrate_avg_raw:
+                    hashrate_avg = self.hashrate_str_to_int(hashrate_avg_raw)
+                else:
+                    hashrate_avg = 0
                 minername = str(miner['name'])
                 self.packet.append(ZabbixMetric(self.host, "{}[{}]".format('hashrate', minername), hashrate))
+                self.packet.append(ZabbixMetric(self.host, "{}[{}]".format('hashrate_avg', minername), hashrate_avg))
+                self.packet.append(ZabbixMetric(self.host, "{}[{}]".format('hashrate_avg_min', minername), int(hashrate_avg * 0.8)))
                 self.packet.append(ZabbixMetric(self.host, "{}[{}]".format('ip', minername), miner['hostname']))
                 self.packet.append(ZabbixMetric(self.host, "{}[{}]".format('group', minername), miner['groupId']))
                 self.packet.append(ZabbixMetric(self.host, "{}[{}]".format('name', minername), miner['name']))
@@ -76,13 +90,18 @@ class AwZabbix:
 
 
 def read_conf():
-    with open('config.json') as f:
+    path = os.path.dirname(os.path.realpath(__file__))
+    conf_file = os.path.join(path, 'config.json')
+    with open(conf_file) as f:
         conf = json.load(f)
     return conf
 
 
 def main():
     conf = read_conf()
+    zabbix_server = conf["zabbix_server"]
+    aw_url = conf["aw_url"]
+    hostname = conf["hostname"]
 
     z = AwZabbix(zabbix_server, aw_url, hostname)
 

config-sample.json

@@ -0,0 +1,11 @@
+{
+  "sshuser":"root",
+  "sshpass":"admin",
+  "sshport":"22",
+  "telnetuser":"telnetd",
+  "telnetpass":"admin",
+  "telnetport":"23",
+  "hostname": "hostname1",
+  "zabbix_server": "",
+  "aw_url": "http://10.5.0.1:17790/api/miners"
+}

config.json

@@ -6,6 +6,6 @@
   "telnetpass":"admin",
   "telnetport":"23",
   "hostname": "hostname1",
-  "zabbix_server": "",
-  "aw_url": "http://10.5.0.1:17790/api/miners"
+  "zabbix_server": "10.3.2.5",
+  "aw_url": "http://10.5.0.13:17790/api/miners"
 }

miner_reboot.py

@@ -35,7 +35,10 @@ def main():
     elif len(sys.argv) == 2 and sys.argv[1] == 'test':
         print(z.lld())
     elif len(sys.argv) == 2:
-        print(reboot_miner(sys.argv[1], z, minerconf))
+        # dc05-miner: CJ1554 04G hashrate = 0
+        miner = "{} {}".format(sys.argv[1].split()[1], sys.argv[1].split()[2])
+        print(miner)
+        print(reboot_miner(miner, z, minerconf))
 
 
 if __name__ == '__main__':