diff options
| author | varac <varacanero@zeromail.org> | 2014-02-10 11:58:01 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-10 11:58:01 +0100 |
| commit | 51feb301c35ede1262167dd26429fb98a9a6e65a (patch) | |
| tree | 3d3bdd9c4720714e9dd8ca5c761fa9b5e3520da1 /provider_base/services | |
| parent | 6720bdba0c67893de713eee7f753fb582d06aa61 (diff) | |
| parent | 665db30f37838bcebbfdc368f65ed369282c31b8 (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.json | 2 |
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": { |