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.

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

Per prospector configurable pipeline #3433

Merged
merged 2 commits into from
Jan 24, 2017
Merged

Conversation

tsg
Copy link
Contributor

@tsg tsg commented Jan 20, 2017

This adds a new "pipeline" configuration option to the prospector, which
can be used to set the Elasticsearch Ingest Node pipeline from the prospector
config.

While this was already possible by using format strings in the pipeline config
from the output, this makes the configuration simpler in many cases and the
mechanism is needed for the Filebeat modules.

Part of #3159.

@tsg tsg added in progress Pull request is currently in progress. review labels Jan 20, 2017
@tsg tsg requested a review from urso January 22, 2017 15:32
This adds a new "pipeline" configuration option to the prospector, which
can be used to set the Elasticsearch Ingest Node pipeline from the prospector
config.

While this was already possible by using format strings in the `pipeline` config
from the output, this makes the configuration simpler in many cases and the
mechanism is needed for the Filebeat modules.

Part of elastic#3159.
@tsg tsg force-pushed the prospector_pipeline branch from 044c875 to c1384ad Compare January 22, 2017 16:32
@tsg tsg removed the in progress Pull request is currently in progress. label Jan 22, 2017
@tsg tsg mentioned this pull request Jan 22, 2017
22 tasks
meta["pipeline"] = e.Pipeline
}
return meta
}
Copy link

Choose a reason for hiding this comment

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

output metadata should also work if meta == nil =>

func (e *Event) Metadata() common.MapStr {
  if e.Pipeline != "" {
    return common.MapStr{
      "pipeline": e.Pipeline,
    }
  }
  return nil

}

This way you don't need to create a map if no pipeline is configured.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nice, I didn't realize that would work.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I pushed a version with that.

@ruflin ruflin merged commit f9666ba into elastic:master Jan 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants