diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java index 39cc6c95989..60b88dd9576 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java @@ -1,4 +1,4 @@ -// Copyright (c) 2020, 2022, Oracle and/or its affiliates. +// Copyright (c) 2020, 2023, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -262,7 +262,7 @@ public interface TestConstants { //monitoring constants public static final String MONITORING_EXPORTER_WEBAPP_VERSION = - getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.1.0"); + getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.1.1"); public static final String MONITORING_EXPORTER_BRANCH = getNonEmptySystemProperty("wko.it.monitoring.exporter.branch", "main"); public static final String PROMETHEUS_CHART_VERSION = diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/MonitoringUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/MonitoringUtils.java index 85f4a86cb86..a7811530ff5 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/MonitoringUtils.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/MonitoringUtils.java @@ -1,4 +1,4 @@ -// Copyright (c) 2021, 2022, Oracle and/or its affiliates. +// Copyright (c) 2021, 2023, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes.utils; @@ -111,15 +111,13 @@ public class MonitoringUtils { public static void downloadMonitoringExporterApp(String configFile, String applicationDir) { //version of wls-exporter.war published in https://github.com/oracle/weblogic-monitoring-exporter/releases/ String monitoringExporterRelease = MONITORING_EXPORTER_WEBAPP_VERSION; - String monitoringExporterWebAppScriptVersion = monitoringExporterRelease.substring(0, - monitoringExporterRelease.length() - 2); String curlDownloadCmd = String.format("cd %s && " - + "curl -O -L -k https://github.com/oracle/weblogic-monitoring-exporter/releases/download/v%s/get%s.sh", + + "curl -O -L -k https://github.com/oracle/weblogic-monitoring-exporter/releases/download/v%s/get_v%s.sh", applicationDir, monitoringExporterRelease, - monitoringExporterWebAppScriptVersion); + monitoringExporterRelease); String monitoringExporterBuildFile = String.format( - "%s/get%s.sh", applicationDir, monitoringExporterWebAppScriptVersion); + "%s/get_v%s.sh", applicationDir, monitoringExporterRelease); logger.info("execute command a monitoring exporter curl command {0} ", curlDownloadCmd); assertTrue(Command .withParams(new CommandParams()