large refactoring of new code
diff --git a/sensors/receiver.py b/sensors/receiver.py
index 8903f24..76f8bb7 100644
--- a/sensors/receiver.py
+++ b/sensors/receiver.py
@@ -1,41 +1,19 @@
-import yaml
-
from api import start_monitoring, Empty
-from influx_exporter import connect, add_data
-
-monitor_config = yaml.load(open("config.yaml").read())
+# from influx_exporter import connect, add_data
uri = "udp://192.168.0.104:12001"
-infldb_url = "influxdb://perf:perf@192.168.152.42:8086/perf"
-conn = connect(infldb_url)
+# infldb_url = "influxdb://perf:perf@192.168.152.42:8086/perf"
+# conn = connect(infldb_url)
-# sw_per_ip = {}
-# count = 4
-# expected = sorted(monitor_config.keys())
-
-# if 'sda1.sectors_written' in data:
-# val = data['sda1.sectors_written']
-# elif 'sdb.sectors_written' in data:
-# val = data['sdb.sectors_written']
-# else:
-# val = 0
-
-# sw_per_ip[ip] = sw_per_ip.get(ip, 0) + val
-# count -= 1
-
-# if 0 == count:
-# try:
-# vals = [sw_per_ip[ip] for ip in expected]
-# print ("{:>6}" * len(expected)).format(*vals)
-# sw_per_ip = {}
-# count = 4
-# except KeyError:
-# pass
+monitor_config = {'127.0.0.1':
+ {"block-io": {'allowed_prefixes': ['sda1', 'rbd1']},
+ "net-io": {"allowed_prefixes": ["virbr2"]}}}
with start_monitoring(uri, monitor_config) as queue:
while True:
try:
(ip, port), data = queue.get(True, 1)
- add_data(conn, ip, [data])
+ print (ip, port), data
+ # add_data(conn, ip, [data])
except Empty:
pass