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

Cherry-pick #17374 to 7.6: Fix mbean parsing for mbeans with multiple quoted properties #17408

Merged
merged 1 commit into from
Apr 7, 2020

Conversation

jsoriano
Copy link
Member

@jsoriano jsoriano commented Apr 1, 2020

Cherry-pick of PR #17374 to 7.6 branch. Original message:

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

…#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 jsoriano force-pushed the backport_17374_7.6 branch from 28be260 to cece8fc Compare April 1, 2020 17:13
@jsoriano
Copy link
Member Author

jsoriano commented Apr 3, 2020

jenkins, test this again please

@jsoriano jsoriano merged commit 76f7fdf into elastic:7.6 Apr 7, 2020
@jsoriano jsoriano deleted the backport_17374_7.6 branch April 7, 2020 18:48
@zube zube bot added [zube]: Done and removed [zube]: Inbox labels Apr 7, 2020
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.

3 participants