AMBARI-1207. Remove /hdp as the httpd conf for any of the nagios urls - should replace it with ambarinagios or something else. (mahadev)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1438804 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -138,6 +138,10 @@ Trunk (unreleased changes):
  AMBARI-1262. Apache Ambari point to dev url, need fix in pom.xml. 
  (mahadev)
 
+ AMBARI-1207. Remove /hdp as the httpd conf for any of the nagios urls -
+ should replace it with ambarinagios or something else.
+ (mahadev)
+
  BUG FIXES
 
  AMBARI-1257. Separator missing in between Oozie and ZooKeeper. (yusaku)

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpProxyPropertyProvider.java

@@ -48,7 +48,7 @@ public class HttpProxyPropertyProvider implements PropertyProvider {
   private static final Map<String, String> MAPPINGS = new HashMap<String, String>();
   
   static {
-    URL_TEMPLATES.put("NAGIOS_SERVER", "http://%s/hdp/nagios/nagios_alerts.php?q1=alerts&alert_type=all");
+    URL_TEMPLATES.put("NAGIOS_SERVER", "http://%s/ambarinagios/nagios/nagios_alerts.php?q1=alerts&alert_type=all");
     
     MAPPINGS.put("NAGIOS_SERVER", PropertyHelper.getPropertyId("HostRoles", "nagios_alerts"));
   }

contrib/addons/package/rpm/hdp_mon_nagios_addons.spec

@@ -60,7 +60,7 @@ monitoring of a Hadoop Cluster
 
 %__cp -rf scripts/* $RPM_BUILD_ROOT/%{nagioshdpscripts_dir}/
 %__cp -rf plugins/* $RPM_BUILD_ROOT/%{nagiosplugin_dir}/
-echo "Alias /hdp %{_prefix}/share/hdp" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf
+echo "Alias /ambarinagios %{_prefix}/share/hdp" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf
 echo "<Directory /usr/share/hdp>" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf
 echo "  Options None" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf
 echo "  AllowOverride None" >> $RPM_BUILD_ROOT/%{httpd_confdir}/hdp_mon_nagios_addons.conf