diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/auditing')
4 files changed, 20 insertions, 26 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/api/AuditEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/api/AuditEventFactory.java index 387e17b596..99c1ac3528 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/api/AuditEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/api/AuditEventFactory.java @@ -30,7 +30,4 @@ public interface AuditEventFactory { String getLogMessage(); AuditingGenericEvent getDbEvent(); List<Pair<String, String>> getQueryParams(); - - //TODO remove together with ES related code - String getAuditingEsType(); } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditBaseEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditBaseEventFactory.java index 89bd6add7b..91212ad11e 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditBaseEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditBaseEventFactory.java @@ -126,11 +126,6 @@ public abstract class AuditBaseEventFactory implements AuditEventFactory { } @Override - public String getAuditingEsType() { - return this.action.getAuditingEsType(); - } - - @Override public final String getLogMessage() { return String.format(getLogPattern(), getLogArgs()); } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditConsumerEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditConsumerEventFactory.java index 8c0054af32..9176a1aa93 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditConsumerEventFactory.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditConsumerEventFactory.java @@ -43,7 +43,7 @@ public class AuditConsumerEventFactory extends AuditBaseEventFactory { } private AuditConsumerEventFactory(AuditingActionEnum action, CommonAuditData commonFields, - String ecompUser, String modifier) { + String ecompUser, String modifier) { super(action); event = new ConsumerEvent(getAction().getName(), commonFields, ecompUser, modifier); } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingManager.java index 4e2b85eeb6..0f94ad2ce7 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingManager.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingManager.java @@ -22,16 +22,17 @@ package org.openecomp.sdc.be.auditing.impl; +import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.openecomp.sdc.be.auditing.api.AuditEventFactory; -import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.dao.cassandra.AuditCassandraDao; import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus; -import org.openecomp.sdc.be.dao.impl.AuditingDao; import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; import org.openecomp.sdc.common.log.elements.LogFieldsMdcHandler; +import org.openecomp.sdc.common.log.enums.LogLevel; +import org.openecomp.sdc.common.log.enums.Severity; import org.openecomp.sdc.common.log.wrappers.Logger; import org.openecomp.sdc.common.log.wrappers.LoggerSdcAudit; -import org.springframework.beans.factory.annotation.Autowired; +import org.slf4j.MarkerFactory; import org.springframework.stereotype.Component; @Component @@ -39,13 +40,10 @@ public class AuditingManager { private static final Logger log = Logger.getLogger(AuditingManager.class.getName()); - private final AuditingDao auditingDao; private final AuditCassandraDao cassandraDao; private final ConfigurationProvider configurationProvider; - @Autowired - public AuditingManager(AuditingDao auditingDao, AuditCassandraDao cassandraDao, ConfigurationProvider configurationProvider) { - this.auditingDao = auditingDao; + public AuditingManager(AuditCassandraDao cassandraDao, ConfigurationProvider configurationProvider) { this.cassandraDao = cassandraDao; this.configurationProvider = configurationProvider; } @@ -57,23 +55,27 @@ public class AuditingManager { String msg = factory.getLogMessage(); logAuditEvent(msg); - //TODO - remove this method after we got rid of ES - saveEventToElasticSearch(factory); saveEventToCassandra(factory.getDbEvent()); return msg; } - private void saveEventToCassandra(AuditingGenericEvent event) { - CassandraOperationStatus result = cassandraDao.saveRecord(event); - if (!result.equals(CassandraOperationStatus.OK)) { - log.warn("Failed to persist to cassandra auditing event: {}", result.name()); + public String auditEvent(AuditEventFactory factory, LoggerSdcAudit audit) { + String msg = auditEvent(factory); + logAuditEvent(msg, audit, factory.getDbEvent().getRequestId()); + return msg; + } + + private void logAuditEvent(String msg, LoggerSdcAudit audit, String requestId) { + if(audit != null) { + audit.logEntry(LogLevel.INFO, Severity.OK, msg, + MarkerFactory.getMarker(ONAPLogConstants.Markers.ENTRY.getName()), requestId); } } - private void saveEventToElasticSearch(AuditEventFactory factory) { - ActionStatus addRecordStatus = auditingDao.addRecord(factory.getDbEvent(), factory.getAuditingEsType()); - if (!addRecordStatus.equals(ActionStatus.OK)) { - log.warn("Failed to persist auditing event: {}", addRecordStatus.name()); + private void saveEventToCassandra(AuditingGenericEvent event) { + CassandraOperationStatus result = cassandraDao.saveRecord(event); + if (result != CassandraOperationStatus.OK) { + log.warn("Failed to persist to cassandra auditing event: {}", result.name()); } } |