Skip to content

Fix Citrix ADC parsing of TCP CONN_TERMINATE events with trailing whitespace #18438

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
qcorporation merged 6 commits into from
Apr 21, 2026
Merged

Fix Citrix ADC parsing of TCP CONN_TERMINATE events with trailing whitespace #18438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
55fdf2d
Fixing Citrix ADC Parsing Issue
qcorporation Apr 16, 2026
2d564be
set PR link within changelog.yml
qcorporation Apr 16, 2026
2519078
properly PR link
qcorporation Apr 16, 2026
3f70a7a
Merge branch 'main' into fix/issue-27329-j83
qcorporation Apr 16, 2026
b56eef0
Merge branch 'main' into fix/issue-27329-j83
qcorporation Apr 17, 2026
e732959
Merge branch 'main' into fix/issue-27329-j83
qcorporation Apr 20, 2026
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
5 changes: 5 additions & 0 deletions packages/citrix_adc/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: "1.18.5"
changes:
- description: Fix parsing of Source/Destination IP, port, and byte counts for TCP CONN_TERMINATE events with trailing whitespace.
type: bugfix
link: https://github.com/elastic/integrations/pull/18438
- version: "1.18.4"
changes:
- description: "Add parsing for APPFW native messages with IP-based format"
Expand Down
66 changes: 64 additions & 2 deletions ..._adc/data_stream/log/_dev/test/pipeline/test-citrix-native-config-time.json-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,40 @@
},
"citrix_adc": {
"log": {
"message": "Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 10/08/2024:09:37:54 - End Time 10/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 "
"destination": {
"ip": "127.1.1.2",
"port": 20714
},
"end_time": "2024-10-08T09:38:41.000-04:00",
"message": "Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 10/08/2024:09:37:54 - End Time 10/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 ",
"source": {
"ip": "127.1.2.1",
"port": 80
},
"start_time": "2024-10-08T09:37:54.000-04:00",
"total_bytes_received": 1,
"total_bytes_send": 1
}
},
"destination": {
"bytes": 1,
"ip": "127.1.1.2",
"port": 20714
},
"ecs": {
"version": "8.11.0"
},
"event": {
"category": [
"network"
],
"duration": 47000000000,
"end": "2024-10-08T09:38:41.000-04:00",
"id": "6715345",
"kind": "event",
"original": "<123> 10/08/2024:09:38:41 SYSLOGHOST 0-PPE-1 : default TCP CONN_TERMINATE 6715345 0 : Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 10/08/2024:09:37:54 - End Time 10/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 ",
"severity": 0,
"start": "2024-10-08T09:37:54.000-04:00",
"timezone": "America/New_York",
"type": [
"end",
Expand All @@ -41,6 +61,17 @@
"type": "firewall",
"vendor": "Citrix"
},
"related": {
"ip": [
"127.1.2.1",
"127.1.1.2"
]
},
"source": {
"bytes": 1,
"ip": "127.1.2.1",
"port": 80
},
"tags": [
"preserve_original_event",
"preserve_duplicate_custom_fields"
Expand All @@ -61,20 +92,40 @@
},
"citrix_adc": {
"log": {
"message": "Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 10/08/2024:09:37:54 - End Time 10/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 "
"destination": {
"ip": "127.1.1.2",
"port": 20714
},
"end_time": "2024-10-08T09:38:41.000-04:00",
"message": "Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 10/08/2024:09:37:54 - End Time 10/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 ",
"source": {
"ip": "127.1.2.1",
"port": 80
},
"start_time": "2024-10-08T09:37:54.000-04:00",
"total_bytes_received": 1,
"total_bytes_send": 1
}
},
"destination": {
"bytes": 1,
"ip": "127.1.1.2",
"port": 20714
},
"ecs": {
"version": "8.11.0"
},
"event": {
"category": [
"network"
],
"duration": 47000000000,
"end": "2024-10-08T09:38:41.000-04:00",
"id": "6715345",
"kind": "event",
"original": "<123> 10/08/2024:09:38:41 SYSLOGHOST 0-PPE-1 : default TCP CONN_TERMINATE 6715345 0 : Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 10/08/2024:09:37:54 - End Time 10/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 ",
"severity": 0,
"start": "2024-10-08T09:37:54.000-04:00",
"timezone": "America/New_York",
"type": [
"end",
Expand All @@ -87,6 +138,17 @@
"type": "firewall",
"vendor": "Citrix"
},
"related": {
"ip": [
"127.1.2.1",
"127.1.1.2"
]
},
"source": {
"bytes": 1,
"ip": "127.1.2.1",
"port": 80
},
"tags": [
"preserve_original_event",
"preserve_duplicate_custom_fields"
Expand Down
33 changes: 32 additions & 1 deletion ...x_adc/data_stream/log/_dev/test/pipeline/test-citrix-native-local-time.json-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,40 @@
},
"citrix_adc": {
"log": {
"message": "Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 10/08/2024:09:37:54 - End Time 10/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 "
"destination": {
"ip": "127.1.1.2",
"port": 20714
},
"end_time": "2024-10-08T09:38:41.000-07:00",
"message": "Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 10/08/2024:09:37:54 - End Time 10/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 ",
"source": {
"ip": "127.1.2.1",
"port": 80
},
"start_time": "2024-10-08T09:37:54.000-07:00",
"total_bytes_received": 1,
"total_bytes_send": 1
}
},
"destination": {
"bytes": 1,
"ip": "127.1.1.2",
"port": 20714
},
"ecs": {
"version": "8.11.0"
},
"event": {
"category": [
"network"
],
"duration": 47000000000,
"end": "2024-10-08T09:38:41.000-07:00",
"id": "6715345",
"kind": "event",
"original": "<123> 10/08/2024:09:38:41 SYSLOGHOST 0-PPE-1 : default TCP CONN_TERMINATE 6715345 0 : Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 10/08/2024:09:37:54 - End Time 10/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 ",
"severity": 0,
"start": "2024-10-08T09:37:54.000-07:00",
"timezone": "-07:00",
"type": [
"end",
Expand All @@ -41,6 +61,17 @@
"type": "firewall",
"vendor": "Citrix"
},
"related": {
"ip": [
"127.1.2.1",
"127.1.1.2"
]
},
"source": {
"bytes": 1,
"ip": "127.1.2.1",
"port": 80
},
"tags": [
"preserve_original_event",
"preserve_duplicate_custom_fields"
Expand Down
66 changes: 64 additions & 2 deletions ..._adc/data_stream/log/_dev/test/pipeline/test-citrix-native-with-delink.json-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,40 @@
},
"citrix_adc": {
"log": {
"message": "Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 10/08/2024:09:37:54 - End Time 10/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 "
"destination": {
"ip": "127.1.1.2",
"port": 20714
},
"end_time": "2024-08-10T09:38:41.000Z",
"message": "Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 10/08/2024:09:37:54 - End Time 10/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 ",
"source": {
"ip": "127.1.2.1",
"port": 80
},
"start_time": "2024-08-10T09:37:54.000Z",
"total_bytes_received": 1,
"total_bytes_send": 1
}
},
"destination": {
"bytes": 1,
"ip": "127.1.1.2",
"port": 20714
},
"ecs": {
"version": "8.11.0"
},
"event": {
"category": [
"network"
],
"duration": 47000000000,
"end": "2024-08-10T09:38:41.000Z",
"id": "6715345",
"kind": "event",
"original": "<123> 10/08/2024:09:38:41 SYSLOGHOST 0-PPE-1 : default TCP CONN_TERMINATE 6715345 0 : Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 10/08/2024:09:37:54 - End Time 10/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 ",
"severity": 0,
"start": "2024-08-10T09:37:54.000Z",
"timezone": "UTC",
"type": [
"end",
Expand All @@ -41,6 +61,17 @@
"type": "firewall",
"vendor": "Citrix"
},
"related": {
"ip": [
"127.1.2.1",
"127.1.1.2"
]
},
"source": {
"bytes": 1,
"ip": "127.1.2.1",
"port": 80
},
"tags": [
"preserve_original_event",
"preserve_duplicate_custom_fields"
Expand Down Expand Up @@ -152,20 +183,40 @@
},
"citrix_adc": {
"log": {
"message": "Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 21/08/2024:09:37:54 - End Time 21/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 "
"destination": {
"ip": "127.1.1.2",
"port": 20714
},
"end_time": "2024-08-21T09:38:41.000Z",
"message": "Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 21/08/2024:09:37:54 - End Time 21/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 ",
"source": {
"ip": "127.1.2.1",
"port": 80
},
"start_time": "2024-08-21T09:37:54.000Z",
"total_bytes_received": 1,
"total_bytes_send": 1
}
},
"destination": {
"bytes": 1,
"ip": "127.1.1.2",
"port": 20714
},
"ecs": {
"version": "8.11.0"
},
"event": {
"category": [
"network"
],
"duration": 47000000000,
"end": "2024-08-21T09:38:41.000Z",
"id": "6715345",
"kind": "event",
"original": "<123> 21/08/2024:09:38:41 SYSLOGHOST 0-PPE-1 : default TCP CONN_TERMINATE 6715345 0 : Source 127.1.2.1:80 - Destination 127.1.1.2:20714 - Start Time 21/08/2024:09:37:54 - End Time 21/08/2024:09:38:41 - Total_bytes_send 1 - Total_bytes_recv 1 ",
"severity": 0,
"start": "2024-08-21T09:37:54.000Z",
"timezone": "UTC",
"type": [
"end",
Expand All @@ -178,6 +229,17 @@
"type": "firewall",
"vendor": "Citrix"
},
"related": {
"ip": [
"127.1.2.1",
"127.1.1.2"
]
},
"source": {
"bytes": 1,
"ip": "127.1.2.1",
"port": 80
},
"tags": [
"preserve_original_event",
"preserve_duplicate_custom_fields"
Expand Down
Loading
Loading