yfinance-exporter 1.0.0__tar.gz → 1.0.2__tar.gz

{yfinance_exporter-1.0.0 → yfinance_exporter-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yfinance-exporter
-Version: 1.0.0
+Version: 1.0.2
 Summary: 
 Author: François Schmidts
 Author-email: francois@schmidts.fr

{yfinance_exporter-1.0.0 → yfinance_exporter-1.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "yfinance-exporter"
-version = "1.0.0"
+version = "1.0.2"
 description = ""
 authors = ["François Schmidts <francois@schmidts.fr>"]
 readme = "README.md"

{yfinance_exporter-1.0.0 → yfinance_exporter-1.0.2}/yfinance_exporter.py

@@ -9,12 +9,13 @@ from the_conf import TheConf
 from yfinance import Ticker
 
 metaconf = {
-    "source_order": ["files"],
+    "source_order": ["env", "files"],
     "config_files": [
         "~/.config/yfinance-exporter.json",
         "/etc/yfinance-exporter/yfinance-exporter.json",
     ],
     "parameters": [
+        {"name": {"default": "yfinance-exporter"}},
         {
             "type": "list",
             "stocks": [
@@ -23,11 +24,7 @@ metaconf = {
                 {"ycode": {"type": str}},
             ],
         },
-        {
-            "loop": [
-                {"interval": {"type": int, "default": 240}},
-            ]
-        },
+        {"loop": [{"interval": {"type": int, "default": 240}}]},
         {
             "prometheus": [
                 {"port": {"type": int, "default": 9100}},
@@ -48,12 +45,7 @@ except AttributeError as error:
         "ERROR and FATAL are accepted"
     ) from error
 
-YFINANCE_EXPORTER = Gauge(
-    "yfinance_exporter",
-    "",
-    ["status"],
-    namespace=conf.prometheus.namespace,
-)
+DAEMON = Gauge("daemon", "", ["name", "section", "status"])
 STOCK = Gauge(
     "financial_positions",
     "",
@@ -97,23 +89,25 @@ def collect(stock):
 
 
 def main():
-    YFINANCE_EXPORTER.labels("loop-count").set(0)
+    labels = {"name": conf.name, "section": "config"}
+    DAEMON.labels(status="loop-period", **labels).set(conf.loop.interval)
+    DAEMON.labels(status="item-count", **labels).set(len(conf.stocks))
+
+    labels["section"] = "exec"
     while True:
         start = datetime.now()
+        DAEMON.labels(status="items-ok", **labels).set(0)
+        DAEMON.labels(status="items-ko", **labels).set(0)
 
-        results = {"ok-stock": 0, "ko-stock": 0}
         for stock in conf.stocks:
             if collect(stock):
-                results["ok-stock"] += 1
+                DAEMON.labels(status="items-ok", **labels).inc()
             else:
-                results["ko-stock"] += 1
+                DAEMON.labels(status="items-ko", **labels).inc()
 
         exec_interval = (datetime.now() - start).total_seconds()
-        YFINANCE_EXPORTER.labels("loop-duration-second").set(exec_interval)
-        YFINANCE_EXPORTER.labels("loop-count").inc()
-        for result, count in results.items():
-            YFINANCE_EXPORTER.labels(result).set(count)
-
+        DAEMON.labels(status="exec-time", **labels).set(exec_interval)
+        DAEMON.labels(status="loop-count", **labels).inc()
         interval = conf.loop.interval - exec_interval
         if interval > 0:
             time.sleep(interval)