Bryant
/
namekoplus
mirror of https://github.com/Bryanthelol/namekoplus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: grafana error 3 (#26)

This commit is contained in:
Bryant He 2023-08-07 16:05:46 +08:00 committed by GitHub
parent 3641e7a1fa
commit 6c059ac19d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
namekoplus/chassis-agent/metric-configs/grafana.json.mako
View File

@ -115,7 +115,7 @@
"yaxis": { "yaxis": {
"align": false "align": false
} }
% if ${loop.index} == len(grafana_list): % if ${grafana_dict['is_last']}:
} }
% else: % else:
}, },

6
namekoplus/command.py
View File

@ -364,8 +364,12 @@ def metric_config_gen(module, class_name_str):
with status(f'Creating files of Grafana.json into the directory of grafana_dashboards'): with status(f'Creating files of Grafana.json into the directory of grafana_dashboards'):
for class_name in class_name_str.split(','): for class_name in class_name_str.split(','):
grafana_list = [] grafana_list = []
for config in config_list: for idx, config in enumerate(config_list):
if config['class_name'] == class_name: if config['class_name'] == class_name:
if idx+1 == len(config_list):
config['is_last'] = True
else:
config['is_last'] = False
grafana_list.append(config) grafana_list.append(config)
grafana_configs_dir = os.path.join(get_directory('chassis-agent'), 'metric-configs') grafana_configs_dir = os.path.join(get_directory('chassis-agent'), 'metric-configs')
grafana_file_path = os.path.join(grafana_configs_dir, 'grafana.json.mako') grafana_file_path = os.path.join(grafana_configs_dir, 'grafana.json.mako')

2
setup.py
View File

@ -9,7 +9,7 @@ with open(path.join(here, 'README.md'), encoding='utf-8') as f:
setup( setup(
name='namekoplus', name='namekoplus',
version='0.4.16', version='0.4.18',
description='A lightweight Python distributed microservice solution', description='A lightweight Python distributed microservice solution',
long_description=long_description, long_description=long_description,
long_description_content_type='text/markdown', long_description_content_type='text/markdown',