fix: grafana error 8 (#31)

This commit is contained in:
Bryant He 2023-08-07 17:11:46 +08:00 committed by GitHub
parent 1818308508
commit 58804bbe50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions

View File

@ -28,14 +28,14 @@
"links": [],
"liveNow": false,
"panels": [
% for grafana_dict in grafana_list:
% for grafana_dict in grafana_list:
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": {
"type": "statsd",
"type": "statsd"
},
"fill": 1,
"fillGradient": 0,
@ -115,8 +115,13 @@
"yaxis": {
"align": false
}
% if grafana_dict['is_last'] == 1:
},
% endfor
% else:
}
% endif
% endfor
],
"refresh": "3s",
"schemaVersion": 36,

View File

@ -367,6 +367,11 @@ 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')

View File

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