Merge "Index Cloud name with Workload Result"

browbeat-complete.yaml

@@ -2,6 +2,7 @@
 browbeat:
   results : results/
   rerun: 3
+  cloud_name: openstack
 elasticsearch:
   enabled: false
   host: 1.1.1.1
@@ -26,7 +27,6 @@ connmon:
   sudo: true
 grafana:
   enabled: true
-  cloud_name: openstack
   grafana_ip: 1.1.1.1
   grafana_port: 3000
   dashboards:

browbeat-config.yaml

@@ -2,6 +2,7 @@
 browbeat:
   results : results/
   rerun: 1
+  cloud_name: openstack
 elasticsearch:
   enabled: false
   host: 1.1.1.1
@@ -26,7 +27,6 @@ connmon:
   sudo: true
 grafana:
   enabled: true
-  cloud_name: openstack
   grafana_ip: 1.1.1.1
   grafana_port: 3000
   dashboards:

conf/browbeat-keystone-complete.yaml

@@ -3,6 +3,7 @@
 browbeat:
   results : results/
   rerun: 3
+  cloud_name: openstack
 elasticsearch:
   enabled: false
   host: 1.1.1.1
@@ -27,7 +28,6 @@ connmon:
   sudo: true
 grafana:
   enabled: false
-  cloud_name: openstack
   grafana_ip: 1.1.1.1
   grafana_port: 3000
   dashboards:

conf/browbeat-keystone-minimal.yaml

@@ -3,6 +3,7 @@
 browbeat:
   results : results/
   rerun: 1
+  cloud_name: openstack
 elasticsearch:
   enabled: false
   host: 1.1.1.1
@@ -14,6 +15,7 @@ elasticsearch:
       file: metadata/environment-metadata.json
     - name: software-metadata
       file: metadata/software-metadata.json
+
 ansible:
   hosts: ansible/hosts
   adjust:
@@ -27,7 +29,6 @@ connmon:
   sudo: true
 grafana:
   enabled: false
-  cloud_name: openstack
   grafana_ip: 1.1.1.1
   grafana_port: 3000
   dashboards:

conf/browbeat-perfkit-complete.yaml

@@ -2,6 +2,7 @@
 browbeat:
   results : results/
   rerun: 3
+  cloud_name: openstack
 elasticsearch:
   enabled: false
   host: 1.1.1.1
@@ -26,7 +27,6 @@ connmon:
   sudo: true
 grafana:
   enabled: false
-  cloud_name: openstack
   grafana_ip: 1.1.1.1
   grafana_port: 3000
   dashboards:

lib/Elastic.py

@@ -75,6 +75,7 @@ class Elastic:
     """
 
     def index_result(self, result, _type='result', _id=None):
+        result['cloud_name'] = self.config['browbeat']['cloud_name']
         return self.es.index(index=self.index,
                              id=_id,
                              body=result,

lib/Grafana.py

@@ -19,7 +19,7 @@ class Grafana:
     def __init__(self, config):
         self.logger = logging.getLogger('browbeat.Grafana')
         self.config = config
-        self.cloud_name = self.config['grafana']['cloud_name']
+        self.cloud_name = self.config['browbeat']['cloud_name']
         self.hosts_file = self.config['ansible']['hosts']
         self.grafana_ip = self.config['grafana']['grafana_ip']
         self.grafana_port = self.config['grafana']['grafana_port']

lib/validate.yaml

@@ -12,6 +12,9 @@ mapping:
       rerun:
         type: int
         required: True
+      cloud_name:
+        type: str
+        required: True
 
   ansible:
     required: True
@@ -53,8 +56,6 @@ mapping:
       enabled:
         type: bool
         required: True
-      cloud_name:
-        type: str
       grafana_ip:
         type: str
         pattern: ^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$