From 4ee34f67d13084f402090b203fc7c74099d07069 Mon Sep 17 00:00:00 2001 From: Dmitry Belousov Date: Thu, 12 Dec 2024 22:38:11 +0300 Subject: [PATCH] Add spool initial weight. Change some descriptions. --- spoolman/prometheus/metrics.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/spoolman/prometheus/metrics.py b/spoolman/prometheus/metrics.py index d3e9789..3963c57 100644 --- a/spoolman/prometheus/metrics.py +++ b/spoolman/prometheus/metrics.py @@ -15,13 +15,18 @@ registry = REGISTRY PREFIX = "spoolman" SPOOL_PRICE = Gauge(f"{PREFIX}_spool_price", "Total Spool price", ["spool_id", "filament_id"]) -SPOOL_USED_WEIGHT = Gauge(f"{PREFIX}_spool_weight_used", "Spool Used Weight", ["spool_id", "filament_id"]) +SPOOL_USED_WEIGHT = Gauge(f"{PREFIX}_spool_weight_used", "Spool Used Weight in grams", ["spool_id", "filament_id"]) +SPOOL_INITIAL_WEIGHT = Gauge( + f"{PREFIX}_spool_initial_weight", + "Spool Net weight in grams", + ["spool_id", "filament_id"], +) FILAMENT_INFO = Gauge( f"{PREFIX}_filament_info", "Filament information", ["filament_id", "vendor", "name", "material", "color"], ) -FILAMENT_DENSITY = Gauge(f"{PREFIX}_filament_density", "Density of filament", ["filament_id"]) +FILAMENT_DENSITY = Gauge(f"{PREFIX}_filament_density", "Density of filament gram/cm3", ["filament_id"]) FILAMENT_DIAMETER = Gauge(f"{PREFIX}_filament_diameter", "Diameter of filament", ["filament_id"]) FILAMENT_WEIGHT = Gauge(f"{PREFIX}_filament_weight", "Net weight of filament", ["filament_id"]) @@ -55,6 +60,8 @@ async def spool_metrics(db: AsyncSession) -> None: for row in result: if row.price is not None: SPOOL_PRICE.labels(str(row.id), str(row.filament_id)).set(row.price) + if row.initial_weight is not None: + SPOOL_INITIAL_WEIGHT.labels(str(row.id), str(row.filament_id)).set(row.initial_weight) SPOOL_USED_WEIGHT.labels(str(row.id), str(row.filament_id)).set(row.used_weight)