diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java index 13a30f75c275e1d57c9d7b4556a5a35e2f5c1d27..24899d8fd8ce95377de40d38e4d0c676b7e1226b 100644 --- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java +++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java @@ -27,17 +27,17 @@ public class ElasticsearchReconciler implements Reconciler<OzgCloudElasticsearch public UpdateControl<OzgCloudElasticsearchCustomResource> reconcile(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) { try { - LOG.info("{}: Reconcile user", resource.getMetadata().getName()); var namespace = resource.getMetadata().getNamespace(); + LOG.info("{}: Reconcile user", namespace); var secret = service.getOrCreateCredentialSecret(resource, context); service.createIndexIfMissing(namespace); service.createSecurityRoleIfMissing(namespace); service.createSecurityUserIfMissing(namespace, getPassword(secret)); service.createCertificateIfMissing(namespace); - LOG.info("{}: Reconcile user successful.", resource.getMetadata().getName()); + LOG.info("{}: Reconcile user successful.", namespace); return OzgCloudElasticsearchUpdateControlBuilder.fromResource(resource).withStatus(CustomResourceStatus.OK).build(); } catch (Exception exception) { - LOG.warn(resource.getMetadata().getName() + ": Reconcile user failed.", exception); + LOG.warn(resource.getMetadata().getNamespace() + ": Reconcile user failed.", exception); return buildExceptionUpdateControl(resource, exception); } } @@ -73,7 +73,7 @@ public class ElasticsearchReconciler implements Reconciler<OzgCloudElasticsearch service.deleteIndexIfExists(namespace); return DeleteControl.defaultDelete(); } catch (Exception e) { - LOG.warn(resource.getCRDName() + ": Could not cleanup elasticsearch resource.", e); + LOG.warn(resource.getMetadata().getNamespace() + ": Could not cleanup elasticsearch resource.", e); return DeleteControl.defaultDelete(); } } diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java index d5ce0f979511c5c1ea61b1d295370c7e53809660..d7207e433215e4bbdbf7a5254b0aa9d16dfbee09 100644 --- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java +++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java @@ -29,18 +29,18 @@ public class OzgCloudElasticsearchService { public Secret getOrCreateCredentialSecret(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) { try { - LOG.debug("{}: Get or create secret.", resource.getCRDName()); + LOG.debug("{}: Get or create secret.", resource.getMetadata().getNamespace()); var namespace = resource.getMetadata().getNamespace(); var secretResource = getCredentialsSecretResource(namespace); if (Objects.isNull(secretResource.get())) { - LOG.info("{}: Secret not exists, create one ...", resource.getCRDName()); + LOG.info("{}: Secret not exists, create one ...", resource.getMetadata().getNamespace()); createCredentialSecret(secretResource, namespace); - LOG.info("{}: Secret creation successful.", resource.getCRDName()); + LOG.info("{}: Secret creation successful.", resource.getMetadata().getNamespace()); } return secretResource.get(); } catch (Exception e) { - LOG.warn(resource.getCRDName() + ": Secret creation failed: ", e); + LOG.warn(resource.getMetadata().getNamespace() + ": Secret creation failed: ", e); throw e; } } diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java index b9d307326791fd3f2e6f2c8c46e1074150db007c..12c4c5db85dff6deeb1d815386f13b54823d6b38 100644 --- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java +++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java @@ -25,7 +25,7 @@ public class ElasticsearchRemoteService { try { LOG.debug("{}: Test if elasticsearch index exits.", index); var exists = client.indices().exists(builder -> builder.index(index)).value(); - LOG.debug("{}: Elasticsearch index exists: {}", exists); + LOG.debug("{}: Elasticsearch index exists: {}", index, exists); return exists; } catch (ElasticsearchException | IOException e) { throw new RuntimeException("Error checking index '" + index, e); diff --git a/ozgcloud-elasticsearch-operator/src/main/resources/log4j2-local.xml b/ozgcloud-elasticsearch-operator/src/main/resources/log4j2-local.xml new file mode 100644 index 0000000000000000000000000000000000000000..5d7001e1f9186d197a2d301d3910c9d73ed05d15 --- /dev/null +++ b/ozgcloud-elasticsearch-operator/src/main/resources/log4j2-local.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<configuration> + <Appenders> + <Console name="CONSOLE" target="SYSTEM_OUT"> + <PatternLayout pattern="[%-5level] %c{1.} %msg%n"/> + </Console> + </Appenders> + + <Loggers> + <Root level="WARN"> + <appender-ref ref="CONSOLE" /> + </Root> + </Loggers> +</configuration> \ No newline at end of file