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

fix: grafana errors (#24)

This commit is contained in:
Bryant He 2023-08-07 15:44:28 +08:00 committed by GitHub
parent 96d33944a4
commit ac50af774d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,6 @@
"dashes": false, "dashes": false,
"datasource": { "datasource": {
"type": "statsd", "type": "statsd",
"uid": "5qrwjFCnk"
}, },
"fill": 1, "fill": 1,
"fillGradient": 0, "fillGradient": 0,
@ -47,7 +46,7 @@
"y": 0 "y": 0
}, },
"hiddenSeries": false, "hiddenSeries": false,
"id": 5, "id": ${loop.index},
"legend": { "legend": {
"alignAsTable": true, "alignAsTable": true,
"avg": true, "avg": true,
@ -92,7 +91,7 @@
"title": "${service_name} | ${grafana_dict['stat_name']}", "title": "${service_name} | ${grafana_dict['stat_name']}",
"tooltip": { "tooltip": {
"shared": true, "shared": true,
"sort": 0, "sort": ${loop.index},
"value_type": "individual" "value_type": "individual"
}, },
"type": "graph", "type": "graph",
@ -116,7 +115,11 @@
"yaxis": { "yaxis": {
"align": false "align": false
} }
if ${loop.index} == len(grafana_list):
}
% else:
}, },
% endif
% endfor % endfor
], ],
"refresh": "3s", "refresh": "3s",

2
namekoplus/command.py
View File

@ -136,7 +136,7 @@ def start_grafana():
grafana_conf_dir = os.path.join(get_directory('chassis-agent'), 'metric-configs') grafana_conf_dir = os.path.join(get_directory('chassis-agent'), 'metric-configs')
grafana_provisioning_path = os.path.join(grafana_conf_dir, 'grafana_conf/provisioning') grafana_provisioning_path = os.path.join(grafana_conf_dir, 'grafana_conf/provisioning')
grafana_config_path = os.path.join(grafana_conf_dir, 'grafana_conf/config/grafana.ini') grafana_config_path = os.path.join(grafana_conf_dir, 'grafana_conf/config/grafana.ini')
grafana_dashboard_path = os.getcwd() + 'grafana_dashboards' grafana_dashboard_path = os.path.join(os.getcwd(), 'grafana_dashboards')
returned_string = docker.run(image='grafana/grafana:latest', name='grafana', hostname='grafana', returned_string = docker.run(image='grafana/grafana:latest', name='grafana', hostname='grafana',
detach=True, restart='always', tty=True, interactive=True, detach=True, restart='always', tty=True, interactive=True,
publish=[(3100, 3000)], pull='missing', publish=[(3100, 3000)], pull='missing',

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.14', version='0.4.15',
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',