diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e065e91a7..3ed83cf22 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -46,7 +46,7 @@ jobs: run: ./gradlew publishToMavenLocal - name: Build PA gradle using the new RCA jar working-directory: ./tmp/pa - run: rm licenses/performanceanalyzer-rca-1.10.jar.sha1 + run: rm licenses/performanceanalyzer-rca-1.11.jar.sha1 - name: Update SHA working-directory: ./tmp/pa run: ./gradlew updateShas diff --git a/INSTALL.md b/INSTALL.md index 8497e9ceb..a98c00854 100644 --- a/INSTALL.md +++ b/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-1.10.jar.sha1` + `rm -f licenses/performanceanalyzer-1.11.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 /build/distributions/performance-analyzer-rca.zip ./` - `cp /build/distributions/opendistro_performance_analyzer-1.10.0.0-SNAPSHOT.zip ./` + `cp /build/distributions/opendistro_performance_analyzer-1.11.0.0-SNAPSHOT.zip ./` ### Installation diff --git a/build.gradle b/build.gradle index 9dc4bdedf..9bb10222c 100644 --- a/build.gradle +++ b/build.gradle @@ -70,14 +70,14 @@ publishing { maven(MavenPublication) { groupId = 'com.amazon.opendistro.elasticsearch' artifactId = 'performanceanalyzer-rca' - version = '1.10' + version = '1.11' from components.java } } } ext { - opendistroVersion = '1.10' + opendistroVersion = '1.11' isSnapshot = "true" == System.getProperty("build.snapshot", "true") } @@ -343,7 +343,7 @@ task cloneGitRepo(type: GitClone) { task removeLicenses(type: Delete) { dependsOn(cloneGitRepo) - def toDelete = Paths.get(paDir, 'licenses', 'performanceanalyzer-rca-1.10.jar.sha1') + def toDelete = Paths.get(paDir, 'licenses', 'performanceanalyzer-rca-1.11.jar.sha1') delete(toDelete) } @@ -366,7 +366,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.10.0.0-SNAPSHOT.zip') + def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opendistro_performance_analyzer-1.11.0.0-SNAPSHOT.zip') dockerArtifactsDir = Paths.get(dockerBuildDir, 'rca-docker') from(dockerArtifacts) diff --git a/docker/Dockerfile b/docker/Dockerfile index 64527f038..2541d2a0f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -38,7 +38,7 @@ WORKDIR /usr/share/elasticsearch ENV BUST_CACHE 1576286189 # Download and extract defined ES version. -RUN curl -fsSL https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.3.2-linux-x86_64.tar.gz | \ +RUN curl -fsSL https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.9.1-linux-x86_64.tar.gz | \ tar zx --strip-components=1 RUN set -ex && for esdirs in config data logs; do \ @@ -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.10.0.0-SNAPSHOT.zip /tmp/ +COPY --chown=1000:0 opendistro_performance_analyzer-1.11.0.0-SNAPSHOT.zip /tmp/ -RUN elasticsearch-plugin install --batch file:///tmp/opendistro_performance_analyzer-1.10.0.0-SNAPSHOT.zip; \ - rm /tmp/opendistro_performance_analyzer-1.10.0.0-SNAPSHOT.zip +RUN elasticsearch-plugin install --batch file:///tmp/opendistro_performance_analyzer-1.11.0.0-SNAPSHOT.zip; \ + rm /tmp/opendistro_performance_analyzer-1.11.0.0-SNAPSHOT.zip USER 0