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

Build config files with Go text/template #18148

Merged
merged 4 commits into from
May 4, 2020
Merged

Build config files with Go text/template #18148

merged 4 commits into from
May 4, 2020

Commits on May 4, 2020

  1. Build config files with Go text/template 

    Rather than relying on file concatenation followed by Go text/template we'll just
use Go text/template. This makes is easier to customize a template without having
to modify libbeat since you can just overwrite a template section (like inject your own
processors section).

This works by loading all of the templates from `libbeat/_meta/config/*.tmpl` followed
by templates from `$mybeat/_meta/config/*.tmpl`. Files loaded last take precedence
(it uses go text/template ParseGlob). Finally each template is created from
`libbeat/_meta/config/default{., reference, docker}.yml.tmpl` (which can be changed
if needed, see elastic/agent).
    @andrewkroh
    andrewkroh committed May 4, 2020
    Configuration menu
    Copy the full SHA
    af7be22 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:elastic/beats into feature/dev-to… 

    …ols/config-go-text-template

# Conflicts:
#	libbeat/_meta/config.yml.tmpl
#	winlogbeat/_meta/beat.yml.tmpl
#	winlogbeat/_meta/config/header.yml.tmpl
#	winlogbeat/scripts/mage/config.go
#	winlogbeat/winlogbeat.reference.yml
#	winlogbeat/winlogbeat.yml
#	x-pack/winlogbeat/_meta/config/winlogbeat.event_logs.yml.tmpl
#	x-pack/winlogbeat/winlogbeat.yml
    @andrewkroh
    andrewkroh committed May 4, 2020
    Configuration menu
    Copy the full SHA
    e0359c0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:elastic/beats into feature/dev-to… 

    …ols/config-go-text-template

# Conflicts:
#	libbeat/_meta/config.reference.yml.tmpl
    @andrewkroh
    andrewkroh committed May 4, 2020
    Configuration menu
    Copy the full SHA
    0a7d41a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:elastic/beats into feature/dev-to… 

    …ols/config-go-text-template
    @andrewkroh
    andrewkroh committed May 4, 2020
    Configuration menu
    Copy the full SHA
    cdd9680 View commit details
    Browse the repository at this point in the history