openstack/monasca-api
Code Issues Proposed changes

Merge "Added a field grafana_url in the installation script"

Browse Source
This commit is contained in:
Jenkins
2017-09-01 15:53:03 +00:00
committed by Gerrit Code Review
parent 5d27af4079 62cf4e26e2
commit be90ed7046
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/files/monasca-notification/notification.yaml
View File

@@ -56,6 +56,7 @@ notification_types:
password: "" password: ""
timeout: 15 timeout: 15
from_addr: "hpcs.mon@hp.com" from_addr: "hpcs.mon@hp.com"
grafana_url: "%GRAFANA_URL%"
webhook: webhook:
timeout: 5 timeout: 5

1
devstack/lib/notification.sh
View File

@@ -102,6 +102,7 @@ configure_monasca-notification() {
s|%KAFKA_HOST%|${SERVICE_HOST}|g; s|%KAFKA_HOST%|${SERVICE_HOST}|g;
s|%MONASCA_STATSD_PORT%|${MONASCA_STATSD_PORT}|g; s|%MONASCA_STATSD_PORT%|${MONASCA_STATSD_PORT}|g;
s|%MONASCA_NOTIFICATION_LOG_DIR%|${MONASCA_NOTIFICATION_LOG_DIR}|g; s|%MONASCA_NOTIFICATION_LOG_DIR%|${MONASCA_NOTIFICATION_LOG_DIR}|g;
s|%GRAFANA_URL%|http:\/\/${SERVICE_HOST}:3000|g;
" -i ${MONASCA_NOTIFICATION_CONF} " -i ${MONASCA_NOTIFICATION_CONF}
sudo install -d -o ${STACK_USER} ${MONASCA_NOTIFICATION_GATE_CFG_LINK} sudo install -d -o ${STACK_USER} ${MONASCA_NOTIFICATION_GATE_CFG_LINK}