jool-exporter 20.12.20__py3-none-any.whl → 25.3.8__py3-none-any.whl

{jool_exporter-20.12.20.dist-info → jool_exporter-25.3.8.dist-info}/METADATA

@@ -1,21 +1,29 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: jool-exporter
-Version: 20.12.20
+Version: 25.3.8
 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
 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
-Requires-Dist: prometheus-client
+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: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # jool-exporter
 
@@ -51,6 +59,8 @@ From GitHub:
 so does the jool-exporter process. It also need to ability to pass the capability to child
 processes.
 
+- From version **4.1.5** jool will no longer require this capability to query stats
+
 The process can also just run was `root`, but running things listening externally as `root`
 is a bad security process.
 
@@ -172,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-25.3.8.dist-info/RECORD

@@ -0,0 +1,7 @@
+jool_exporter.py,sha256=xJQqIbkojAqtU0WJOASQBbZrphXcPlAvXXhacHfqDyw,3582
+jool_exporter-25.3.8.dist-info/LICENSE,sha256=Nk_wwh_-xaIa8gwgiHAnfZqw8O0AaIawc2Wle2JoUCg,1321
+jool_exporter-25.3.8.dist-info/METADATA,sha256=EmRFsCzmS5JQQ082rq_Gy-NdCkIZJTkU5TIX6yccDh8,8193
+jool_exporter-25.3.8.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+jool_exporter-25.3.8.dist-info/entry_points.txt,sha256=t84r-KaB7nTKr0GEpcUco1ueXh39-56igLzN49ME8vw,53
+jool_exporter-25.3.8.dist-info/top_level.txt,sha256=SmhUI8tDD36vZuSOg0nbROONpGvBfjVH5AjwfnnVIlI,14
+jool_exporter-25.3.8.dist-info/RECORD,,

{jool_exporter-20.12.20.dist-info → jool_exporter-25.3.8.dist-info}/WHEEL

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

{jool_exporter-20.12.20.dist-info → jool_exporter-25.3.8.dist-info}/entry_points.txt

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

jool_exporter.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# This source code is licensed under the MIT license found in the
+# This source code is licensed under the BSD license found in the
 # LICENSE file in the root directory of this source tree.
 # coding=utf8
 
@@ -14,16 +14,18 @@ from socket import getfqdn
 from subprocess import CompletedProcess, PIPE, run
 from typing import Generator, Union
 
-from prometheus_client.core import GaugeMetricFamily, REGISTRY  # type: ignore
-from prometheus_client import start_http_server  # type: ignore
+from prometheus_client import start_http_server
+from prometheus_client.core import GaugeMetricFamily, REGISTRY
+from prometheus_client.registry import Collector
 
 
+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"]
 
@@ -61,7 +63,15 @@ class JoolCollector:
         LOG.info(f"Collection finished in {run_time}s")
 
     def run_jool(self) -> Union[str, CompletedProcess]:
-        cmd = ["jool", "stats", "display", "--csv", "--no-headers", "--explain"]
+        cmd = [
+            "jool",
+            "stats",
+            "display",
+            "--csv",
+            "--no-headers",
+            "--explain",
+            "--all",
+        ]
         cp = run(cmd, stderr=PIPE, stdout=PIPE, encoding="utf8")
         if cp.returncode:
             return cp
@@ -81,6 +91,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"
     )
@@ -95,7 +111,7 @@ def main() -> int:
     _handle_debug(args.debug)
 
     LOG.info(f"Starting {sys.argv[0]}")
-    start_http_server(args.port)
+    start_http_server(args.port, args.addr)
     REGISTRY.register(JoolCollector())
     LOG.info(f"jool prometheus exporter - listening on {args.port}")
     try:

jool_exporter-20.12.20.dist-info/RECORD

@@ -1,7 +0,0 @@
-jool_exporter.py,sha256=GUnkdZ9GOsPrHHzwijqbZ0M7QQQzQGrlYAVgPtoRwJ4,3251
-jool_exporter-20.12.20.dist-info/LICENSE,sha256=Nk_wwh_-xaIa8gwgiHAnfZqw8O0AaIawc2Wle2JoUCg,1321
-jool_exporter-20.12.20.dist-info/METADATA,sha256=2r8dBC2G-5uKZSpbb3M_CgJSClisGeE2Np32CwUKNlw,7994
-jool_exporter-20.12.20.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
-jool_exporter-20.12.20.dist-info/entry_points.txt,sha256=QpzQw2sQ6T7pdUNvXMn1p8tBgElBe4PvCjKY2trUnVQ,54
-jool_exporter-20.12.20.dist-info/top_level.txt,sha256=SmhUI8tDD36vZuSOg0nbROONpGvBfjVH5AjwfnnVIlI,14
-jool_exporter-20.12.20.dist-info/RECORD,,