updated monexp to 2.0 (#2401)

* update monexp to 2.0

Author: marinakog

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

@@ -110,7 +110,6 @@
 import static oracle.weblogic.kubernetes.TestConstants.GRAFANA_CHART_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
-import static oracle.weblogic.kubernetes.TestConstants.MONITORING_EXPORTER_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.OCIR_EMAIL;
 import static oracle.weblogic.kubernetes.TestConstants.OCIR_PASSWORD;
 import static oracle.weblogic.kubernetes.TestConstants.OCIR_REGISTRY;
@@ -1397,12 +1396,9 @@ private static void installMonitoringExporter() {
 
     monitoringExporterSrcDir = monitoringTemp.toString();
     monitoringExporterEndToEndDir = monitoringTemp + "/samples/kubernetes/end2end/";
-    String monitoringExporterVersion = Optional.ofNullable(System.getenv("MONITORING_EXPORTER_VERSION"))
-        .orElse(MONITORING_EXPORTER_VERSION);
 
     //adding ability to build monitoring exporter if branch is not master
     boolean toBuildMonitoringExporter = (!monitoringExporterBranch.equalsIgnoreCase(("master")));
-    logger.info("create a monitoring exporter version {0} ",monitoringExporterVersion);
     monitoringExporterAppDir = monitoringApp.toString();
     String monitoringExporterAppNoRestPortDir = monitoringAppNoRestPort.toString();
 

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

@@ -235,9 +235,9 @@ public interface TestConstants {
   public static final String WDT_BASIC_APP_NAME = "sample-app";
 
   //monitoring constants
-  public static final String MONITORING_EXPORTER_VERSION = Optional.ofNullable(System.getenv(
-      "MONITORING_EXPORTER_VERSION"))
-      .orElse("1.3.0");
+  public static final String MONITORING_EXPORTER_WEBAPP_VERSION = Optional.ofNullable(System.getenv(
+      "MONITORING_EXPORTER_WEBAPP_VERSION"))
+      .orElse("2.0");
   public static final String MONITORING_EXPORTER_BRANCH = Optional.ofNullable(System.getenv(
       "MONITORING_EXPORTER_BRANCH"))
       .orElse("master");

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

@@ -18,7 +18,7 @@
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
-import static oracle.weblogic.kubernetes.TestConstants.MONITORING_EXPORTER_VERSION;
+import static oracle.weblogic.kubernetes.TestConstants.MONITORING_EXPORTER_WEBAPP_VERSION;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
 import static oracle.weblogic.kubernetes.utils.FileUtils.checkDirectory;
 import static oracle.weblogic.kubernetes.utils.FileUtils.checkFile;
@@ -39,17 +39,21 @@ public class MonitoringUtils {
    */
   public static void downloadMonitoringExporterApp(String configFile, String applicationDir) {
     LoggingFacade logger = getLogger();
-    String monitoringExporterVersion = Optional.ofNullable(System.getenv("MONITORING_EXPORTER_VERSION"))
-        .orElse(MONITORING_EXPORTER_VERSION);
+    //version of wls-exporter.war published in https://github.com/oracle/weblogic-monitoring-exporter/releases/
+    String monitoringExporterWebAppVersion = Optional.ofNullable(System.getenv("MONITORING_EXPORTER_WEBAPP_VERSION"))
+        .orElse(MONITORING_EXPORTER_WEBAPP_VERSION);
+
     String monitoringExporterBuildFile = String.format(
-        "%s/get%s.sh", applicationDir, monitoringExporterVersion);
+        "%s/get%s.sh", applicationDir, monitoringExporterWebAppVersion);
     checkDirectory(applicationDir);
     logger.info("Download a monitoring exporter build file {0} ", monitoringExporterBuildFile);
+    String monitoringExporterRelease =
+        monitoringExporterWebAppVersion.equals("2.0") ? "2.0.0" : monitoringExporterWebAppVersion;
     String curlDownloadCmd = String.format("cd %s && "
             + "curl -O -L -k https://github.com/oracle/weblogic-monitoring-exporter/releases/download/v%s/get%s.sh",
         applicationDir,
-        monitoringExporterVersion,
-        monitoringExporterVersion);
+        monitoringExporterRelease,
+        monitoringExporterWebAppVersion);
     logger.info("execute command  a monitoring exporter curl command {0} ", curlDownloadCmd);
     assertTrue(new Command()
         .withParams(new CommandParams()