From b81240db26abcba7f0bd4e5665fc8bbb7c1aa16f Mon Sep 17 00:00:00 2001
From: Kirill Zakharenko <earwin@gmail.com>
Date: Sat, 22 Jun 2019 21:31:00 +0300
Subject: [PATCH] utils: remove collectd integration, it belongs in another
 package

---
 debian/umtrx.install                  |  3 --
 host/utils/collectd/umtrx.conf        |  6 ---
 host/utils/collectd/umtrx.types.db    |  1 -
 host/utils/collectd/umtrx2collectd.py | 54 ---------------------------
 4 files changed, 64 deletions(-)
 delete mode 100644 host/utils/collectd/umtrx.conf
 delete mode 100644 host/utils/collectd/umtrx.types.db
 delete mode 100755 host/utils/collectd/umtrx2collectd.py

diff --git a/debian/umtrx.install b/debian/umtrx.install
index 37f005da3..0bd4e41bd 100644
--- a/debian/umtrx.install
+++ b/debian/umtrx.install
@@ -3,6 +3,3 @@ images/u2plus_umtrx_v2.bin images/umtrx_txrx_uhd.bin usr/share/umtrx/firmware
 host/utils/umtrx_property_tree.py host/utils/umtrx_vswr.py usr/share/umtrx
 host/utils/umtrx_query_sensors.py host/utils/umtrx_query_versions.py host/utils/umtrx_net_burner.py usr/share/umtrx
 
-host/utils/collectd/umtrx.types.db usr/share/collectd
-host/utils/collectd/umtrx2collectd.py usr/share/umtrx
-host/utils/collectd/umtrx.conf etc/collectd/collectd.conf.d
diff --git a/host/utils/collectd/umtrx.conf b/host/utils/collectd/umtrx.conf
deleted file mode 100644
index 680b49908..000000000
--- a/host/utils/collectd/umtrx.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-TypesDB "/usr/share/collectd/umtrx.types.db"
-
-LoadPlugin exec
-<Plugin exec>
-  Exec "fairwaves-monitoring" "/usr/share/umtrx/umtrx2collectd.py"
-</Plugin>
diff --git a/host/utils/collectd/umtrx.types.db b/host/utils/collectd/umtrx.types.db
deleted file mode 100644
index e9f6a96ef..000000000
--- a/host/utils/collectd/umtrx.types.db
+++ /dev/null
@@ -1 +0,0 @@
-sensor        value:GAUGE:U:U
diff --git a/host/utils/collectd/umtrx2collectd.py b/host/utils/collectd/umtrx2collectd.py
deleted file mode 100755
index 2af4f3cae..000000000
--- a/host/utils/collectd/umtrx2collectd.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/python -u
-# -*- coding: utf-8 -*-
-
-import os
-import sched, time
-
-from umtrx_property_tree import umtrx_property_tree
-from umtrx_vswr import umtrx_vswr
-
-BOARD_ID = "0"
-SENSORS_PATH = "/mboards/{id}/sensors".format(id=BOARD_ID)
-VSWR_CALIBRATION = 0  # = TM10_VSWR_cal
-
-HOSTNAME = os.environ['COLLECTD_HOSTNAME'] if 'COLLECTD_HOSTNAME' in os.environ  else 'localhost'
-INTERVAL = os.environ['COLLECTD_INTERVAL'] if 'COLLECTD_INTERVAL' in os.environ  else '60'
-
-umtrx = umtrx_property_tree()
-umtrx.connect()
-
-# typically this yields: ['tempA', 'tempB', 'voltagePR1', 'voltagePF1', 'voltagePR2', 'voltagePF2', 'voltagezero', 'voltageVin', 'voltageVinPA', 'voltageDCOUT']
-sensors_list = umtrx.list_path_raw(SENSORS_PATH).get("result", [])
-
-
-def publish():
-    now = time.time()
-
-    current_sensors = {sensor: umtrx.query_sensor_value(SENSORS_PATH + "/" + sensor) for sensor in sensors_list}
-
-    for channel in ["1", "2"]:
-        vpf_name = "voltagePF" + channel
-        vpr_name = "voltagePR" + channel
-
-        if vpf_name in current_sensors and vpr_name in current_sensors:
-            vswr = umtrx_vswr(float(current_sensors[vpf_name]), float(current_sensors[vpr_name]), VSWR_CALIBRATION)
-            current_sensors["VSWR" + channel] = vswr.vswr()
-            current_sensors["ReturnLoss" + channel] = vswr.return_loss()
-
-    for name, value in current_sensors.items():
-        print "PUTVAL {host}/umtrx-{id}/sensor-{name} interval={interval} {now}:{value}".format(
-            host=HOSTNAME, id=BOARD_ID, name=name.lower(), interval=INTERVAL, now=now, value=value)
-
-
-s = sched.scheduler(time.time, time.sleep)
-
-
-def timer_loop():
-    s.enter(float(INTERVAL), 1, timer_loop, ())
-    publish()
-
-
-timer_loop()
-s.run()
-
-umtrx.close()