Merge pull request #890 from grafana/fix-org-id-cfg

sync configs for new org-id kafka option
grafana · Apr 17, 2018 · a3edb46 · a3edb46
2 parents 88249aa + 0ed66ac
commit a3edb46
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 1 deletion.
diff --git a/docker/docker-chaos/metrictank.ini b/docker/docker-chaos/metrictank.ini
@@ -176,6 +176,8 @@ partition = 0
 ### kafka-mdm input (optional, recommended)
 [kafka-mdm-in]
 enabled = true
+# For incoming MetricPoint messages without org-id, assume this org id
+org-id = 0
 # 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)

diff --git a/docker/docker-cluster/metrictank.ini b/docker/docker-cluster/metrictank.ini
@@ -176,6 +176,8 @@ partition = 0
 ### kafka-mdm input (optional, recommended)
 [kafka-mdm-in]
 enabled = true
+# For incoming MetricPoint messages without org-id, assume this org id
+org-id = 0
 # 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)

diff --git a/docker/docker-dev-custom-cfg-kafka/metrictank.ini b/docker/docker-dev-custom-cfg-kafka/metrictank.ini
@@ -176,6 +176,8 @@ partition = 0
 ### kafka-mdm input (optional, recommended)
 [kafka-mdm-in]
 enabled = true
+# For incoming MetricPoint messages without org-id, assume this org id
+org-id = 0
 # 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)

diff --git a/docs/config.md b/docs/config.md
@@ -224,6 +224,8 @@ partition = 0
 ```
 [kafka-mdm-in]
 enabled = false
+# For incoming MetricPoint messages without org-id, assume this org id
+org-id = 0
 # 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)

diff --git a/input/kafkamdm/kafkamdm.go b/input/kafkamdm/kafkamdm.go
@@ -72,7 +72,7 @@ var partitionLag map[int32]*stats.Gauge64
 func ConfigSetup() {
 	inKafkaMdm := flag.NewFlagSet("kafka-mdm-in", flag.ExitOnError)
 	inKafkaMdm.BoolVar(&Enabled, "enabled", false, "")
-	inKafkaMdm.UintVar(&orgId, "org-id", 0, "For incoming MetricPoint messages, assume this org id")
+	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(&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")

diff --git a/metrictank-sample.ini b/metrictank-sample.ini
@@ -179,6 +179,8 @@ partition = 0
 ### kafka-mdm input (optional, recommended)
 [kafka-mdm-in]
 enabled = false
+# For incoming MetricPoint messages without org-id, assume this org id
+org-id = 0
 # 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)

diff --git a/scripts/config/metrictank-docker.ini b/scripts/config/metrictank-docker.ini
@@ -176,6 +176,8 @@ partition = 0
 ### kafka-mdm input (optional, recommended)
 [kafka-mdm-in]
 enabled = false
+# For incoming MetricPoint messages without org-id, assume this org id
+org-id = 0
 # 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)

diff --git a/scripts/config/metrictank-package.ini b/scripts/config/metrictank-package.ini
@@ -176,6 +176,8 @@ partition = 0
 ### kafka-mdm input (optional, recommended)
 [kafka-mdm-in]
 enabled = false
+# For incoming MetricPoint messages without org-id, assume this org id
+org-id = 0
 # 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)