Merge pull request #394 from raintank/removeKafkaMdam

remove kafkamdam input plugin
grafana · Nov 17, 2016 · 82af80b · 82af80b
2 parents a036c09 + cec9103
commit 82af80b
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 220 deletions.
diff --git a/docs/config.md b/docs/config.md
@@ -203,19 +203,6 @@ consumer-max-processing-time = 1s
 net-max-open-requests = 100
 ```
 
-### kafka-mdam input (optional, discouraged)
-
-```
-[kafka-mdam-in]
-enabled = false
-# tcp address (may be given multiple times as a comma-separated list)
-brokers = kafka:9092
-# kafka topic (may be given multiple times as a comma-separated list)
-topics = mdam
-# consumer group name
-group = group1
-```
-
 ## clustering transports ##
 ### kafka as transport for clustering messages (recommended)
 

diff --git a/docs/inputs.md b/docs/inputs.md
@@ -24,14 +24,7 @@ note: it does not implement [carbon2.0](http://metrics20.org/implementations/)
 ## Kafka-mdm (recommended)
 
 `mdm = MetricData Messagepack-encoded` [MetricData schema definition](https://github.com/raintank/schema/blob/master/metric.go#L20)  
-This is a kafka input wherein each point is sent as a unique kafka message. This is the best way,
-even though we haven't gotten it to perform on par with kafka-mdam yet, but we expect to get there soon.
+This is a kafka input wherein each point is sent as a unique kafka message.
 This is the recommended input option if you want a queue.
 
-## Kafka-mdam (experimental, discouraged)
 
-`mdm = MetricDataArray Messagepack-encoded` [MetricDatayArray schema definition](https://github.com/raintank/schema/blob/master/metric.go#L47)  
-This is a kafka input that uses application-level batches stored within single kafka messages.
-It is discouraged because this does not allow proper routing/partitioning of messages and will be removed.
-It only exists to compare performance numbers against kafka-mdm, and make mdm as fast as mdam.
-It also doesn't have the performance tuning options and offset control that has kafka-mdm has. (kafka-mdam always uses latest offset).
diff --git a/input/kafkamdam/kafkamdam.go b/input/kafkamdam/kafkamdam.go
diff --git a/metrictank-sample.ini b/metrictank-sample.ini
@@ -172,17 +172,6 @@ consumer-max-processing-time = 1s
 # How many outstanding requests a connection is allowed to have before sending on it blocks
 net-max-open-requests = 100
 
-### kafka-mdam input (optional, discouraged)
-[kafka-mdam-in]
-enabled = false
-# tcp address (may be given multiple times as a comma-separated list)
-brokers = kafka:9092
-# kafka topic (may be given multiple times as a comma-separated list)
-topics = mdam
-# consumer group name
-group = group1
-
-
 ## clustering transports ##
 
 ### kafka as transport for clustering messages (recommended)

diff --git a/metrictank.go b/metrictank.go
@@ -29,7 +29,6 @@ import (
 	"github.com/raintank/metrictank/idx/memory"
 	"github.com/raintank/metrictank/input"
 	inCarbon "github.com/raintank/metrictank/input/carbon"
-	inKafkaMdam "github.com/raintank/metrictank/input/kafkamdam"
 	inKafkaMdm "github.com/raintank/metrictank/input/kafkamdm"
 	"github.com/raintank/metrictank/mdata"
 	"github.com/raintank/metrictank/mdata/chunk"
@@ -162,7 +161,6 @@ func main() {
 	// load config for metric ingestors
 	inCarbon.ConfigSetup()
 	inKafkaMdm.ConfigSetup()
-	inKafkaMdam.ConfigSetup()
 
 	// load config for cluster handlers
 	notifierNsq.ConfigSetup()
@@ -214,12 +212,11 @@ func main() {
 
 	inCarbon.ConfigProcess()
 	inKafkaMdm.ConfigProcess(*instance)
-	inKafkaMdam.ConfigProcess(*instance)
 	notifierNsq.ConfigProcess()
 	notifierKafka.ConfigProcess(*instance)
 	api.ConfigProcess()
 
-	if !inCarbon.Enabled && !inKafkaMdm.Enabled && !inKafkaMdam.Enabled {
+	if !inCarbon.Enabled && !inKafkaMdm.Enabled {
 		log.Fatal(4, "you should enable at least 1 input plugin")
 	}
 
@@ -315,11 +312,6 @@ func main() {
 		inputs = append(inputs, inKafkaMdm.New(stats))
 	}
 
-	if inKafkaMdam.Enabled {
-		sarama.Logger = l.New(os.Stdout, "[Sarama] ", l.LstdFlags)
-		inputs = append(inputs, inKafkaMdam.New(stats))
-	}
-
 	accountingPeriod := dur.MustParseUNsec("accounting-period", *accountingPeriodStr)
 
 	metrics = mdata.NewAggMetrics(store, chunkSpan, numChunks, chunkMaxStale, metricMaxStale, ttl, gcInterval, finalSettings)

diff --git a/scripts/config/metrictank-docker.ini b/scripts/config/metrictank-docker.ini
@@ -167,17 +167,6 @@ consumer-max-processing-time = 1s
 # How many outstanding requests a connection is allowed to have before sending on it blocks
 net-max-open-requests = 100
 
-### kafka-mdam input (optional, discouraged)
-[kafka-mdam-in]
-enabled = false
-# tcp address (may be given multiple times as a comma-separated list)
-brokers = kafka:9092
-# kafka topic (may be given multiple times as a comma-separated list)
-topics = mdam
-# consumer group name
-group = group1
-
-
 ## clustering transports ##
 
 ### kafka as transport for clustering messages (recommended)

diff --git a/scripts/config/metrictank-package.ini b/scripts/config/metrictank-package.ini
@@ -155,17 +155,6 @@ consumer-max-processing-time = 1s
 # How many outstanding requests a connection is allowed to have before sending on it blocks
 net-max-open-requests = 100
 
-### kafka-mdam input (optional, discouraged)
-[kafka-mdam-in]
-enabled = false
-# tcp address (may be given multiple times as a comma-separated list)
-brokers = localhost:9092
-# kafka topic (may be given multiple times as a comma-separated list)
-topics = mdam
-# consumer group name
-group = group1
-
-
 ## clustering transports ##
 
 ### kafka as transport for clustering messages (recommended)