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 application_pool metricset reader after pdh changes #18477

Merged
merged 3 commits into from
May 13, 2020

Conversation

narph
Copy link
Contributor

@narph narph commented May 13, 2020

What does this PR do?

Fixes tests and implementation in the iis/application_pool after pdh changes

Why is it important?

successful build

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.

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 13, 2020
@narph narph self-assigned this May 13, 2020
@narph narph added [zube]: In Review Metricbeat Metricbeat Team:Integrations Label for the Integrations team labels May 13, 2020
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 13, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

Copy link
Contributor

@sayden sayden left a comment

Choose a reason for hiding this comment

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

LGTM but I left a comment for a follow up PR

re.log.Debugw("Ignoring the first measurement because the data isn't ready",
"error", val.Err, logp.Namespace("website"), "query", counterPath)
continue
if val.Err.Error != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

AFAICS val.Err and values could also be nil. Let's leave that change for a follow up PR

Copy link
Contributor Author

Choose a reason for hiding this comment

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

values can be nil but that would also return an error and the check above that will make sure to exit before , https://github.com/elastic/beats/blob/master/metricbeat/helper/windows/pdh/pdh_query_windows.go#L176.
val.Err should not be nil also, it is instantiated here https://github.com/elastic/beats/blob/master/metricbeat/helper/windows/pdh/pdh_query_windows.go#L244

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 13, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

Test stats 🧪

Test Results
Failed 0
Passed 366
Skipped 39
Total 405

@narph narph merged commit e20f856 into elastic:master May 13, 2020
@narph narph deleted the fix-iis branch May 13, 2020 12:51
narph added a commit to narph/beats that referenced this pull request May 13, 2020
* fix

* changelog

* mage fmt update

(cherry picked from commit e20f856)
@narph narph added the needs_backport PR is waiting to be backported to other branches. label May 13, 2020
narph added a commit to narph/beats that referenced this pull request May 13, 2020
* fix

* changelog

* mage fmt update

(cherry picked from commit e20f856)
narph added a commit that referenced this pull request May 13, 2020
)

* fix

* changelog

* mage fmt update

(cherry picked from commit e20f856)
narph added a commit that referenced this pull request May 13, 2020
)

* fix

* changelog

* mage fmt update

(cherry picked from commit e20f856)
jsoriano added a commit that referenced this pull request May 15, 2020
Jenkins pipeline is not executing the tests on Windows and OSX for some x-pack
beats, so we cannot detect specific issues on these platforms, like the compilation
error in Windows solved by #18477, that was introduced after a green build.

Run x-pack Filebeat and Metricbeat builds and unit tests in Windows and OSX.
jsoriano added a commit to jsoriano/beats that referenced this pull request May 15, 2020
…c#18494)

Jenkins pipeline is not executing the tests on Windows and OSX for some x-pack
beats, so we cannot detect specific issues on these platforms, like the compilation
error in Windows solved by elastic#18477, that was introduced after a green build.

Run x-pack Filebeat and Metricbeat builds and unit tests in Windows and OSX.

(cherry picked from commit 0419a4d)
jsoriano added a commit to jsoriano/beats that referenced this pull request May 15, 2020
…c#18494)

Jenkins pipeline is not executing the tests on Windows and OSX for some x-pack
beats, so we cannot detect specific issues on these platforms, like the compilation
error in Windows solved by elastic#18477, that was introduced after a green build.

Run x-pack Filebeat and Metricbeat builds and unit tests in Windows and OSX.

(cherry picked from commit 0419a4d)
jsoriano added a commit that referenced this pull request May 18, 2020
#18583)

Jenkins pipeline is not executing the tests on Windows and OSX for some x-pack
beats, so we cannot detect specific issues on these platforms, like the compilation
error in Windows solved by #18477, that was introduced after a green build.

Run x-pack Filebeat and Metricbeat builds and unit tests in Windows and OSX.

(cherry picked from commit 0419a4d)
jsoriano added a commit that referenced this pull request May 18, 2020
#18584)

Jenkins pipeline is not executing the tests on Windows and OSX for some x-pack
beats, so we cannot detect specific issues on these platforms, like the compilation
error in Windows solved by #18477, that was introduced after a green build.

Run x-pack Filebeat and Metricbeat builds and unit tests in Windows and OSX.

(cherry picked from commit 0419a4d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Metricbeat Metricbeat needs_backport PR is waiting to be backported to other branches. Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants