Repository: ambari Updated Branches: refs/heads/trunk 4c6ee1f90 -> f109887bb
AMBARI-6433. On Ubuntu should redirect from /nagios to /nagios3 (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f109887b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f109887b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f109887b Branch: refs/heads/trunk Commit: f109887bb40eef4d05a1cb15d6fe74a73e4bed1d Parents: 4c6ee1f Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Thu Jul 10 14:45:16 2014 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Thu Jul 10 14:45:16 2014 +0300 ---------------------------------------------------------------------- .../stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py | 2 ++ .../HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2 | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f109887b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py index edb9b04..8a31ddf 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py @@ -162,6 +162,8 @@ else: nn_ha_host_port_map[config['clusterHostInfo']['namenode_host'][0]] = namenode_metadata_port else: namenode_metadata_port = '8020' + +os_family = System.get_instance().os_family ganglia_port = "8651" ganglia_collector_slaves_port = "8660" http://git-wip-us.apache.org/repos/asf/ambari/blob/f109887b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2 index c7658c1..d85f423 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2 @@ -61,7 +61,11 @@ ScriptAlias {{cgi_weblink}} "{{cgi_dir}}" Require valid-user </Directory> -Alias /{{nagios_service_name}} "{{nagios_web_dir}}" +Alias /nagios "{{nagios_web_dir}}" +{# Ubuntu has different nagios url #} +{% if os_family == "debian" %} +Alias /nagios3 "{{nagios_web_dir}}" +{% endif %} <Directory "{{nagios_web_dir}}"> # SSLRequireSSL
