Fluentd minor fix (#2975)

* Fluentd minor fix

Author: jshum2479

integration-tests/src/test/java/oracle/weblogic/domain/DomainSpec.java

@@ -135,12 +135,13 @@ public class DomainSpec {
    *
    */
   @ApiModelProperty("Automatic fluentd sidecar injection. If "
-          + "specified, the operator "
-          + "will deploy a sidecar container alongside each WebLogic Server instance that runs the exporter. "
-          + "WebLogic Server instances that are already running when the `monitoringExporter` field is created "
-          + "or deleted, will not be affected until they are restarted. When any given server "
-          + "is restarted for another reason, such as a change to the `restartVersion`, then the newly created pod "
-          + " will have the fluentd sidecar or not, as appropriate")
+      + "specified, the operator "
+      + "will deploy a sidecar container alongside each WebLogic Server instance that runs the fluentd, "
+      + "Optionally, the introspector job pod can be enabled to deploy with the fluentd sidecar container. "
+      + "WebLogic Server instances that are already running when the `fluentdSpecification` field is created "
+      + "or deleted, will not be affected until they are restarted. When any given server "
+      + "is restarted for another reason, such as a change to the `restartVersion`, then the newly created pod "
+      + " will have the fluentd sidecar or not, as appropriate")
   private FluentdSpecification fluentdSpecification;
 
   public FluentdSpecification getFluentdSpecification() {
@@ -816,7 +817,8 @@ public String toString() {
             .append("serverPod", serverPod)
             .append("serverService", serverService)
             .append("restartVersion", restartVersion)
-            .append("monitoringExporter", monitoringExporter);
+            .append("monitoringExporter", monitoringExporter)
+            .append("fluentdSpecification", fluentdSpecification);
 
     return builder.toString();
   }
@@ -853,7 +855,8 @@ public int hashCode() {
             .append(serverService)
             .append(serverStartState)
             .append(restartVersion)
-            .append(monitoringExporter);
+            .append(monitoringExporter)
+            .append(fluentdSpecification);
 
     return builder.toHashCode();
   }
@@ -898,7 +901,8 @@ public boolean equals(Object other) {
             .append(serverService, rhs.serverService)
             .append(serverStartState, rhs.serverStartState)
             .append(restartVersion, rhs.restartVersion)
-            .append(monitoringExporter, rhs.monitoringExporter);
+            .append(monitoringExporter, rhs.monitoringExporter)
+            .append(fluentdSpecification, rhs.fluentdSpecification);
     return builder.isEquals();
   }
 }

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

@@ -189,7 +189,6 @@ public static void init(@Namespaces(3) List<String> namespaces) {
         String.format("Failed to upgrade operator in namespace %s", opNamespace));
 
     // create fluentd configuration
-    //configFluentd();
 
     // create and verify WebLogic domain image using model in image with model files
     String imageName = createAndVerifyDomainImage();
@@ -293,7 +292,8 @@ private boolean queryAndVerify() {
     String queryCriteria1 = "/_search?q=filesource:introspectDomain.sh";
     String results1 = execSearchQuery(queryCriteria1, INTROSPECTOR_INDEX_KEY);
     logger.info("/_search?q=filesource:introspectDomain.sh ===> {0}", results1);
-    boolean jobCompeted = results1.contains("Domain introspection complete");
+    // as long as there is something returned
+    boolean jobCompeted = results1.contains("introspectDomain.sh");
     logger.info("found completed job " + jobCompeted);
 
     return count > 0 && failedCount == 0 && jobCompeted;

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainSpec.java

@@ -1043,7 +1043,8 @@ public String toString() {
             .append("monitoringExporter", monitoringExporter)
             .append("replicas", replicas)
             .append("serverStartPolicy", serverStartPolicy)
-            .append("webLogicCredentialsSecret", webLogicCredentialsSecret);
+            .append("webLogicCredentialsSecret", webLogicCredentialsSecret)
+            .append("fluentdSpecification", fluentdSpecification);
 
     return builder.toString();
   }
@@ -1076,7 +1077,8 @@ public int hashCode() {
             .append(monitoringExporter)
             .append(replicas)
             .append(serverStartPolicy)
-            .append(webLogicCredentialsSecret);
+            .append(webLogicCredentialsSecret)
+            .append(fluentdSpecification);
 
     return builder.toHashCode();
   }
@@ -1117,7 +1119,8 @@ public boolean equals(Object other) {
             .append(configOverrideSecrets, rhs.configOverrideSecrets)
             .append(isAllowReplicasBelowMinDynClusterSize(), rhs.isAllowReplicasBelowMinDynClusterSize())
             .append(getMaxClusterConcurrentStartup(), rhs.getMaxClusterConcurrentStartup())
-            .append(getMaxClusterConcurrentShutdown(), rhs.getMaxClusterConcurrentShutdown());
+            .append(getMaxClusterConcurrentShutdown(), rhs.getMaxClusterConcurrentShutdown())
+            .append(fluentdSpecification, rhs.getFluentdSpecification());
     return builder.isEquals();
   }