Log grafana url of each benchmark's cloud performance metrics.

Change-Id: I63c8f2e9117a888721f8371e83f6ab334fc7123e
This commit is contained in:
Alex Krzos
2016-02-11 21:15:56 -05:00
parent 189fd12389
commit b371d89df3
3 changed files with 25 additions and 0 deletions

View File

@@ -26,6 +26,12 @@ ansible:
adjust:
workers: ansible/browbeat/adjustment.yml
keystone-token: browbeat/keystone_token_type.yml
grafana:
enabled: true
cloud_name: openstack
dashboards:
- openstack-general-system-performance
url: http://grafana-host.example.com:3000/dashboard/db/
rally:
benchmarks:
cinder:

View File

@@ -26,6 +26,12 @@ ansible:
adjust:
workers: ansible/browbeat/adjustment.yml
keystone-token: browbeat/keystone_token_type.yml
grafana:
enabled: true
cloud_name: openstack
dashboards:
- openstack-general-system-performance
url: http://grafana-host.example.com:3000/dashboard/db/
rally:
benchmarks:
cinder:

View File

@@ -6,6 +6,7 @@ import datetime
import glob
import logging
import shutil
import time
class Rally:
@@ -28,6 +29,7 @@ class Rally:
self.logger.debug("test_name: {}".format(test_name))
self.logger.debug("--------------------------------")
from_ts = int(time.time() * 1000)
if self.config['browbeat']['pbench']['enabled']:
task_args = str(scenario_args).replace("'", "\\\"")
self.pbench.register_tools()
@@ -42,6 +44,17 @@ class Rally:
cmd = "rally task start {} --task-args \'{}\' 2>&1 | tee {}.log".format(task_file,
task_args, test_name)
self.tools.run_cmd(cmd)
to_ts = int(time.time() * 1000)
if 'grafana' in self.config and self.config['grafana']['enabled']:
from_ts -= - 10000
to_ts += 10000
url = self.config['grafana']['url']
cloud_name = self.config['grafana']['cloud_name']
for dashboard in self.config['grafana']['dashboards']:
full_url = '{}{}?from={}&to={}&var-Cloud={}'.format(url, dashboard, from_ts, to_ts,
cloud_name)
self.logger.info('{} - Grafana URL: {}'.format(test_name, full_url))
def workload_logger(self,result_dir) :
base = result_dir.split('/')