linse/seweb
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed lab4.json (now constants in influxdb.py), config.ini to influx.ini

Browse Source
This commit is contained in:
l_samenv
2024-09-09 10:51:18 +02:00
parent 400899643b
commit 2a4efff511
4 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
config/config.ini → config/influx.ini
View File

18
graphs/lab4.json
View File

@ -1,18 +0,0 @@
{
"types":
{
"graph":"influx",
"control":"sea"
},
"influx":
{
"bucket_prefix":"nicos-cache-",
"bucket":"nicos-cache-lab4",
"measurement_prefix":"nicos/se_",
"setup_info_prefix":"se_"
},
"sea":{
"address":"samenv:8664",
"logger_dir":"/home/l_samenv/sea/lab4/"
}
}

12
influxdb.py
View File

@ -6,13 +6,16 @@ from datetime import datetime
from pandas import DataFrame as df, merge_ordered from pandas import DataFrame as df, merge_ordered
from numpy import NaN from numpy import NaN
MEASURMENT_PREFIX = "nicos/se_"
BUCKET_PREFIX = "nicos-cache-"
class InfluxDB: class InfluxDB:
""" """
Class used to handle the connection with the InfluxDB instance Class used to handle the connection with the InfluxDB instance
""" """
def __init__(self): def __init__(self):
config = ConfigParser() config = ConfigParser()
config.read("./config/config.ini") config.read("./config/influx.ini")
self._client = InfluxDBClient(url=config["INFLUX"]["url"], token=config["INFLUX"]["token"], self._client = InfluxDBClient(url=config["INFLUX"]["url"], token=config["INFLUX"]["token"],
org=config["INFLUX"]["org"]) org=config["INFLUX"]["org"])
@ -51,9 +54,8 @@ class PrettyFloat(float):
return '%.15g' % self return '%.15g' % self
class InfluxDataGetter: class InfluxDataGetter:
def __init__(self, db, influx_instrument_config): def __init__(self, db, instrument_name):
self._influx_instrument_config = influx_instrument_config self._bucket = BUCKET_PREFIX + instrument_name
self._bucket = self._influx_instrument_config["bucket"]
self._db = db self._db = db
# ----- PUBLIC METHODS # ----- PUBLIC METHODS
@ -378,7 +380,7 @@ class InfluxDataGetter:
Returns : Returns :
str : the transformed variable name that matches the Influx names reqauirements str : the transformed variable name that matches the Influx names reqauirements
""" """
return self._influx_instrument_config["measurement_prefix"] + secop_module_name.lower() return MEASURMENT_PREFIX + secop_module_name.lower()
def _filter_params_with_config(self, available_variables, chart_config): def _filter_params_with_config(self, available_variables, chart_config):
""" """

4
seaweb.py
View File

@ -533,7 +533,7 @@ class SeaInfluxInstrument(SeaInstrument):
def __init__(self, inst_name, instrument_config): def __init__(self, inst_name, instrument_config):
super().__init__(inst_name, instrument_config) super().__init__(inst_name, instrument_config)
self.db = InfluxDB() self.db = InfluxDB()
self.influx_data_getter = InfluxDataGetter(self.db, json.load(open("./graphs/lab4.json", "r"))["influx"]) self.influx_data_getter = InfluxDataGetter(self.db, inst_name)
self.device = self.influx_data_getter.get_device_name(int(datetime.now().timestamp())) self.device = self.influx_data_getter.get_device_name(int(datetime.now().timestamp()))
def newClient(self): def newClient(self):
@ -545,7 +545,7 @@ class InfluxInstrument(Instrument):
def __init__(self, instr_name): def __init__(self, instr_name):
self.db = InfluxDB() self.db = InfluxDB()
self.influx_data_getter = InfluxDataGetter(self.db, json.load(open("./graphs/lab4.json", "r"))["influx"]) self.influx_data_getter = InfluxDataGetter(self.db, inst_name)
self.clients = {} self.clients = {}
self.title = instr_name self.title = instr_name
self.device = self.influx_data_getter.get_device_name(int(datetime.now().timestamp())) self.device = self.influx_data_getter.get_device_name(int(datetime.now().timestamp()))