From 46cc137198fa99dfa0cba3aea5d1993a1e230589 Mon Sep 17 00:00:00 2001 From: Mikhail Grebenkin Date: Wed, 4 Apr 2018 23:39:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/vcs.xml | 6 ++++++ SetupMinersClass.py | 5 ++++- aw_sender.py | 41 ++++++++++++++++++++++++++++++----------- config-sample.json | 11 +++++++++++ config.json | 4 ++-- miner_reboot.py | 5 ++++- 6 files changed, 57 insertions(+), 15 deletions(-) create mode 100644 .idea/vcs.xml create mode 100644 config-sample.json diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SetupMinersClass.py b/SetupMinersClass.py index a434ee5..472a11f 100644 --- a/SetupMinersClass.py +++ b/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 diff --git a/aw_sender.py b/aw_sender.py index e726795..65d0a1b 100755 --- a/aw_sender.py +++ b/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) diff --git a/config-sample.json b/config-sample.json new file mode 100644 index 0000000..8713788 --- /dev/null +++ b/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" +} diff --git a/config.json b/config.json index 8713788..1ff2217 100644 --- a/config.json +++ b/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" } diff --git a/miner_reboot.py b/miner_reboot.py index 9c65764..07c59f7 100755 --- a/miner_reboot.py +++ b/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__':