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

Only attempt loading the ES template if ES output is enabled #4436

Merged
merged 1 commit into from
Jun 1, 2017
+22 −35
Merged

Only attempt loading the ES template if ES output is enabled #4436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 22 additions & 35 deletions libbeat/beat/beat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,17 +459,6 @@ func (b *Beat) loadDashboards() error {
// the elasticsearch output. It is important the the registration happens before
// the publisher is created.
func (b *Beat) registerTemplateLoading() error {
if *setup {
// -setup implies template.enabled=true
if b.Config.Template == nil {
b.Config.Template = common.NewConfig()
}
err := b.Config.Template.SetBool("enabled", -1, true)
if err != nil {
return fmt.Errorf("Error setting template.enabled=true: %v", err)
}
}

// Check if outputting to file is enabled, and output to file if it is
if b.Config.Template != nil && b.Config.Template.Enabled() {
var cfg template.TemplateConfig
Expand All @@ -495,33 +484,31 @@ func (b *Beat) registerTemplateLoading() error {

esConfig := b.Config.Output["elasticsearch"]
// Loads template by default if esOutput is enabled
if (b.Config.Template == nil && esConfig.Enabled()) || (b.Config.Template != nil && b.Config.Template.Enabled()) {
if esConfig == nil || !esConfig.Enabled() {
return fmt.Errorf("Template loading requested but the Elasticsearch output is not configured/enabled")
}

// load template through callback to make sure it is also loaded
// on reconnecting
callback := func(esClient *elasticsearch.Client) error {

if b.Config.Template == nil {
b.Config.Template = common.NewConfig()
if esConfig != nil && esConfig.Enabled() {
if b.Config.Template == nil || (b.Config.Template != nil && b.Config.Template.Enabled()) {
// load template through callback to make sure it is also loaded
// on reconnecting
callback := func(esClient *elasticsearch.Client) error {

if b.Config.Template == nil {
b.Config.Template = common.NewConfig()
}

loader, err := template.NewLoader(b.Config.Template, esClient, b.Info)
if err != nil {
return fmt.Errorf("Error creating Elasticsearch template loader: %v", err)
}

err = loader.Load()
if err != nil {
return fmt.Errorf("Error loading Elasticsearch template: %v", err)
}

return nil
}

loader, err := template.NewLoader(b.Config.Template, esClient, b.Info)
if err != nil {
return fmt.Errorf("Error creating Elasticsearch template loader: %v", err)
}

err = loader.Load()
if err != nil {
return fmt.Errorf("Error loading Elasticsearch template: %v", err)
}

return nil
elasticsearch.RegisterConnectCallback(callback)
}

elasticsearch.RegisterConnectCallback(callback)
}

return nil
Expand Down