Jelajahi Sumber

AMBARI-251. Oozie link is not displayed even when Oozie is installed

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1339756 13f79535-47bb-0310-9956-ffa450edef68
Ramya Sunil 13 tahun lalu
induk
melakukan
ed129e3c2f

+ 3 - 0
CHANGES.txt

@@ -2,6 +2,9 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-251. Oozie link is not displayed even when Oozie is installed 
+  (vgogate via ramya)
+
   AMBARI-298. The current stage and the next stage are shown at the same time
   during state transition (Yusaku Sako via ramya)
 

+ 3 - 3
hmc/puppet/modules/hdp-dashboard/templates/cluster_configuration.json.erb

@@ -80,15 +80,15 @@
       ],
       "TEMPLETON" : [
         {
-          "installed": <%=not scope.function_hdp_no_hosts("public_templeton_host")%>,
+          "installed": <%=not scope.function_hdp_no_hosts("public_templeton_server_host")%>,
           "name": "TEMPLETON"
         }
       ],
       "OOZIE" : [
         {
-          "installed": <%=not scope.function_hdp_no_hosts("public_oozie_host")%>,
+          "installed": <%=not scope.function_hdp_no_hosts("public_oozie_server")%>,
           "name": "OOZIE",
-          "oozie_host": "<%=scope.function_hdp_host("public_oozie_host")%>",
+          "oozie_host": "<%=scope.function_hdp_host("public_oozie_server")%>",
           "oozie_port": 11000
         }
       ]

+ 3 - 4
mon_dashboard/src/ui/hbase.html

@@ -43,11 +43,10 @@
 		</nav>
 		
 		<section id="links">
-			<a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Post Feedback</a>
-			<a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Documentation</a>
+			<a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
+			<a class="roundedBox" href="http://docs.hortonworks.com" target="_blank">Documentation</a>
 			<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
 			<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
-                        <a id="oozie" class="roundedBox" href="" target="_blank">Oozie</a>
 		</section>
 		<section class="clear"></section>
 	</section>
@@ -128,7 +127,7 @@
 		<a id="graphForwardLink" href=""></a>
 	</section>
 	
-	<footer></footer>
+	<footer>Hortonworks &copy; 2012</footer>
 	<script type="text/javascript" src="./libs/jquery-1.7.1.js"></script>
 	<script type="text/javascript" src="./libs/jqueryui/js/jquery-ui-1.7.3.custom.min.js"></script>
 	<script type="text/javascript" src="./libs/jquery.multiselect.js"></script>

+ 3 - 4
mon_dashboard/src/ui/hdfs.html

@@ -43,11 +43,10 @@
 		</nav>
 		
 		<section id="links">
-			<a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Post Feedback</a>
-			<a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Documentation</a>
+			<a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
+			<a class="roundedBox" href="http://docs.hortonworks.com" target="_blank">Documentation</a>
 			<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
 			<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
-                        <a id="oozie" class="roundedBox" href="" target="_blank">Oozie</a>
 		</section>
 		<section class="clear"></section>
 	</section>
@@ -129,7 +128,7 @@
 		<a id="graphForwardLink" href=""></a>
 	</section>
 	
-	<footer></footer>
+	<footer>Hortonworks &copy; 2012</footer>
 	<script type="text/javascript" src="./libs/jquery-1.7.1.js"></script>
 	<script type="text/javascript" src="./libs/jqueryui/js/jquery-ui-1.7.3.custom.min.js"></script>
 	<script type="text/javascript" src="./libs/jquery.multiselect.js"></script>

+ 3 - 4
mon_dashboard/src/ui/home.html

@@ -43,11 +43,10 @@
     </nav>
     
     <section id="links">
-      <a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Post Feedback</a>
-      <a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Documentation</a>
+      <a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
+      <a class="roundedBox" href="http://docs.hortonworks.com" target="_blank">Documentation</a>
       <a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
       <a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
-      <a id="oozie" class="roundedBox" href="" target="_blank">Oozie</a>
     </section>
     <section class="clear"></section>
   </section>
@@ -147,7 +146,7 @@
     <a id="graphForwardLink" href=""></a>
   </section>
   
-  <footer></footer>
+  <footer>Hortonworks &copy; 2012</footer>
   <script type="text/javascript" src="./libs/jquery-1.7.1.js"></script>
   <script type="text/javascript" src="./libs/jqueryui/js/jquery-ui-1.7.3.custom.min.js"></script>
   <script type="text/javascript" src="./libs/jquery.multiselect.js"></script>

+ 9 - 5
mon_dashboard/src/ui/js/common.js

@@ -589,12 +589,16 @@
     nagios.setAttribute("href", data.nagios_url);
     var ganglia = document.getElementById("ganglia");
     ganglia.setAttribute("href", data.ganglia_url);
-    var oozie = document.getElementById("oozie");
     if (data.oozie_url != "") {
-      oozie.setAttribute("href", data.oozie_url);
-    } else {
-      oozie.style.display = 'none';
-    }
+      var oozie_button = document.createElement("a");
+      oozie_button.setAttribute("id", "oozie");
+      oozie_button.setAttribute("class", "roundedBox");
+      oozie_button.setAttribute("target", "_blank");
+      oozie_button.setAttribute("href", data.oozie_url);
+      oozie_button.innerHTML = "Oozie";
+      var links = document.getElementById("links");
+      links.appendChild(oozie_button);
+    } 
   };
   
   // Get Graphs for Dashboard page

+ 3 - 4
mon_dashboard/src/ui/mapreduce.html

@@ -43,11 +43,10 @@
 		</nav>
 		
 		<section id="links">
-			<a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Post Feedback</a>
-			<a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Documentation</a>
+			<a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
+			<a class="roundedBox" href="http://docs.hortonworks.com" target="_blank">Documentation</a>
 			<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
 			<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
-                        <a id="oozie" class="roundedBox" href="" target="_blank">Oozie</a>
 		</section>
 		<section class="clear"></section>
 	</section>
@@ -134,7 +133,7 @@
 		<a id="graphForwardLink" href=""></a>
 	</section>
 	
-	<footer></footer>
+	<footer>Hortonworks &copy; 2012</footer>
 	<script type="text/javascript" src="./libs/jquery-1.7.1.js"></script>
 	<script type="text/javascript" src="./libs/jqueryui/js/jquery-ui-1.7.3.custom.min.js"></script>
 	<script type="text/javascript" src="./libs/jquery.multiselect.js"></script>