ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbrodets...@apache.org
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:47:54 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 133cbf8cd -> b5194c4ce


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/b5194c4c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b5194c4c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b5194c4c

Branch: refs/heads/branch-2.1
Commit: b5194c4ced90073c657cc3c7865d69e31468fb9d
Parents: 133cbf8
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Wed Jun 17 20:47:09 2015 +0300
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Wed Jun 17 20:47:09 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/b5194c4c/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/b5194c4c/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/b5194c4c/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/b5194c4c/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
+}


Mime
View raw message