aboutsummaryrefslogtreecommitdiffstats
path: root/api/resources
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2017-07-14 08:26:53 +0000
committerchenjiankun <chenjiankun1@huawei.com>2017-07-14 08:58:05 +0000
commitcce6fa7f1bca039bedc7484aff6f7862d9074053 (patch)
treec82b60efeaebc372cb7c3accd1f7eef57fc15113 /api/resources
parent961de9447288c431a47a42a31a70df23ccc726eb (diff)
yardstick env influxdb/grafana cmd support centos
JIRA: YARDSTICK-714 Currently yardstick env influxdb/grafana command do not support centos. Because we use the gateway ip to get the service of influxdb and grafana. But in centos, we can not access influxdb/grafana service via gateway ip. In this patch, I use docker inspect to get the ip of influxdb and grafana. So these command can support centos. Change-Id: I4599cbbd0fe43de9cf08e5d9e74d31edbb742998 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Diffstat (limited to 'api/resources')
-rw-r--r--api/resources/env_action.py49
1 files changed, 33 insertions, 16 deletions
diff --git a/api/resources/env_action.py b/api/resources/env_action.py
index 7bfaf27a7..50c737fa3 100644
--- a/api/resources/env_action.py
+++ b/api/resources/env_action.py
@@ -53,13 +53,16 @@ def _create_grafana(task_id):
if not _check_image_exist(client, image):
client.pull(consts.GRAFANA_IMAGE, consts.GRAFANA_TAG)
- _create_grafana_container(client)
+ container = _create_grafana_container(client)
time.sleep(5)
- _create_data_source()
+ container = client.inspect_container(container['Id'])
+ ip = container['NetworkSettings']['Networks']['bridge']['IPAddress']
- _create_dashboard()
+ _create_data_source(ip)
+
+ _create_dashboard(ip)
_update_task_status(task_id)
except Exception as e:
@@ -67,8 +70,8 @@ def _create_grafana(task_id):
logger.exception('Error: %s', e)
-def _create_dashboard():
- url = 'http://admin:admin@%s:3000/api/dashboards/db' % consts.GRAFANA_IP
+def _create_dashboard(ip):
+ url = 'http://admin:admin@{}:{}/api/dashboards/db'.format(ip, consts.GRAFANA_PORT)
path = os.path.join(consts.REPOS_DIR, 'dashboard', '*dashboard.json')
for i in sorted(glob.iglob(path)):
@@ -77,13 +80,21 @@ def _create_dashboard():
HttpClient().post(url, data)
-def _create_data_source():
- url = 'http://admin:admin@%s:3000/api/datasources' % consts.GRAFANA_IP
+def _create_data_source(ip):
+ url = 'http://admin:admin@{}:{}/api/datasources'.format(ip, consts.GRAFANA_PORT)
+
+ influx_conf = yardstick_utils.parse_ini_file(consts.CONF_FILE)
+ try:
+ influx_url = influx_conf['dispatcher_influxdb']['target']
+ except KeyError:
+ logger.exception('influxdb url not set in yardstick.conf')
+ raise
+
data = {
"name": "yardstick",
"type": "influxdb",
"access": "proxy",
- "url": "http://%s:8086" % consts.INFLUXDB_IP,
+ "url": influx_url,
"password": "root",
"user": "root",
"database": "yardstick",
@@ -96,8 +107,8 @@ def _create_data_source():
def _create_grafana_container(client):
- ports = [3000]
- port_bindings = {k: k for k in ports}
+ ports = [consts.GRAFANA_PORT]
+ port_bindings = {consts.GRAFANA_PORT: consts.GRAFANA_MAPPING_PORT}
host_config = client.create_host_config(port_bindings=port_bindings)
container = client.create_container(image='%s:%s' % (consts.GRAFANA_IMAGE,
@@ -107,6 +118,7 @@ def _create_grafana_container(client):
tty=True,
host_config=host_config)
client.start(container)
+ return container
def _check_image_exist(client, t):
@@ -128,16 +140,20 @@ def _create_influxdb(task_id):
client = Client(base_url=consts.DOCKER_URL)
try:
- _change_output_to_influxdb()
-
if not _check_image_exist(client, '%s:%s' % (consts.INFLUXDB_IMAGE,
consts.INFLUXDB_TAG)):
client.pull(consts.INFLUXDB_IMAGE, tag=consts.INFLUXDB_TAG)
- _create_influxdb_container(client)
+ container = _create_influxdb_container(client)
time.sleep(5)
+ container = client.inspect_container(container['Id'])
+ ip = container['NetworkSettings']['Networks']['bridge']['IPAddress']
+
+ logger.info('Changing output to influxdb')
+ _change_output_to_influxdb(ip)
+
_config_influxdb()
_update_task_status(task_id)
@@ -148,7 +164,7 @@ def _create_influxdb(task_id):
def _create_influxdb_container(client):
- ports = [8083, 8086]
+ ports = [consts.INFLUXDB_DASHBOARD_PORT, consts.INFLUXDB_PORT]
port_bindings = {k: k for k in ports}
host_config = client.create_host_config(port_bindings=port_bindings)
@@ -159,6 +175,7 @@ def _create_influxdb_container(client):
tty=True,
host_config=host_config)
client.start(container)
+ return container
def _config_influxdb():
@@ -173,7 +190,7 @@ def _config_influxdb():
logger.debug('Failed to config influxDB: %s', e)
-def _change_output_to_influxdb():
+def _change_output_to_influxdb(ip):
yardstick_utils.makedirs(consts.CONF_DIR)
parser = configparser.ConfigParser()
@@ -181,7 +198,7 @@ def _change_output_to_influxdb():
parser.set('DEFAULT', 'dispatcher', 'influxdb')
parser.set('dispatcher_influxdb', 'target',
- 'http://%s:8086' % consts.INFLUXDB_IP)
+ 'http://{}:{}'.format(ip, consts.INFLUXDB_PORT))
with open(consts.CONF_FILE, 'w') as f:
parser.write(f)