added monitoring exporter test and utility to build and start it part 3

Author: marinakog

integration-tests/src/test/java/oracle/kubernetes/operator/ITMonitoringExporter.java

@@ -85,7 +85,7 @@ public static void staticPrepare() throws Exception {
       metricsUrl = exporterUrl + "metrics";
       configPath = BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/exporter/";
 
-      DeployRunMonitoringExporter();
+      deployRunMonitoringExporter(domain, operator);
       upgradeTraefikHostName();
       buildDeployWebServiceApp(domain, TESTWSAPP, TESTWSSERVICE);
     }
@@ -116,18 +116,21 @@ public static void staticUnPrepare() throws Exception {
   }
 
   /**
-   * clone, build , deploy monitoring exporter
+   * clone, build , deploy monitoring exporter on specified domain, operator
    *
    * @throws Exception
    */
-  private static void DeployRunMonitoringExporter() throws Exception {
+  private static void deployRunMonitoringExporter(Domain domain, Operator operator)
+      throws Exception {
 
     TestUtils.gitCloneBuildMonitoringExporter();
     logger.info("Creating Operator & waiting for the script to complete execution");
     boolean testCompletedSuccessfully = false;
     startExporterPrometheusGrafana(domain, operator);
+    // check if exporter is up
+    domain.callWebAppAndVerifyLoadBalancing("wls-exporter", false);
     testCompletedSuccessfully = true;
-    logger.info("SUCCESS - DeployRunMonitoringExporter");
+    logger.info("SUCCESS - deployRunMonitoringExporter");
   }
 
   /**
@@ -255,7 +258,6 @@ public void test01_ReplaceConfiguration() throws Exception {
     boolean isFoundOldKey1 = true;
     boolean isFoundOldKey2 = true;
 
-    logger.info("Checking configuration for " + searchKey1);
     isFoundNewKey1 = checkMetrics(searchKey1);
     isFoundNewKey2 = checkMetrics(searchKey2);
     isFoundOldKey1 = checkMetrics(testWSAppTotalServletInvokesSearchKey1);

integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java

@@ -935,7 +935,7 @@ public static void createDirUnderDomainPV(String dirPath) throws Exception {
 
   /**
    * A utility method to copy Cross Namespaces RBAC yaml template file replacing the DOMAIN_NS,
-   * OPERATOR_NS and DOMAINUID.
+   * OPERATOR_NS
    *
    * @throws IOException when copying files from source location to staging area fails
    */
@@ -947,11 +947,6 @@ private static void createCrossNSRBACFile(String domainNS, String operatorNS) th
       logger.log(Level.INFO, "Copying {0}", src.toString());
       Charset charset = StandardCharsets.UTF_8;
       String content = new String(Files.readAllBytes(src), charset);
-      /*
-      content = content.replaceAll("@DOMAIN_NS@", domainNS);
-      content = content.replaceAll("@DOMAIN_UID@", domainUID);
-      content = content.replaceAll("@OPERATOR_NS@", operatorNS);
-      */
       content = content.replaceAll("weblogic-domain", domainNS);
       content = content.replaceAll("weblogic-operator", operatorNS);
       logger.log(Level.INFO, "to {0}", dst.toString());
@@ -963,8 +958,7 @@ private static void createCrossNSRBACFile(String domainNS, String operatorNS) th
    * Remove monitoring exporter directory if exists and clone latest from github for monitoring
    * exporter code
    *
-   * @throws Exception if could not run the command successfully to clone of docker-images sample
-   *     from github
+   * @throws Exception if could not run the command successfully to clone from github
    */
   public static void gitCloneBuildMonitoringExporter() throws Exception {
     monitoringDir = BaseTest.getResultDir() + "/monitoring";
@@ -989,7 +983,7 @@ public static void gitCloneBuildMonitoringExporter() throws Exception {
           removeAndClone.append("rm -rf ").append(monitoringExporterSrcDir).append(" && ");
         }
         logger.info(" Cloning and building Weblogic Server Monitoring Exporter application");
-        // git clone docker-images project
+        // git clone exporter project
         removeAndClone
             .append(" git clone  https://github.com/oracle/weblogic-monitoring-exporter.git ")
             .append(monitoringExporterSrcDir);