summaryrefslogtreecommitdiff
path: root/provider_base/services/monitor.json
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-02-27 22:43:23 +0100
committervarac <varacanero@zeromail.org>2014-02-27 22:43:23 +0100
commit0cd0076f945c0e02bfdc50ff483ceebceec131e2 (patch)
tree21c631e5bdee5e3019c7fbe4dfac1b04ef325599 /provider_base/services/monitor.json
parente8cd9ab2d4480aa7c16d15f5db664fa650d4c655 (diff)
parent66cc1345c3af4e814d98c8e4b90d90158ac9d399 (diff)
Merge branch 'one_monitornode_rules_them_all' into 0.6
Diffstat (limited to 'provider_base/services/monitor.json')
-rw-r--r--provider_base/services/monitor.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json
index 82c18745..03f6c6d1 100644
--- a/provider_base/services/monitor.json
+++ b/provider_base/services/monitor.json
@@ -1,9 +1,9 @@
{
"nagios": {
"nagiosadmin_pw": "= secret :nagios_admin_password",
- "hosts": "= nodes_like_me.pick_fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')"
+ "hosts": "= (self.environment == 'local' ? nodes_like_me : nodes[:environment => '!local']).pick_fields('domain.internal', 'domain.full_suffix', 'ip_address', 'services', 'openvpn.gateway_address', 'ssh.port')"
},
- "hosts": "= hosts_file(nodes_like_me)",
+ "hosts": "= self.environment == 'local' ? hosts_file(nodes_like_me) : hosts_file(nodes[:environment => '!local'])",
"ssh": {
"monitor": {
"username": "= Leap::Platform.monitor_username",