jool-exporter 25.3.8__tar.gz → 26.2.3__tar.gz

{jool_exporter-25.3.8 → jool_exporter-26.2.3}/PKG-INFO

@@ -1,13 +1,12 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: jool-exporter
-Version: 25.3.8
+Version: 26.2.3
 Summary: Export `jool stats display` for prometheus
 Home-page: http://github.com/cooperlees/jool-exporter
 Author: Cooper Lees
 Author-email: me@cooperlees.com
-License: BSD
+License: BSD-3-Clause
 Classifier: Development Status :: 3 - Alpha
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.8
@@ -21,6 +20,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{jool_exporter-25.3.8 → jool_exporter-26.2.3}/jool_exporter.egg-info/PKG-INFO

@@ -1,13 +1,12 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: jool-exporter
-Version: 25.3.8
+Version: 26.2.3
 Summary: Export `jool stats display` for prometheus
 Home-page: http://github.com/cooperlees/jool-exporter
 Author: Cooper Lees
 Author-email: me@cooperlees.com
-License: BSD
+License: BSD-3-Clause
 Classifier: Development Status :: 3 - Alpha
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.8
@@ -21,6 +20,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{jool_exporter-25.3.8 → jool_exporter-26.2.3}/jool_exporter.py

@@ -18,7 +18,8 @@ from prometheus_client import start_http_server
 from prometheus_client.core import GaugeMetricFamily, REGISTRY
 from prometheus_client.registry import Collector
 
-
+DEFAULT_CLI = "jool"
+DEFAULT_INSTANCE = "default"
 DEFAULT_ADDR = "0.0.0.0"
 DEFAULT_PORT = 6971
 HOSTNAME = getfqdn()
@@ -29,6 +30,10 @@ class JoolCollector(Collector):
     key_prefix = "jool"
     labels = ["hostname"]
 
+    def __init__(self, args: argparse.Namespace):
+        super().__init__()
+        self.args = args
+
     def _handle_counter(
         self, category: str, value: float, explanation: str
     ) -> GaugeMetricFamily:
@@ -64,7 +69,8 @@ class JoolCollector(Collector):
 
     def run_jool(self) -> Union[str, CompletedProcess]:
         cmd = [
-            "jool",
+            self.args.cli,
+            f"-i {self.args.instance}",
             "stats",
             "display",
             "--csv",
@@ -107,12 +113,24 @@ def main() -> int:
         default=DEFAULT_PORT,
         help=f"Port to run webserver on [Default = {DEFAULT_PORT}]",
     )
+    parser.add_argument(
+        "-i",
+        "--instance",
+        default=DEFAULT_INSTANCE,
+        help=f"Instance to listen to [Default = {DEFAULT_INSTANCE}]",
+    )
+    parser.add_argument(
+        "-c",
+        "--cli",
+        default=DEFAULT_CLI,
+        help=f"Cli to use (for instance jool or jool_siit) [Default = {DEFAULT_CLI}]",
+    )
     args = parser.parse_args()
     _handle_debug(args.debug)
 
     LOG.info(f"Starting {sys.argv[0]}")
     start_http_server(args.port, args.addr)
-    REGISTRY.register(JoolCollector())
+    REGISTRY.register(JoolCollector(args))
     LOG.info(f"jool prometheus exporter - listening on {args.port}")
     try:
         while True:

{jool_exporter-25.3.8 → jool_exporter-26.2.3}/setup.py

@@ -7,7 +7,6 @@ from pathlib import Path
 
 from setuptools import setup
 
-
 ptr_params = {
     "entry_point_module": "jool_exporter",
     "test_suite": "jool_exporter_tests",
@@ -33,7 +32,7 @@ def get_long_desc() -> str:
 
 setup(
     name="jool-exporter",
-    version="25.3.8",
+    version="26.2.3",
     description="Export `jool stats display` for prometheus",
     long_description=get_long_desc(),
     long_description_content_type="text/markdown",
@@ -41,10 +40,9 @@ setup(
     url="http://github.com/cooperlees/jool-exporter",
     author="Cooper Lees",
     author_email="me@cooperlees.com",
-    license="BSD",
+    license="BSD-3-Clause",
     classifiers=[
         "Development Status :: 3 - Alpha",
-        "License :: OSI Approved :: BSD License",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3 :: Only",
     ],