Skip to content

Commit 49cb452

Browse files
committed
Merge branch 'revoke-elk-fluentd-debug' into 'main'
Revoked the brach elk-fluentd-debug from main See merge request weblogic-cloud/weblogic-kubernetes-operator!4254
2 parents 458808f + ca82fe0 commit 49cb452

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/LoggingExporter.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,6 @@ public static Map<String, String> verifyLoggingExporterReady(String opNamespace,
278278
execLoggingExpStatusCheck(opNamespace, esNamespace, labelSelector, "*" + index + "*");
279279
assertNotNull(statusLine);
280280

281-
logger.info("=== statusLine return by execLoggingExpStatusCheck: {0}!", statusLine);
282-
283281
String [] parseString = statusLine.split("\\s+");
284282
assertTrue(parseString.length >= 3, index + " does not exist!");
285283
String healthStatus = parseString[0];
@@ -471,33 +469,28 @@ private static V1Service createKibanaServiceCr(LoggingExporterParams params) {
471469
private static String execLoggingExpStatusCheck(String opNamespace, String esNamespace,
472470
String labelSelector, String indexRegex) {
473471
String elasticSearchHost = "elasticsearch." + esNamespace + ".svc.cluster.local";
474-
logger.info("=== elasticSearchHost in execLoggingExpStatusCheck: {0}", elasticSearchHost);
475472
StringBuffer k8sExecCmdPrefixBuff = new StringBuffer("curl http://");
476473
String cmd = k8sExecCmdPrefixBuff
477474
.append(elasticSearchHost)
478475
.append(":")
479476
.append(ELASTICSEARCH_HTTP_PORT)
480477
.append("/_cat/indices/")
481478
.append(indexRegex).toString();
482-
logger.info("=== Command to get logging exporter status line {0}", cmd);
479+
logger.info("Command to get logging exporter status line {0}", cmd);
483480

484481
// get Operator pod name
485482
String operatorPodName = assertDoesNotThrow(() -> getOperatorPodName(OPERATOR_RELEASE_NAME, opNamespace));
486483
assertTrue(operatorPodName != null && !operatorPodName.isEmpty(), "Failed to get Operator pad name");
487-
logger.info("=== operatorPodName in execLoggingExpStatusCheck: {0}", operatorPodName);
488484

489485
int i = 0;
490486
ExecResult statusLine = null;
491487
while (i < maxIterationsPod) {
492-
logger.info("=== cmd to exec execLoggingExpStatusCheck: opNamespace: {0}, operatorPodName: {1}, cmd {2} {3}",
488+
logger.info("Command to exec execLoggingExpStatusCheck: opNamespace: {0}, operatorPodName: {1}, cmd {2} {3}",
493489
opNamespace, operatorPodName, "/bin/sh -c ", cmd);
494490
statusLine = assertDoesNotThrow(() -> execCommand(opNamespace, operatorPodName, null, true,
495491
"/bin/sh", "-c", cmd));
496492
assertNotNull(statusLine, "curl command returns null");
497493

498-
logger.info("Status.stdout(): ###{0}### for index ***{1}***", statusLine.stdout(), indexRegex);
499-
logger.info("Status.stderr(): ###{0}### for index ***{1}***", statusLine.stderr(), indexRegex);
500-
logger.info("Status.toString(): ###{0}### for index ***{1}***", statusLine.toString(), indexRegex);
501494
if (null != statusLine.stdout() && !statusLine.stdout().isEmpty()) {
502495
break;
503496
}

0 commit comments

Comments
 (0)