namekoplus/chassis-agent/metric-configs/grafana.json.mako

@@ -28,14 +28,14 @@
   "links": [],
   "liveNow": false,
   "panels": [
-% for grafana_dict in grafana_list:
+    % for grafana_dict in grafana_list:
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": {
-        "type": "statsd"
+        "type": "statsd",
       },
       "fill": 1,
       "fillGradient": 0,
@@ -115,13 +115,12 @@
       "yaxis": {
         "align": false
       }
-
+        % if ${grafana_dict['is_last']}:
-  % if grafana_dict['is_last'] == 1:
     }
-  % else:
+        % else:
     },
-  % endif
+        % endif
-% endfor
+    % endfor
   ],
   "refresh": "3s",
   "schemaVersion": 36,

namekoplus/command.py

@@ -364,14 +364,13 @@ 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)
-            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_file_path = os.path.join(grafana_configs_dir, 'grafana.json.mako')
             output_file = os.path.join('grafana_dashboards', f'{class_name}_Grafana.json')

setup.py

@@ -9,7 +9,7 @@ with open(path.join(here, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='namekoplus',
-    version='0.4.24',
+    version='0.4.18',
     description='A lightweight Python distributed microservice solution',
     long_description=long_description,
     long_description_content_type='text/markdown',