Преглед на файлове

AMBARI-11978. Ambari alerts should not use oozie authentication principal for doing kinit in Oozie HA envs.(vbrodetskyi)

Vitaly Brodetskyi преди 10 години
родител
ревизия
fc41f66738

+ 6 - 0
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());

+ 2 - 2
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": {

+ 2 - 2
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'

+ 3 - 3
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 @@
       }
     ]
   }
-}
+}