3 Commits

Author SHA1 Message Date
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
6c059ac19d fix: grafana error 3 (#26) 2023-08-07 16:05:46 +08:00
3 changed files with 11 additions and 6 deletions

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 ${loop.index} == len(grafana_list): %if ${grafana_dict['is_last']}:
} }
% else: %else:
}, },
% endif %endif
% endfor %endfor
], ],
"refresh": "3s", "refresh": "3s",
"schemaVersion": 36, "schemaVersion": 36,

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'] = 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')

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.20',
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',