diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 96bb5210a..319caa117 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -52,17 +52,17 @@ jobs: run: ./gradlew publishToMavenLocal - name: Build PA gradle using the new RCA jar working-directory: ./tmp/pa - run: rm -f licenses/performanceanalyzer-rca-1.0.0.0-beta1.jar.sha1 + run: rm -f licenses/performanceanalyzer-rca-1.0.0.0-rc1.jar.sha1 # PA depends on OpenSearch. Checkout and publish to maven local for PA build. - name: Checkout OpenSearch uses: actions/checkout@v2 with: repository: 'opensearch-project/OpenSearch' path: OpenSearch - ref: '1.0.0-beta1' + ref: '1.x' - name: Build OpenSearch working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=beta1 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false - name: Update SHA working-directory: ./tmp/pa run: ./gradlew updateShas diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index a5ed35c81..6cacb96a1 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -23,4 +23,4 @@ This code of conduct applies to all spaces provided by the OpenSource project in Instances of abusive, harassing, or otherwise unacceptable behavior may be reported. [Contact us](mailto:opensource-codeofconduct@amazon.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. -In the event of conflict, this **Code of Conduct** supercedes the original [Code of Conduct](https://opendistro.github.io/for-elasticsearch/codeofconduct.html) that this project had adopted. \ No newline at end of file +In the event of conflict, this **Code of Conduct** supercedes the original [Code of Conduct](https://opensearch.org/codeofconduct.html) that this project had adopted. \ No newline at end of file diff --git a/INSTALL.md b/INSTALL.md index 2d32f751f..bcecd8d17 100644 --- a/INSTALL.md +++ b/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 /build/distributions/performance-analyzer-rca.zip ./` - `cp /build/distributions/opensearch-performance-analyzer-1.0.0.0-beta1-SNAPSHOT.zip ./` + `cp /build/distributions/opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip ./` ### Installation diff --git a/README.md b/README.md index 21373bf99..2ef621e21 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Java CI](https://github.com/opensearch-project/performance-analyzer-rca/workflows/Java%20CI/badge.svg)](https://github.com/opensearch-project/performance-analyzer-rca/actions?query=workflow%3A%22Java+CI%22) [![codecov](https://codecov.io/gh/opensearch-project/performance-analyzer-rca/branch/master/graph/badge.svg)](https://codecov.io/gh/opensearch-project/performance-analyzer-rca) -[![Documentation](https://img.shields.io/badge/api-reference-blue.svg)](https://opendistro.github.io/for-elasticsearch-docs/docs/rca/) +[![Documentation](https://img.shields.io/badge/api-reference-blue.svg)](https://docs-beta.opensearch.org/docs/pa/reference/) [![Chat](https://img.shields.io/badge/chat-on%20forums-blue)](https://discuss.opendistrocommunity.dev/c/performance-analyzer/) ![PRs welcome!](https://img.shields.io/badge/PRs-welcome!-success) @@ -171,7 +171,7 @@ We invite developers from the larger Open Distro community to contribute and hel ## Code of Conduct -This project has adopted an [Open Source Code of Conduct](https://opendistro.github.io/for-elasticsearch/codeofconduct.html). +This project has adopted an [Open Source Code of Conduct](https://opensearch.org/codeofconduct.html). ## Security Issue Notifications diff --git a/build.gradle b/build.gradle index 89ec8ae87..d490364f2 100644 --- a/build.gradle +++ b/build.gradle @@ -80,9 +80,9 @@ distZip { publishing { publications { maven(MavenPublication) { - groupId = 'com.amazon.opensearch' + groupId = 'org.opensearch' artifactId = 'performanceanalyzer-rca' - version = '1.0.0.0-beta1' + version = '1.0.0.0-rc1' from components.java } } @@ -209,7 +209,7 @@ jacocoTestCoverageVerification { check.dependsOn jacocoTestCoverageVerification -version = "${rca_version}.0.0-beta1" +version = "${rca_version}.0.0-rc1" if (isSnapshot) { version += "-SNAPSHOT" } @@ -376,7 +376,7 @@ task cloneGitRepo(type: GitClone) { task removeLicenses(type: Delete) { dependsOn(cloneGitRepo) - def toDelete = Paths.get(paDir, 'licenses', 'performanceanalyzer-rca-1.0.0.0-beta1.jar.sha1') + def toDelete = Paths.get(paDir, 'licenses', 'performanceanalyzer-rca-1.0.0.0-rc1.jar.sha1') delete(toDelete) } @@ -399,7 +399,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', 'opensearch-performance-analyzer-1.0.0.0-beta1-SNAPSHOT.zip') + def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip') dockerArtifactsDir = Paths.get(dockerBuildDir, 'rca-docker') from(dockerArtifacts) diff --git a/docker/Dockerfile b/docker/Dockerfile index d60e35016..5ccf026b2 100644 --- a/docker/Dockerfile +++ b/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/releases/core/opensearch/1.0.0-beta1/opensearch-1.0.0-beta1-linux-x64.tar.gz | \ +RUN curl -fsSL https://artifacts.opensearch.org/releases/core/opensearch/1.0.0-rc1/opensearch-1.0.0-rc1-linux-x64.tar.gz | \ tar zx --strip-components=1 RUN set -ex && for opensearchdirs in config data logs; do \ @@ -60,10 +60,10 @@ COPY --chown=1000:0 opensearch.yml log4j2.properties config/ COPY --chown=1000:0 performance-analyzer-rca.zip config/ -COPY --chown=1000:0 opensearch-performance-analyzer-1.0.0.0-beta1-SNAPSHOT.zip /tmp/ +COPY --chown=1000:0 opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip /tmp/ -RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-1.0.0.0-beta1-SNAPSHOT.zip; \ - rm /tmp/opensearch-performance-analyzer-1.0.0.0-beta1-SNAPSHOT.zip +RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip; \ + rm /tmp/opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip USER 0 @@ -145,7 +145,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.0" \ - org.label-schema.url="https://opendistro.github.io" \ + 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" \ org.label-schema.vendor="Amazon" \ diff --git a/docs/gauntlet.md b/docs/gauntlet.md index 54e04bc69..84761b4ec 100644 --- a/docs/gauntlet.md +++ b/docs/gauntlet.md @@ -85,7 +85,7 @@ Let's see an example: metrics class that you specify, should have a `static final` field called `NAME` (`CPU_Utilization`) and that will be used to determine the name of the metric table. - _dimensionNames_ : For the dimension names for a metric, please refer to the docs -[here](https://opendistro.github.io/for-elasticsearch-docs/docs/pa/reference/). Each of the dimension +[here](https://docs-beta.opensearch.org/docs/pa/reference/). Each of the dimension will be a column in the rca.sqlite table. - _tables_ : This specifies one or more table(s). The table should be a 5 second snapshot of the metrics, similar to what exists in metricsdb files. The table is an array type diff --git a/src/main/java/org/opensearch/performanceanalyzer/rca/README.md b/src/main/java/org/opensearch/performanceanalyzer/rca/README.md index 2ef5d5faa..9d2e125df 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/rca/README.md +++ b/src/main/java/org/opensearch/performanceanalyzer/rca/README.md @@ -19,7 +19,7 @@ will run through the entirety of this discussion. ### Metrics ### This is the input to the system. These are essentially key-value pairs. For details on what metrics are available, please take a look at the online - reference [here](https://opendistro.github.io/for-elasticsearch-docs/docs/pa/reference/). + reference [here](https://docs-beta.opensearch.org/docs/pa/reference/). ### Symptoms ### diff --git a/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/README.md b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/README.md index b05867b7a..26326e1f5 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/README.md +++ b/src/main/java/org/opensearch/performanceanalyzer/rca/store/rca/temperature/README.md @@ -16,7 +16,7 @@ node and cluster) based on resource utilization. ### Temperature RCA Graph construction Temperature along each dimension is contributed by a shard-dependent and a shard-independent components. For all the metrics - [here](https://opendistro.github.io/for-elasticsearch-docs/docs/pa/reference/), the metrics that + [here](https://docs-beta.opensearch.org/docs/pa/reference/), the metrics that have shardID as dimension will have a shard contributed factor to the temperature along that dimension. But that metric also might have a factor that is shard independent. For example , _CPU_utilization_, has a shard dependent components for the CPU that is spent for various diff --git a/src/main/resources/plugin-descriptor.properties b/src/main/resources/plugin-descriptor.properties index 334b78350..118009430 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=1.0.0.0-beta1 +version=1.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=1.0.0-beta1 +opensearch.version=1.0.0-rc1 diff --git a/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AMetric.java b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AMetric.java index aea3d12ea..4a1be613c 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AMetric.java +++ b/src/test/java/org/opensearch/performanceanalyzer/rca/integTests/framework/annotations/AMetric.java @@ -48,7 +48,7 @@ Class name(); // The names of the dimension columns that the metrics has. The dimensions can be found here: - // https://opendistro.github.io/for-elasticsearch-docs/docs/pa/reference/ + // https://docs-beta.opensearch.org/docs/pa/reference/ String[] dimensionNames(); // Specify one or more tables for the metric where each table belongs to a host or a group of