diff --git a/namekoplus/chassis-agent/metric-configs/grafana.json.mako b/namekoplus/chassis-agent/metric-configs/grafana.json.mako index 53f36de..99cfcdb 100644 --- a/namekoplus/chassis-agent/metric-configs/grafana.json.mako +++ b/namekoplus/chassis-agent/metric-configs/grafana.json.mako @@ -28,7 +28,7 @@ "links": [], "liveNow": false, "panels": [ -%for grafana_dict in grafana_list: + % for grafana_dict in grafana_list: { "aliasColors": {}, "bars": false, @@ -115,12 +115,8 @@ "yaxis": { "align": false } - %if ${grafana_dict['is_last']} == '1': - } - %else: }, - %endif -%endfor + % endfor ], "refresh": "3s", "schemaVersion": 36, diff --git a/namekoplus/command.py b/namekoplus/command.py index 3411786..366e5c5 100644 --- a/namekoplus/command.py +++ b/namekoplus/command.py @@ -367,11 +367,6 @@ def metric_config_gen(module, class_name_str): for config in config_list: if config['class_name'] == class_name: grafana_list.append(config) - for idx, grafana_dict in enumerate(grafana_list): - if idx + 1 == len(grafana_list): - grafana_dict['is_last'] = '1' - else: - grafana_dict['is_last'] = '0' grafana_configs_dir = os.path.join(get_directory('chassis-agent'), 'metric-configs') grafana_file_path = os.path.join(grafana_configs_dir, 'grafana.json.mako') output_file = os.path.join('grafana_dashboards', f'{class_name}_Grafana.json') diff --git a/setup.py b/setup.py index 4817d89..7811a52 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ with open(path.join(here, 'README.md'), encoding='utf-8') as f: setup( name='namekoplus', - version='0.4.21', + version='0.4.22', description='A lightweight Python distributed microservice solution', long_description=long_description, long_description_content_type='text/markdown',