Author: mahadev
Date: Sat Jan 26 00:57:09 2013
New Revision: 1438804
URL: http://svn.apache.org/viewvc?rev=1438804&view=rev
Log:
AMBARI-1207. Remove /hdp as the httpd conf for any of the nagios urls - should
replace it with ambarinagios or something else. (mahadev)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpProxyPropertyProvider.java
incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1438804&r1=1438803&r2=1438804&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Jan 26 00:57:09 2013
@@ -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)
Modified:
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpProxyPropertyProvider.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpProxyPropertyProvider.java?rev=1438804&r1=1438803&r2=1438804&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpProxyPropertyProvider.java
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpProxyPropertyProvider.java
Sat Jan 26 00:57:09 2013
@@ -48,7 +48,7 @@ public class HttpProxyPropertyProvider i
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"));
}
Modified:
incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec?rev=1438804&r1=1438803&r2=1438804&view=diff
==============================================================================
---
incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec
(original)
+++
incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec
Sat Jan 26 00:57:09 2013
@@ -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
