AMBARI-16156. Sometimes : Warning Alert for Atlas (HTTP 500 response from) is present after upgrade to 2.2.2.0 (aonishuk)

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

@@ -597,6 +597,22 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog {
         alertDefinition.setHash(UUID.randomUUID().toString());
         alertDefinitionDAO.merge(alertDefinition);
       }
+      //update Atlas alert
+      final AlertDefinitionEntity atlasMetadataServerWebUI = alertDefinitionDAO.findByName(
+              clusterID, "metadata_server_webui");
+      if (atlasMetadataServerWebUI != null) {
+        String source = atlasMetadataServerWebUI.getSource();
+        JsonObject sourceJson = new JsonParser().parse(source).getAsJsonObject();
+
+        JsonObject uriJson = sourceJson.get("uri").getAsJsonObject();
+        uriJson.remove("kerberos_keytab");
+        uriJson.remove("kerberos_principal");
+        uriJson.addProperty("kerberos_keytab", "{{cluster-env/smokeuser_keytab}}");
+        uriJson.addProperty("kerberos_principal", "{{cluster-env/smokeuser_principal_name}}");
+
+        atlasMetadataServerWebUI.setSource(sourceJson.toString());
+        alertDefinitionDAO.merge(atlasMetadataServerWebUI);
+      }
     }
   }
 

ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/alerts.json

@@ -42,8 +42,8 @@
             "https_property": "{{application-properties/atlas.enableTLS}}",
             "https_property_value": "true",
             "default_port": 21000,
-            "kerberos_keytab": "{{application-properties/atlas.http.authentication.kerberos.keytab}}",
-            "kerberos_principal": "{{application-properties/atlas.http.authentication.kerberos.principal}}",
+            "kerberos_keytab": "{{cluster-env/smokeuser_keytab}}",
+            "kerberos_principal": "{{cluster-env/smokeuser_principal_name}}",
             "connection_timeout": 5.0
           },
           "reporting": {