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

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

namekoplus/command.py

@@ -109,7 +109,7 @@ def start_statsd_agent():
 
 def start_statsd_exporter():
     with status(f'Starting statsd exporter'):
-        statsd_mapping_file_path = os.getcwd() + '/statsd_mapping.yml'
+        statsd_mapping_file_path = os.path.join(os.getcwd(), 'statsd_mapping.yml')
         returned_string = docker.run(image='prom/statsd-exporter:latest', name='statsd-exporter', pull='missing',
                                      detach=True, restart='always', tty=True, hostname='statsd-exporter',
                                      publish=[(9125, 9125, 'udp'), (9102, 9102)], interactive=True,
@@ -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.path.join(os.getcwd(), 'grafana_dashboards')
+        grafana_dashboard_path = os.path.join('.', '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',
@@ -364,12 +364,8 @@ 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 idx, config in enumerate(config_list):
+            for config in 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')

setup.py

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