Skip to content

IIS and MYSQL expected json logfile update#35221

Merged
ishleenk17 merged 6 commits intoelastic:mainfrom
ishleenk17:mysql_iis_beats_grokupdate
Apr 27, 2023
Merged

IIS and MYSQL expected json logfile update#35221
ishleenk17 merged 6 commits intoelastic:mainfrom
ishleenk17:mysql_iis_beats_grokupdate

Conversation

@ishleenk17
Copy link
Member

@ishleenk17 ishleenk17 commented Apr 26, 2023

  • Bug

What does this PR do?

This PR updates the expected json files for mysql and iis as there was a change in the way grok processing is done by ES.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 26, 2023
@botelastic
Copy link

botelastic bot commented Apr 26, 2023

This pull request doesn't have a Team:<team> label.

@mergify
Copy link
Contributor

mergify bot commented Apr 26, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @ishleenk17? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@elasticmachine
Copy link
Contributor

elasticmachine commented Apr 26, 2023 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-04-27T09:19:50.406+0000

  • Duration: 79 min 3 sec

Test stats 🧪

Test Results
Failed 0
Passed 26295
Skipped 1975
Total 28270

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@ishleenk17 ishleenk17 changed the title IIS and MYSQL json update IIS and MYSQL expected json logfile update Apr 26, 2023
@rdner rdner mentioned this pull request Apr 27, 2023
Closed
@rdner
Copy link
Member

rdner commented Apr 27, 2023

Our team is investigating the metricbeat failures, they are due the old Debian version. The repository was archived and the tests cannot install cockroachdb.

cc @michalpristas

@ishleenk17
Copy link
Member Author

ishleenk17 commented Apr 27, 2023

Our team is investigating the metricbeat failures, they are due the old Debian version. The repository was archived and the tests cannot install cockroachdb.

cc @michalpristas

@rdner : Since, this is unrelated issue, can we bypass the CI/CD and commit the change once we get approval from integrations.

@ishleenk17 ishleenk17 marked this pull request as ready for review April 27, 2023 09:29
@ishleenk17 ishleenk17 requested review from a team as code owners April 27, 2023 09:29
@ishleenk17 ishleenk17 requested review from leehinman and pierrehilbert and removed request for a team April 27, 2023 09:29
@rdner
Copy link
Member

rdner commented Apr 27, 2023

@ishleenk17 Michal merged his fix and merged the main into your PR, the CI should pass now. Let's wait.

@ishleenk17
Copy link
Member Author

ishleenk17 commented Apr 27, 2023

The snapshot.yml has been updated to trigger the appropriate CI/CD (#34589) .
It's not related to the IIS/MYSQL-specific changes

@ishleenk17 ishleenk17 merged commit f5ace09 into elastic:main Apr 27, 2023
@rdner
Copy link
Member

rdner commented Apr 27, 2023

The snapshot.yml has been updated to trigger the appropriate CI/CD (#34589) .
It's not related to the IIS/MYSQL-specific changes

@ishleenk17 Please read the comments above. There was an issue unrelated to your changes. Then it was fixed and fix was merged to your branch (this PR). That's why the tests are green now. No need to by pass anything now.

@rdner rdner mentioned this pull request Apr 27, 2023
Closed
4 tasks
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@ishleenk17 @michalpristas
IIS and MYSQL expected json logfile update (elastic#35221)
81894dd 
* IIS and MYSQL  json update

* Update changelog

* Updating the snapshot version for CI/CD

---------

Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
@cmacknz cmacknz mentioned this pull request May 1, 2023
Merged
@rdner rdner added the backport-v8.8.0 Automated backport with mergify label May 2, 2023
mergify bot pushed a commit that referenced this pull request May 2, 2023
@ishleenk17 @michalpristas @mergify
IIS and MYSQL expected json logfile update (#35221)
0a018e4 
* IIS and MYSQL  json update

* Update changelog

* Updating the snapshot version for CI/CD

---------

Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
(cherry picked from commit f5ace09)
@mergify mergify bot mentioned this pull request May 2, 2023
Merged
@rdner rdner added the backport-v8.7.0 Automated backport with mergify label May 2, 2023
mergify bot pushed a commit that referenced this pull request May 2, 2023
@ishleenk17 @mergify
IIS and MYSQL expected json logfile update (#35221)
e5d0861 
* IIS and MYSQL  json update

* Update changelog

* Updating the snapshot version for CI/CD

---------

Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
(cherry picked from commit f5ace09)

# Conflicts:
#	filebeat/module/mysql/slowlog/test/mysql-ubuntu-8.0.15.log-expected.json
@mergify mergify bot mentioned this pull request May 2, 2023
Merged
HiDAl pushed a commit to HiDAl/beats that referenced this pull request May 2, 2023
Revert "IIS and MYSQL expected json logfile update (elastic#35221)"
cf15b06 
This reverts commit f5ace09.
rdner added a commit that referenced this pull request May 2, 2023
@mergify @ishleenk17 @rdner
IIS and MYSQL expected json logfile update (#35221) (#35273)
6038b95 
* IIS and MYSQL  json update

* Update changelog

* Updating the snapshot version for CI/CD

---------

Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
(cherry picked from commit f5ace09)

Co-authored-by: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com>
Co-authored-by: Denis <denis.rechkunov@elastic.co>
rdner added a commit that referenced this pull request May 2, 2023
@mergify @ishleenk17 @rdner
[8.7](backport #35221) IIS and MYSQL expected json logfile update (#3…
c50e2d0 
…5274)

* IIS and MYSQL  expected json logfile update (#35221)

* IIS and MYSQL  json update

* Update changelog

* Updating the snapshot version for CI/CD

---------

Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
(cherry picked from commit f5ace09)

# Conflicts:
#	filebeat/module/mysql/slowlog/test/mysql-ubuntu-8.0.15.log-expected.json

* Resolve conflict

* Fix the changelog

* Rollback unintended change

---------

Co-authored-by: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com>
Co-authored-by: Denis <denis.rechkunov@elastic.co>
chrisberkhout pushed a commit that referenced this pull request Jun 1, 2023
@ishleenk17 @michalpristas @chrisberkhout
IIS and MYSQL expected json logfile update (#35221)
4b7678d 
* IIS and MYSQL  json update

* Update changelog

* Updating the snapshot version for CI/CD

---------

Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
@reakaleek reakaleek mentioned this pull request Jul 19, 2023
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rdner rdner rdner approved these changes

@pierrehilbert pierrehilbert Awaiting requested review from pierrehilbert pierrehilbert is a code owner automatically assigned from elastic/elastic-agent-data-plane

@leehinman leehinman Awaiting requested review from leehinman leehinman is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@ishleenk17 ishleenk17

Labels

backport-v8.7.0 Automated backport with mergify backport-v8.8.0 Automated backport with mergify needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Behaviour of certain Filebeat modules changed with Elasticsearch 8.7.0

4 participants

@ishleenk17 @elasticmachine @rdner @michalpristas