From ac50af774d358113b3728d8ce1a35c52267c90a0 Mon Sep 17 00:00:00 2001
From: Bryant He <bryantsisu@qq.com>
Date: Mon, 7 Aug 2023 15:44:28 +0800
Subject: [PATCH] fix: grafana errors (#24)

---
 .../chassis-agent/metric-configs/grafana.json.mako       | 9 ++++++---
 namekoplus/command.py                                    | 2 +-
 setup.py                                                 | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/namekoplus/chassis-agent/metric-configs/grafana.json.mako b/namekoplus/chassis-agent/metric-configs/grafana.json.mako
index c57e072..052350a 100644
--- a/namekoplus/chassis-agent/metric-configs/grafana.json.mako
+++ b/namekoplus/chassis-agent/metric-configs/grafana.json.mako
@@ -36,7 +36,6 @@
       "dashes": false,
       "datasource": {
         "type": "statsd",
-        "uid": "5qrwjFCnk"
       },
       "fill": 1,
       "fillGradient": 0,
@@ -47,7 +46,7 @@
         "y": 0
       },
       "hiddenSeries": false,
-      "id": 5,
+      "id": ${loop.index},
       "legend": {
         "alignAsTable": true,
         "avg": true,
@@ -92,7 +91,7 @@
       "title": "${service_name} | ${grafana_dict['stat_name']}",
       "tooltip": {
         "shared": true,
-        "sort": 0,
+        "sort": ${loop.index},
         "value_type": "individual"
       },
       "type": "graph",
@@ -116,7 +115,11 @@
       "yaxis": {
         "align": false
       }
+        if ${loop.index} == len(grafana_list):
+    }
+        % else:
     },
+        % endif
     % endfor
   ],
   "refresh": "3s",
diff --git a/namekoplus/command.py b/namekoplus/command.py
index 5713804..366e5c5 100644
--- a/namekoplus/command.py
+++ b/namekoplus/command.py
@@ -136,7 +136,7 @@ def start_grafana():
         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_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',
                                      detach=True, restart='always', tty=True, interactive=True,
                                      publish=[(3100, 3000)], pull='missing',
diff --git a/setup.py b/setup.py
index b98c977..2442fec 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ with open(path.join(here, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='namekoplus',
-    version='0.4.14',
+    version='0.4.15',
     description='A lightweight Python distributed microservice solution',
     long_description=long_description,
     long_description_content_type='text/markdown',