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

[Backport 2.x] Improved display of log types. #765

Merged
merged 2 commits into from
Nov 15, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 7d90bb1 from #753

* Improved display of log types.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed cypress tests.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated cypress workflow.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed cypress tests. Fixed flyout. Fixed rule form.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated log type labels usage. Adjusted cypress tests.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit 7d90bb1)
@codecov
Copy link

codecov bot commented Oct 25, 2023

Codecov Report

Merging #765 (ad3c10c) into 2.x (09b26f0) will increase coverage by 0.10%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              2.x     #765      +/-   ##
==========================================
+ Coverage   31.28%   31.38%   +0.10%     
==========================================
  Files         150      150              
  Lines        4913     4916       +3     
  Branches      880      881       +1     
==========================================
+ Hits         1537     1543       +6     
+ Misses       3192     3188       -4     
- Partials      184      185       +1     

see 11 files with indirect coverage changes

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
@AWSHurneyt AWSHurneyt merged commit b2fb868 into 2.x Nov 15, 2023
7 of 9 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.10 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.10 2.10
# Navigate to the new working tree
cd .worktrees/backport-2.10
# Create a new branch
git switch --create backport/backport-765-to-2.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b2fb8688a51c1c018d160145aba502154e043eb2
# Push it to GitHub
git push --set-upstream origin backport/backport-765-to-2.10
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.10

Then, create a pull request where the base branch is 2.10 and the compare/head branch is backport/backport-765-to-2.10.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants