Upgrade plugin and log4j version (#102)

Signed-off-by: Sruti Parthiban <partsrut@amazon.com>

.github/workflows/gauntlet-tests-workflow.yml

@@ -25,4 +25,4 @@ jobs:
         path: ./tmp/performance-analyzer-rca
     - name: Build RCA and run Gauntlet tests
       working-directory:  ./tmp/performance-analyzer-rca
-      run: ./gradlew build -Drun.gauntlet.tests=true -Dopensearch.version=1.2.1-SNAPSHOT
+      run: ./gradlew build -Drun.gauntlet.tests=true -Dopensearch.version=1.2.2-SNAPSHOT

.github/workflows/gradle.yml

@@ -26,7 +26,7 @@ jobs:
         path: ./tmp/performance-analyzer-rca
     - name: Build RCA
       working-directory:  ./tmp/performance-analyzer-rca
-      run: ./gradlew build --stacktrace -Dopensearch.version=1.2.1-SNAPSHOT
+      run: ./gradlew build --stacktrace -Dopensearch.version=1.2.2-SNAPSHOT
     - name: Upload reports
       uses: actions/upload-artifact@v2
       with:
@@ -42,7 +42,7 @@ jobs:
       run: bash <(curl -s https://codecov.io/bash) -f ./build/reports/jacoco/test/jacocoTestReport.xml
     - name: Publish RCA jar to maven local
       working-directory: ./tmp/performance-analyzer-rca
-      run: ./gradlew publishToMavenLocal -Dopensearch.version=1.2.1-SNAPSHOT
+      run: ./gradlew publishToMavenLocal -Dopensearch.version=1.2.2-SNAPSHOT
 
     # PA in ./tmp/performance-analyzer
     - name: Checkout Performance Analyzer
@@ -56,22 +56,22 @@ jobs:
       run: rm -f licenses/performanceanalyzer-rca-*.jar.sha1
     - name: Update SHA
       working-directory: ./tmp/performance-analyzer
-      run: ./gradlew updateShas -Dopensearch.version=1.2.1-SNAPSHOT
+      run: ./gradlew updateShas -Dopensearch.version=1.2.2-SNAPSHOT
     - name: Set docker-compose path
       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
     - name: Build PA and run Unit Tests
       working-directory: ./tmp/performance-analyzer
-      run: ./gradlew build -i -Dopensearch.version=1.2.1-SNAPSHOT
+      run: ./gradlew build -i -Dopensearch.version=1.2.2-SNAPSHOT
 
     # Enable RCA for Integration Tests
     - name: Spin up Docker cluster for integ testing
       working-directory: ./tmp/performance-analyzer-rca
-      run: ./gradlew enableRca -Dopensearch.version=1.2.1-SNAPSHOT
+      run: ./gradlew enableRca -Dopensearch.version=1.2.2-SNAPSHOT
 
     # Run Integration Tests in PA
     - name: Run integration tests
       working-directory: ./tmp/performance-analyzer
-      run: ./gradlew integTest --info --stacktrace -Dtests.enableIT=true -Dopensearch.version=1.2.1-SNAPSHOT
+      run: ./gradlew integTest --info --stacktrace -Dtests.enableIT=true -Dopensearch.version=1.2.2-SNAPSHOT

INSTALL.md

@@ -73,7 +73,7 @@ This package uses the [Gradle](https://docs.gradle.org/current/userguide/usergui
 
 4. Because we are supplying our own version of the RCA framework, the SHA might have changed. So, delete the old SHA file if it exists. The SHA will get updated during build time.
 
-    `rm -f licenses/performanceanalyzer-rca-1.0.0.0.jar.sha1`
+    `rm -f licenses/performanceanalyzer-rca-1.2.2.0.jar.sha1`
 
 5. Trigger a gradle build. This builds the plugin, runs unit tests and creates the plugin jar.
 
@@ -106,7 +106,7 @@ You can use the packaged Dockerfile and docker-compose.yml files [here](./docker
 4. Copy the RCA framework artifact and the Performance Analyzer plugin JAR into this folder
 
     `cp <RCA framework root>/build/distributions/performance-analyzer-rca.zip ./`  
-    `cp <Performance Analyzer plugin root>/build/distributions/opensearch-performance-analyzer-1.0.0.0-SNAPSHOT.zip ./` 
+    `cp <Performance Analyzer plugin root>/build/distributions/opensearch-performance-analyzer-1.2.2.0-SNAPSHOT.zip ./` 
 
  ### Installation
 

build.gradle

@@ -74,7 +74,7 @@ distributions {
 }
 
 ext {
-    opensearch_version = System.getProperty("opensearch.version", "1.2.1-SNAPSHOT")
+    opensearch_version = System.getProperty("opensearch.version", "1.2.2-SNAPSHOT")
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
     gitPaBranch = 'main'
     gitPaRepo = "https://github.com/opensearch-project/performance-analyzer.git"
@@ -322,8 +322,8 @@ dependencies {
     compile 'com.google.guava:guava:28.2-jre'
     compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
     compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.15.0'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.15.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.16.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.16.0'
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
     compile group: 'commons-io', name: 'commons-io', version: '2.7'
     implementation 'io.grpc:grpc-netty-shaded:1.28.0'

docker/Dockerfile

@@ -49,7 +49,7 @@ WORKDIR /usr/share/opensearch
 ENV BUST_CACHE 1576286189
 
 # Download and extract defined OpenSearch version.
-RUN curl -fsSL https://artifacts.opensearch.org/snapshots/core/opensearch/1.2.1-SNAPSHOT/opensearch-min-1.2.1-SNAPSHOT-linux-x64-latest.tar.gz | \
+RUN curl -fsSL https://artifacts.opensearch.org/snapshots/core/opensearch/1.2.2-SNAPSHOT/opensearch-min-1.2.2-SNAPSHOT-linux-x64-latest.tar.gz | \
     tar zx --strip-components=1
 
 RUN set -ex && for opensearchdirs in config data logs; do \
@@ -58,20 +58,20 @@ RUN set -ex && for opensearchdirs in config data logs; do \
 
 COPY --chown=1000:0 opensearch.yml log4j2.properties config/
 
-COPY --chown=1000:0 performance-analyzer-rca-1.2.1.0-SNAPSHOT.zip config/
+COPY --chown=1000:0 performance-analyzer-rca-1.2.2.0-SNAPSHOT.zip config/
 
-COPY --chown=1000:0 opensearch-performance-analyzer-1.2.1.0-SNAPSHOT.zip /tmp/
+COPY --chown=1000:0 opensearch-performance-analyzer-1.2.2.0-SNAPSHOT.zip /tmp/
 
-RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-1.2.1.0-SNAPSHOT.zip; \
-        rm /tmp/opensearch-performance-analyzer-1.2.1.0-SNAPSHOT.zip
+RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-1.2.2.0-SNAPSHOT.zip; \
+        rm /tmp/opensearch-performance-analyzer-1.2.2.0-SNAPSHOT.zip
 
 USER 0
 
 # Set gid to 0 for opensearch and make group permission similar to that of user
 RUN chown -R opensearch:0 . && \
     chmod -R g=u /usr/share/opensearch
 
-RUN unzip config/performance-analyzer-rca-1.2.1.0-SNAPSHOT.zip
+RUN unzip config/performance-analyzer-rca-1.2.2.0-SNAPSHOT.zip
 
 RUN cp -r performance-analyzer-rca/* plugins/opensearch-performance-analyzer/
 RUN chmod 755 /usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_bin/performance-analyzer-agent
@@ -144,7 +144,7 @@ EXPOSE 9200 9300 9600 9650
 
 LABEL org.label-schema.schema-version="1.0" \
   org.label-schema.name="opensearch" \
-  org.label-schema.version="1.2.1" \
+  org.label-schema.version="1.2.2" \
   org.label-schema.url="https://opensearch.org/" \
   org.label-schema.vcs-url="https://github.com/opensearch-project/opensearch-build" \
   org.label-schema.license="Apache-2.0" \

src/main/resources/plugin-descriptor.properties

@@ -27,7 +27,7 @@
 description=Performance Analyzer Plugin
 #
 # 'version': plugin's version
-version=1.0.0.0
+version=1.2.2.0
 #
 # 'name': the plugin name
 name=performance-analyzer
@@ -42,4 +42,4 @@ classname=org.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin
 java.version=1.8
 #
 # 'opensearch.version' version of openSearch compiled against
-opensearch.version=1.0.0
+opensearch.version=1.2.2