Merge "Use neutral IPs/hostnames in example configuration"

This commit is contained in:
Jenkins 2017-04-12 07:08:33 +00:00 committed by Gerrit Code Review
commit 0708971544
1 changed files with 7 additions and 7 deletions

View File

@ -1,5 +1,5 @@
kafka: kafka:
url: 192.168.10.4:9092 # or comma seperated list of multiple hosts url: 127.0.0.1:9092 # or comma seperated list of multiple hosts
group: monasca-notification group: monasca-notification
alarm_topic: alarm-state-transitions alarm_topic: alarm-state-transitions
notification_topic: alarm-notifications notification_topic: alarm-notifications
@ -17,7 +17,7 @@ database:
url: 'postgres://notification:password@127.0.0.1:5432/mon' url: 'postgres://notification:password@127.0.0.1:5432/mon'
mysql: mysql:
host: 192.168.10.4 host: 127.0.0.1
port: 3306 port: 3306
user: notification user: notification
passwd: password passwd: password
@ -38,12 +38,12 @@ notification_types:
- monasca_notification.plugins.slack_notifier:SlackNotifier - monasca_notification.plugins.slack_notifier:SlackNotifier
email: email:
server: 192.168.10.4 server: 127.0.0.1
port: 25 port: 25
user: user:
password: password:
timeout: 60 timeout: 60
from_addr: hpcs.mon@hp.com from_addr: monasca-notification@none.invalid
webhook: webhook:
timeout: 5 timeout: 5
@ -56,13 +56,13 @@ notification_types:
timeout: 5 timeout: 5
ca_certs: "/etc/ssl/certs/ca-certificates.crt" ca_certs: "/etc/ssl/certs/ca-certificates.crt"
insecure: False insecure: False
proxy: https://myproxy.corp.com:8080 proxy: https://myproxy.corp.invalid:8080
slack: slack:
timeout: 5 timeout: 5
ca_certs: "/etc/ssl/certs/ca-certificates.crt" ca_certs: "/etc/ssl/certs/ca-certificates.crt"
insecure: False insecure: False
proxy: https://myproxy.corp.com:8080 proxy: https://myproxy.corp.invalid:8080
processors: processors:
alarm: alarm:
@ -82,7 +82,7 @@ queues:
sent_notifications_size: 50 # limiting this size reduces potential # of re-sent notifications after a failure sent_notifications_size: 50 # limiting this size reduces potential # of re-sent notifications after a failure
zookeeper: zookeeper:
url: 192.168.10.4:2181 # or comma seperated list of multiple hosts url: 127.0.0.1:2181 # or comma seperated list of multiple hosts
notification_path: /notification/alarms notification_path: /notification/alarms
notification_retry_path: /notification/retry notification_retry_path: /notification/retry
periodic_path: periodic_path: