Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 2.1 release version #232

Merged
merged 3 commits into from
Jun 24, 2022
Merged

Update 2.1 release version #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cec8b81
Adding _agent to uri path for PerformanceAnalyzerRCAHealthCheckIT (#225)
jainankitk May 24, 2022
1bf9411
Update 2.1 release version
sruti1312 Jun 24, 2022
e892dd3
Update gradle version
sruti1312 Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
buildscript {

ext {
opensearch_version = System.getProperty("opensearch.version", "2.0.1-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.1-SNAPSHOT -> 2.0.1.0-SNAPSHOT
// 2.1.0-SNAPSHOT -> 2.1.0.0-SNAPSHOT
version_tokens = opensearch_version.tokenize('-')
opensearch_build = version_tokens[0] + '.0'
if (buildVersionQualifier) {
Expand Down Expand Up @@ -63,9 +63,9 @@ spotbugsTest {
}

ext {
// The RCA branch that will be built. Default branch is 2.0.
// The RCA branch that will be built. Default branch is 2.1.
rcaProjectRepo = System.getProperty("performance-analyzer-rca.repo", "https://github.com/opensearch-project/performance-analyzer-rca.git")
rcaProjectBranch = System.getProperty("performance-analyzer-rca.branch", "2.0")
rcaProjectBranch = System.getProperty("performance-analyzer-rca.branch", "2.1")

// If true, then the build will clone the RCA Project into $rcaProjectDir
cloneRcaProject = "true" == System.getProperty("performance-analyzer-rca.build", "true")
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion licenses/performanceanalyzer-rca-2.0.0.0-rc1-SNAPSHOT.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions licenses/performanceanalyzer-rca-2.1.0.0-SNAPSHOT.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3d56acab29397385232ab7720921f0328a2468b4
8 changes: 4 additions & 4 deletions src/main/resources/plugin-descriptor.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -27,7 +27,7 @@
description=Performance Analyzer Plugin
#
# 'version': plugin's version
version=2.0.1.0
version=2.1.0.0
#
# 'name': the plugin name
name=performance-analyzer
Expand All @@ -42,4 +42,4 @@ classname=org.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin
java.version=1.8
#
# 'opensearch.version' version of opensearch compiled against
opensearch.version=2.0.1
opensearch.version=2.1.0
2 changes: 1 addition & 1 deletion src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerRCAHealthCheckIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void checkMetrics(String paBaseUri) throws Exception {
new Request(
"GET",
paBaseUri
+ "/metrics/?metrics=Disk_Utilization&agg=max&dim=&nodes=all");
+ "/_agent/metrics/?metrics=Disk_Utilization&agg=max&dim=&nodes=all");
Response resp = paClient.performRequest(request);
Assert.assertEquals(HttpStatus.SC_OK, resp.getStatusLine().getStatusCode());
jsonString[0] = EntityUtils.toString(resp.getEntity());
Expand Down