Added SASL options for ouput kafka plugin (#2721)

This commit is contained in:
Seuf 2017-04-27 20:50:25 +02:00 committed by Daniel Nelson
parent c9921f5cf3
commit b23596c232
3 changed files with 20 additions and 0 deletions

View File

@ -41,6 +41,7 @@ be deprecated eventually.
### Features ### Features
- [#2721](https://github.com/influxdata/telegraf/pull/2721): Added SASL options for kafka output plugin.
- [#2723](https://github.com/influxdata/telegraf/pull/2723): Added SSL configuration for input haproxy. - [#2723](https://github.com/influxdata/telegraf/pull/2723): Added SSL configuration for input haproxy.
- [#2494](https://github.com/influxdata/telegraf/pull/2494): Add interrupts input plugin. - [#2494](https://github.com/influxdata/telegraf/pull/2494): Add interrupts input plugin.
- [#2094](https://github.com/influxdata/telegraf/pull/2094): Add generic socket listener & writer. - [#2094](https://github.com/influxdata/telegraf/pull/2094): Add generic socket listener & writer.

View File

@ -45,6 +45,10 @@ This plugin writes to a [Kafka Broker](http://kafka.apache.org/07/quickstart.htm
## Use SSL but skip chain & host verification ## Use SSL but skip chain & host verification
# insecure_skip_verify = false # insecure_skip_verify = false
## Optional SASL Config
# sasl_username = "kafka"
# sasl_password = "secret"
data_format = "influx" data_format = "influx"
``` ```

View File

@ -44,6 +44,11 @@ type Kafka struct {
// Skip SSL verification // Skip SSL verification
InsecureSkipVerify bool InsecureSkipVerify bool
// SASL Username
SASLUsername string `toml:"sasl_username"`
// SASL Password
SASLPassword string `toml:"sasl_password"`
tlsConfig tls.Config tlsConfig tls.Config
producer sarama.SyncProducer producer sarama.SyncProducer
@ -92,6 +97,10 @@ var sampleConfig = `
## Use SSL but skip chain & host verification ## Use SSL but skip chain & host verification
# insecure_skip_verify = false # insecure_skip_verify = false
## Optional SASL Config
# sasl_username = "kafka"
# sasl_password = "secret"
## Data format to output. ## Data format to output.
## Each data format has its own unique set of configuration options, read ## Each data format has its own unique set of configuration options, read
## more about them here: ## more about them here:
@ -129,6 +138,12 @@ func (k *Kafka) Connect() error {
config.Net.TLS.Enable = true config.Net.TLS.Enable = true
} }
if k.SASLUsername != "" && k.SASLPassword != "" {
config.Net.SASL.User = k.SASLUsername
config.Net.SASL.Password = k.SASLPassword
config.Net.SASL.Enable = true
}
producer, err := sarama.NewSyncProducer(k.Brokers, config) producer, err := sarama.NewSyncProducer(k.Brokers, config)
if err != nil { if err != nil {
return err return err