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.

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

Fix mbean parsing for mbeans with multiple quoted properties #17374

Merged

Conversation

jsoriano
Copy link
Member

@jsoriano jsoriano commented Mar 31, 2020

What does this PR do?

Fix mbean parsing when multiple properties are quoted.

Why is it important?

There are mbeans that can contain multiple quoted properties, and we are failing to correctly parse them.

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

Related issues

@jsoriano jsoriano added bug in progress Pull request is currently in progress. [zube]: In Progress Team:Integrations Label for the Integrations team labels Mar 31, 2020
@jsoriano jsoriano self-assigned this Mar 31, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@jsoriano jsoriano force-pushed the fix-mbeans-multiple-quoted-properties branch from 926e4d1 to 8599859 Compare March 31, 2020 19:51
@jsoriano jsoriano marked this pull request as ready for review April 1, 2020 08:16
@jsoriano jsoriano added [zube]: In Review needs_backport PR is waiting to be backported to other branches. review v7.6.3 v7.7.0 v7.8.0 skip-test-plan and removed [zube]: In Progress in progress Pull request is currently in progress. labels Apr 1, 2020
@zube zube bot removed the skip-test-plan label Apr 1, 2020
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

lgtm! Thanks for fixing this @jsoriano!

@jsoriano jsoriano merged commit 7b6d7c4 into elastic:master Apr 1, 2020
@jsoriano jsoriano deleted the fix-mbeans-multiple-quoted-properties branch April 1, 2020 17:06
@jsoriano jsoriano removed the needs_backport PR is waiting to be backported to other branches. label Apr 1, 2020
jsoriano added a commit to jsoriano/beats that referenced this pull request Apr 1, 2020
…#17374)

There are mbeans that can contain multiple quoted properties, and Metricbeat
was failing to correctly parse them. Fix the regular expression used for parsing
to cover this case.

Also small refactors in tests and to remove an almost duplicated regular
expression.

(cherry picked from commit 7b6d7c4)
jsoriano added a commit to jsoriano/beats that referenced this pull request Apr 1, 2020
…#17374)

There are mbeans that can contain multiple quoted properties, and Metricbeat
was failing to correctly parse them. Fix the regular expression used for parsing
to cover this case.

Also small refactors in tests and to remove an almost duplicated regular
expression.

(cherry picked from commit 7b6d7c4)
jsoriano added a commit to jsoriano/beats that referenced this pull request Apr 1, 2020
…#17374)

There are mbeans that can contain multiple quoted properties, and Metricbeat
was failing to correctly parse them. Fix the regular expression used for parsing
to cover this case.

Also small refactors in tests and to remove an almost duplicated regular
expression.

(cherry picked from commit 7b6d7c4)
jsoriano added a commit that referenced this pull request Apr 7, 2020
…#17405)

There are mbeans that can contain multiple quoted properties, and Metricbeat
was failing to correctly parse them. Fix the regular expression used for parsing
to cover this case.

Also small refactors in tests and to remove an almost duplicated regular
expression.

(cherry picked from commit 7b6d7c4)
jsoriano added a commit that referenced this pull request Apr 7, 2020
…#17407)

There are mbeans that can contain multiple quoted properties, and Metricbeat
was failing to correctly parse them. Fix the regular expression used for parsing
to cover this case.

Also small refactors in tests and to remove an almost duplicated regular
expression.

(cherry picked from commit 7b6d7c4)
jsoriano added a commit that referenced this pull request Apr 7, 2020
…#17408)

There are mbeans that can contain multiple quoted properties, and Metricbeat
was failing to correctly parse them. Fix the regular expression used for parsing
to cover this case.

Also small refactors in tests and to remove an almost duplicated regular
expression.

(cherry picked from commit 7b6d7c4)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…#17374) (elastic#17407)

There are mbeans that can contain multiple quoted properties, and Metricbeat
was failing to correctly parse them. Fix the regular expression used for parsing
to cover this case.

Also small refactors in tests and to remove an almost duplicated regular
expression.

(cherry picked from commit 46f74f6)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Metricbeat] Jolokia module fails to parse mbeans with multiple quoted parameters
4 participants