forked from Boerderij/Varken
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Boerderij#203 * Update docker compose to specify influxdb:1.8.4 * Update requirements to use urllib3==1.26.5 * updated to support Radarr and Sonarr V3 Api * bump requirements for requests * Fix Sonarr & Radarr V3 API /queue endpoint (Boerderij#220) * Fix lint issues * More lint fixes * Update Sonarr structures * Add Overseerr Support (Boerderij#210) * Remove duplicate structures * update changelog to reflect v1.7.7 changes * Add IP data to tautulli Boerderij#202 * add missing ip address in tautulli * Fixed: Streamlined API calls to Radarr and Sonarr (Boerderij#221) * Fixed: Sonarr Data pull issues (Boerderij#222) * Fix Sonarrr calendar * Update lidarr structure (Boerderij#225) Added missing arguments to Lidarr structure Fixes Boerderij#223 * Clean up request totals. Upstream change sct/overseerr#2426 * Cleanup blank space * Fix requested_date syntax. * Fix requested_date for Overseerr tv and movie * Fix overseerr config refernces * Fix overseerr structures * Update intparser to accommodate changes to config structure * Cleanup overseerr data collection * Fix SERVICES_ENABLED in varken.py to acomidate overseerr * Fixed: Sonarr/Lidarr Queues (Boerderij#227) * Change sonarr queue structures to str * Fixed: Multipage queue fetching * Update historical tautulli import (Boerderij#226) * Fixed: Sonarr perams ordering * Fixed: Proper warnings for missing data in sonarr and radarr * Added: Overseerr ENVs to docker compose. * Added: Logging to empty/no data returns * Update Sonarr & Lidarr Structs to match latest API changes (Boerderij#231) * Add support for estimatedCompletionTime in LidarrQueue * Add support for tvdbId in SonarrEpisode struct * Fix typo in docker yml * Rename example url for overseerr in docker yml * Update radarr structures to inclue originalLanguage * Update radarr structures to include addOptions * Update radarr structures to include popularity * fix(ombi): Update structures.py (Boerderij#238) * feat(docker): remove envs from example * fix(logging): remove depreciation warning. Var for debug mode (Boerderij#240) * fix(build): bump schedule version to 1.1 * fix(build): bump docker python version * fix(dep): update requests and urllib3 * fix(sonarr): ensure invalid sonarr queue items are just skipped over - fixes Boerderij#239 (Boerderij#243) * add branch to build inputs * update pipeline badge * Update automation * Add influxdb 2 client * Add structure for influxdb 2 params This contains all the data needed for connecting and writing to an InfluxDB2 server * Parse influxdb 2 config data * Add influxdb2 manager class This stores the data needed for InfluxDB2, and has a single `write_points` function on this that takes an array of points to add to the database * Use the correct db manager for varken * Add influxdb2 to the example varken config file * Create influx bucket if it doesn't exist * Update InfluxDB type on README * Clean up linting errors * Wrap create bucket in try/catch * Use bucket given in ini file * Log exception to troubleshoot errors * Allow configured influx2 address as URL (no port) * Bypass validity check to troubleshoot --------- Co-authored-by: mal5305 <malcolm.e.rogers@gmail.com> Co-authored-by: samwiseg0 <2241731+samwiseg0@users.noreply.github.com> Co-authored-by: Robin <19610103+RobinDadswell@users.noreply.github.com> Co-authored-by: tigattack <10629864+tigattack@users.noreply.github.com> Co-authored-by: Stewart Thomson <stewartthomson3@gmail.com> Co-authored-by: Cameron Stephen <mail@cajs.co.uk> Co-authored-by: MDHMatt <10845262+MDHMatt@users.noreply.github.com> Co-authored-by: Nathan Adams <dinnerbone@dinnerbone.com> Co-authored-by: Nicholas St. Germain <nick@cajun.pro> Co-authored-by: Gabe Revells <gcrevell@mtu.edu>
- Loading branch information
1 parent
b5a83f0
commit 7e03144
Showing
15 changed files
with
578 additions
and
194 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM python:3.9.1-alpine | ||
FROM python:3.10.5-alpine | ||
|
||
ENV DEBUG="True" \ | ||
DATA_FOLDER="/config" \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
from sys import exit | ||
from logging import getLogger | ||
import influxdb_client | ||
from influxdb_client import InfluxDBClient | ||
from influxdb_client.client.write_api import SYNCHRONOUS | ||
|
||
|
||
class InfluxDB2Manager(object): | ||
def __init__(self, server): | ||
self.server = server | ||
self.logger = getLogger() | ||
if self.server.url == "influxdb2.domain.tld": | ||
self.logger.critical("You have not configured your varken.ini. Please read Wiki page for configuration") | ||
exit() | ||
|
||
self.influx = InfluxDBClient(url=self.server.url, token=self.server.token, org=self.server.org, | ||
timeout=self.server.timeout, verify_ssl=self.server.verify_ssl, | ||
ssl_ca_cert=self.server.ssl) | ||
self.influx_write_api = self.influx.write_api(write_options=SYNCHRONOUS) | ||
|
||
# Create the bucket if needed | ||
|
||
bucket_api = self.influx.buckets_api() | ||
|
||
try: | ||
bucket = bucket_api.find_bucket_by_name(self.server.bucket) | ||
|
||
if bucket is None: | ||
self.logger.info('Creating bucket %s', self.server.bucket) | ||
|
||
org_api = influxdb_client.service.organizations_service.OrganizationsService(self.influx.api_client) | ||
orgs = org_api.get_orgs() | ||
for org in orgs.orgs: | ||
if org.name == self.server.org: | ||
my_org = org | ||
|
||
self.influx.buckets_api().create_bucket(bucket_name=self.server.bucket, org_id=my_org.id) | ||
except Exception as e: | ||
self.logger.error('Failed creating new InfluxDB bucket! Error: %s', e) | ||
|
||
def write_points(self, data): | ||
self.logger.info('Writing Data to InfluxDBv2 %s', data) | ||
|
||
try: | ||
self.influx_write_api.write(bucket=self.server.bucket, record=data) | ||
except Exception as e: | ||
self.logger.exception('Error writing data to influxdb2. Dropping this set of data. ' | ||
'Check your database! Error: %s', e) |
Oops, something went wrong.