Skip to content

[github] audit: prefer @timestamp over created_at in agent cursor logic #16097

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 4 commits into from
Nov 27, 2025
+13 −7
Merged

[github] audit: prefer @timestamp over created_at in agent cursor logic #16097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92d7c62
audit: Populate cursor.last_timestamp based on the @timestamp field.
chrisberkhout Nov 24, 2025
41d7674
Update system test data.
chrisberkhout Nov 24, 2025
ebdbbd5
Version bump, changelog entry.
chrisberkhout Nov 24, 2025
915255b
Tweak changelog description.
chrisberkhout Nov 26, 2025
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
4 changes: 0 additions & 4 deletions packages/github/_dev/deploy/docker/files/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ rules:
"@timestamp": 1605719148837,
"action": "repo.destroy",
"actor": "monalisa",
"created_at": 1605719148837,
"_document_id": "LwW2vpJZCDS-WUmo9Z-ifw",
"org": "mona-org",
"repo": "mona-org/mona-test-repo",
Expand Down Expand Up @@ -70,7 +69,6 @@ rules:
"_document_id": "Vqvg6kZ4MYqwWRKFDzlMoQ",
"org": "octocat-test-org"
},{
"@timestamp": 1605719148837,
"action": "repo.destroy",
"actor": "monalisa",
"created_at": 1605719148837,
Expand Down Expand Up @@ -112,7 +110,6 @@ rules:
"_document_id": "Vqvg6kZ4MYqwWRKFDzlMoQ",
"org": "octocat-test-org"
},{
"@timestamp": 1605719148837,
"action": "repo.destroy",
"actor": "monalisa",
"created_at": 1605719148837,
Expand Down Expand Up @@ -153,7 +150,6 @@ rules:
"@timestamp": 1605719148837,
"action": "repo.destroy",
"actor": "monalisa",
"created_at": 1605719148837,
"_document_id": "LwW2vpJZCDS-WUmo9Z-ifw",
"org": "mona-org",
"repo": "mona-org/mona-test-repo",
Expand Down
5 changes: 5 additions & 0 deletions packages/github/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "2.17.3"
changes:
- description: Fix HTTPJSON cursor logic for audit data stream.
type: bugfix
link: https://github.com/elastic/integrations/pull/16097
- version: "2.17.2"
changes:
- description: Remove updated_at field from latest issues transform unique keys.
Expand Down
9 changes: 7 additions & 2 deletions packages/github/data_stream/audit/agent/stream/httpjson.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ response.pagination:

cursor:
last_timestamp:
value: '[[ .last_event.created_at ]]'
value: >-
[[- if index .last_event "@timestamp" -]]
[[- .last_event.Get "@timestamp" -]]
[[- else -]]
[[- .last_event.created_at -]]
[[- end -]]
fail_on_template_error: true

{{#if tags.length}}
Expand All @@ -76,4 +81,4 @@ publisher_pipeline.disable_host: true
{{#if processors}}
processors:
{{processors}}
{{/if}}
{{/if}}
2 changes: 1 addition & 1 deletion packages/github/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: github
title: GitHub
version: "2.17.2"
version: "2.17.3"
description: Collect logs from GitHub with Elastic Agent.
type: integration
format_version: "3.4.0"
Expand Down