Skip to content

RANGER-5404 Modify the evtTime format to avoid format errors in ES #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2025
Merged

RANGER-5404 Modify the evtTime format to avoid format errors in ES #746

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion ...t-es/src/main/java/org/apache/ranger/audit/destination/ElasticSearchAuditDestination.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
import java.io.File;
import java.io.IOException;
import java.security.PrivilegedActionException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand All @@ -59,13 +61,19 @@
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.TimeZone;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;

public class ElasticSearchAuditDestination extends AuditDestination {
private static final Logger LOG = LoggerFactory.getLogger(ElasticSearchAuditDestination.class);
private static final ThreadLocal<DateFormat> DATE_FORMAT = ThreadLocal.withInitial(() -> {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
format.setTimeZone(TimeZone.getTimeZone("UTC"));
return format;
});

public static final String CONFIG_URLS = "urls";
public static final String CONFIG_PORT = "port";
Expand Down Expand Up @@ -300,7 +308,12 @@ Map<String, Object> toDoc(AuthzAuditEvent auditEvent) {
doc.put("resType", auditEvent.getResourceType());
doc.put("reason", auditEvent.getResultReason());
doc.put("action", auditEvent.getAction());
doc.put("evtTime", auditEvent.getEventTime());
Date eventTime = auditEvent.getEventTime();
if (eventTime != null) {
doc.put("evtTime", DATE_FORMAT.get().format(eventTime));
} else {
doc.put("evtTime", null);
}
doc.put("seq_num", auditEvent.getSeqNum());
doc.put("event_count", auditEvent.getEventCount());
doc.put("event_dur_ms", auditEvent.getEventDurationMS());
Expand Down
Loading