refactor: Add 127.0.0.1 as default uri value for PrometheusDB

powerapi-ng · Nov 22, 2023 · fe186ca · fe186ca
1 parent eda819c
commit fe186ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/powerapi/cli/common_cli_parsing_manager.py b/powerapi/cli/common_cli_parsing_manager.py
@@ -32,7 +32,8 @@
 from powerapi.cli.parsing_manager import RootConfigParsingManager, SubgroupConfigParsingManager
 from powerapi.cli.config_parser import store_true
 from powerapi.cli.config_parser import MissingValueException
-from powerapi.database.prometheus_db import DEFAULT_METRIC_DESCRIPTION, DEFAULT_MODEL_VALUE, DEFAULT_PUSHER_NAME
+from powerapi.database.prometheus_db import DEFAULT_METRIC_DESCRIPTION, DEFAULT_MODEL_VALUE, DEFAULT_PUSHER_NAME, \
+    DEFAULT_ADDRESS
 from powerapi.exception import BadTypeException, BadContextException, UnknownArgException
 
 POWERAPI_ENVIRONMENT_VARIABLE_PREFIX = 'POWERAPI_'
@@ -253,7 +254,8 @@ def __init__(self):
 
         subparser_prometheus_output = SubgroupConfigParsingManager("prometheus")
         subparser_prometheus_output.add_argument("t", "tags", help_text="specify report tags")
-        subparser_prometheus_output.add_argument("u", "uri", help_text="specify server uri")
+        subparser_prometheus_output.add_argument("u", "uri", help_text="specify server uri",
+                                                 default_value=DEFAULT_ADDRESS)
         subparser_prometheus_output.add_argument(
             "p", "port", help_text="specify server port", argument_type=int
         )

diff --git a/powerapi/cli/generator.py b/powerapi/cli/generator.py
@@ -34,7 +34,6 @@
 
 from powerapi.actor import Actor
 from powerapi.database.influxdb2 import InfluxDB2
-from powerapi.database.prometheus_db import DEFAULT_ADDRESS
 from powerapi.exception import PowerAPIException, ModelNameAlreadyUsed, DatabaseNameDoesNotExist, ModelNameDoesNotExist, \
     DatabaseNameAlreadyUsed, ProcessorTypeDoesNotExist, ProcessorTypeAlreadyUsed, MonitorTypeDoesNotExist
 from powerapi.filter import Filter
@@ -199,8 +198,7 @@ def __init__(self, component_group_name: str):
                                                    port=db_config['port'], metric_name=db_config['metric_name']),
             'prometheus': lambda db_config: PrometheusDB(report_type=db_config['model'],
                                                          port=db_config['port'],
-                                                         address=db_config['uri'] if 'uri' in db_config else
-                                                         DEFAULT_ADDRESS,
+                                                         address=db_config['uri'],
                                                          metric_name=db_config['metric_name'],
                                                          metric_description=db_config['metric_description'],
                                                          tags=gen_tag_list(db_config)),