Fix empty field error in the iis/application pool metricset #19537

narph · 2020-07-01T10:09:47Z

What does this PR do?

Fixes errors as:

"metricset":{"name":"application_pool","period":10000},"service":{"type":"iis"}}, Private:interface {}(nil), TimeSeries:true}, Flags:0x0, Cache:publisher.EventCache{m:common.MapStr(nil)}} (status=400): {"type":"mapper_parsing_exception","reason":"failed to parse","caused_by":{"type":"illegal_argument_exception","reason":"field name cannot be an empty string"}}

also improves refresh functionality

Why is it important?

Errors

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.

How to test this PR locally

Run the IIS module wit the application pool metricset enabled

elasticmachine · 2020-07-01T10:10:39Z

Pinging @elastic/integrations (Team:Integrations)

elasticmachine · 2020-07-01T10:31:56Z

💚 Build Succeeded

Expand to view the summary

Build stats

Build Cause: [Pull request #19537 updated]
Start Time: 2020-07-14T09:18:42.942+0000
Duration: 41 min 51 sec

Test stats 🧪

Test	Results
Failed	0
Passed	745
Skipped	72
Total	817

Steps errors

Expand to view the steps failures

Name: Report to Codecov
- Description: curl -sSLo codecov https://codecov.io/bash for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat do FILE="${i}/build/coverage/full.cov" if [ -f "${FILE}" ]; then bash codecov -f "${FILE}" fi done
- Duration: 1 min 27 sec
- Start Time: 2020-07-14T09:55:42.040+0000
- log

jsoriano · 2020-07-02T12:41:39Z

x-pack/metricbeat/module/iis/application_pool/reader.go

+				return nil, errors.Wrapf(err, `failed to add counter (query="%v")`, v)
+			}
+			r.workerProcesses[v] = key
+		}


Code added here is mostly the same as in refreshCounterPaths(), could it be reused?

refactored the code so the function is reused

jsoriano · 2020-07-02T12:53:32Z

x-pack/metricbeat/module/iis/application_pool/application_pool.go

+	// refresh performance counter list
+	// Some counters, such as rate counters, require two counter values in order to compute a displayable value. In this case we must call PdhCollectQueryData twice before calling PdhGetFormattedCounterValue.
+	// For more information, see Collecting Performance Data (https://docs.microsoft.com/en-us/windows/desktop/PerfCtrs/collecting-performance-data).
+	// A flag is set if the second call has been executed else refresh will fail (reader.executed)


Code added to newReader seems to be the same as a refresh, and it is run before reader.executed, could it also fail?

we try to run one refresh at a time, running them one after another seems to yield exceptions

jsoriano · 2020-07-02T12:54:39Z

x-pack/metricbeat/module/iis/application_pool/reader.go

+	}
+	apps, err := getApplicationPools(config.Names)
+	if err != nil {
+		return r, errors.Wrap(err, "failed retrieving running worker processes")


If something fails here, should we close query to avoid leaks?

indeed, added the call

ChrsMark · 2020-07-14T10:19:40Z

x-pack/metricbeat/module/iis/application_pool/application_pool.go

@@ -81,6 +84,7 @@ func (m *MetricSet) Fetch(report mb.ReporterV2) error {
 			break
 		}
 	}
+


nit: not related?

ChrsMark · 2020-07-14T10:19:57Z

x-pack/metricbeat/module/iis/application_pool/reader.go

@@ -9,40 +9,41 @@ package application_pool
 import (
 	"strings"

+	"github.com/elastic/beats/v7/libbeat/common"
+	"github.com/elastic/beats/v7/metricbeat/helper/windows/pdh"


nit: please fix import's order

ran fmt so that should be the order

I don't think that mage fmt touches the order, I just made a small local test and it seems that doesn't. You can verify that by putting them in order and running again fmt.
Not sure how this change occurred and preserving order is not crucial but it's a more convention we follow.

x-pack/metricbeat/module/iis/application_pool/reader.go

ChrsMark

looks good! It would be nice to address #19537 (comment)

…19537) * fix * update test * changelog * change * refactor * close (cherry picked from commit 93e43e7)

…19886) * fix * update test * changelog * change * refactor * close (cherry picked from commit 93e43e7)

…on pool metricset (#19887) * Fix empty field error in the iis/application pool metricset (#19537) * fix * update test * changelog * change * refactor * close (cherry picked from commit 93e43e7) * update changelog

…19537) * fix * update test * changelog * change * refactor * close

