jool-exporter 21.6.15__py3-none-any.whl → 26.2.3__py3-none-any.whl

{jool_exporter-21.6.15.dist-info → jool_exporter-26.2.3.dist-info}/METADATA

@@ -1,22 +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
+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
 
@@ -175,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-26.2.3.dist-info/RECORD

@@ -0,0 +1,7 @@
+jool_exporter.py,sha256=1cj9mmU8_JPj79dO-AAQ0msMbBMhFAD1TYowexFdNHw,4134
+jool_exporter-26.2.3.dist-info/licenses/LICENSE,sha256=Nk_wwh_-xaIa8gwgiHAnfZqw8O0AaIawc2Wle2JoUCg,1321
+jool_exporter-26.2.3.dist-info/METADATA,sha256=sZUKclHcfHcC4Fo7NLiT9xuVNuUruID4W9wctQfySiA,8173
+jool_exporter-26.2.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+jool_exporter-26.2.3.dist-info/entry_points.txt,sha256=t84r-KaB7nTKr0GEpcUco1ueXh39-56igLzN49ME8vw,53
+jool_exporter-26.2.3.dist-info/top_level.txt,sha256=SmhUI8tDD36vZuSOg0nbROONpGvBfjVH5AjwfnnVIlI,14
+jool_exporter-26.2.3.dist-info/RECORD,,

{jool_exporter-21.6.15.dist-info → jool_exporter-26.2.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.36.2)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{jool_exporter-21.6.15.dist-info → jool_exporter-26.2.3.dist-info}/entry_points.txt

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

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.dist-info/RECORD

@@ -1,7 +0,0 @@
-jool_exporter.py,sha256=prKXT3yKwO3HlqKjEOpvO2_dkjxl4HkhaEAEMFd4t7s,3355
-jool_exporter-21.6.15.dist-info/LICENSE,sha256=Nk_wwh_-xaIa8gwgiHAnfZqw8O0AaIawc2Wle2JoUCg,1321
-jool_exporter-21.6.15.dist-info/METADATA,sha256=Vqm8O1k3wql651VwvkbfAX4LrkoesE52yEP0o7MWRks,8100
-jool_exporter-21.6.15.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
-jool_exporter-21.6.15.dist-info/entry_points.txt,sha256=QpzQw2sQ6T7pdUNvXMn1p8tBgElBe4PvCjKY2trUnVQ,54
-jool_exporter-21.6.15.dist-info/top_level.txt,sha256=SmhUI8tDD36vZuSOg0nbROONpGvBfjVH5AjwfnnVIlI,14
-jool_exporter-21.6.15.dist-info/RECORD,,