d_mcknight/Varken
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added ssl/verify_ssl for influx as options

Browse source
This commit is contained in:
Nicholas St. Germain 2019-01-11 23:27:06 -06:00
parent 989e7f0e44
commit 3d0f4b275f
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/varken.example.ini
View file

@ -9,6 +9,8 @@ unifi_server_ids = false
[influxdb] [influxdb]
url = influxdb.domain.tld url = influxdb.domain.tld
port = 8086 port = 8086
ssl = false
verify_ssl = false
username = root username = root
password = root password = root

5
varken/dbmanager.py
View file

@ -5,8 +5,9 @@ from influxdb import InfluxDBClient
class DBManager(object): class DBManager(object):
def __init__(self, server): def __init__(self, server):
self.server = server self.server = server
self.influx = InfluxDBClient(self.server.url, self.server.port, self.server.username, self.server.password, self.influx = InfluxDBClient(host=self.server.url, port=self.server.port, username=self.server.username,
'varken') password=self.server.password, ssl=self.server.ssl, database='varken',
verify_ssl=self.server.verify_ssl)
databases = [db['name'] for db in self.influx.get_list_database()] databases = [db['name'] for db in self.influx.get_list_database()]
self.logger = getLogger() self.logger = getLogger()

8
varken/iniparser.py
View file

@ -141,13 +141,15 @@ class INIParser(object):
self.config_blacklist() self.config_blacklist()
# Parse InfluxDB options # Parse InfluxDB options
url = self.url_check(self.config.get('influxdb', 'url'), include_port=False, section='influxdb') url = self.url_check(self.config.get('influxdb', 'url'), include_port=False, section='influxdb')
port = self.config.getint('influxdb', 'port') port = self.config.getint('influxdb', 'port')
ssl = self.config.getboolean('influxdb', 'ssl')
verify_ssl = self.config.getboolean('influxdb', 'verify_ssl')
username = self.config.get('influxdb', 'username') username = self.config.get('influxdb', 'username')
password = self.config.get('influxdb', 'password') password = self.config.get('influxdb', 'password')
self.influx_server = InfluxServer(url=url, port=port, username=username, password=password)
self.influx_server = InfluxServer(url=url, port=port, username=username, password=password, ssl=ssl,
verify_ssl=verify_ssl)
# Check for all enabled services # Check for all enabled services
for service in self.services: for service in self.services:

2
varken/structures.py
View file

@ -14,8 +14,10 @@ if version_info < (3, 6, 2):
class InfluxServer(NamedTuple): class InfluxServer(NamedTuple):
password: str = 'root' password: str = 'root'
port: int = 8086 port: int = 8086
ssl: bool = False
url: str = 'localhost' url: str = 'localhost'
username: str = 'root' username: str = 'root'
verify_ssl: bool = False
class SonarrServer(NamedTuple): class SonarrServer(NamedTuple):