filebeat/module/nginx/ingress_controller: Add parsing if one of upstreams fails to return response #34787

leweafan · 2023-03-09T16:35:39Z

What does this PR do?

Adds nginx ingress_controller parsing if one of upstreams fails to return response cause of timeout

Why is it important?

Nginx logs should be parsed even one of upstreams fails to return response cause of timeout.

Checklist

My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
I have made corresponding change to the default configuration files
I have added tests that prove my fix is effective or that my feature works
I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

[ ]

How to test this PR locally

Related issues

Closes Nginx ingress_controller pipeline can not parse message if a second upstream fails to return response #30697

Use cases

Screenshots

Logs

…urn response cause of timeout

mergify · 2023-03-09T16:36:16Z

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @leweafan? 🙏.
For such, you'll need to label your PR with:

The upcoming major version of the Elastic Stack
The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

elasticmachine · 2023-03-09T16:40:38Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2023-03-29T11:39:28.431+0000
Duration: 68 min 44 sec

Test stats 🧪

Test	Results
Failed	0
Passed	7585
Skipped	747
Total	8332

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.
/package : Generate the packages and run the E2E tests.
/beats-tester : Run the installation tests with beats-tester.
run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

leweafan · 2023-03-09T17:02:51Z

@tetianakravchenko can I ask you to help with this PR :)

mergify · 2023-03-16T03:11:22Z

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b nginx_ingress_controller upstream/nginx_ingress_controller
git merge upstream/main
git push upstream nginx_ingress_controller

mergify · 2023-03-28T00:58:15Z

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b nginx_ingress_controller upstream/nginx_ingress_controller
git merge upstream/main
git push upstream nginx_ingress_controller

mergify · 2023-03-29T00:59:08Z

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b nginx_ingress_controller upstream/nginx_ingress_controller
git merge upstream/main
git push upstream nginx_ingress_controller

tetianakravchenko

Thank you for the contribution!

tetianakravchenko · 2023-03-29T11:26:21Z

filebeat/module/nginx/ingress_controller/ingest/pipeline.yml

@@ -17,16 +17,16 @@ processors:
          "(-|%{DATA:http.request.referrer})" "(-|%{DATA:user_agent.original})" %{NUMBER:nginx.ingress_controller.http.request.length:long}
          %{NUMBER:nginx.ingress_controller.http.request.time:double} \[%{DATA:nginx.ingress_controller.upstream.name}\]
          \[%{DATA:nginx.ingress_controller.upstream.alternative_name}\] (%{UPSTREAM_ADDRESS_LIST:nginx.ingress_controller.upstream_address_list}|-)
-          (%{UPSTREAM_RESPONSE_LENGTH_LIST:nginx.ingress_controller.upstream.response.length_list}|-) (%{UPSTREAM_RESPONSE_TIME_LIST:nginx.ingress_controller.upstream.response.time_list}|-)
-          (%{UPSTREAM_RESPONSE_STATUS_CODE_LIST:nginx.ingress_controller.upstream.response.status_code_list}|-) %{GREEDYDATA:nginx.ingress_controller.http.request.id}
+          (%{UPSTREAM_RESPONSE_LENGTH_LIST:nginx.ingress_controller.upstream.response.length_list}|-) (-|%{UPSTREAM_RESPONSE_TIME_LIST:nginx.ingress_controller.upstream.response.time_list})


could you explain why it was needed to change order here?

I really don't remember. I've made test and it works if we change it.

…eams fails to return response (#34787) * Add nginx ingress_controller parsing if one of upstreams fails to return response cause of timeout * added pull id --------- Co-authored-by: Tetiana Kravchenko <[email protected]>

Add nginx ingress_controller parsing if one of upstreams fails to ret…

91ec883

…urn response cause of timeout

leweafan requested a review from a team as a code owner March 9, 2023 16:35

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 9, 2023

mergify bot assigned leweafan Mar 9, 2023

added pull id

0970381

Merge branch 'main' into nginx_ingress_controller

8502941

tetianakravchenko requested review from a team, gizas, tetianakravchenko and gsantoro and removed request for a team March 27, 2023 12:57

gsantoro approved these changes Mar 27, 2023

View reviewed changes

leweafan added 2 commits March 27, 2023 17:51

Merge branch 'main' into nginx_ingress_controller

485b7d6

Merge branch 'main' into nginx_ingress_controller

ea69db2

Merge branch 'main' into nginx_ingress_controller

f431dc0

Merge branch 'main' into nginx_ingress_controller

42729d6

tetianakravchenko approved these changes Mar 29, 2023

View reviewed changes

tetianakravchenko added the Team:Cloudnative-Monitoring Label for the Cloud Native Monitoring team label Mar 29, 2023

botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 29, 2023

tetianakravchenko merged commit 324aae0 into elastic:main Apr 3, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

filebeat/module/nginx/ingress_controller: Add parsing if one of upstreams fails to return response #34787

filebeat/module/nginx/ingress_controller: Add parsing if one of upstreams fails to return response #34787

leweafan commented Mar 9, 2023

mergify bot commented Mar 9, 2023

elasticmachine commented Mar 9, 2023 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

leweafan commented Mar 9, 2023

mergify bot commented Mar 16, 2023

mergify bot commented Mar 28, 2023

mergify bot commented Mar 29, 2023

tetianakravchenko left a comment

tetianakravchenko Mar 29, 2023

leweafan Mar 30, 2023

filebeat/module/nginx/ingress_controller: Add parsing if one of upstreams fails to return response #34787

filebeat/module/nginx/ingress_controller: Add parsing if one of upstreams fails to return response #34787

Conversation

leweafan commented Mar 9, 2023

What does this PR do?

Why is it important?

Checklist

Author's Checklist

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

mergify bot commented Mar 9, 2023

elasticmachine commented Mar 9, 2023 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

Test stats 🧪

💚 Flaky test report

🤖 GitHub comments

leweafan commented Mar 9, 2023

mergify bot commented Mar 16, 2023

mergify bot commented Mar 28, 2023

mergify bot commented Mar 29, 2023

tetianakravchenko left a comment

Choose a reason for hiding this comment

tetianakravchenko Mar 29, 2023

Choose a reason for hiding this comment

leweafan Mar 30, 2023

Choose a reason for hiding this comment

elasticmachine commented Mar 9, 2023 •

edited by jenkins-beats-ci bot

Loading