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

allow/merge fields.yml overrides #9188

Merged
merged 15 commits into from
Nov 27, 2018
Merged

allow/merge fields.yml overrides #9188

merged 15 commits into from
Nov 27, 2018

Commits on Nov 21, 2018

  1. allow kibana index pattern overrides

    @graphaelli
    graphaelli committed Nov 21, 2018
    Configuration menu
    Copy the full SHA
    0d89125 View commit details
    Browse the repository at this point in the history

  2. allow/merge duplicate fields

    @graphaelli
    graphaelli committed Nov 21, 2018
    Configuration menu
    Copy the full SHA
    cbceb4b View commit details
    Browse the repository at this point in the history

  3. skip sections without fields 

    for functionbeat
    @graphaelli
    graphaelli committed Nov 21, 2018
    Configuration menu
    Copy the full SHA
    c70d9c6 View commit details
    Browse the repository at this point in the history

  4. reverse fields.yml inputs to enable overrides

    @graphaelli
    graphaelli committed Nov 21, 2018
    Configuration menu
    Copy the full SHA
    f0a77ca View commit details
    Browse the repository at this point in the history

  5. simplify per feedback from @simitt

    @graphaelli
    graphaelli committed Nov 21, 2018
    Configuration menu
    Copy the full SHA
    ec409ff View commit details
    Browse the repository at this point in the history

  6. require field overwrite flag for duplicated fields

    @graphaelli
    graphaelli committed Nov 21, 2018
    Configuration menu
    Copy the full SHA
    4da287f View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2018

  1. lint

    @graphaelli
    graphaelli committed Nov 26, 2018
    Configuration menu
    Copy the full SHA
    0465347 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into fields-merge 

     Conflicts:
	filebeat/include/fields.go
	libbeat/kibana/fields_transformer.go
    @graphaelli
    graphaelli committed Nov 26, 2018
    Configuration menu
    Copy the full SHA
    e5b4560 View commit details
    Browse the repository at this point in the history

  3. lint

    @graphaelli
    graphaelli committed Nov 26, 2018
    Configuration menu
    Copy the full SHA
    a42d4ad View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2018

  1. delete

    @graphaelli
    graphaelli committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    088abac View commit details
    Browse the repository at this point in the history

  2. allow common to override ecs

    @graphaelli
    graphaelli committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    237c6eb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into fields-merge

    @graphaelli
    graphaelli committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    cb4a10e View commit details
    Browse the repository at this point in the history

  4. add changelog entry

    @graphaelli
    graphaelli committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    29c86ee View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into fields-merge

    @graphaelli
    graphaelli committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    37594a5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into fields-merge

    @graphaelli
    graphaelli committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    2ae7e50 View commit details
    Browse the repository at this point in the history