Skip to content

[8.7](backport #35221) IIS and MYSQL expected json logfile update#35274

Merged
rdner merged 4 commits into8.7from
mergify/bp/8.7/pr-35221
May 2, 2023
Merged

[8.7](backport #35221) IIS and MYSQL expected json logfile update#35274
rdner merged 4 commits into8.7from
mergify/bp/8.7/pr-35221

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 2, 2023

This is an automatic backport of pull request #35221 done by Mergify.
Cherry-pick of f5ace09 has failed:

On branch mergify/bp/8.7/pr-35221
Your branch is up to date with 'origin/8.7'.

You are currently cherry-picking commit f5ace09f10.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   filebeat/module/iis/access/test/test-iis-7.5.log-expected.json
	modified:   filebeat/module/mysql/slowlog/test/mariadb-10.3.13.log-expected.json
	modified:   filebeat/module/mysql/slowlog/test/percona-ubuntu-8.0.15.log-expected.json
	modified:   testing/environments/snapshot.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   filebeat/module/mysql/slowlog/test/mysql-ubuntu-8.0.15.log-expected.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* 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 requested review from a team as code owners May 2, 2023 07:39
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 2, 2023
@mergify mergify bot requested review from leehinman and rdner and removed request for a team May 2, 2023 07:39
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 2, 2023
@botelastic
Copy link

botelastic bot commented May 2, 2023

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

@elasticmachine
Copy link
Contributor

elasticmachine commented May 2, 2023

💚 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-05-02T10:41:11.659+0000

  • Duration: 78 min 37 sec

Test stats 🧪

Test Results
Failed 0
Passed 26010
Skipped 1975
Total 27985

💚 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!)

@rdner rdner merged commit c50e2d0 into 8.7 May 2, 2023
@rdner rdner deleted the mergify/bp/8.7/pr-35221 branch May 2, 2023 12:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants