Skip to content

Commit

Permalink
Merge branch 'opensearch-project:main' into new-collectors
Browse files Browse the repository at this point in the history
  • Loading branch information
atharvasharma61 authored Sep 2, 2024
2 parents 3919c4a + a607422 commit 904c268
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 19 deletions.
22 changes: 8 additions & 14 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
**Is your feature request related to a problem? Please provide an existing Issue # , or describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
### Description
[Describe what this change achieves]

**Describe the solution you are proposing**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
### Related Issues
Resolves #[Issue number to be closed when this PR is merged]
<!-- List any other related issues here -->

### Check List
- [ ] Backport Labels added.
- [ ] 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
- [ ] API changes companion pull request [created](https://github.com/opensearch-project/opensearch-api-specification/blob/main/DEVELOPER_GUIDE.md).
- [ ] Commits are signed per the DCO using `--signoff`.
- [ ] Public documentation issue/PR [created](https://github.com/opensearch-project/documentation-website/issues/new/choose).

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](https://github.com/opensearch-project/performance-analyzer/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ buildscript {

// The PA Commons (https://github.com/opensearch-project/performance-analyzer-commons)
// is a library dependency with hardcoded versioning in PA and RCA repos.
paCommonsVersion = "1.4.0"
paCommonsVersion = "1.5.0"

// 3.0.0-SNAPSHOT -> 3.0.0.0-SNAPSHOT
version_tokens = opensearch_version.tokenize('-')
Expand Down Expand Up @@ -301,8 +301,8 @@ dependencies {

implementation 'org.jooq:jooq:3.10.8'
implementation 'org.apache.commons:commons-lang3:3.9'
implementation 'org.bouncycastle:bcprov-jdk15to18:1.74'
implementation 'org.bouncycastle:bcpkix-jdk18on:1.74'
implementation 'org.bouncycastle:bcprov-jdk15to18:1.78.1'
implementation 'org.bouncycastle:bcpkix-jdk18on:1.78.1'
implementation "org.opensearch:performance-analyzer-commons:${paCommonsVersion}"
implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
Expand Down
1 change: 1 addition & 0 deletions licenses/bcpkix-jdk15to18-1.78.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5884ee847542641d04abfbfdeca3446d0300670b
1 change: 0 additions & 1 deletion licenses/bcpkix-jdk18on-1.74.jar.sha1

This file was deleted.

1 change: 0 additions & 1 deletion licenses/bcprov-jdk15to18-1.74.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions licenses/bcprov-jdk15to18-1.78.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
83bfa8229f7127d933161aefb281e54a9ffcf9f4
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## Version 2.16.0 Release Notes

Compatible with OpenSearch 2.16.0

### Infrastructure
* Bump bouncycastle from 1.74 to 1.78.1 [#656](https://github.com/opensearch-project/performance-analyzer/pull/656)
* Bump PA to use 1.5.0 PA commons lib [#698](https://github.com/opensearch-project/performance-analyzer/pull/698)

### Feature
* Adds index_uuid as a tag in node stats all shard metrics [#680](https://github.com/opensearch-project/performance-analyzer/pull/680)
* Adds the listener for resource utilization metrics [#687](https://github.com/opensearch-project/performance-analyzer/pull/687)

0 comments on commit 904c268

Please sign in to comment.