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

Add support for loading the raw json template file #7039

Merged
merged 2 commits into from May 22, 2018

Conversation

Projects
None yet
3 participants
@ruflin
Copy link
Collaborator

commented May 8, 2018

Current in 6.x templates can only be loaded from the fields.yml and are generated or have to be loaded manually. To allow users to create their own template.json file and still use the Beat to load it, setup.template.raw.path can now be used.

@ruflin

This comment has been minimized.

Copy link
Collaborator Author

commented May 8, 2018

@tsg Any input on the config naming?

@tsg

This comment has been minimized.

Copy link
Collaborator

commented May 8, 2018

Maybe setup.template.json.path? or raw_json?

@tsg tsg closed this May 8, 2018

@tsg tsg reopened this May 8, 2018

@tsg

This comment has been minimized.

Copy link
Collaborator

commented May 8, 2018

(pressed the wrong button, sorry)

@@ -215,7 +215,7 @@ Contains common fields available in all event types.
required: True
The event log API type used to read the record. The possible values are "wineventlog" for the Windows Event Log API or "eventlogging" for the Event Logging API.
The Event Logging API was designed for Windows Server 2003 or Windows 2000 operating systems. In Windows Vista, the event logging infrastructure was redesigned. On Windows Vista or later operating systems, the Windows Event Log API is used. Winlogbeat automatically detects which API to use for reading event logs.
The Event Logging API was designed for Windows Server 2003, Windows XP, or Windows 2000 operating systems. In Windows Vista, the event logging infrastructure was redesigned. On Windows Vista or later operating systems, the Windows Event Log API is used. Winlogbeat automatically detects which API to use for reading event logs.

This comment has been minimized.

Copy link
@andrewkroh

andrewkroh May 9, 2018

Member

That sounds correct, but doesn't seem related to this PR.

@ruflin ruflin force-pushed the ruflin:raw-template branch from 1d3f231 to 5ba4a2f May 14, 2018

@ruflin ruflin removed the in progress label May 14, 2018

@ruflin

This comment has been minimized.

Copy link
Collaborator Author

commented May 14, 2018

The config option is now called setup.template.json. Docs and tests were added. Ready for review.

@ruflin ruflin force-pushed the ruflin:raw-template branch 7 times, most recently from 687ad33 to 09651f3 May 14, 2018

@ruflin

This comment has been minimized.

Copy link
Collaborator Author

commented May 17, 2018

Ready for an other round of reviews.

@ruflin ruflin force-pushed the ruflin:raw-template branch from 09651f3 to f287e99 May 18, 2018

Add support for loading the raw json template file
Current in 6.x templates can only be loaded from the fields.yml and are generated or have to be loaded manually. To allow users to create their own template.json file and still use the Beat to load it, `setup.template.json.path` can now be used.

The configuration options look as following:

```
setup.template.json.enabled: true
setup.template.json.path: "template.json"
setup.template.json.name: "template-name
```

@ruflin ruflin force-pushed the ruflin:raw-template branch from f287e99 to 0073a8c May 22, 2018

@ruflin

This comment has been minimized.

Copy link
Collaborator Author

commented May 22, 2018

CI failure is not related.

@andrewkroh
Copy link
Member

left a comment

LGTM

@andrewkroh andrewkroh merged commit 9f499c0 into elastic:master May 22, 2018

2 of 4 checks passed

beats-ci Build started sha1 is merged.
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
CLA Commit author has signed the CLA
Details
Hound No violations found. Woof!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.