From 6c059ac19d6afc27f5442951ad7ba7f388c37351 Mon Sep 17 00:00:00 2001
From: Bryant He <bryantsisu@qq.com>
Date: Mon, 7 Aug 2023 16:05:46 +0800
Subject: [PATCH] fix: grafana error 3 (#26)

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

diff --git a/namekoplus/chassis-agent/metric-configs/grafana.json.mako b/namekoplus/chassis-agent/metric-configs/grafana.json.mako
index 84e6bc0..88b4490 100644
--- a/namekoplus/chassis-agent/metric-configs/grafana.json.mako
+++ b/namekoplus/chassis-agent/metric-configs/grafana.json.mako
@@ -115,7 +115,7 @@
       "yaxis": {
         "align": false
       }
-        % if ${loop.index} == len(grafana_list):
+        % if ${grafana_dict['is_last']}:
     }
         % else:
     },
diff --git a/namekoplus/command.py b/namekoplus/command.py
index 366e5c5..eadcdef 100644
--- a/namekoplus/command.py
+++ b/namekoplus/command.py
@@ -364,8 +364,12 @@ def metric_config_gen(module, class_name_str):
     with status(f'Creating files of Grafana.json into the directory of grafana_dashboards'):
         for class_name in class_name_str.split(','):
             grafana_list = []
-            for config in config_list:
+            for idx, config in enumerate(config_list):
                 if config['class_name'] == class_name:
+                    if idx+1 == len(config_list):
+                        config['is_last'] = True
+                    else:
+                        config['is_last'] = False
                     grafana_list.append(config)
             grafana_configs_dir = os.path.join(get_directory('chassis-agent'), 'metric-configs')
             grafana_file_path = os.path.join(grafana_configs_dir, 'grafana.json.mako')
diff --git a/setup.py b/setup.py
index e1c9989..b98f139 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.16',
+    version='0.4.18',
     description='A lightweight Python distributed microservice solution',
     long_description=long_description,
     long_description_content_type='text/markdown',