AMBARI-11749 - Oozie Web Alert Has Wrong http Property In Alert Definition (jonathanhurley)

ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertUri.java

@@ -99,6 +99,17 @@ public class AlertUri {
     return m_httpUri;
   }
 
+  /**
+   * Sets the plaintext (HTTP) URI that can be used to retrieve alert
+   * information.
+   *
+   * @param httpUri
+   *          the plaintext URI or {@code null} for none.
+   */
+  public void setHttpUri(String httpUri) {
+    m_httpUri = httpUri;
+  }
+
   /**
    * Gets the default port to use on the host running the alert if none of the
    * http properties are available.

ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java

@@ -58,6 +58,7 @@ import org.apache.ambari.server.state.StackId;
 import org.apache.ambari.server.state.alert.AlertDefinition;
 import org.apache.ambari.server.state.alert.AlertDefinitionFactory;
 import org.apache.ambari.server.state.alert.PortSource;
+import org.apache.ambari.server.state.alert.WebSource;
 import org.apache.ambari.server.state.stack.OsFamily;
 import org.apache.ambari.server.utils.VersionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -1047,21 +1048,38 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
 
           // zookeeper failover conroller alert update for default port and uri
           // to 8019 and dfs.ha.zkfc.port
-          AlertDefinitionEntity alertDefinitionEntity = alertDefinitionDAO.findByName(
+          AlertDefinitionEntity zkFailoverDefinitionEntity = alertDefinitionDAO.findByName(
               cluster.getClusterId(), "hdfs_zookeeper_failover_controller_process");
 
-          if (alertDefinitionEntity != null) {
-            AlertDefinition zkfcAlertDefinition = alertDefinitionFactory.coerce(alertDefinitionEntity);
+          if (zkFailoverDefinitionEntity != null) {
+            AlertDefinition zkfcAlertDefinition = alertDefinitionFactory.coerce(zkFailoverDefinitionEntity);
             PortSource portSource = (PortSource) zkfcAlertDefinition.getSource();
             portSource.setPort(8019);
             portSource.setUri("{{hdfs-site/dfs.ha.zkfc.port}}");
 
             // merge the definition back into the entity
-            alertDefinitionEntity = alertDefinitionFactory.merge(zkfcAlertDefinition,
-                alertDefinitionEntity);
+            zkFailoverDefinitionEntity = alertDefinitionFactory.merge(zkfcAlertDefinition,
+                zkFailoverDefinitionEntity);
 
             // save the changes
-            alertDefinitionDAO.merge(alertDefinitionEntity);
+            alertDefinitionDAO.merge(zkFailoverDefinitionEntity);
+          }
+
+          // oozie web url changed
+          AlertDefinitionEntity oozieWebDefinitionEntity = alertDefinitionDAO.findByName(
+              cluster.getClusterId(), "oozie_server_webui");
+
+          if (oozieWebDefinitionEntity != null) {
+            AlertDefinition oozieAlertDefinition = alertDefinitionFactory.coerce(oozieWebDefinitionEntity);
+            WebSource webSource = (WebSource) oozieAlertDefinition.getSource();
+            webSource.getUri().setHttpUri("{{oozie-site/oozie.base.url}}/?user.name={{oozie-env/oozie_user}}");
+
+            // merge the definition back into the entity
+            oozieWebDefinitionEntity = alertDefinitionFactory.merge(oozieAlertDefinition,
+                oozieWebDefinitionEntity);
+
+            // save the changes
+            alertDefinitionDAO.merge(oozieWebDefinitionEntity);
           }
         }
       }

ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/alerts.json

@@ -11,7 +11,7 @@
         "source": {
           "type": "WEB",
           "uri": {
-            "http": "{{oozie-site/oozie.base.url}}/oozie/?user.name=oozie",
+            "http": "{{oozie-site/oozie.base.url}}/?user.name={{oozie-env/oozie_user}}",
             "kerberos_keytab": "{{oozie-site/oozie.authentication.kerberos.keytab}}",
             "kerberos_principal": "{{oozie-site/oozie.authentication.kerberos.principal}}",
             "connection_timeout": 5.0

ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json

@@ -11,7 +11,7 @@
         "source": {
           "type": "WEB",
           "uri": {
-            "http": "{{oozie-site/oozie.base.url}}/oozie/?user.name=oozie",
+            "http": "{{oozie-site/oozie.base.url}}/?user.name={{oozie-env/oozie_user}}",
             "kerberos_keytab": "{{oozie-site/oozie.authentication.kerberos.keytab}}",
             "kerberos_principal": "{{oozie-site/oozie.authentication.kerberos.principal}}",
             "connection_timeout": 5.0

ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/alerts.json

@@ -11,7 +11,7 @@
         "source": {
           "type": "WEB",
           "uri": {
-            "http": "{{oozie-site/oozie.base.url}}/oozie",
+            "http": "{{oozie-site/oozie.base.url}}",
             "connection_timeout": 5.0
           },
           "reporting": {