Thanks to visit codestin.com
Credit goes to github.com

Skip to content

x-pack/filebeat/module/panw Fix url scheme grok pattern#35757

Merged
bhapas merged 1 commit into
elastic:mainfrom
bhapas:sdh-beats-3485-panw-url
Jun 13, 2023
Merged

x-pack/filebeat/module/panw Fix url scheme grok pattern#35757
bhapas merged 1 commit into
elastic:mainfrom
bhapas:sdh-beats-3485-panw-url

Conversation

@bhapas
Copy link
Copy Markdown
Contributor

@bhapas bhapas commented Jun 13, 2023 •
edited
Loading

What does this PR do?

This PR fixes the url.scheme grok pattern from ANY to URIPROTO for proper url handling.

Why is it important?

If there is another reference url in the main url then the url.domain is broken.

url.original value --> url.original vlaue "www.sportspar.de/widgets/index/refreshStatistic?requestPage=/&requestController=index&referer=https://www.google.com/" will be parsed in url.domain: "www.google.com".

"url": {
    "path": "/",
    "registered_domain": "sportspar.de",
    "original": "www.sportspar.de/widgets/index/refreshStatistic?requestPage=/&requestController=index&referer=https://www.google.com/",
    "scheme": "www.sportspar.de/widgets/index/refreshStatistic?requestPage=/&requestController=index&referer=https",
    "domain": "www.google.com"
  },

Instead it should be

"url": {
    "path": "/",
    "registered_domain": "sportspar.de",
    "original": "www.sportspar.de/widgets/index/refreshStatistic?requestPage=/&requestController=index&referer=https://www.google.com/",
    "scheme": "www.sportspar.de/widgets/index/refreshStatistic?requestPage=/&requestController=index&referer=https://www.google.com/",
    "domain": "www.sportspar.de"
  },

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

Integration test has been modified and to run that

navigate to x-path/filebeat and run

TESTING_FILEBEAT_MODULES=panw MODULES_PATH=module mage -v pythonIntegTest

@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 13, 2023
@bhapas bhapas self-assigned this Jun 13, 2023
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 13, 2023
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jun 13, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @bhapas? 🙏.
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

@bhapas bhapas added needs_team Indicates that the issue/PR needs a Team:* label backport-v8.8.0 Automated backport with mergify labels Jun 13, 2023
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 13, 2023
@botelastic
Copy link
Copy Markdown

botelastic Bot commented Jun 13, 2023

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 13, 2023 •
edited by jenkins-beats-ci Bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-06-13T11:45:27.957+0000

  • Duration: 73 min 59 sec

Test stats 🧪

Test Results
Failed 0
Passed 2989
Skipped 177
Total 3166

💚 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!)

@bhapas bhapas force-pushed the sdh-beats-3485-panw-url branch from 962c79b to bbf1378 Compare June 13, 2023 10:09
@bhapas bhapas marked this pull request as ready for review June 13, 2023 10:15
@bhapas bhapas requested a review from a team as a code owner June 13, 2023 10:15
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 13, 2023

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@bhapas bhapas force-pushed the sdh-beats-3485-panw-url branch from bbf1378 to f47347b Compare June 13, 2023 11:45
kcreddy
kcreddy approved these changes Jun 13, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@kcreddy kcreddy left a comment

Choose a reason for hiding this comment

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

LGTM 👍🏼

@bhapas bhapas merged commit d359f9e into elastic:main Jun 13, 2023
mergify Bot pushed a commit that referenced this pull request Jun 13, 2023
@bhapas @mergify
Fix url scheme grok pattern (#35757)
7729098 
(cherry picked from commit d359f9e)
@mergify mergify Bot mentioned this pull request Jun 13, 2023
Merged
bhapas added a commit that referenced this pull request Jun 14, 2023
@mergify @bhapas
[8.8](backport #35757) x-pack/filebeat/module/panw Fix url scheme gro…
df38a1f 
…k pattern (#35761)

* Fix url scheme grok pattern (#35757)

(cherry picked from commit d359f9e)

* Update CHANGELOG-developer.next.asciidoc

---------

Co-authored-by: Bharat Pasupula <[email protected]>
@reakaleek reakaleek mentioned this pull request Jul 19, 2023
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kcreddy kcreddy kcreddy approved these changes

Assignees

@bhapas bhapas

Labels

backport-v8.8.0 Automated backport with mergify bugfix Filebeat Filebeat

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@bhapas @elasticmachine @kcreddy