From c4c1ace54fdb3834083a472546ce114c1e9bbf25 Mon Sep 17 00:00:00 2001
From: "Nicholas St. Germain" <nick@cajun.pro>
Date: Fri, 25 Jan 2019 13:53:44 -0600
Subject: [PATCH] check payload for unifi

---
 varken.xml      | 54 +++++++++++++++++++++++++++++++++++++++++++++++++
 varken/unifi.py | 54 ++++++++++++++++++++++++++-----------------------
 2 files changed, 83 insertions(+), 25 deletions(-)
 create mode 100644 varken.xml

diff --git a/varken.xml b/varken.xml
new file mode 100644
index 0000000..b7fbf3a
--- /dev/null
+++ b/varken.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>Varken</Name>
+  <Repository>boerderij/varken</Repository>
+  <Registry>https://hub.docker.com/r/boerderij/varken/~/dockerfile/</Registry>
+  <Network>bridge</Network>
+  <MyIP/>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://discord.gg/VjZ6qSM</Support>
+  <Project/>
+  <Overview>
+    Varken is a standalone command-line utility to aggregate data from the Plex ecosystem into InfluxDB. Examples use Grafana for a frontend
+  </Overview>
+  <Category/>
+  <WebUI/>
+  <TemplateURL/>
+  <Icon>Pig.png</Icon>
+  <ExtraParams/>
+  <PostArgs/>
+  <CPUset/>
+  <DonateText/>
+  <DonateLink/>
+  <Description>
+    Varken is a standalone command-line utility to aggregate data from the Plex ecosystem into InfluxDB. Examples use Grafana for a frontend
+  </Description>
+  <Networking>
+    <Mode>bridge</Mode>
+    <Publish/>
+  </Networking>
+  <Data>
+    <Volume>
+      <HostDir>/mnt/user/appdata/varken</HostDir>
+      <ContainerDir>/config</ContainerDir>
+      <Mode>rw</Mode>
+    </Volume>
+  </Data>
+  <Environment>
+    <Variable>
+      <Value>99</Value>
+      <Name>PGID</Name>
+      <Mode/>
+    </Variable>
+    <Variable>
+      <Value>100</Value>
+      <Name>PUID</Name>
+      <Mode/>
+    </Variable>
+  </Environment>
+  <Labels/>
+  <Config Name="PGID" Target="PGID" Default="" Mode="" Description="Container Variable: PGID" Type="Variable" Display="always" Required="true" Mask="false">99</Config>
+  <Config Name="PUID" Target="PUID" Default="" Mode="" Description="Container Variable: PUID" Type="Variable" Display="always" Required="true" Mask="false">100</Config>
+  <Config Name="Varken DataDir" Target="/config" Default="" Mode="rw" Description="Container Path: /config" Type="Path" Display="advanced-hide" Required="true" Mask="false">/mnt/user/appdata/varken</Config>
+</Container>
\ No newline at end of file
diff --git a/varken/unifi.py b/varken/unifi.py
index 1cf3333..01f68ac 100644
--- a/varken/unifi.py
+++ b/varken/unifi.py
@@ -47,29 +47,33 @@ class UniFiAPI(object):
             self.logger.error("Could not find a USG named %s from your UniFi Controller", self.server.usg_name)
             return
 
-        influx_payload = [
-            {
-                "measurement": "UniFi",
-                "tags": {
-                    "model": device['model'],
-                    "name": device['name']
-                },
-                "time": now,
-                "fields": {
-                    "bytes_current": device['wan1']['bytes-r'],
-                    "rx_bytes_total": device['wan1']['rx_bytes'],
-                    "rx_bytes_current": device['wan1']['rx_bytes-r'],
-                    "tx_bytes_total": device['wan1']['tx_bytes'],
-                    "tx_bytes_current": device['wan1']['tx_bytes-r'],
-                    "speedtest_latency": device['speedtest-status']['latency'],
-                    "speedtest_download": device['speedtest-status']['xput_download'],
-                    "speedtest_upload": device['speedtest-status']['xput_upload'],
-                    "cpu_loadavg_1": device['sys_stats']['loadavg_1'],
-                    "cpu_loadavg_5": device['sys_stats']['loadavg_5'],
-                    "cpu_loadavg_15": device['sys_stats']['loadavg_15'],
-                    "cpu_util": device['system-stats']['cpu'],
-                    "mem_util": device['system-stats']['mem'],
+        try:
+            influx_payload = [
+                {
+                    "measurement": "UniFi",
+                    "tags": {
+                        "model": device['model'],
+                        "name": device['name']
+                    },
+                    "time": now,
+                    "fields": {
+                        "bytes_current": device['wan1']['bytes-r'],
+                        "rx_bytes_total": device['wan1']['rx_bytes'],
+                        "rx_bytes_current": device['wan1']['rx_bytes-r'],
+                        "tx_bytes_total": device['wan1']['tx_bytes'],
+                        "tx_bytes_current": device['wan1']['tx_bytes-r'],
+                        # Commenting speedtest out until Unifi gets their shit together
+                        # "speedtest_latency": device['speedtest-status']['latency'],
+                        # "speedtest_download": device['speedtest-status']['xput_download'],
+                        # "speedtest_upload": device['speedtest-status']['xput_upload'],
+                        "cpu_loadavg_1": device['sys_stats']['loadavg_1'],
+                        "cpu_loadavg_5": device['sys_stats']['loadavg_5'],
+                        "cpu_loadavg_15": device['sys_stats']['loadavg_15'],
+                        "cpu_util": device['system-stats']['cpu'],
+                        "mem_util": device['system-stats']['mem'],
+                    }
                 }
-            }
-        ]
-        self.dbmanager.write_points(influx_payload)
+            ]
+            self.dbmanager.write_points(influx_payload)
+        except KeyError as e:
+            self.logger.error('Error building payload for unifi. Discarding. Error: %s', e)