Merge pull request #603 from sruti1312/update-plugin

Update plugin and log4j version

.github/workflows/gradle.yml

@@ -24,6 +24,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         repository: opendistro-for-elasticsearch/performance-analyzer
+        branch: opendistro-1.13
         path: ./tmp/pa
     - name: Set up JDK 1.12
       uses: actions/setup-java@v1

INSTALL.md

@@ -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/opendistro-performance-analyzer-1.13.0.0-SNAPSHOT.zip ./`
+    `cp <Performance Analyzer plugin root>/build/distributions/opendistro-performance-analyzer-1.13.3.0-SNAPSHOT.zip ./`
 
  ### Installation
 

build.gradle

@@ -274,8 +274,8 @@ dependencies {
     compile 'com.google.guava:guava:28.2-jre'
     compile 'com.fasterxml.jackson.core:jackson-annotations:2.10.5'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.10.5.1'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.0'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0'
+    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.commons', name: 'commons-lang3', version: '3.9'
     compile group: 'commons-io', name: 'commons-io', version: '2.3'
     implementation 'io.grpc:grpc-netty-shaded:1.28.0'
@@ -345,6 +345,7 @@ task cloneGitRepo(type: GitClone) {
 
     def destination = file(paDir)
     uri = "https://github.com/opendistro-for-elasticsearch/performance-analyzer.git"
+    branch = "opendistro-1.13"
     destinationPath = destination
     bare = false
     enabled = !destination.exists() //to clone only once
@@ -375,7 +376,7 @@ task copyAllArtifacts(type: Copy) {
     def projectPathStr = getProjectDir().toPath().toString()
     def dockerArtifacts = Paths.get(projectPathStr, 'docker').toString()
     def rcaArtifacts = Paths.get(projectPathStr, 'build', 'distributions', 'performance-analyzer-rca.zip')
-    def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opendistro-performance-analyzer-1.13.0.0-SNAPSHOT.zip')
+    def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opendistro-performance-analyzer-1.13.3.0-SNAPSHOT.zip')
 
     dockerArtifactsDir = Paths.get(dockerBuildDir, 'rca-docker')
     from(dockerArtifacts)

docker/Dockerfile

@@ -49,10 +49,10 @@ COPY --chown=1000:0 elasticsearch.yml log4j2.properties config/
 
 COPY --chown=1000:0 performance-analyzer-rca.zip config/
 
-COPY --chown=1000:0 opendistro-performance-analyzer-1.13.0.0-SNAPSHOT.zip /tmp/
+COPY --chown=1000:0 opendistro-performance-analyzer-1.13.3.0-SNAPSHOT.zip /tmp/
 
-RUN elasticsearch-plugin install --batch file:///tmp/opendistro-performance-analyzer-1.13.0.0-SNAPSHOT.zip; \
-        rm /tmp/opendistro-performance-analyzer-1.13.0.0-SNAPSHOT.zip
+RUN elasticsearch-plugin install --batch file:///tmp/opendistro-performance-analyzer-1.13.3.0-SNAPSHOT.zip; \
+        rm /tmp/opendistro-performance-analyzer-1.13.3.0-SNAPSHOT.zip
 
 USER 0
 
@@ -132,7 +132,7 @@ EXPOSE 9200 9300 9600 9650
 
 LABEL org.label-schema.schema-version="1.0" \
   org.label-schema.name="opendistroforelasticsearch" \
-  org.label-schema.version="1.2.0" \
+  org.label-schema.version="1.13.3" \
   org.label-schema.url="https://opendistro.github.io" \
   org.label-schema.vcs-url="https://github.com/opendistro-for-elasticsearch/opendistro-build" \
   org.label-schema.license="Apache-2.0" \