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

Regenerate expectations for logs without timestamps #9862

Merged

Conversation

jsoriano
Copy link
Member

@jsoriano jsoriano commented Jan 3, 2019

Regenerate expected json for logs without timestamps after #9855

@jsoriano jsoriano added module review Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. Team:Integrations Label for the Integrations team labels Jan 3, 2019
@jsoriano jsoriano requested a review from a team as a code owner January 3, 2019 10:19
Copy link
Contributor

@ycombinator ycombinator left a comment

Choose a reason for hiding this comment

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

LGTM. WFG.

Copy link
Contributor

@kaiyan-sheng kaiyan-sheng left a comment

Choose a reason for hiding this comment

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

Good to know this is the way to go. Thanks!!

@jsoriano jsoriano merged commit 9b740a9 into elastic:master Jan 3, 2019
@jsoriano jsoriano deleted the generate-test-logs-without-timestamp branch January 3, 2019 15:47
kaiyan-sheng added a commit that referenced this pull request Jan 3, 2019
…ebeat module (#9855) (#9858)

* Ignore timestamp in redis, haproxy and system filebeat module (#9855)

* Ignore timestamp in redis, haproxy and system filebeat module

* Fixing formatting

(cherry picked from commit b9a20f7)

* Use event.dataset in if statement

* Update golden files for icinga/startup test to exclude timestamp (#9506)

The icing/startup log file does not contain a timestamp. Because of this the timestamp from filebeat is taken. During the generation of golden files still a timestamp was added but every skipped on comparison. Instead now the timestamp is not added to the generated file anymore to now show a diff each time GENERATE is run.

* Regenerate expectations for logs without timestamps (#9862)

* Rerun GENERATE=1 to update expected json files
kaiyan-sheng added a commit that referenced this pull request Jan 3, 2019
…ebeat module (#9855) (#9857)

* Ignore timestamp in redis, haproxy and system filebeat module (#9855)

* Ignore timestamp in redis, haproxy and system filebeat module

* Fixing formatting

(cherry picked from commit b9a20f7)

* Change to use event.dataset instead

* Update golden files for icinga/startup test to exclude timestamp (#9506)

The icing/startup log file does not contain a timestamp. Because of this the timestamp from filebeat is taken. During the generation of golden files still a timestamp was added but every skipped on comparison. Instead now the timestamp is not added to the generated file anymore to now show a diff each time GENERATE is run.

* Regenerate expectations for logs without timestamps (#9862)

* Rerun icinga redis haproxy and system modules with GENERATE=1
@jsoriano jsoriano removed the needs_backport PR is waiting to be backported to other branches. label Jan 4, 2019
@jsoriano
Copy link
Member Author

jsoriano commented Jan 4, 2019

Removing the needs_backport label because it has been backported as part of #9855

jsoriano pushed a commit to jsoriano/beats that referenced this pull request Jan 15, 2019
…ebeat module (elastic#9855) (elastic#9858)

* Ignore timestamp in redis, haproxy and system filebeat module (elastic#9855)

* Ignore timestamp in redis, haproxy and system filebeat module

* Fixing formatting

(cherry picked from commit b9a20f7)

* Use event.dataset in if statement

* Update golden files for icinga/startup test to exclude timestamp (elastic#9506)

The icing/startup log file does not contain a timestamp. Because of this the timestamp from filebeat is taken. During the generation of golden files still a timestamp was added but every skipped on comparison. Instead now the timestamp is not added to the generated file anymore to now show a diff each time GENERATE is run.

* Regenerate expectations for logs without timestamps (elastic#9862)

* Rerun GENERATE=1 to update expected json files

(cherry picked from commit 6defdd4)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…ebeat module (elastic#9855) (elastic#9858)

* Ignore timestamp in redis, haproxy and system filebeat module (elastic#9855)

* Ignore timestamp in redis, haproxy and system filebeat module

* Fixing formatting

(cherry picked from commit a5f0323)

* Use event.dataset in if statement

* Update golden files for icinga/startup test to exclude timestamp (elastic#9506)

The icing/startup log file does not contain a timestamp. Because of this the timestamp from filebeat is taken. During the generation of golden files still a timestamp was added but every skipped on comparison. Instead now the timestamp is not added to the generated file anymore to now show a diff each time GENERATE is run.

* Regenerate expectations for logs without timestamps (elastic#9862)

* Rerun GENERATE=1 to update expected json files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Filebeat Filebeat module review Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants