Skip to content
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

Jump to bottom

Add nginx.ingress_controller.upstream.ip to related.ip (#34645) #34672

Merged
merged 6 commits into from
Feb 28, 2023
Merged

Add nginx.ingress_controller.upstream.ip to related.ip (#34645) #34672

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3bc072f
Add nginx.ingress_controller.upstream.ip to related.ip (#34645)
leweafan Feb 26, 2023
dc43edc
Added pull id
leweafan Feb 26, 2023
75d5b7a
Added "allow_duplicates: false"
leweafan Feb 27, 2023
b6f8a97
Added "allow_duplicates: false" for all related.ip appends
leweafan Feb 27, 2023
3dbc2b7
Merge branch 'main' into main
gsantoro Feb 28, 2023
1cd900e
Merge branch 'main' into main
leweafan Feb 28, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ automatic splitting at root level, if root level element is an array. {pull}3415
- Add support for Okta debug attributes, `risk_reasons`, `risk_behaviors` and `factor`. {issue}33677[33677] {pull}34508[34508]
- Fill okta.request.ip_chain.* as a flattened object in Okta module. {pull}34621[34621]
- Fixed GCS log format issues. {pull}34659[34659]
- Add nginx.ingress_controller.upstream.ip to related.ip {issue}34645[34645] {pull}34672[34672]

*Auditbeat*

Expand Down
7 changes: 7 additions & 0 deletions filebeat/module/nginx/ingress_controller/ingest/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,17 @@ processors:
field: related.ip
value: "{{source.ip}}"
if: "ctx?.source?.ip != null"
allow_duplicates: false
- append:
field: related.ip
value: "{{destination.ip}}"
if: "ctx?.destination?.ip != null"
allow_duplicates: false
- append:
field: related.ip
value: "{{nginx.ingress_controller.upstream.ip}}"
if: "ctx?.nginx?.ingress_controller?.upstream?.ip != null"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add allow_duplicates: false, similar to the integration - https://github.com/elastic/integrations/blob/main/packages/nginx_ingress_controller/data_stream/access/elasticsearch/ingest_pipeline/default.yml#L297-L301

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tetianakravchenko Thanks for the helpful advice! Done.

allow_duplicates: false
- append:
field: related.user
value: "{{user.name}}"
Expand Down
68 changes: 45 additions & 23 deletions filebeat/module/nginx/ingress_controller/test/test.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -107,7 +108,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -167,7 +169,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -227,7 +230,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -365,7 +369,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -425,7 +430,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -489,7 +495,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -553,7 +560,8 @@
"172.17.0.6:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.6"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -617,7 +625,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -681,7 +690,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -745,7 +755,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -809,7 +820,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -872,7 +884,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -936,7 +949,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -1000,7 +1014,8 @@
"172.17.0.6:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.6"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -1064,7 +1079,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -1128,7 +1144,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -1189,7 +1206,8 @@
"172.17.0.6:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.6"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -1252,7 +1270,8 @@
"172.17.0.5:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.5"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -1316,7 +1335,8 @@
"172.17.0.6:8080"
],
"related.ip": [
"192.168.64.1"
"192.168.64.1",
"172.17.0.6"
],
"service.type": "nginx",
"source.address": "192.168.64.1",
Expand Down Expand Up @@ -1383,7 +1403,8 @@
"172.17.0.7:8080"
],
"related.ip": [
"192.168.64.14"
"192.168.64.14",
"172.17.0.7"
],
"service.type": "nginx",
"source.address": "192.168.64.14",
Expand Down Expand Up @@ -1450,7 +1471,8 @@
"172.17.0.7:8080"
],
"related.ip": [
"192.168.64.14"
"192.168.64.14",
"172.17.0.7"
],
"service.type": "nginx",
"source.address": "192.168.64.14",
Expand Down Expand Up @@ -1681,4 +1703,4 @@
"user_agent.os.version": "10.15.7",
"user_agent.version": "104.0.0.0"
}
]
]