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

fix: grafana error 4 (#27)

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

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

@ -28,7 +28,7 @@
"links": [], "links": [],
"liveNow": false, "liveNow": false,
"panels": [ "panels": [
% for grafana_dict in grafana_list: % for grafana_dict in grafana_list:
{ {
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
@ -115,12 +115,12 @@
"yaxis": { "yaxis": {
"align": false "align": false
} }
% if ${grafana_dict['is_last']}: % if ${grafana_dict['is_last']}:
} }
% else: % else:
}, },
% endif % endif
% endfor % endfor
], ],
"refresh": "3s", "refresh": "3s",
"schemaVersion": 36, "schemaVersion": 36,

11
namekoplus/command.py
View File

@ -364,13 +364,14 @@ 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 idx, config in enumerate(config_list): for config in 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)
for idx, grafana_dict in enumerate(grafana_list):
if idx + 1 == len(grafana_list):
grafana_dict['is_last'] = True
else:
grafana_dict['is_last'] = False
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')
output_file = os.path.join('grafana_dashboards', f'{class_name}_Grafana.json') output_file = os.path.join('grafana_dashboards', f'{class_name}_Grafana.json')

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.18', version='0.4.19',
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',