3 Commits

Author SHA1 Message Date
7866e6cbbf fix: grafana error 6 (#29) 2023-08-07 16:27:19 +08:00
a34e1c7d0b fix: grafana error 5 (#28) 2023-08-07 16:23:29 +08:00
b6659976fb fix: grafana error 4 (#27) 2023-08-07 16:15:22 +08:00
3 changed files with 12 additions and 11 deletions

View File

@@ -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,12 @@
"yaxis": {
"align": false
}
% if ${grafana_dict['is_last']}:
%if ${grafana_dict['is_last']} == '1':
}
% else:
%else:
},
% endif
% endfor
%endif
%endfor
],
"refresh": "3s",
"schemaVersion": 36,

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'):
for class_name in class_name_str.split(','):
grafana_list = []
for idx, config in enumerate(config_list):
for config in config_list:
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)
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')

View File

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