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

Fix Kafka configuration #1913

Merged
merged 3 commits into from
May 4, 2018
Merged

Fix Kafka configuration #1913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce0597a
Fix Kafka configuration
jaredscheib May 4, 2018
3dfb853
Update changelog
desa May 4, 2018
7e95777
Return empty Kafka Config instead of Enabled: false
desa May 4, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ alert will auto-recover.
- [#1842](https://github.com/influxdata/kapacitor/pull/1842): Add alert inhibitors that allow an alert to supress events from other matching alerts.
- [#1776](https://github.com/influxdata/kapacitor/issues/1776): Fix bug where you could not delete a topic handler with the same name as its topic.
- [#1905](https://github.com/influxdata/kapacitor/pull/1905): Adjust PagerDuty v2 service-test names and capture detailed error messages.
- [#1913](https://github.com/influxdata/kapacitor/pull/1913): Fix Kafka configuration.

## v1.4.1 [2018-03-13]

Expand Down
4 changes: 2 additions & 2 deletions etc/kapacitor/kapacitor.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,13 +457,13 @@ default-retention-policy = ""
brokers = []
# Timeout on network operations with the brokers.
# If 0 a default of 10s will be used.
timeout = 10s
timeout = "10s"
# BatchSize is the number of messages that are batched before being sent to Kafka
# If 0 a default of 100 will be used.
batch-size = 100
# BatchTimeout is the maximum amount of time to wait before flushing an incomplete batch.
# If 0 a default of 1s will be used.
batch-timeout = 1s
batch-timeout = "1s"
# Use SSL enables ssl communication.
# Must be true for the other ssl options to take effect.
use-ssl = false
Expand Down
1 change: 1 addition & 0 deletions server/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ func NewConfig() *Config {

c.Alerta = alerta.NewConfig()
c.HipChat = hipchat.NewConfig()
c.Kafka = kafka.Configs{kafka.NewConfig()}
c.MQTT = mqtt.Configs{mqtt.NewConfig()}
c.OpsGenie = opsgenie.NewConfig()
c.OpsGenie2 = opsgenie2.NewConfig()
Expand Down
4 changes: 4 additions & 0 deletions services/kafka/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ type Config struct {
InsecureSkipVerify bool `toml:"insecure-skip-verify" override:"insecure-skip-verify"`
}

func NewConfig() Config {
return Config{}
}

func (c Config) Validate() error {
if !c.Enabled {
return nil
Expand Down