diff --git a/INSTALL.md b/INSTALL.md index 213cee180..27b052f21 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -72,8 +72,8 @@ This package uses the [Gradle](https://docs.gradle.org/current/userguide/usergui 3. `cd performance-analyzer` 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-2.0.0.0.jar.sha1` + + `rm -f licenses/performanceanalyzer-rca-2.1.0.0.jar.sha1` 5. Trigger a gradle build. This builds the plugin, runs unit tests and creates the plugin jar. @@ -104,9 +104,9 @@ You can use the packaged Dockerfile and docker-compose.yml files [here](./docker `cp /docker/* ./` 4. Copy the RCA framework artifact and the Performance Analyzer plugin JAR into this folder - - `cp /build/distributions/performance-analyzer-rca-2.0.0.0-SNAPSHOT.zip ./` - `cp /build/distributions/opensearch-performance-analyzer-2.0.0.0-SNAPSHOT.zip ./` + + `cp /build/distributions/performance-analyzer-rca-2.1.0.0-SNAPSHOT.zip ./` + `cp /build/distributions/opensearch-performance-analyzer-2.1.0.0-SNAPSHOT.zip ./` ### Installation @@ -114,7 +114,7 @@ You can use the packaged Dockerfile and docker-compose.yml files [here](./docker 2. Build and tag the Docker image with our RCA framework. - `docker build -t opensearch/pa-rca:2.0 .` + `docker build -t opensearch/pa-rca:2.1 .` 3. Spin up a two node cluster as follows: diff --git a/build.gradle b/build.gradle index 9a7e8aaec..b79c8013e 100644 --- a/build.gradle +++ b/build.gradle @@ -52,11 +52,11 @@ distributions { } ext { - opensearch_version = System.getProperty("opensearch.version", "2.0.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") buildVersionQualifier = System.getProperty("build.version_qualifier", "") - // 2.0.0-SNAPSHOT -> 2.0.0.0-SNAPSHOT + // 2.1.0-SNAPSHOT -> 2.1.0.0-SNAPSHOT version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' if (buildVersionQualifier) { @@ -458,7 +458,7 @@ task buildDocker(type: Exec) { dependsOn(copyAllArtifacts) workingDir(dockerArtifactsDir) - commandLine 'docker', 'build', '-t', 'opensearch/pa-rca:2.0', '.' + commandLine 'docker', 'build', '-t', 'opensearch/pa-rca:2.1', '.' } task runDocker(type: Exec) { diff --git a/docker/Dockerfile b/docker/Dockerfile index 7047a27b3..ecb99ad27 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -29,7 +29,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/2.0.0-SNAPSHOT/opensearch-min-2.0.0-SNAPSHOT-linux-x64-latest.tar.gz | \ +RUN curl -fsSL https://artifacts.opensearch.org/snapshots/core/opensearch/2.1.0-SNAPSHOT/opensearch-min-2.1.0-SNAPSHOT-linux-x64-latest.tar.gz | \ tar zx --strip-components=1 RUN set -ex && for opensearchdirs in config data logs; do \ @@ -38,12 +38,12 @@ 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-2.0.0.0-SNAPSHOT.zip config/ +COPY --chown=1000:0 performance-analyzer-rca-2.1.0.0-SNAPSHOT.zip config/ -COPY --chown=1000:0 opensearch-performance-analyzer-2.0.0.0-SNAPSHOT.zip /tmp/ +COPY --chown=1000:0 opensearch-performance-analyzer-2.1.0.0-SNAPSHOT.zip /tmp/ -RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-2.0.0.0-SNAPSHOT.zip; \ - rm /tmp/opensearch-performance-analyzer-2.0.0.0-SNAPSHOT.zip +RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-2.1.0.0-SNAPSHOT.zip; \ + rm /tmp/opensearch-performance-analyzer-2.1.0.0-SNAPSHOT.zip USER 0 @@ -51,7 +51,7 @@ USER 0 RUN chown -R opensearch:0 . && \ chmod -R g=u /usr/share/opensearch -RUN unzip config/performance-analyzer-rca-2.0.0.0-SNAPSHOT.zip +RUN unzip config/performance-analyzer-rca-2.1.0.0-SNAPSHOT.zip RUN chmod -R 755 /dev/shm ################################################################################ @@ -123,7 +123,7 @@ EXPOSE 9200 9300 9600 9650 LABEL org.label-schema.schema-version="1.0" \ org.label-schema.name="opensearch" \ - org.label-schema.version="2.0.0" \ + org.label-schema.version="2.1.0" \ 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" \ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 12e12e28b..40cabbedc 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -13,7 +13,7 @@ version: '2.1' services: opensearch1: container_name: opensearch1 - image: opensearch/pa-rca:2.0 + image: opensearch/pa-rca:2.1 mem_limit: 4g networks: opensearchnet: @@ -34,7 +34,7 @@ services: container_name: opensearch2 environment: - node.master=false - image: opensearch/pa-rca:2.0 + image: opensearch/pa-rca:2.1 mem_limit: 4g networks: - opensearchnet diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 60052d8b6..ae3843542 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Tue Jan 28 11:59:31 PST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/src/main/resources/plugin-descriptor.properties b/src/main/resources/plugin-descriptor.properties index 172381479..5bcb03f44 100644 --- a/src/main/resources/plugin-descriptor.properties +++ b/src/main/resources/plugin-descriptor.properties @@ -17,8 +17,8 @@ # # classname=foo.bar.BazPlugin # description=My cool plugin -# version=2.0 -# opensearch.version=2.0 +# version=2.1 +# opensearch.version=2.1 # java.version=1.7 # ### mandatory elements for all plugins: @@ -27,7 +27,7 @@ description=Performance Analyzer Plugin # # 'version': plugin's version -version=2.0.0.0 +version=2.1.0.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=2.0.0 +opensearch.version=2.1.0