diff --git a/InfluxdbSpeedtest.py b/InfluxdbSpeedtest.py index 2a84f1d5e7561d0836c680e8e29275582dad2d2d..2e65ae206b682790fdf00e8b5c3ca6b4d010a074 100644 --- a/InfluxdbSpeedtest.py +++ b/InfluxdbSpeedtest.py @@ -33,6 +33,8 @@ class configManager(): self.influx_address = self.config['INFLUXDB']['Address'] self.influx_port = self.config['INFLUXDB'].getint('Port', fallback=8086) self.influx_database = self.config['INFLUXDB'].get('Database', fallback='speedtests') + self.influx_user = self.config['INFLUXDB'].get('Username', fallback='') + self.influx_password = self.config['INFLUXDB'].get('Password', fallback='') self.influx_ssl = self.config['INFLUXDB'].getboolean('SSL', fallback=False) self.influx_verify_ssl = self.config['INFLUXDB'].getboolean('Verify_SSL', fallback=True) @@ -51,6 +53,8 @@ class InfluxdbSpeedtest(): self.influx_client = InfluxDBClient( self.config.influx_address, self.config.influx_port, + username=self.config.influx_user, + password=self.config.influx_password, database=self.config.influx_database, ssl=self.config.influx_ssl, verify_ssl=self.config.influx_verify_ssl @@ -108,8 +112,7 @@ class InfluxdbSpeedtest(): print('Download: {}'.format(str(result_dict['download']))) print('Upload: {}'.format(str(result_dict['upload']))) - print(input_points) - #self.write_influx_data(input_points) + self.write_influx_data(input_points) def run(self): @@ -147,7 +150,8 @@ class InfluxdbSpeedtest(): print('ERROR: Failed To Write To InfluxDB') print(e) - print('Written To Influx: {}'.format(json_data)) + if self.output: + print('Written To Influx: {}'.format(json_data)) def main():