From 62cf4e26e21fa6611fd0008e26c30de317bb5615 Mon Sep 17 00:00:00 2001 From: Georgia-Anna Farmaki Date: Thu, 1 Jun 2017 15:39:58 +0200 Subject: [PATCH] Added a field grafana_url in the installation script Included a field 'grafana_url' in notification.yaml for email notifications and replaced it with the respective grafana host in plugin.sh. Change-Id: I581b2e9d12632cc7509d24525cc225b60514a8c3 Story: 2001052 Task: 4653 --- devstack/files/monasca-notification/notification.yaml | 1 + devstack/lib/notification.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/devstack/files/monasca-notification/notification.yaml b/devstack/files/monasca-notification/notification.yaml index 7b4eac8e3..5bbc4a7bc 100644 --- a/devstack/files/monasca-notification/notification.yaml +++ b/devstack/files/monasca-notification/notification.yaml @@ -56,6 +56,7 @@ notification_types: password: "" timeout: 15 from_addr: "hpcs.mon@hp.com" + grafana_url: "%GRAFANA_URL%" webhook: timeout: 5 diff --git a/devstack/lib/notification.sh b/devstack/lib/notification.sh index 067e463ae..435fa893c 100644 --- a/devstack/lib/notification.sh +++ b/devstack/lib/notification.sh @@ -102,6 +102,7 @@ configure_monasca-notification() { s|%KAFKA_HOST%|${SERVICE_HOST}|g; s|%MONASCA_STATSD_PORT%|${MONASCA_STATSD_PORT}|g; s|%MONASCA_NOTIFICATION_LOG_DIR%|${MONASCA_NOTIFICATION_LOG_DIR}|g; + s|%GRAFANA_URL%|http:\/\/${SERVICE_HOST}:3000|g; " -i ${MONASCA_NOTIFICATION_CONF} sudo install -d -o ${STACK_USER} ${MONASCA_NOTIFICATION_GATE_CFG_LINK}