summaryrefslogtreecommitdiff
path: root/provider_base/services
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-02-10 11:58:01 +0100
committervarac <varacanero@zeromail.org>2014-02-10 11:58:01 +0100
commit51feb301c35ede1262167dd26429fb98a9a6e65a (patch)
tree3d3bdd9c4720714e9dd8ca5c761fa9b5e3520da1 /provider_base/services
parent6720bdba0c67893de713eee7f753fb582d06aa61 (diff)
parent665db30f37838bcebbfdc368f65ed369282c31b8 (diff)
Merge remote-tracking branch 'elijah/feature/known_hosts' into 4982_check_mk
Conflicts: platform.rb
Diffstat (limited to 'provider_base/services')
-rw-r--r--provider_base/services/monitor.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json
index 9140901b..5656fe80 100644
--- a/provider_base/services/monitor.json
+++ b/provider_base/services/monitor.json
@@ -1,7 +1,7 @@
{
"nagios": {
"nagiosadmin_pw": "= secret :nagios_admin_password",
- "hosts": "= nodes_like_me.pick_fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')"
+ "hosts": "= nodes_like_me[:services => '!monitor'].pick_fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')"
},
"hosts": "= hosts_file(nodes_like_me[:services => '!monitor'])",
"ssh": {