Merge branch 'main' into add-dependabot

.github/PULL_REQUEST_TEMPLATE.md

@@ -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).

.github/workflows/gradle.yml

@@ -31,7 +31,7 @@ jobs:
       # Explicitly set the docker-compose program path so that our build scripts in RCA can run the program
       # This is necessary because of the Github Actions environment and the workingDir of the Gradle environment
     - name: Set docker-compose path
-      run: DOCKER_COMPOSE_LOCATION=$(which docker-compose)
+      run: echo "DOCKER_COMPOSE_LOCATION=$(which docker-compose)" >> $GITHUB_ENV
       # Set the vm.max_map_count system property to the minimum required to run OpenSearch
     - name: Set vm.max_map_count
       run: sudo sysctl -w vm.max_map_count=262144
@@ -55,10 +55,14 @@ jobs:
       working-directory: ./tmp/performance-analyzer
       run: ./gradlew jacocoTestReport
     - name: Upload coverage report
-      working-directory: ./tmp/performance-analyzer
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      run: bash <(curl -s https://codecov.io/bash) -f ./build/reports/jacoco/test/jacocoTestReport.xml
+      uses: codecov/codecov-action@v3
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+    - uses: actions/upload-artifact@v3
+      with:
+        name: linux-JDK${{ matrix.java }}-reports
+        path: |
+          ./tmp/performance-analyzer/build/reports/
     - name: Run Integration Tests
       working-directory: ./tmp/performance-analyzer
       run: ./gradlew integTest -Dtests.enableIT -Dtests.useDockerCluster

README.md

@@ -116,7 +116,7 @@ This project has adopted the [Amazon Open Source Code of Conduct](CODE_OF_CONDUC
 
 ## Security
 
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue.
+If you discover a potential security issue in this project we ask that you notify OpenSearch Security directly via email to security@opensearch.org. Please do **not** create a public GitHub issue.
 
 ## License
 

SECURITY.md

@@ -1,3 +1,3 @@
 ## Reporting a Vulnerability
 
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/) or directly via email to aws-security@amazon.com. Please do **not** create a public GitHub issue.
+If you discover a potential security issue in this project we ask that you notify OpenSearch Security directly via email to security@opensearch.org. Please do **not** create a public GitHub issue.

build.gradle

@@ -10,13 +10,13 @@ buildscript {
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
 
-        default_bwc_version = System.getProperty("bwc.version", "2.12.0.0")
+        default_bwc_version = System.getProperty("bwc.version", "2.18.0.0")
         pa_bwc_version = System.getProperty("tests.bwc.version", default_bwc_version)
         baseName = "paBwcCluster"
 
         // 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.3.0"
+        paCommonsVersion = "1.6.0"
 
         // 3.0.0-SNAPSHOT -> 3.0.0.0-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
@@ -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}"
@@ -669,7 +669,7 @@ task integTestRemote(type: RestIntegTestTask) {
     testClusters {
         "${baseName}$i" {
             testDistribution = "ARCHIVE"
-            versions = ["2.12.0-SNAPSHOT", opensearch_version]
+            versions = ["2.18.0-SNAPSHOT", opensearch_version]
             numberOfNodes = 3
             plugin(provider(new Callable<RegularFile>() {
                 @Override

licenses/bcpkix-jdk15to18-1.78.1.jar.sha1

@@ -0,0 +1 @@
+5884ee847542641d04abfbfdeca3446d0300670b

licenses/bcprov-jdk15to18-1.78.1.jar.sha1

@@ -0,0 +1 @@
+83bfa8229f7127d933161aefb281e54a9ffcf9f4

release-notes/opensearch-performance-analyzer.release-notes-1.3.16.0.md

@@ -0,0 +1,6 @@
+## Version 1.3.16.0 Release Notes
+
+Compatible with OpenSearch 1.3.16
+
+### Maintenance
+* Bump netty to match version from core's buildSrc/version.properties and bump grpc to 1.56.1 ([#546](https://github.com/opensearch-project/performance-analyzer-rca/pull/546))

release-notes/opensearch-performance-analyzer.release-notes-2.15.0.0.md

@@ -0,0 +1,12 @@
+## Version 2.15.0 Release Notes
+
+Compatible with OpenSearch 2.15.0
+
+### Infrastructure
+* Bump PA to use 1.4.0 PA commons lib [#664](https://github.com/opensearch-project/performance-analyzer/pull/664)
+
+### Feature 
+* Framework changes to merge PA with RTF [#662](https://github.com/opensearch-project/performance-analyzer/pull/662)
+
+### Bug Fix
+* Fixed the bug in CacheConfigMetricsCollector [#657](https://github.com/opensearch-project/performance-analyzer/pull/657)

release-notes/opensearch-performance-analyzer.release-notes-2.16.0.0.md

@@ -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)

release-notes/opensearch-performance-analyzer.release-notes-2.17.0.0.md

@@ -0,0 +1,9 @@
+## Version 2.17.0 Release Notes
+
+Compatible with OpenSearch 2.17.0
+
+### Infrastructure
+* Bump PA to use 1.6.0 PA commons lib [#712](https://github.com/opensearch-project/performance-analyzer/pull/712)
+
+### Feature 
+* Added cacheConfig Collector [#690](https://github.com/opensearch-project/performance-analyzer/pull/690)

src/main/java/org/opensearch/performanceanalyzer/OpenSearchResources.java

@@ -11,6 +11,7 @@
 import org.opensearch.core.indices.breaker.CircuitBreakerService;
 import org.opensearch.env.Environment;
 import org.opensearch.indices.IndicesService;
+import org.opensearch.telemetry.metrics.MetricsRegistry;
 import org.opensearch.threadpool.ThreadPool;
 
 public final class OpenSearchResources {
@@ -20,6 +21,7 @@ public final class OpenSearchResources {
     private CircuitBreakerService circuitBreakerService;
     private ClusterService clusterService;
     private IndicesService indicesService;
+    private MetricsRegistry metricsRegistry;
     private Settings settings;
     private Environment environment;
     private java.nio.file.Path configPath;
@@ -32,6 +34,7 @@ private OpenSearchResources() {
         clusterService = null;
         settings = null;
         indicesService = null;
+        metricsRegistry = null;
         environment = null;
         configPath = null;
         pluginFileLocation = null;
@@ -101,6 +104,14 @@ public void setIndicesService(IndicesService indicesService) {
         this.indicesService = indicesService;
     }
 
+    public MetricsRegistry getMetricsRegistry() {
+        return metricsRegistry;
+    }
+
+    public void setMetricsRegistry(MetricsRegistry metricsRegistry) {
+        this.metricsRegistry = metricsRegistry;
+    }
+
     public void setClient(final Client client) {
         this.client = client;
     }