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

Logtypes pr v2 #475

Merged
merged 18 commits into from
Jul 11, 2023
Merged

Logtypes pr v2 #475

merged 18 commits into from
Jul 11, 2023

Conversation

petardz
Copy link
Contributor

@petardz petardz commented Jul 6, 2023

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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.

petardz added 2 commits July 5, 2023 22:23
Signed-off-by: Petar Dzepina <[email protected]>
petardz and others added 16 commits July 6, 2023 20:24
Signed-off-by: Petar Dzepina <[email protected]>
Signed-off-by: Petar Dzepina <[email protected]>
Signed-off-by: Subhobrata Dey <[email protected]>
address code review comments
Signed-off-by: Petar Dzepina <[email protected]>
Signed-off-by: Petar Dzepina <[email protected]>
Signed-off-by: Petar Dzepina <[email protected]>
@codecov
Copy link

codecov bot commented Jul 11, 2023

Codecov Report

Merging #475 (8332aea) into main (faccf6c) will decrease coverage by 0.05%.
The diff coverage is 25.34%.

@@             Coverage Diff              @@
##               main     #475      +/-   ##
============================================
- Coverage     28.23%   28.19%   -0.05%     
- Complexity      906      940      +34     
============================================
  Files           235      236       +1     
  Lines          9443     9861     +418     
  Branches       1081     1118      +37     
============================================
+ Hits           2666     2780     +114     
- Misses         6545     6839     +294     
- Partials        232      242      +10     
Impacted Files Coverage Δ
...rch/securityanalytics/action/GetAlertsRequest.java 0.00% <0.00%> (ø)
...h/securityanalytics/action/GetFindingsRequest.java 0.00% <0.00%> (ø)
...rch/securityanalytics/action/IndexRuleRequest.java 0.00% <ø> (ø)
...search/securityanalytics/alerts/AlertsService.java 21.90% <0.00%> (ø)
...rrelation/index/codec/CorrelationCodecService.java 0.00% <0.00%> (ø)
...ch/securityanalytics/findings/FindingsService.java 36.48% <0.00%> (ø)
...indexmanagment/DetectorIndexManagementService.java 0.00% <0.00%> (ø)
...ecurityanalytics/logtype/BuiltinLogTypeLoader.java 2.27% <0.00%> (+2.27%) ⬆️
...earch/securityanalytics/logtype/MappingSchema.java 0.00% <0.00%> (ø)
...search/securityanalytics/mapper/MapperService.java 0.00% <0.00%> (-4.29%) ⬇️
... and 17 more

... and 2 files with indirect coverage changes

@sbcd90 sbcd90 merged commit d0d3ee7 into opensearch-project:main Jul 11, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x 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.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-475-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d0d3ee7d990d521282b337df0a7b8f761c7c1191
# Push it to GitHub
git push --set-upstream origin backport/backport-475-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-475-to-2.x.

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

Successfully merging this pull request may close these issues.

3 participants