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 instance name in perfmon metricset #22261

Merged
merged 47 commits into from
Nov 3, 2020
Merged

Fix instance name in perfmon metricset #22261

merged 47 commits into from
Nov 3, 2020

Conversation

narph
Copy link
Contributor

@narph narph commented Oct 29, 2020 •
edited
Loading

What does this PR do?

Fix instance name in perfmon metricset by adding an additional check in iswildcard function if path contains *

Why is it important?

Fixes instance name in perfmon metricset

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

narph added 30 commits July 23, 2020 11:01
@narph
mofidy doc
938e66c
@narph
Merge branch 'master' of github.com:elastic/beats
4daef08
@narph
Merge branch 'master' of github.com:elastic/beats
b613178
@narph
Merge branch 'master' of github.com:elastic/beats
05364cf
@narph
Merge branch 'master' of github.com:elastic/beats
f147c4d
@narph
Merge branch 'master' of github.com:elastic/beats
4574718
@narph
Merge branch 'master' of github.com:elastic/beats
1e43077
@narph
Merge branch 'master' of github.com:elastic/beats
807cf06
@narph
Merge branch 'master' of github.com:elastic/beats
2096668
@narph
Merge branch 'master' of github.com:elastic/beats
da8ac1f
@narph
Merge branch 'master' of github.com:elastic/beats
c2d8930
@narph
Merge branch 'master' of github.com:elastic/beats
7bd9e73
@narph
Merge branch 'master' of github.com:elastic/beats
6e89a84
@narph
Merge branch 'master' of github.com:elastic/beats
bdf21e9
@narph
Merge branch 'master' of github.com:elastic/beats
7833687
@narph
Merge branch 'master' of github.com:elastic/beats
bbf6178
@narph
Merge branch 'master' of github.com:elastic/beats
4ba8817
@narph
Merge branch 'master' of github.com:elastic/beats
0cba5dc
@narph
Merge branch 'master' of github.com:elastic/beats
b2625ca
@narph
Merge branch 'master' of github.com:elastic/beats
5100e6a
@narph
Merge branch 'master' of github.com:elastic/beats
a302d31
@narph
Merge branch 'master' of github.com:elastic/beats
631d667
@narph
Merge branch 'master' of github.com:elastic/beats
35072a5
@narph
Merge branch 'master' of github.com:elastic/beats
4b2f87a
@narph
Merge branch 'master' of github.com:elastic/beats
f26b533
@narph
Merge branch 'master' of github.com:elastic/beats
c61620d
@narph
Merge branch 'master' of github.com:elastic/beats
43f90c4
@narph
Merge branch 'master' of github.com:elastic/beats
2d28f07
@narph
Merge branch 'master' of github.com:elastic/beats
0a42bbe
@narph
Merge branch 'master' of github.com:elastic/beats
0bedffe
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 29, 2020
@narph narph self-assigned this Oct 29, 2020
@narph narph added [zube]: In Review needs_backport PR is waiting to be backported to other branches. Team:Platforms Label for the Integrations - Platforms team labels Oct 29, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 29, 2020
@elasticmachine
Copy link
Collaborator

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

Expand to view the summary

Build stats

  • Build Cause: [Pull request #22261 updated]

  • Start Time: 2020-11-03T10:42:48.304+0000

  • Duration: 77 min 56 sec

Test stats 🧪

Test Results
Failed 0
Passed 2203
Skipped 490
Total 2693

@narph narph mentioned this pull request Oct 29, 2020
Closed
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 29, 2020 •
edited by jenkins-beats-ci bot
Loading

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 2203
Skipped 490
Total 2693

@narph narph added the windows-7-32 Enable builds in the CI for windows-7 32 bits label Nov 2, 2020
@narph
Copy link
Contributor Author

narph commented Nov 2, 2020

/test metricbeat for windows-7-32

1 similar comment
@narph
Copy link
Contributor Author

narph commented Nov 2, 2020

/test metricbeat for windows-7-32

ChrsMark
ChrsMark reviewed Nov 3, 2020
View reviewed changes
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. Would it worth adding a unit test for this functionality?

@narph
Copy link
Contributor Author

narph commented Nov 3, 2020

lgtm. Would it worth adding a unit test for this functionality?

the other tests should cover it but I just added one as well, doesn't hurt.

@narph narph requested a review from ChrsMark November 3, 2020 10:42
@narph narph merged commit f2a55fd into elastic:master Nov 3, 2020
@narph narph deleted the perfmon-inst branch November 3, 2020 12:45
narph added a commit to narph/beats that referenced this pull request Nov 4, 2020
@narph
Fix instance name in perfmon metricset (elastic#22261)
c1efd50 
* mofidy doc

* fix

* changelog

* add test

(cherry picked from commit f2a55fd)
@narph narph mentioned this pull request Nov 4, 2020
Merged
6 tasks
narph added a commit to narph/beats that referenced this pull request Nov 4, 2020
@narph
Fix instance name in perfmon metricset (elastic#22261)
541519e 
* mofidy doc

* fix

* changelog

* add test

(cherry picked from commit f2a55fd)
@narph narph mentioned this pull request Nov 4, 2020
Merged
6 tasks
narph added a commit that referenced this pull request Nov 4, 2020
@narph
Cherry-pick #22261 to 7.10: Fix instance name in perfmon metricset (#…
16bf6d6 
…22411)

* Fix instance name in perfmon metricset (#22261)

* mofidy doc

* fix

* changelog

* add test

(cherry picked from commit f2a55fd)

* changelog
narph added a commit that referenced this pull request Nov 4, 2020
@narph
Cherry-pick #22261 to 7.x: Fix instance name in perfmon metricset (#2…
f302adc 
…2410)

* Fix instance name in perfmon metricset (#22261)

* mofidy doc

* fix

* changelog

* add test

(cherry picked from commit f2a55fd)

* changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChrsMark ChrsMark ChrsMark approved these changes

Assignees

@narph narph

Labels
needs_backport PR is waiting to be backported to other branches. Team:Platforms Label for the Integrations - Platforms team windows-7-32 Enable builds in the CI for windows-7 32 bits [zube]: In Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Metricbeat] Windows perfmon wildcard instance queries with one instance show instance name as asterisk
3 participants
@narph @elasticmachine @ChrsMark