Repository: ambari Updated Branches: refs/heads/trunk 97b44238e -> 099f6e562
AMBARI-16156. Sometimes : Warning Alert for Atlas (HTTP 500 response from) is present after upgrade to 2.2.2.0 (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/099f6e56 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/099f6e56 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/099f6e56 Branch: refs/heads/trunk Commit: 099f6e562f67f58d1cc64b9233a25214e3d44fd2 Parents: 97b4423 Author: Andrew Onishuk <[email protected]> Authored: Thu Apr 28 16:07:25 2016 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Thu Apr 28 16:07:25 2016 +0300 ---------------------------------------------------------------------- .../ambari/server/upgrade/UpgradeCatalog240.java | 16 ++++++++++++++++ .../common-services/ATLAS/0.1.0.2.3/alerts.json | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/099f6e56/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java index eb8700e..b9b14be 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java +++ b/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); + } } } http://git-wip-us.apache.org/repos/asf/ambari/blob/099f6e56/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/alerts.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/alerts.json b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/alerts.json index 186ccaf..e65b5c1 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/alerts.json +++ b/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": {
