diff options
| author | Varac <varac@leap.se> | 2014-12-04 17:30:07 +0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@review.leap.se> | 2014-12-04 17:30:07 +0800 |
| commit | 60bd76583d46fe1c9f39804c7fd892fa9c1745d0 (patch) | |
| tree | e938e8bc993104715c79595af313f9d8485f5125 /provider_base | |
| parent | acd6dd2848f38ba1b728f263f297bc6d2ad9e4bb (diff) | |
| parent | a84272aa77715a4029ebd06b38b7a5ad05e6acd0 (diff) | |
Merge "Change nagios mail To: Header to contain the actual platform environment's contact email (Bug #6466)" into develop
Diffstat (limited to 'provider_base')
| -rw-r--r-- | provider_base/services/monitor.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json index 56ca015b..a68ee8d8 100644 --- a/provider_base/services/monitor.json +++ b/provider_base/services/monitor.json @@ -2,7 +2,8 @@ "nagios": { "nagiosadmin_pw": "= secret :nagios_admin_password", "domains_internal": "= global.tags.field('domain.internal_suffix').compact.uniq", - "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')" + "environments": "= Hash[ global.environment_names.select{|e|e!='local'}.map{|e| [e||'default',{'contact_emails'=>global.env(e).provider.contacts.default}]} ]", + "hosts": "= (self.environment == 'local' ? nodes_like_me : nodes[:environment => '!local']).pick_fields('environment', 'domain.internal', 'domain.full_suffix', 'ip_address', 'services', 'openvpn.gateway_address', 'ssh.port')" }, "hosts": "= self.environment == 'local' ? hosts_file(nodes_like_me) : hosts_file(nodes[:environment => '!local'])", "ssh": { |