diff --git a/puppetboard/docker_settings.py b/puppetboard/docker_settings.py index e32ac2a..3f61b33 100644 --- a/puppetboard/docker_settings.py +++ b/puppetboard/docker_settings.py @@ -33,6 +33,13 @@ TABLE_COUNT_DEF = "10,20,50,100,500" TABLE_COUNT_SELECTOR = [int(x) for x in os.getenv('TABLE_COUNT_SELECTOR', TABLE_COUNT_DEF).split(',')] +DISP_METR_DEF = ','.join(['resources.total', 'events.failure', + 'events.success', 'resources.skipped', + 'events.noop']) + +DISPLAYED_METRICS = [x.strip() for x in os.getenv('DISPLAYED_METRICS', + DISP_METR_DEF).split(',')] + OFFLINE_MODE = bool(os.getenv('OFFLINE_MODE', 'False').upper() == 'TRUE') ENABLE_CATALOG = bool(os.getenv('ENABLE_CATALOG', 'False').upper() == 'TRUE') OVERVIEW_FILTER = os.getenv('OVERVIEW_FILTER', None) @@ -46,7 +53,6 @@ GRAPH_FACTS_DEFAULT = ','.join(['architecture', 'clientversion', 'domain', GRAPH_FACTS = [x.strip() for x in os.getenv('GRAPH_FACTS', GRAPH_FACTS_DEFAULT).split(',')] - GRAPH_TYPE = os.getenv('GRAPH_TYPE', 'pie') # Tuples are hard to express as an environment variable, so here diff --git a/test/test_docker_settings.py b/test/test_docker_settings.py index 4b36a6d..6a44ab1 100644 --- a/test/test_docker_settings.py +++ b/test/test_docker_settings.py @@ -116,3 +116,11 @@ def test_env_table_selector(cleanUpEnv): os.environ['TABLE_COUNT_SELECTOR'] = '5,15,25' reload(docker_settings) assert [5, 15, 25] == docker_settings.TABLE_COUNT_SELECTOR + + +def test_env_column_options(cleanUpEnv): + os.environ['DISPLAYED_METRICS'] = 'resources.total, events.failure' + + reload(docker_settings) + assert ['resources.total', + 'events.failure'] == docker_settings.DISPLAYED_METRICS