…plication pool metricset (elastic#19887) * Fix empty field error in the iis/application pool metricset (elastic#19537) * fix * update test * changelog * change * refactor * close (cherry picked from commit 134324e) * update changelog

narph added 2 commits July 1, 2020 11:54

fix

59d1464

update test

0188793

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 1, 2020

narph self-assigned this Jul 1, 2020

narph added the Team:Integrations Label for the Integrations team label Jul 1, 2020

botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 1, 2020

changelog

1aac524

narph added the [zube]: In Review label Jul 1, 2020

Merge branch 'master' into app-pool-fix

0660353

narph added the needs_backport PR is waiting to be backported to other branches. label Jul 1, 2020

narph added 4 commits July 2, 2020 12:47

Merge branch 'master' into app-pool-fix

aaf8889

change

3c27aef

Merge branch 'master' into app-pool-fix

a94c8b7

Merge branch 'app-pool-fix' of github.com:narph/beats into app-pool-fix

90ae0c4

jsoriano reviewed Jul 2, 2020

View reviewed changes

narph added 3 commits July 14, 2020 09:54

Merge branch 'master' into app-pool-fix

7caa22f

refactor

276ab14

close

1698895

narph requested a review from jsoriano July 14, 2020 09:18

ChrsMark reviewed Jul 14, 2020

View reviewed changes

narph requested a review from ChrsMark July 14, 2020 11:07

ChrsMark approved these changes Jul 14, 2020

View reviewed changes

narph merged commit 93e43e7 into elastic:master Jul 14, 2020

narph deleted the app-pool-fix branch July 14, 2020 12:23

zube bot added [zube]: Done and removed [zube]: In Review labels Jul 14, 2020

narph added a commit to narph/beats that referenced this pull request Jul 14, 2020

Fix empty field error in the iis/application pool metricset (elastic#…

f957a4f

…19537) * fix * update test * changelog * change * refactor * close (cherry picked from commit 93e43e7)

narph mentioned this pull request Jul 14, 2020

Cherry-pick #19537 to 7.x: Fix empty field error in the iis/application pool metricset #19886

Merged

6 tasks

narph added a commit to narph/beats that referenced this pull request Jul 14, 2020

Fix empty field error in the iis/application pool metricset (elastic#…

d75bf76

…19537) * fix * update test * changelog * change * refactor * close (cherry picked from commit 93e43e7)

narph mentioned this pull request Jul 14, 2020

Cherry-pick #19537 to 7.8: Fix empty field error in the iis/application pool metricset #19887

Merged

6 tasks

narph added a commit that referenced this pull request Jul 14, 2020

Fix empty field error in the iis/application pool metricset (#19537) (#…

a557235

…19886) * fix * update test * changelog * change * refactor * close (cherry picked from commit 93e43e7)

andresrc removed the [zube]: Done label Jul 17, 2020

melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020

Fix empty field error in the iis/application pool metricset (elastic#…

8e9f6fc

…19537) * fix * update test * changelog * change * refactor * close

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix empty field error in the iis/application pool metricset #19537

Fix empty field error in the iis/application pool metricset #19537

narph commented Jul 1, 2020

elasticmachine commented Jul 1, 2020

elasticmachine commented Jul 1, 2020 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

jsoriano Jul 2, 2020

narph Jul 14, 2020

jsoriano Jul 2, 2020

narph Jul 14, 2020

jsoriano Jul 2, 2020

narph Jul 14, 2020

ChrsMark Jul 14, 2020

ChrsMark Jul 14, 2020

narph Jul 14, 2020

ChrsMark Jul 14, 2020

ChrsMark left a comment •

edited

Loading

@@ @@ -81,6 +84,7 @@ func (m *MetricSet) Fetch(report mb.ReporterV2) error { @@
               			break
               		}
               	}

Fix empty field error in the iis/application pool metricset #19537

Fix empty field error in the iis/application pool metricset #19537

Conversation

narph commented Jul 1, 2020

What does this PR do?

Why is it important?

Checklist

How to test this PR locally

elasticmachine commented Jul 1, 2020

elasticmachine commented Jul 1, 2020 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

Test stats 🧪

Steps errors

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ChrsMark left a comment • edited Loading

Choose a reason for hiding this comment

elasticmachine commented Jul 1, 2020 •

edited by jenkins-beats-ci bot

Loading

ChrsMark left a comment •

edited

Loading