fix config

apache · Oct 27, 2023 · 09b5fb2 · 09b5fb2
1 parent 69df9f5
commit 09b5fb2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/config/KyuubiConf.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/config/KyuubiConf.scala
@@ -2232,15 +2232,15 @@ object KyuubiConf {
       .booleanConf
       .createWithDefault(true)
 
-  val SERVER_EVENT_ELASTICSEARCH_API_USER: OptionalConfigEntry[String] =
+  val SERVER_EVENT_ELASTICSEARCH_USER: OptionalConfigEntry[String] =
     buildConf("kyuubi.backend.server.event.elasticsearch.user")
       .doc("The user for ElasticSearch that server events go for the built-in ElasticSearch logger")
       .version("1.9.0")
       .serverOnly
       .stringConf
       .createOptional
 
-  val SERVER_EVENT_ELASTICSEARCH_API_PASSWORD: OptionalConfigEntry[String] =
+  val SERVER_EVENT_ELASTICSEARCH_PASSWORD: OptionalConfigEntry[String] =
     buildConf("kyuubi.backend.server.event.elasticsearch.password")
       .doc("The password for ElasticSearch that server events go for" +
         " the built-in ElasticSearch logger")

diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/events/ServerEventHandlerRegister.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/events/ServerEventHandlerRegister.scala
@@ -63,8 +63,8 @@ object ServerEventHandlerRegister extends EventHandlerRegister {
       throw new IllegalArgumentException(
         s"${SERVER_EVENT_ELASTICSEARCH_SERVER_URL.key} must be configured")
     }
-    val username = kyuubiConf.get(SERVER_EVENT_ELASTICSEARCH_API_USER)
-    val password = kyuubiConf.get(SERVER_EVENT_ELASTICSEARCH_API_PASSWORD)
+    val username = kyuubiConf.get(SERVER_EVENT_ELASTICSEARCH_USER)
+    val password = kyuubiConf.get(SERVER_EVENT_ELASTICSEARCH_PASSWORD)
     ServerElasticSearchLoggingEventHandler(
       indexId,
       serverUrl,

diff --git a/.../scala/org/apache/kyuubi/events/handler/ServerElasticSearchLoggingEventHandlerSuite.scala b/.../scala/org/apache/kyuubi/events/handler/ServerElasticSearchLoggingEventHandlerSuite.scala
@@ -63,8 +63,8 @@ abstract class ServerElasticSearchLoggingEventHandlerSuite extends WithKyuubiSer
       .set(KyuubiConf.SERVER_EVENT_LOGGERS, Seq("ELASTICSEARCH"))
       .set(KyuubiConf.SERVER_EVENT_ELASTICSEARCH_INDEX, destIndex)
       .set(KyuubiConf.SERVER_EVENT_ELASTICSEARCH_INDEX_AUTOCREATE_ENABLED, true)
-      .set(KyuubiConf.SERVER_EVENT_ELASTICSEARCH_API_USER, esUser)
-      .set(KyuubiConf.SERVER_EVENT_ELASTICSEARCH_API_PASSWORD, esPassword)
+      .set(KyuubiConf.SERVER_EVENT_ELASTICSEARCH_USER, esUser)
+      .set(KyuubiConf.SERVER_EVENT_ELASTICSEARCH_PASSWORD, esPassword)
   }
 
   override def beforeAll(): Unit = withContainers { esContainer =>