Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use sarama built in support for consumer groups #6172

Merged
merged 7 commits into from
Jul 30, 2019
Merged

Use sarama built in support for consumer groups #6172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
52ecadf
Use sarama built in consumer group support instead of sarama-cluster
danielnelson Jul 25, 2019
98c6888
Update sample config
danielnelson Jul 26, 2019
f74a022
Disable CGO on Windows
danielnelson Jul 26, 2019
de0f99c
Lock map of undelivered messages
danielnelson Jul 29, 2019
aff8612
Disable cgo on Windows by default
danielnelson Jul 29, 2019
df3e271
Export CGO_ENABLED on Windows
danielnelson Jul 30, 2019
15b999f
Change Windows detection
danielnelson Jul 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 96 additions & 12 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
name = "github.com/aws/aws-sdk-go"
version = "1.15.54"

[[constraint]]
name = "github.com/bsm/sarama-cluster"
version = "2.1.13"

[[constraint]]
name = "github.com/couchbase/go-couchbase"
branch = "master"
Expand Down
8 changes: 3 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
ifeq ($(SHELL), cmd)
VERSION := $(shell git describe --exact-match --tags 2>nil)
HOME := $(HOMEPATH)
else ifeq ($(SHELL), sh.exe)
ifeq ($(OS), Windows_NT)
VERSION := $(shell git describe --exact-match --tags 2>nil)
HOME := $(HOMEPATH)
CGO_ENABLED ?= 0
export CGO_ENABLED
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switched over to disabling CGO in Windows unless explicitly enabled. Not entirely sure this is a good idea but I'm trying to avoid the confusion of suddenly needing gcc to build.

else
VERSION := $(shell git describe --exact-match --tags 2>/dev/null)
endif
Expand Down Expand Up @@ -48,7 +47,6 @@ install: telegraf
mkdir -p $(DESTDIR)$(PREFIX)/bin/
cp telegraf $(DESTDIR)$(PREFIX)/bin/


.PHONY: test
test:
go test -short ./...
Expand Down
3 changes: 1 addition & 2 deletions docs/LICENSE_OF_DEPENDENCIES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ following works:
- github.com/aws/aws-sdk-go [Apache License 2.0](https://github.com/aws/aws-sdk-go/blob/master/LICENSE.txt)
- github.com/Azure/go-autorest [Apache License 2.0](https://github.com/Azure/go-autorest/blob/master/LICENSE)
- github.com/beorn7/perks [MIT License](https://github.com/beorn7/perks/blob/master/LICENSE)
- github.com/bsm/sarama-cluster [MIT License](https://github.com/bsm/sarama-cluster/blob/master/LICENSE)
- github.com/cenkalti/backoff [MIT License](https://github.com/cenkalti/backoff/blob/master/LICENSE)
- github.com/cisco-ie/nx-telemetry-proto [Apache License 2.0](https://github.com/cisco-ie/nx-telemetry-proto/blob/master/LICENSE)
- github.com/couchbase/go-couchbase [MIT License](https://github.com/couchbase/go-couchbase/blob/master/LICENSE)
Expand Down Expand Up @@ -139,4 +138,4 @@ following works:
- gopkg.in/yaml.v2 [Apache License 2.0](https://github.com/go-yaml/yaml/blob/v2.2.2/LICENSE)

## telegraf used and modified code from these projects
- github.com/DataDog/datadog-agent [Apache License 2.0](https://github.com/DataDog/datadog-agent/LICENSE)
- github.com/DataDog/datadog-agent [Apache License 2.0](https://github.com/DataDog/datadog-agent/LICENSE)
17 changes: 10 additions & 7 deletions plugins/inputs/kafka_consumer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ and use the old zookeeper connection method.

```toml
[[inputs.kafka_consumer]]
## kafka servers
## Kafka brokers.
brokers = ["localhost:9092"]
## topic(s) to consume

## Topics to consume.
topics = ["telegraf"]
## Add topic as tag if topic_tag is not empty

## When set this tag will be added to all metrics with the topic as the value.
# topic_tag = ""

## Optional Client id
Expand All @@ -37,10 +39,11 @@ and use the old zookeeper connection method.
# sasl_username = "kafka"
# sasl_password = "secret"

## the name of the consumer group
consumer_group = "telegraf_metrics_consumers"
## Offset (must be either "oldest" or "newest")
offset = "oldest"
## Name of the consumer group.
# consumer_group = "telegraf_metrics_consumers"

## Initial offset position; one of "oldest" or "newest".
# offset = "oldest"

## Maximum length of a message to consume, in bytes (default 0/unlimited);
## larger messages are dropped
Expand Down
Loading