mirror of https://github.com/milvus-io/milvus.git
support configurable sasl mechanisms for kafka (#17542)
Signed-off-by: yun.zhang <yun.zhang@zilliz.com>pull/17806/head
parent
4ae1ca2cac
commit
762e3b78a6
|
@ -84,6 +84,8 @@ pulsar:
|
||||||
# brokerList: localhost1:9092,localhost2:9092,localhost3:9092
|
# brokerList: localhost1:9092,localhost2:9092,localhost3:9092
|
||||||
# saslUsername: username
|
# saslUsername: username
|
||||||
# saslPassword: password
|
# saslPassword: password
|
||||||
|
# saslMechanisms: PLAIN
|
||||||
|
# securityProtocol: SASL_SSL
|
||||||
|
|
||||||
rocksmq:
|
rocksmq:
|
||||||
# please adjust in embedded Milvus: /tmp/milvus/rdb_data
|
# please adjust in embedded Milvus: /tmp/milvus/rdb_data
|
||||||
|
|
|
@ -43,8 +43,8 @@ func NewKafkaClientInstanceWithConfig(config *paramtable.KafkaConfig) *kafkaClie
|
||||||
}
|
}
|
||||||
|
|
||||||
if config.SaslUsername != "" && config.SaslPassword != "" {
|
if config.SaslUsername != "" && config.SaslPassword != "" {
|
||||||
kafkaConfig.SetKey("sasl.mechanisms", "PLAIN")
|
kafkaConfig.SetKey("sasl.mechanisms", config.SaslMechanisms)
|
||||||
kafkaConfig.SetKey("security.protocol", "SASL_SSL")
|
kafkaConfig.SetKey("security.protocol", config.SecurityProtocol)
|
||||||
kafkaConfig.SetKey("sasl.username", config.SaslUsername)
|
kafkaConfig.SetKey("sasl.username", config.SaslUsername)
|
||||||
kafkaConfig.SetKey("sasl.password", config.SaslPassword)
|
kafkaConfig.SetKey("sasl.password", config.SaslPassword)
|
||||||
}
|
}
|
||||||
|
|
|
@ -246,10 +246,12 @@ func (p *PulsarConfig) initMaxMessageSize() {
|
||||||
|
|
||||||
// --- kafka ---
|
// --- kafka ---
|
||||||
type KafkaConfig struct {
|
type KafkaConfig struct {
|
||||||
Base *BaseTable
|
Base *BaseTable
|
||||||
Address string
|
Address string
|
||||||
SaslUsername string
|
SaslUsername string
|
||||||
SaslPassword string
|
SaslPassword string
|
||||||
|
SaslMechanisms string
|
||||||
|
SecurityProtocol string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (k *KafkaConfig) init(base *BaseTable) {
|
func (k *KafkaConfig) init(base *BaseTable) {
|
||||||
|
@ -257,6 +259,8 @@ func (k *KafkaConfig) init(base *BaseTable) {
|
||||||
k.initAddress()
|
k.initAddress()
|
||||||
k.initSaslUsername()
|
k.initSaslUsername()
|
||||||
k.initSaslPassword()
|
k.initSaslPassword()
|
||||||
|
k.initSaslMechanisms()
|
||||||
|
k.initSecurityProtocol()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (k *KafkaConfig) initAddress() {
|
func (k *KafkaConfig) initAddress() {
|
||||||
|
@ -275,6 +279,14 @@ func (k *KafkaConfig) initSaslPassword() {
|
||||||
k.SaslPassword = k.Base.LoadWithDefault("kafka.saslPassword", "")
|
k.SaslPassword = k.Base.LoadWithDefault("kafka.saslPassword", "")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (k *KafkaConfig) initSaslMechanisms() {
|
||||||
|
k.SaslMechanisms = k.Base.LoadWithDefault("kafka.saslMechanisms", "PLAIN")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k *KafkaConfig) initSecurityProtocol() {
|
||||||
|
k.SecurityProtocol = k.Base.LoadWithDefault("kafka.securityProtocol", "SASL_SSL")
|
||||||
|
}
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// --- rocksmq ---
|
// --- rocksmq ---
|
||||||
type RocksmqConfig struct {
|
type RocksmqConfig struct {
|
||||||
|
|
Loading…
Reference in New Issue