From 961359af251dc2542c5aed8921398f5abd0eb07f Mon Sep 17 00:00:00 2001 From: Surya Sashank Nistala Date: Sat, 16 Apr 2022 00:33:57 +0530 Subject: [PATCH 1/2] Adds management permission (control) in security policy file (#164) Signed-off-by: Surya Sashank Nistala --- pa_config/opensearch_security.policy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pa_config/opensearch_security.policy b/pa_config/opensearch_security.policy index cf88b0349..1e0d2f6b1 100644 --- a/pa_config/opensearch_security.policy +++ b/pa_config/opensearch_security.policy @@ -1,3 +1,7 @@ +grant { + permission java.lang.management.ManagementPermission "control"; +}; + grant codebase "file:${java.home}/../lib/tools.jar" { permission java.security.AllPermission; }; From 5373ddb54c6a31dc86efc985fa4c73d7f8e39b97 Mon Sep 17 00:00:00 2001 From: "Daniel Doubrovkine (dB.)" Date: Fri, 15 Apr 2022 15:19:43 -0400 Subject: [PATCH 2/2] Incremented version to 2.0-rc1. (#165) Signed-off-by: dblock --- INSTALL.md | 2 +- build.gradle | 6 +++--- docker/Dockerfile | 14 +++++++------- src/main/resources/plugin-descriptor.properties | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 926f40fa4..c188bad2f 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-rca-2.0.0.0-alpha1.jar.sha1` + `rm -f licenses/performanceanalyzer-rca-2.0.0.0-rc1.jar.sha1` 5. Trigger a gradle build. This builds the plugin, runs unit tests and creates the plugin jar. diff --git a/build.gradle b/build.gradle index 62c4085de..c9efc93bb 100644 --- a/build.gradle +++ b/build.gradle @@ -52,11 +52,11 @@ distributions { } ext { - opensearch_version = System.getProperty("opensearch.version", "2.0.0-alpha1-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.0.0-rc1-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") - buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1") + buildVersionQualifier = System.getProperty("build.version_qualifier", "rc1") - // 2.0.0-alpha1-SNAPSHOT -> 2.0.0.0-alpha1-SNAPSHOT + // 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' if (buildVersionQualifier) { diff --git a/docker/Dockerfile b/docker/Dockerfile index 59344243a..907e21d80 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-alpha1-SNAPSHOT/opensearch-min-2.0.0-alpha1-SNAPSHOT-linux-x64-latest.tar.gz | \ +RUN curl -fsSL https://artifacts.opensearch.org/snapshots/core/opensearch/2.0.0-rc1-SNAPSHOT/opensearch-min-2.0.0-rc1-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-alpha1-SNAPSHOT.zip config/ +COPY --chown=1000:0 performance-analyzer-rca-2.0.0.0-rc1-SNAPSHOT.zip config/ -COPY --chown=1000:0 opensearch-performance-analyzer-2.0.0.0-alpha1-SNAPSHOT.zip /tmp/ +COPY --chown=1000:0 opensearch-performance-analyzer-2.0.0.0-rc1-SNAPSHOT.zip /tmp/ -RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-2.0.0.0-alpha1-SNAPSHOT.zip; \ - rm /tmp/opensearch-performance-analyzer-2.0.0.0-alpha1-SNAPSHOT.zip +RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-2.0.0.0-rc1-SNAPSHOT.zip; \ + rm /tmp/opensearch-performance-analyzer-2.0.0.0-rc1-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-alpha1-SNAPSHOT.zip +RUN unzip config/performance-analyzer-rca-2.0.0.0-rc1-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 @@ -124,7 +124,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-alpha1" \ + org.label-schema.version="2.0.0-rc1" \ 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/src/main/resources/plugin-descriptor.properties b/src/main/resources/plugin-descriptor.properties index 722de98fb..22780a8db 100644 --- a/src/main/resources/plugin-descriptor.properties +++ b/src/main/resources/plugin-descriptor.properties @@ -27,7 +27,7 @@ description=Performance Analyzer Plugin # # 'version': plugin's version -version=2.0.0.0-alpha1 +version=2.0.0.0-rc1 # # '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-alpha1 +opensearch.version=2.0.0-rc1