From 2501b7a4dbe46543cfceed07e0039c339f810a6f Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Fri, 13 Sep 2024 06:22:01 -0500 Subject: [PATCH] Remove internal usages of config_to_json.php (#16388) * Remove internal usages of config_to_json.php * Appease lint --- LibreNMS/__init__.py | 2 +- snmp-scan.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/LibreNMS/__init__.py b/LibreNMS/__init__.py index 293b20554a..ed9eed3c5d 100644 --- a/LibreNMS/__init__.py +++ b/LibreNMS/__init__.py @@ -167,7 +167,7 @@ def get_config_data(base_dir): ) logger.debug("Traceback:", exc_info=True) - config_cmd = ["/usr/bin/env", "php", "%s/config_to_json.php" % base_dir] + config_cmd = ["/usr/bin/env", "php", "%s/lnms" % base_dir, "config:get", "--dump"] try: exit_code, output = command_runner(config_cmd, timeout=300, stderr=False) if exit_code != 0: diff --git a/snmp-scan.py b/snmp-scan.py index fd90b5798b..4121f7ed6b 100755 --- a/snmp-scan.py +++ b/snmp-scan.py @@ -33,6 +33,7 @@ from sys import stdout from time import time Result = namedtuple("Result", ["ip", "hostname", "outcome", "output"]) +args = {} class Outcome: @@ -263,7 +264,9 @@ Example: 192.168.0.1/32 will be treated as a single host address""", chdir(install_dir) try: CONFIG = json.loads( - check_output(["/usr/bin/env", "php", "config_to_json.php"]).decode() + check_output( + ["/usr/bin/env", "php", "lnms", "config:get", "--dump"] + ).decode() ) except CalledProcessError as e: parser.error(