Output of integration tests cleaned.

Signed-off-by: Lukasz Soszynski <[email protected]>

build.gradle

@@ -280,6 +280,8 @@ sourceSets {
 task integrationTest(type: Test) {
     description = 'Run integration tests.'
     group = 'verification'
+    systemProperty "org.opensearch.common.logging.NodeAndClusterIdConverter.enabled", "false"
+    systemProperty "java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager"
     testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
 
@@ -423,6 +425,8 @@ dependencies {
     integrationTestImplementation "org.opensearch.plugin:percolator-client:${opensearch_version}"
     integrationTestImplementation 'commons-io:commons-io:2.11.0'
     integrationTestImplementation 'org.apache.logging.log4j:log4j-core:2.17.1'
+    integrationTestImplementation 'org.apache.logging.log4j:log4j-jul:2.17.1'
+    integrationTestImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
     integrationTestImplementation 'org.hamcrest:hamcrest:2.2'
 }
 

src/integrationTest/java/org/opensearch/security/SecurityRolesTests.java

@@ -58,7 +58,6 @@ public class SecurityRolesTests {
 
 	@Test
 	public void testSecurityRoles() throws Exception {
-
 		try (TestRestClient client = cluster.getRestClient(USER_SR)) {
 			HttpResponse response = client.getAuthInfo();
 			assertThat(response.getStatusCode(), equalTo(HttpStatus.SC_OK));

src/integrationTest/java/org/opensearch/test/framework/cluster/LocalOpenSearchCluster.java

@@ -471,6 +471,7 @@ private Settings getMinimalOpenSearchSettings() {
 					.put("discovery.probe.connect_timeout", "10s").put("discovery.probe.handshake_timeout", "10s").put("http.cors.enabled", true)
 					.put("plugins.security.compliance.salt", "1234567890123456")
 					.put("plugins.security.audit.type", "noop")
+					.put("gateway.auto_import_dangling_indices", "true")
 					.build();
 		}
 

src/integrationTest/resources/log4j2-test.properties

@@ -1,10 +1,16 @@
 status = info
 name = Integration test logging configuration
 
+
+
 appender.console.type = Console
 appender.console.name = consoleLogger
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %threadName %-5p %c{1}:%L - %m%n
+appender.console.filter.prerelease.type=RegexFilter
+appender.console.filter.prerelease.regex=.+\\Qis a pre-release version of OpenSearch and is not suitable for production\\E
+appender.console.filter.prerelease.onMatch=DENY
+appender.console.filter.prerelease.onMismatch=NEUTRAL
 
 rootLogger.level = warn
 rootLogger.appenderRef.stdout.ref = consoleLogger

src/main/java/org/opensearch/security/securityconf/DynamicConfigFactory.java

@@ -42,6 +42,7 @@
 import org.apache.logging.log4j.Logger;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBusBuilder;
+import org.greenrobot.eventbus.Logger.JavaLogger;
 
 import org.opensearch.client.Client;
 import org.opensearch.common.settings.Settings;
@@ -120,7 +121,7 @@ public final static SecurityDynamicConfiguration<?> addStatics(SecurityDynamicCo
     protected final Logger log = LogManager.getLogger(this.getClass());
     private final ConfigurationRepository cr;
     private final AtomicBoolean initialized = new AtomicBoolean();
-    private final EventBus eventBus = EVENT_BUS_BUILDER.build();
+    private final EventBus eventBus = EVENT_BUS_BUILDER.logger(new JavaLogger(DynamicConfigFactory.class.getCanonicalName())).build();
     private final Settings opensearchSettings;
     private final Path configPath;
     private final InternalAuthenticationBackend iab = new InternalAuthenticationBackend();