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

Fix parsing of apache trace log levels #28717

Merged
merged 4 commits into from
Nov 23, 2021
Merged

Fix parsing of apache trace log levels #28717

merged 4 commits into from
Nov 23, 2021

Conversation

jsoriano
Copy link
Member

What does this PR do?

Add supports for log levels including numbers, such as trace1, in the apache module.

Why is it important?

Apache levels may contain numbers as sublevels such as trace1, such log lines cannot be parsed by current patterns.

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.

Related issues

Logs

See #28650.

@jsoriano
Fix parsing of apache levels
c9377bd 
Apache levels may contain numbers as sublevels such as trace1.
@jsoriano jsoriano added the Team:Integrations Label for the Integrations team label Oct 29, 2021
@jsoriano jsoriano self-assigned this Oct 29, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Oct 29, 2021
@mergify
Copy link
Contributor

mergify bot commented Oct 29, 2021

This pull request does not have a backport label. Could you fix it @jsoriano? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Oct 29, 2021
@jsoriano jsoriano added backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify backport-v8.0.0 Automated backport with mergify labels Oct 29, 2021
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Oct 29, 2021
This was referenced Oct 29, 2021
Merged
Closed
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 29, 2021 •
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

  • Duration: 106 min 8 sec

❕ Flaky test report

No test was executed to be analysed.

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

@mergify
Copy link
Contributor

mergify bot commented Nov 9, 2021

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 apache-trace-loglevels upstream/apache-trace-loglevels
git merge upstream/master
git push upstream apache-trace-loglevels

@jsoriano jsoriano removed the backport-v7.15.0 Automated backport with mergify label Nov 22, 2021
mtojek
mtojek approved these changes Nov 22, 2021
View reviewed changes
Copy link
Contributor

@mtojek mtojek left a comment

Choose a reason for hiding this comment

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

LGTM

filebeat/module/apache/error/test/sublevel.log Outdated
@@ -0,0 +1,2 @@
[Wed Oct 20 19:20:59.121211 2021] [rewrite:trace3] [pid 121591:tid 140413273032448] mod_rewrite.c(470): [client 10.121.192.8:38350] 10.121.192.8 - - [api-dev.onintranet.com/sid#55a374e851c8][rid#7fb438083ac0/initial] applying pattern '^/bankimport/?(.*)$' to uri '/'
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: don't need to obfuscate this line? Does it contain any customer-specific data?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, I will change the urls.

@jsoriano jsoriano merged commit 78f3a3b into elastic:master Nov 23, 2021
@jsoriano jsoriano deleted the apache-trace-loglevels branch November 23, 2021 09:32
mergify bot pushed a commit that referenced this pull request Nov 23, 2021
@jsoriano
Fix parsing of apache trace log levels (#28717)
b8f4079 
Apache levels may contain numbers as sublevels such as trace1.

(cherry picked from commit 78f3a3b)
@mergify mergify bot mentioned this pull request Nov 23, 2021
Merged
mergify bot pushed a commit that referenced this pull request Nov 23, 2021
@jsoriano
Fix parsing of apache trace log levels (#28717)
dbdd90d 
Apache levels may contain numbers as sublevels such as trace1.

(cherry picked from commit 78f3a3b)
@mergify mergify bot mentioned this pull request Nov 23, 2021
Merged
jsoriano added a commit that referenced this pull request Nov 23, 2021
@mergify @jsoriano
Fix parsing of apache trace log levels (#28717) (#29091)
5b7f202 
Apache levels may contain numbers as sublevels such as trace1.

(cherry picked from commit 78f3a3b)

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
jsoriano added a commit that referenced this pull request Nov 23, 2021
@mergify @jsoriano
Fix parsing of apache trace log levels (#28717) (#29090)
936200b 
Apache levels may contain numbers as sublevels such as trace1.

(cherry picked from commit 78f3a3b)

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
v1v added a commit to v1v/beats that referenced this pull request Nov 24, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/support-a…
3c5dac0 
…ws-on-file-changes

* upstream/master:
  override host on statsd metricset (elastic#29103)
  Skip config check in autodiscover for duplicated configurations (elastic#29048)
  Change "filebeat.config.modules.enabled" to "true" (elastic#28769)
  Remove deprecated spool queue from Beats (elastic#28869)
  Add `beat` field back to beat.stats (elastic#29094)
  Revert "Move labels and annotations under kubernetes.namespace. (elastic#27917)" (elastic#29069)
  heartbeat: remove w2008 in the CI (elastic#29093)
  Remove deprecated `--template` and `--index-policy` flags (elastic#28870)
  Fix parsing of apache trace log levels (elastic#28717)
  [Elastic-Agent] IUse itnernal port for local fleet server (elastic#28993)
  [Heartbeat] Log error on dupe monitor ID instead of strict req (elastic#29041)
  Enable pprof for elastic-agent and beats (elastic#28983)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mtojek mtojek mtojek approved these changes

@aspacca aspacca aspacca approved these changes

Assignees

@jsoriano jsoriano

Labels
backport-v7.16.0 Automated backport with mergify backport-v8.0.0 Automated backport with mergify Team:Integrations Label for the Integrations team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Filebeat] filebeat-7.15.0-apache-error-pipeline doesn't recognize apache trace log levels
4 participants
@jsoriano @elasticmachine @aspacca @mtojek