Merge "import new _put_file_shell method from upstream rally"

[yardstick.git] / yardstick / dispatcher / influxdb.py

diff --git a/yardstick/dispatcher/influxdb.py b/yardstick/dispatcher/influxdb.py
index efa5669..fc9f3e9 100644 (file)
--- a/yardstick/dispatcher/influxdb.py
+++ b/yardstick/dispatcher/influxdb.py
@@ -16,7 +16,7 @@ import time
 from oslo_config import cfg
 
 from yardstick.dispatcher.base import Base as DispatchBase
-from yardstick.dispatcher.influxdb_line_protocol import make_lines
+from third_party.influxdb.influxdb_line_protocol import make_lines
 
 LOG = logging.getLogger(__name__)
 
@@ -67,7 +67,10 @@ class InfluxdbDispatcher(DispatchBase):
         self.static_tags = {
             "pod_name": os.environ.get('NODE_NAME', 'unknown'),
             "installer": os.environ.get('INSTALLER_TYPE', 'unknown'),
-            "version": os.environ.get('YARDSTICK_VERSION', 'unknown')
+            "deploy_scenario": os.environ.get('DEPLOY_SCENARIO', 'unknown'),
+            "version": os.path.basename(os.environ.get('YARDSTICK_BRANCH',
+                                                       'unknown'))
+
         }
 
     def _dict_key_flatten(self, data):
@@ -124,7 +127,7 @@ class InfluxdbDispatcher(DispatchBase):
         return make_lines(msg).encode('utf-8')
 
     def record_result_data(self, data):
-        LOG.debug('Test result : %s' % json.dumps(data))
+        LOG.debug('Test result : %s', json.dumps(data))
         self.raw_result.append(data)
         if self.target == '':
             # if the target was not set, do not do anything
@@ -145,13 +148,13 @@ class InfluxdbDispatcher(DispatchBase):
             return 0
 
         if self.tc == "":
-            LOG.error('Test result : %s' % json.dumps(data))
+            LOG.error('Test result : %s', json.dumps(data))
             LOG.error('The case_name cannot be found, no data will be posted.')
             return -1
 
         try:
             line = self._data_to_line_protocol(data)
-            LOG.debug('Test result line format : %s' % line)
+            LOG.debug('Test result line format : %s', line)
             res = requests.post(self.influxdb_url,
                                 data=line,
                                 auth=(self.username, self.password),
@@ -159,6 +162,8 @@ class InfluxdbDispatcher(DispatchBase):
             if res.status_code != 204:
                 LOG.error('Test result posting finished with status code'
                           ' %d.' % res.status_code)
+                LOG.error(res.text)
+
         except Exception as err:
             LOG.exception('Failed to record result data: %s',
                           err)
@@ -166,5 +171,5 @@ class InfluxdbDispatcher(DispatchBase):
         return 0
 
     def flush_result_data(self):
-        LOG.debug('Test result all : %s' % json.dumps(self.raw_result))
+        LOG.debug('Test result all : %s', json.dumps(self.raw_result))
         return 0