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

Improved display of log types. #753

Merged

Conversation

AWSHurneyt
Copy link
Collaborator

@AWSHurneyt AWSHurneyt commented Oct 11, 2023

Description

Refactored label displays for log types to capitalize text.

Issues Resolved

[List any issues this PR will resolve]

Screenshots

Create detector flow

Before

Screenshot 2023-10-12 at 1 11 17 PM

After

Screenshot 2023-10-12 at 1 17 35 PM

Create rule flow

Before

Screenshot 2023-10-12 at 1 11 39 PM

After

Screenshot 2023-10-12 at 1 17 16 PM

Log types table page

Before

Screenshot 2023-10-12 at 1 10 58 PM

After

Screenshot 2023-10-12 at 1 08 29 PM

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

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

codecov bot commented Oct 11, 2023

Codecov Report

Merging #753 (08b8e24) into main (b581e58) will increase coverage by 0.10%.
Report is 1 commits behind head on main.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main     #753      +/-   ##
==========================================
+ 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>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
@AWSHurneyt
Copy link
Collaborator Author

Haven't been able to reproduce locally the 3_alerts.spec.js 4_findings.spec.js cypress test failures we're seeing in this github CI; but all cypress tests are passing locally on a 3.0 cluster.

====================================================================================================

  (Run Finished)


       Spec                                              Tests  Passing  Failing  Pending  Skipped  
  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
  │ ✔  1_detectors.spec.js                      02:25       13       13        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  2_rules.spec.js                          03:55       16       16        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  3_alerts.spec.js                         01:55        8        8        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  4_findings.spec.js                       01:42        6        5        -        1        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  5_integrations.spec.js                   01:06        2        -        -        2        - │
  └────────────────────────────────────────────────────────────────────────────────────────────────┘
    ✔  All specs passed!                        11:07       45       42        -        3        -  

✨  Done in 851.48s.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
@AWSHurneyt
Copy link
Collaborator Author

AWSHurneyt commented Oct 12, 2023

Haven't been able to reproduce locally the 3_alerts.spec.js 4_findings.spec.js cypress test failures we're seeing in this github CI; but all cypress tests are passing locally on a 3.0 cluster.

====================================================================================================

  (Run Finished)


       Spec                                              Tests  Passing  Failing  Pending  Skipped  
  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
  │ ✔  1_detectors.spec.js                      02:25       13       13        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  2_rules.spec.js                          03:55       16       16        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  3_alerts.spec.js                         01:55        8        8        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  4_findings.spec.js                       01:42        6        5        -        1        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  5_integrations.spec.js                   01:06        2        -        -        2        - │
  └────────────────────────────────────────────────────────────────────────────────────────────────┘
    ✔  All specs passed!                        11:07       45       42        -        3        -  

✨  Done in 851.48s.

@amsiglan confirmed that the 3_alerts.spec.js and 4_findings.spec.js cypress test failures are due to the backend plugin; they're not related to this PR.

@AWSHurneyt AWSHurneyt added backport 2.9 backport 2.10 backport 2.11 PRs to be backported to 2.11 branch labels Oct 12, 2023
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
@amsiglan amsiglan merged commit 7d90bb1 into opensearch-project:main Oct 25, 2023
7 of 9 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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-753-to-2.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7d90bb1301a3067164f4462291fa5a7d016b20e3
# Push it to GitHub
git push --set-upstream origin backport/backport-753-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-753-to-2.10.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 25, 2023
* 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)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 25, 2023
* 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)
AWSHurneyt added a commit that referenced this pull request Oct 25, 2023
* Improved display of log types. (#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)

* Update cypress-workflow.yml

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

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit that referenced this pull request Nov 15, 2023
* Improved display of log types. (#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)

* Update cypress-workflow.yml

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

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport 2.10 backport 2.11 PRs to be backported to 2.11 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants