set sarama client KafkaVersion via config

see issue: #1053 from https://github.com/Shopify/sarama/blob/v1.19.0/config.go#L324-L330 ``` The version of Kafka that Sarama will assume it is running against. Defaults to the oldest supported stable version. Since Kafka provides backwards-compatibility, setting it to a version older than you have will not break anything, although it may prevent you from using the latest features. Setting it to a version greater than you are actually running may lead to random breakage. ```
grafana · Oct 23, 2018 · 5a7fba2 · 5a7fba2
1 parent cf70352
commit 5a7fba2
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 4 deletions.
diff --git a/docker/docker-chaos/metrictank.ini b/docker/docker-chaos/metrictank.ini
@@ -224,6 +224,8 @@ enabled = true
 org-id = 0
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = kafka:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (may be given multiple times as a comma-separated list)
 topics = mdm
 # offset to start consuming from. Can be one of newest, oldest,last or a time duration
@@ -322,6 +324,8 @@ dns-config-path = /etc/resolv.conf
 enabled = true
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = kafka:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (only one)
 topic = metricpersist
 # kafka partitions to consume. use '*' or a comma separated list of id's. Should match kafka-mdm-in's partitions.

diff --git a/docker/docker-cluster/metrictank.ini b/docker/docker-cluster/metrictank.ini
@@ -224,6 +224,8 @@ enabled = true
 org-id = 0
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = kafka:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (may be given multiple times as a comma-separated list)
 topics = mdm
 # offset to start consuming from. Can be one of newest, oldest,last or a time duration
@@ -322,6 +324,8 @@ dns-config-path = /etc/resolv.conf
 enabled = true
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = kafka:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (only one)
 topic = metricpersist
 # kafka partitions to consume. use '*' or a comma separated list of id's. Should match kafka-mdm-in's partitions.

diff --git a/docker/docker-dev-custom-cfg-kafka/metrictank.ini b/docker/docker-dev-custom-cfg-kafka/metrictank.ini
@@ -224,6 +224,8 @@ enabled = true
 org-id = 1
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = kafka:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (may be given multiple times as a comma-separated list)
 topics = mdm
 # offset to start consuming from. Can be one of newest, oldest,last or a time duration
@@ -322,6 +324,8 @@ dns-config-path = /etc/resolv.conf
 enabled = true
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = kafka:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (only one)
 topic = metricpersist
 # kafka partitions to consume. use '*' or a comma separated list of id's. Should match kafka-mdm-in's partitions.

diff --git a/docs/config.md b/docs/config.md
@@ -276,6 +276,8 @@ enabled = false
 org-id = 0
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = kafka:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (may be given multiple times as a comma-separated list)
 topics = mdm
 # offset to start consuming from. Can be one of newest, oldest,last or a time duration
@@ -383,6 +385,8 @@ dns-config-path = /etc/resolv.conf
 enabled = false
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = kafka:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (only one)
 topic = metricpersist
 # kafka partitions to consume. use '*' or a comma separated list of id's. Should match kafka-mdm-in's partitions.

diff --git a/input/kafkamdm/kafkamdm.go b/input/kafkamdm/kafkamdm.go
@@ -46,6 +46,7 @@ func (k *KafkaMdm) Name() string {
 
 var Enabled bool
 var orgId uint
+var kafkaVersionStr string
 var brokerStr string
 var brokers []string
 var topicStr string
@@ -73,6 +74,7 @@ func ConfigSetup() {
 	inKafkaMdm.BoolVar(&Enabled, "enabled", false, "")
 	inKafkaMdm.UintVar(&orgId, "org-id", 0, "For incoming MetricPoint messages without org-id, assume this org id")
 	inKafkaMdm.StringVar(&brokerStr, "brokers", "kafka:9092", "tcp address for kafka (may be be given multiple times as a comma-separated list)")
+	inKafkaMdm.StringVar(&kafkaVersionStr, "kafka-version", "V0_10_0_0", "Kafka version. All brokers must be this version or newer.")
 	inKafkaMdm.StringVar(&topicStr, "topics", "mdm", "kafka topic (may be given multiple times as a comma-separated list)")
 	inKafkaMdm.StringVar(&offsetStr, "offset", "last", "Set the offset to start consuming from. Can be one of newest, oldest,last or a time duration")
 	inKafkaMdm.StringVar(&partitionStr, "partitions", "*", "kafka partitions to consume. use '*' or a comma separated list of id's")
@@ -92,6 +94,11 @@ func ConfigProcess(instance string) {
 		return
 	}
 
+	kafkaVersion, err := sarama.ParseKafkaVersion(kafkaVersionStr)
+	if err != nil {
+		log.Fatalf("kafkamdm: invalid client-version. %s", err)
+	}
+
 	if offsetCommitInterval == 0 {
 		log.Fatal("kafkamdm: offset-commit-interval must be greater then 0")
 	}
@@ -101,7 +108,7 @@ func ConfigProcess(instance string) {
 	if consumerMaxProcessingTime == 0 {
 		log.Fatal("kafkamdm: consumer-max-processing-time must be greater then 0")
 	}
-	var err error
+
 	switch offsetStr {
 	case "last":
 	case "oldest":
@@ -129,7 +136,7 @@ func ConfigProcess(instance string) {
 	config.Consumer.MaxWaitTime = consumerMaxWaitTime
 	config.Consumer.MaxProcessingTime = consumerMaxProcessingTime
 	config.Net.MaxOpenRequests = netMaxOpenRequests
-	config.Version = sarama.V0_10_0_0
+	config.Version = kafkaVersion
 	err = config.Validate()
 	if err != nil {
 		log.Fatalf("kafkamdm: invalid config: %s", err)

diff --git a/mdata/notifierKafka/cfg.go b/mdata/notifierKafka/cfg.go
@@ -15,6 +15,7 @@ import (
 )
 
 var Enabled bool
+var kafkaVersionStr string
 var brokerStr string
 var brokers []string
 var topic string
@@ -42,6 +43,7 @@ func init() {
 	fs := flag.NewFlagSet("kafka-cluster", flag.ExitOnError)
 	fs.BoolVar(&Enabled, "enabled", false, "")
 	fs.StringVar(&brokerStr, "brokers", "kafka:9092", "tcp address for kafka (may be given multiple times as comma separated list)")
+	fs.StringVar(&kafkaVersionStr, "kafka-version", "V0_10_0_0", "Kafka version. All brokers must be this version or newer.")
 	fs.StringVar(&topic, "topic", "metricpersist", "kafka topic")
 	fs.StringVar(&partitionStr, "partitions", "*", "kafka partitions to consume. use '*' or a comma separated list of id's. This should match the partitions used for kafka-mdm-in")
 	fs.StringVar(&offsetStr, "offset", "last", "Set the offset to start consuming from. Can be one of newest, oldest,last or a time duration")
@@ -55,7 +57,12 @@ func ConfigProcess(instance string) {
 	if !Enabled {
 		return
 	}
-	var err error
+
+	kafkaVersion, err := sarama.ParseKafkaVersion(kafkaVersionStr)
+	if err != nil {
+		log.Fatalf("kafka-cluster: invalid client-version. %s", err)
+	}
+
 	switch offsetStr {
 	case "last":
 	case "oldest":
@@ -70,7 +77,7 @@ func ConfigProcess(instance string) {
 
 	config = sarama.NewConfig()
 	config.ClientID = instance + "-cluster"
-	config.Version = sarama.V0_10_0_0
+	config.Version = kafkaVersion
 	config.Producer.RequiredAcks = sarama.WaitForAll // Wait for all in-sync replicas to ack the message
 	config.Producer.Retry.Max = 10                   // Retry up to 10 times to produce the message
 	config.Producer.Compression = sarama.CompressionSnappy

diff --git a/metrictank-sample.ini b/metrictank-sample.ini
@@ -227,6 +227,8 @@ enabled = false
 org-id = 0
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = kafka:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (may be given multiple times as a comma-separated list)
 topics = mdm
 # offset to start consuming from. Can be one of newest, oldest,last or a time duration
@@ -325,6 +327,8 @@ dns-config-path = /etc/resolv.conf
 enabled = false
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = kafka:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (only one)
 topic = metricpersist
 # kafka partitions to consume. use '*' or a comma separated list of id's. Should match kafka-mdm-in's partitions.

diff --git a/scripts/config/metrictank-docker.ini b/scripts/config/metrictank-docker.ini
@@ -224,6 +224,8 @@ enabled = false
 org-id = 0
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = kafka:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (may be given multiple times as a comma-separated list)
 topics = mdm
 # offset to start consuming from. Can be one of newest, oldest,last or a time duration
@@ -322,6 +324,8 @@ dns-config-path = /etc/resolv.conf
 enabled = false
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = kafka:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (only one)
 topic = metricpersist
 # kafka partitions to consume. use '*' or a comma separated list of id's. Should match kafka-mdm-in's partitions.

diff --git a/scripts/config/metrictank-package.ini b/scripts/config/metrictank-package.ini
@@ -224,6 +224,8 @@ enabled = false
 org-id = 0
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = localhost:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (may be given multiple times as a comma-separated list)
 topics = mdm
 # offset to start consuming from. Can be one of newest, oldest,last or a time duration
@@ -322,6 +324,8 @@ dns-config-path = /etc/resolv.conf
 enabled = false
 # tcp address (may be given multiple times as a comma-separated list)
 brokers = localhost:9092
+# Kafka version. All brokers must be this version or newer.
+kafka-version = V0_10_0_0
 # kafka topic (only one)
 topic = metricpersist
 # kafka partitions to consume. use '*' or a comma separated list of id's. Should match kafka-mdm-in's partitions.