diff --git a/py-dashboard/InfluxRequest.py b/py-dashboard/InfluxRequest.py index 37838159..d96b898b 100644 --- a/py-dashboard/InfluxRequest.py +++ b/py-dashboard/InfluxRequest.py @@ -8,6 +8,7 @@ import sys import os import pandas as pd +from influxdb_client import WritePrecision if sys.version_info[0] != 3: print("This script requires Python 3") @@ -61,7 +62,7 @@ class RecordInflux(): for tag_key, tag_value in tags.items(): p.tag(tag_key, tag_value) print(tag_key, tag_value) - p.time(time) + p.time(datetime.datetime.strptime(time, '%Y-%m-%dT%H:%M:%S.%f').utcnow(), WritePrecision.NS) p.field("value", value) self.write_api.write(bucket=self.influx_bucket, org=self.influx_org, record=p) diff --git a/py-scripts/csv_to_influx.py b/py-scripts/csv_to_influx.py index ad3ee8d9..abc81732 100755 --- a/py-scripts/csv_to_influx.py +++ b/py-scripts/csv_to_influx.py @@ -5,7 +5,6 @@ import importlib from pathlib import Path import argparse - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) cv_test_manager = importlib.import_module("py-json.cv_test_manager") @@ -15,6 +14,7 @@ InfluxRequest = importlib.import_module("py-dashboard.InfluxRequest") RecordInflux = InfluxRequest.RecordInflux influx_add_parser_args = InfluxRequest.influx_add_parser_args + class CSVtoInflux: def __init__(self, influx_host, @@ -34,7 +34,7 @@ class CSVtoInflux: path = Path(self.path) self.kpi_list = list(path.glob('**/kpi.csv')) for kpi in self.kpi_list: - self.influxdb.RecordInflux.csv_to_influx(kpi) + self.influxdb.csv_to_influx(kpi) def main():