ignace/service_netatmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

with out-temp

Browse Source
This commit is contained in:
ignace
2026-09-06 12:25:34 +02:00
parent 77bf334fce
commit dd8f7536d3
4 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netatmo_service/rrd.py
+25 -6
View File
@@ -18,10 +18,10 @@ HEARTBEAT = 1500
SAFE_NAME = re.compile(r"^[a-z][a-z0-9_]*$")
SCHEMAS = {
"outdoor": {"min_temp": "GAUGE:-60:70", "max_temp": "GAUGE:-60:70", "humidity": "GAUGE:0:100", "pressure": "GAUGE:800:1200"},
"outdoor": {"temperature": "GAUGE:-60:70", "min_temp": "GAUGE:-60:70", "max_temp": "GAUGE:-60:70", "humidity": "GAUGE:0:100", "pressure": "GAUGE:800:1200"},
"pressure": {"pressure": "GAUGE:800:1200"},
"wind": {"gust": "GAUGE:0:300", "average": "GAUGE:0:300", "angle": "GAUGE:0:360"},
"rain": {"sum_rain_24": "GAUGE:0:1000"},
"rain": {"sum_rain_24": "GAUGE:0:1000", "sum_rain_1": "GAUGE:0:1000"},
"bedroom": {"temperature": "GAUGE:-20:60", "co2": "GAUGE:0:10000", "humidity": "GAUGE:0:100"},
"study": {"temperature": "GAUGE:-20:60", "co2": "GAUGE:0:10000", "humidity": "GAUGE:0:100"},
"living": {"temperature": "GAUGE:-20:60", "co2": "GAUGE:0:10000", "humidity": "GAUGE:0:100"},
@@ -57,6 +57,7 @@ class RRDStore:
for name, schema in SCHEMAS.items():
path = self.path(name)
if path.exists():
self._ensure_data_sources(path, schema)
continue
# Leave room for a station that has been temporarily offline when the
# RRD is first created; RRDtool rejects samples older than --start.
@@ -67,6 +68,17 @@ class RRDStore:
"RRA:AVERAGE:0.5:36:1464", "RRA:MIN:0.5:36:1464", "RRA:MAX:0.5:36:1464"]
rrdtool.create(str(path), *args)
@staticmethod
def _ensure_data_sources(path: Path, schema: dict[str, str]) -> None:
"""Add newly introduced data sources without discarding RRD history."""
info = rrdtool.info(str(path))
for field, definition in schema.items():
if f"ds[{field}].index" in info:
continue
data_type, limits = definition.split(":", 1)
LOG.info("Adding %s data source to %s", field, path)
rrdtool.tune(str(path), f"DS:{field}:{data_type}:{HEARTBEAT}:{limits}")
def update(self, name: str, sample: Sample) -> bool:
"""Store at most one sample per RRD step; return whether it was written."""
path = self.path(name)
@@ -139,15 +151,22 @@ class RRDStore:
if name == "wind":
drawings = self._wind_drawings()
elif name == "rain":
drawings = ["AREA:sum_rain_24#3498DB80:Rain today (mm)",
"LINE2:sum_rain_24#2471A3:Rain today (mm)"]
rain_field = "sum_rain_24" if period == "year" else "sum_rain_1"
rain_label = "Rain per day (mm)" if period == "year" else "Rain per hour (mm)"
drawings = [f"AREA:{rain_field}#3498DB80:{rain_label}",
f"LINE2:{rain_field}#2471A3"]
elif name == "pressure":
drawings = ["AREA:pressure_floor#00000000",
"AREA:pressure_above_floor#77787280:Pressure (mbar):STACK",
"LINE1:pressure#111111"]
elif name == "outdoor":
drawings = ["LINE2:min_temp#3488DB:Minimum temperature (C)", "LINE2:max_temp#E74C3C:Maximum temperature (C)",
"LINE1:humidity_scaled#27AE60:Humidity (% / 2.5)"]
drawings = [] if period == "year" else [
"AREA:temperature#E74C3C70:Temperature (C)",
"LINE1:temperature#A93226",
]
drawings += ["LINE2:min_temp#3488DB:Minimum temperature (C)",
"LINE2:max_temp#E74C3C:Maximum temperature (C)",
"LINE1:humidity_scaled#27AE60:Humidity (% / 2.5)"]
else:
drawings = ["AREA:temperature#E74C3C70:Temperature (C)",
"LINE1:temperature#A93226",