summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-21 21:00:23 +0000
committerGerrit Code Review <review@openstack.org>2016-10-21 21:00:23 +0000
commit774ad60314433118d2e25ebf7713d880c1b412d7 (patch)
tree153921f2c8202863cf44815c11a70911fafbf9eb /environments
parentf4ec754a4df333af597cc44208c3cc7114b47969 (diff)
parent9d9eecea56b15f6f96f9d33def8045afb6527051 (diff)
Merge "Prefill Sensu client custom config"
Diffstat (limited to 'environments')
-rw-r--r--environments/monitoring-environment.yaml36
1 files changed, 11 insertions, 25 deletions
diff --git a/environments/monitoring-environment.yaml b/environments/monitoring-environment.yaml
index 62ab06dc..f4aa67a9 100644
--- a/environments/monitoring-environment.yaml
+++ b/environments/monitoring-environment.yaml
@@ -1,30 +1,16 @@
-## A Heat environment file which can be used to set up monitoring
-## and logging agents
+## A Heat environment file which can be used to set up monitoring agents
resource_registry:
OS::TripleO::Services::SensuClient: ../puppet/services/monitoring/sensu-client.yaml
#parameter_defaults:
- #### Sensu settings ####
- ##MonitoringRabbitHost: 10.10.10.10
- ##MonitoringRabbitPort: 5672
- ##MonitoringRabbitUserName: sensu
- ##MonitoringRabbitPassword: sensu
- ##MonitoringRabbitUseSSL: false
- ##MonitoringRabbitVhost: "/sensu"
- ##SensuClientCustomConfig:
- ## - api:
- ## - warning: 10
- ## critical: 20
- ## openstack:
- ## - username: admin
- ## password: changeme
- ## project_name: admin
- ## auth_url: http://controller:5000/v2.0
- ## region_name: RegionOne
-
- #### EFK settings ####
- ## TBD
-
- #### Grafana/Graphite settings ####
- ## TBD
+# MonitoringRabbitHost: 10.10.10.10
+# MonitoringRabbitPort: 5672
+# MonitoringRabbitUserName: sensu
+# MonitoringRabbitPassword: sensu
+# MonitoringRabbitUseSSL: false
+# MonitoringRabbitVhost: "/sensu"
+# SensuClientCustomConfig:
+# api:
+# warning: 10
+# critical: 20