From c42a0b58e462de95863426de6f817b2d7ff5b8d7 Mon Sep 17 00:00:00 2001 From: samwiseg0 Date: Sat, 20 Apr 2019 09:30:17 -0400 Subject: [PATCH 1/3] Add album and track totals to artist library from Tautulli #127 --- varken/tautulli.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/varken/tautulli.py b/varken/tautulli.py index 4eac352..c49d95b 100644 --- a/varken/tautulli.py +++ b/varken/tautulli.py @@ -208,6 +208,10 @@ class TautulliAPI(object): if library['section_type'] == 'show': data['fields']['seasons'] = int(library['parent_count']) data['fields']['episodes'] = int(library['child_count']) + + elif library['section_type'] == 'artist': + data['fields']['albums'] = int(library['parent_count']) + data['fields']['tracks'] = int(library['child_count']) influx_payload.append(data) self.dbmanager.write_points(influx_payload) From 2a260f6ee9dcc80be62399a1eacafd51132c5cf6 Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Mon, 22 Apr 2019 14:05:17 -0500 Subject: [PATCH 2/3] make an attempt to reauth unifi + let users know they didnt RTFM --- varken/dbmanager.py | 3 +++ varken/unifi.py | 15 +++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/varken/dbmanager.py b/varken/dbmanager.py index db3629f..c321469 100644 --- a/varken/dbmanager.py +++ b/varken/dbmanager.py @@ -8,6 +8,9 @@ from influxdb.exceptions import InfluxDBServerError class DBManager(object): def __init__(self, server): self.server = server + if self.server.url == "influxdb.domain.tld": + self.logger.critical("You have not configured your varken.ini. Please read Wiki page for configuration") + exit() self.influx = InfluxDBClient(host=self.server.url, port=self.server.port, username=self.server.username, password=self.server.password, ssl=self.server.ssl, database='varken', verify_ssl=self.server.verify_ssl) diff --git a/varken/unifi.py b/varken/unifi.py index a32cd52..a9c5164 100644 --- a/varken/unifi.py +++ b/varken/unifi.py @@ -12,7 +12,7 @@ class UniFiAPI(object): # Create session to reduce server web thread load, and globally define pageSize for all requests self.session = Session() self.logger = getLogger() - + self.get_retry = True self.get_cookie() def __repr__(self): @@ -37,7 +37,14 @@ class UniFiAPI(object): get = connection_handler(self.session, req, self.server.verify_ssl) if not get: - self.logger.error("Disregarding Job get_usg_stats for unifi-%s", self.server.id) + if self.get_retry: + self.get_retry = False + self.logger.error("Attempting to reauthenticate for unifi-%s", self.server.id) + self.get_cookie() + self.get_usg_stats() + else: + self.get_retry = True + self.logger.error("Disregarding Job get_usg_stats for unifi-%s", self.server.id) return devices = {device['name']: device for device in get['data'] if device.get('name')} @@ -63,10 +70,6 @@ class UniFiAPI(object): "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": float(device['sys_stats']['loadavg_1']), "cpu_loadavg_5": float(device['sys_stats']['loadavg_5']), "cpu_loadavg_15": float(device['sys_stats']['loadavg_15']), From 61def3b37e28f7a61a02df33af44226bdcb7bbc2 Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Mon, 22 Apr 2019 14:07:28 -0500 Subject: [PATCH 3/3] reset check if successful --- varken/unifi.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/varken/unifi.py b/varken/unifi.py index a9c5164..0de3e87 100644 --- a/varken/unifi.py +++ b/varken/unifi.py @@ -47,6 +47,9 @@ class UniFiAPI(object): self.logger.error("Disregarding Job get_usg_stats for unifi-%s", self.server.id) return + if not self.get_retry: + self.get_retry = True + devices = {device['name']: device for device in get['data'] if device.get('name')} if devices.get(self.server.usg_name):