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

{jool-exporter-21.6.15 → jool_exporter-26.2.3}/PKG-INFO

@@ -1,21 +1,29 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: jool-exporter
-Version: 21.6.15
+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
-Platform: UNKNOWN
+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
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: prometheus_client
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # jool-exporter
 
@@ -174,5 +182,3 @@ We use Facebook's [ptr](https://github.com/facebookincubator/ptr) for testing.
 It is driven by config in setup.py.
 
 
-
-

{jool-exporter-21.6.15 → jool_exporter-26.2.3}/jool_exporter.egg-info/PKG-INFO

@@ -1,21 +1,29 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: jool-exporter
-Version: 21.6.15
+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
-Platform: UNKNOWN
+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
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: prometheus_client
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # jool-exporter
 
@@ -174,5 +182,3 @@ We use Facebook's [ptr](https://github.com/facebookincubator/ptr) for testing.
 It is driven by config in setup.py.
 
 
-
-

{jool-exporter-21.6.15 → jool_exporter-26.2.3}/jool_exporter.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 jool-exporter = jool_exporter:main
-

{jool-exporter-21.6.15 → jool_exporter-26.2.3}/jool_exporter.py

@@ -14,19 +14,26 @@ from socket import getfqdn
 from subprocess import CompletedProcess, PIPE, run
 from typing import Generator, Union
 
-from prometheus_client import start_http_server  # type: ignore
-from prometheus_client.core import GaugeMetricFamily, REGISTRY  # type: ignore
-
+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()
 LOG = logging.getLogger(__name__)
 
 
-class JoolCollector:
+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:
@@ -62,7 +69,8 @@ class JoolCollector:
 
     def run_jool(self) -> Union[str, CompletedProcess]:
         cmd = [
-            "jool",
+            self.args.cli,
+            f"-i {self.args.instance}",
             "stats",
             "display",
             "--csv",
@@ -89,6 +97,12 @@ def main() -> int:
     parser = argparse.ArgumentParser(
         description="Export `jool stats display` for prometheus"
     )
+    parser.add_argument(
+        "-a",
+        "--addr",
+        default=DEFAULT_ADDR,
+        help=f"Address to bind socket to [Default = {DEFAULT_ADDR}]",
+    )
     parser.add_argument(
         "-d", "--debug", action="store_true", help="Verbose debug output"
     )
@@ -99,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)
-    REGISTRY.register(JoolCollector())
+    start_http_server(args.port, args.addr)
+    REGISTRY.register(JoolCollector(args))
     LOG.info(f"jool prometheus exporter - listening on {args.port}")
     try:
         while True:

{jool-exporter-21.6.15 → 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="21.6.15",
+    version="26.2.3",
     description="Export `jool stats display` for prometheus",
     long_description=get_long_desc(),
     long_description_content_type="text/markdown",
@@ -41,14 +40,11 @@ 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",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
     ],
     python_requires=">=3.8",
     entry_points={"console_scripts": ["jool-exporter = jool_exporter:main"]},