From 902ecbabe33a1c9321526d5401a228cb382922c8 Mon Sep 17 00:00:00 2001 From: Zen Date: Sat, 20 Jan 2024 13:32:06 -0600 Subject: [PATCH] bump dependency versions, simplify main Signed-off-by: Zen --- pyproject.toml | 6 +++--- src/json_exporter/main.py | 19 ++++--------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b1f6acd..0ffd152 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "json_exporter" -version = "0.13.2" +version = "0.13.3" authors = [ { name="Desultory", email="dev@pyl.onl" }, ] @@ -17,9 +17,9 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "prometheus_exporter >= 0.13.0", + "prometheus_exporter >= 0.13.2", "aiohttp >= 3.9.1", - "zenlib >= 1.6.5" + "zenlib >= 1.7.1" ] [project.scripts] diff --git a/src/json_exporter/main.py b/src/json_exporter/main.py index b89f746..d1a56cf 100644 --- a/src/json_exporter/main.py +++ b/src/json_exporter/main.py @@ -1,24 +1,13 @@ #!/usr/bin/env python3 from json_exporter import JSONExporter -from zenlib.util import init_logger, init_argparser, process_args +from zenlib.util import get_kwargs +from prometheus_exporter import DEFAULT_EXPORTER_ARGS def main(): - logger = init_logger(__package__) - argparser = init_argparser(prog=__package__, description='JSON Exporter for Prometheus') - - argparser.add_argument('-p', '--port', type=int, nargs='?', help='Port to listen on.') - argparser.add_argument('-a', '--address', type=str, nargs='?', help='Address to listen on.') - - args = process_args(argparser, logger=logger) - - kwargs = {'logger': logger} - - if args.port: - kwargs['listen_port'] = args.port - if args.address: - kwargs['listen_ip'] = args.address + kwargs = get_kwargs(package=__package__, description='JSON Exporter for Prometheus', + arguments=DEFAULT_EXPORTER_ARGS) exporter = JSONExporter(**kwargs) exporter.start()