Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 605B718563 for ; Wed, 17 Jun 2015 17:49:13 +0000 (UTC) Received: (qmail 24720 invoked by uid 500); 17 Jun 2015 17:49:13 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 24691 invoked by uid 500); 17 Jun 2015 17:49:13 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 24682 invoked by uid 99); 17 Jun 2015 17:49:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2015 17:49:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2D163DFF98; Wed, 17 Jun 2015 17:49:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vbrodetskyi@apache.org To: commits@ambari.apache.org Message-Id: <38141b0735524fe182ed2af8d48a4dc6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-11978. Ambari alerts should not use oozie authentication principal for doing kinit in Oozie HA envs.(vbrodetskyi) Date: Wed, 17 Jun 2015 17:49:13 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 45c7b27ed -> fc41f6673 AMBARI-11978. Ambari alerts should not use oozie authentication principal for doing kinit in Oozie HA envs.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fc41f667 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fc41f667 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fc41f667 Branch: refs/heads/trunk Commit: fc41f66738c38aa25455f4b4d1c721a29f5df95d Parents: 45c7b27 Author: Vitaly Brodetskyi Authored: Wed Jun 17 20:48:45 2015 +0300 Committer: Vitaly Brodetskyi Committed: Wed Jun 17 20:48:45 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/UpgradeCatalog210.java | 6 ++++++ .../main/resources/common-services/OOZIE/4.0.0.2.0/alerts.json | 4 ++-- .../OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py | 4 ++-- .../main/resources/common-services/OOZIE/4.2.0.2.3/alerts.json | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fc41f667/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java index 22e80a3..48c8d8d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java @@ -1131,8 +1131,14 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog { String source = oozieWebUIAlertDefinitionEntity.getSource(); JsonObject rootJson = new JsonParser().parse(source).getAsJsonObject(); rootJson.get("uri").getAsJsonObject().remove("http"); + rootJson.get("uri").getAsJsonObject().remove("kerberos_keytab"); + rootJson.get("uri").getAsJsonObject().remove("kerberos_principal"); rootJson.get("uri").getAsJsonObject().addProperty("http", "{{oozie-site/oozie.base.url}}/?user.name={{oozie-env/oozie_user}}"); + rootJson.get("uri").getAsJsonObject().addProperty("kerberos_keytab", + "{{cluster-env/smokeuser_keytab}}"); + rootJson.get("uri").getAsJsonObject().addProperty("kerberos_principal", + "{{cluster-env/smokeuser_principal_name}}"); // save the changes updateAlertDefinitionEntitySource("oozie_server_webui", rootJson.toString()); http://git-wip-us.apache.org/repos/asf/ambari/blob/fc41f667/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/alerts.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/alerts.json b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/alerts.json index e02a66a..a1d267f 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/alerts.json +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/alerts.json @@ -12,8 +12,8 @@ "type": "WEB", "uri": { "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}}", + "kerberos_keytab": "{{cluster-env/smokeuser_keytab}}", + "kerberos_principal": "{{cluster-env/smokeuser_principal_name}}", "connection_timeout": 5.0 }, "reporting": { http://git-wip-us.apache.org/repos/asf/ambari/blob/fc41f667/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py index cc4d52b..e29dfb0 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py @@ -43,8 +43,8 @@ KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY = '{{kerberos-env/executable_search_paths}} OOZIE_URL_KEY = '{{oozie-site/oozie.base.url}}' SECURITY_ENABLED = '{{cluster-env/security_enabled}}' -OOZIE_PRINCIPAL = '{{oozie-site/oozie.authentication.kerberos.principal}}' -OOZIE_KEYTAB = '{{oozie-site/oozie.authentication.kerberos.keytab}}' +OOZIE_PRINCIPAL = '{{cluster-env/smokeuser_principal_name}}' +OOZIE_KEYTAB = '{{cluster-env/smokeuser_keytab}}' OOZIE_USER = '{{oozie-env/oozie_user}}' OOZIE_CONF_DIR = '/usr/hdp/current/oozie-server/conf' OOZIE_CONF_DIR_LEGACY = '/etc/oozie/conf' http://git-wip-us.apache.org/repos/asf/ambari/blob/fc41f667/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/alerts.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/alerts.json b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/alerts.json index ceb923c..a1d267f 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/alerts.json +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/alerts.json @@ -12,8 +12,8 @@ "type": "WEB", "uri": { "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}}", + "kerberos_keytab": "{{cluster-env/smokeuser_keytab}}", + "kerberos_principal": "{{cluster-env/smokeuser_principal_name}}", "connection_timeout": 5.0 }, "reporting": { @@ -42,4 +42,4 @@ } ] } -} \ No newline at end of file +}