Skip to content

Commit 62f33ef

Browse files
authored
backort changes from main for monexp update (#3881)
* backport changes from main for WME update
1 parent 0d2aa0a commit 62f33ef

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.kubernetes;
@@ -262,7 +262,7 @@ public interface TestConstants {
262262

263263
//monitoring constants
264264
public static final String MONITORING_EXPORTER_WEBAPP_VERSION =
265-
getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.1.0");
265+
getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.1.1");
266266
public static final String MONITORING_EXPORTER_BRANCH =
267267
getNonEmptySystemProperty("wko.it.monitoring.exporter.branch", "main");
268268
public static final String PROMETHEUS_CHART_VERSION =

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/MonitoringUtils.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2021, 2023, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.kubernetes.utils;
@@ -111,15 +111,13 @@ public class MonitoringUtils {
111111
public static void downloadMonitoringExporterApp(String configFile, String applicationDir) {
112112
//version of wls-exporter.war published in https://github.com/oracle/weblogic-monitoring-exporter/releases/
113113
String monitoringExporterRelease = MONITORING_EXPORTER_WEBAPP_VERSION;
114-
String monitoringExporterWebAppScriptVersion = monitoringExporterRelease.substring(0,
115-
monitoringExporterRelease.length() - 2);
116114
String curlDownloadCmd = String.format("cd %s && "
117-
+ "curl -O -L -k https://github.com/oracle/weblogic-monitoring-exporter/releases/download/v%s/get%s.sh",
115+
+ "curl -O -L -k https://github.com/oracle/weblogic-monitoring-exporter/releases/download/v%s/get_v%s.sh",
118116
applicationDir,
119117
monitoringExporterRelease,
120-
monitoringExporterWebAppScriptVersion);
118+
monitoringExporterRelease);
121119
String monitoringExporterBuildFile = String.format(
122-
"%s/get%s.sh", applicationDir, monitoringExporterWebAppScriptVersion);
120+
"%s/get_v%s.sh", applicationDir, monitoringExporterRelease);
123121
logger.info("execute command a monitoring exporter curl command {0} ", curlDownloadCmd);
124122
assertTrue(Command
125123
.withParams(new CommandParams()

0 commit comments

Comments
 (0)