diff options
| author | elijah <elijah@riseup.net> | 2014-02-25 12:04:39 -0800 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-27 18:12:15 +0100 |
| commit | f8e01ef3c5cc725a685f03869d8d821176181baa (patch) | |
| tree | 75ce2c5e29694c801cea587423b59c5ed19afa25 | |
| parent | 488022986a54f6031d4547701031c7b0017e729c (diff) | |
new monitor hosts rule: local environment monitors just see local machines, other monitors see the nodes from all environments (except local)
| -rw-r--r-- | provider_base/services/monitor.json | 4 |
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", |