Skip to content

backort changes from main for monexp update #3881

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

Merged
merged 4 commits into from
Jan 24, 2023
Merged

backort changes from main for monexp update #3881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3efad13
backported from main
marinakog Jan 23, 2023
87da4b7
fixed merges
marinakog Jan 23, 2023
e6f2da5
added fixes
marinakog Jan 23, 2023
18e3bea
year fix
marinakog Jan 23, 2023
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
4 changes: 2 additions & 2 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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 =
Expand Down
10 changes: 4 additions & 6 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/MonitoringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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()
Expand Down