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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": { "datasource": {
"type": "statsd", "type": "statsd"
}, },
"fill": 1, "fill": 1,
"fillGradient": 0, "fillGradient": 0,
@ -115,7 +115,12 @@
"yaxis": { "yaxis": {
"align": false "align": false
} }
% if grafana_dict['is_last'] == 1:
}, },
% else:
}
% endif
% endfor % endfor
], ],
"refresh": "3s", "refresh": "3s",

5
namekoplus/command.py
View File

@ -367,6 +367,11 @@ def metric_config_gen(module, class_name_str):
for config in config_list: for config in config_list:
if config['class_name'] == class_name: if config['class_name'] == class_name:
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'] = 1
else:
grafana_dict['is_last'] = 0
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.22', version='0.4.23',
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',