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 monitor datasources to 2.x #558

Merged
merged 1 commit into from
Sep 15, 2022
Merged

Conversation

eirsep
Copy link
Member

@eirsep eirsep commented Sep 14, 2022

Backport monitor datasources to 2.x

Signed-off-by: Surya Sashank Nistala [email protected]

Signed-off-by: Surya Sashank Nistala <[email protected]>
@eirsep eirsep requested a review from a team September 14, 2022 23:33
@codecov-commenter
Copy link

codecov-commenter commented Sep 14, 2022

Codecov Report

Merging #558 (62cd57d) into 2.x (f34ee22) will decrease coverage by 0.00%.
The diff coverage is 78.02%.

@@             Coverage Diff              @@
##                2.x     #558      +/-   ##
============================================
- Coverage     76.54%   76.53%   -0.01%     
- Complexity      114      116       +2     
============================================
  Files           143      143              
  Lines          6914     6969      +55     
  Branches        961      973      +12     
============================================
+ Hits           5292     5334      +42     
- Misses         1137     1138       +1     
- Partials        485      497      +12     
Impacted Files Coverage Δ
...rch/alerting/resthandler/RestIndexMonitorAction.kt 80.70% <50.00%> (-3.62%) ⬇️
...lin/org/opensearch/alerting/alerts/AlertIndices.kt 69.50% <65.00%> (-0.25%) ⬇️
...org/opensearch/alerting/QueryLevelMonitorRunner.kt 79.48% <66.66%> (ø)
...opensearch/alerting/util/DocLevelMonitorQueries.kt 79.54% <77.41%> (+2.98%) ⬆️
.../opensearch/alerting/DocumentLevelMonitorRunner.kt 81.91% <77.77%> (+0.06%) ⬆️
...ain/kotlin/org/opensearch/alerting/AlertService.kt 78.19% <100.00%> (-0.27%) ⬇️
...rg/opensearch/alerting/BucketLevelMonitorRunner.kt 77.44% <100.00%> (+0.52%) ⬆️
...lerting/transport/TransportExecuteMonitorAction.kt 81.53% <100.00%> (ø)
.../alerting/transport/TransportIndexMonitorAction.kt 70.68% <100.00%> (+0.10%) ⬆️
...nationmigration/DestinationMigrationCoordinator.kt 61.70% <0.00%> (-6.39%) ⬇️
... and 5 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@eirsep eirsep merged commit 7e812ab into opensearch-project:2.x Sep 15, 2022
@opensearch-trigger-bot
Copy link
Contributor

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

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

eirsep added a commit that referenced this pull request Oct 10, 2022
* Added 2.1 release notes. (#485) (#487)

* Added 2.1 release notes.

Signed-off-by: AWSHurneyt <[email protected]>

* Added 2.1 release notes.

Signed-off-by: AWSHurneyt <[email protected]>
(cherry picked from commit 9f3c393)

Co-authored-by: AWSHurneyt <[email protected]>

* Staging for version increment automation (#489) (#503)

* Version increment automation

Signed-off-by: pgodithi <[email protected]>

* Version increment automation: task rename updateVersion

Signed-off-by: pgodithi <[email protected]>
(cherry picked from commit 3b8bfe7)
Signed-off-by: prudhvigodithi <[email protected]>

Co-authored-by: Prudhvi Godithi <[email protected]>

* Add support for reproducible builds (#472) (#499)

As per gradle [docs] add support to remove timestamps and package with same order which is required from
[reproducible] builds

[docs]: https://docs.gradle.org/current/userguide/working_with_files.html#sec:archives
[reproducible]: https://reproducible-builds.org/

Signed-off-by: Leonidas Spyropoulos <[email protected]>
(cherry picked from commit a27d5a2)
Signed-off-by: prudhvigodithi <[email protected]>

Co-authored-by: Leonidas Spyropoulos <[email protected]>

* Refactored backwards compatibility tests to point to the OpenSearch 1.1.0.0 zip following deprecation of ODFE. (#510) (#512)

Signed-off-by: AWSHurneyt <[email protected]>
(cherry picked from commit fea6b4a)

Co-authored-by: AWSHurneyt <[email protected]>

* Bumping 2.x branch version from 2.1.0 to 2.2.0. Bumped mockito-core version from 4.3.1 to 4.6.1. (#506)

Signed-off-by: AWSHurneyt <[email protected]>

* Added 2.2 release notes. (#514)

* Added 2.2 release notes.

Signed-off-by: AWSHurneyt <[email protected]>

* Added 2.2 release notes.

Signed-off-by: AWSHurneyt <[email protected]>

* Bumped 2.x branch from version 2.2.0 to 2.3.0. (#547)

* Bumped 2.x branch from version 2.2.0 to 2.3.0.

Signed-off-by: AWSHurneyt <[email protected]>

* Bumped mockito core version.

Signed-off-by: AWSHurneyt <[email protected]>

Signed-off-by: AWSHurneyt <[email protected]>

* Deprecate the Master nomenclature (#548) (#549)

Signed-off-by: Subhobrata Dey <[email protected]>

* Added 2.3 release notes. (#551)

* Added 2.3 release notes.

Signed-off-by: AWSHurneyt <[email protected]>

* Added 2.3 release notes.

Signed-off-by: AWSHurneyt <[email protected]>

Signed-off-by: AWSHurneyt <[email protected]>

* moving over data models from alerting to common-utils (#556)

Signed-off-by: Subhobrata Dey <[email protected]>

* backport monitor datasources to 2.x (#558)

Signed-off-by: Surya Sashank Nistala <[email protected]>

* expose delete monitor api from alerting (#568)

Signed-off-by: Subhobrata Dey <[email protected]>

* Use findings and alerts models, dtos from common utils (#569)

Signed-off-by: Surya Sashank Nistala <[email protected]>

* Disable ktlint for alerting as it has errors on Windows (#570) (#571)

Signed-off-by: Peter Zhu <[email protected]>

Signed-off-by: Peter Zhu <[email protected]>
(cherry picked from commit 3a844f8)

Co-authored-by: Peter Zhu <[email protected]>

* Recreate request object from writeable for Get alerts and get findings (#577)

Signed-off-by: Surya Sashank Nistala <[email protected]>

* Use alerting models and dtos from common-utils dependencies

Signed-off-by: Surya Sashank Nistala <[email protected]>

* port over datasources alert index usage correctly

Signed-off-by: Surya Sashank Nistala <[email protected]>

Signed-off-by: AWSHurneyt <[email protected]>
Signed-off-by: Subhobrata Dey <[email protected]>
Signed-off-by: Surya Sashank Nistala <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: AWSHurneyt <[email protected]>
Co-authored-by: Prudhvi Godithi <[email protected]>
Co-authored-by: Leonidas Spyropoulos <[email protected]>
Co-authored-by: Subhobrata Dey <[email protected]>
Co-authored-by: Peter Zhu <[email protected]>
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.

5 participants