-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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
[inputs.vsphere] Resolved issue 4790 (Resource whitelisting) #5165
Conversation
* Don't stop collection on partial error * Compute average if query returned multiple samples for a metric
…roblems with some versions of vCenter
Let's do #5113 separately and then rebase this once it is merged. |
…g from GetClient(), fixed discovered object counting
@danielnelson @glinton Is the plan still to pull this in by 1.10? I haven't seen much movement on it. |
I'd like to include it, can you rebase? |
@@ -209,7 +290,11 @@ func TestParseConfig(t *testing.T) { | |||
require.NotNil(t, tab) | |||
} | |||
|
|||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge
Fixed the merge issues, but circleci is failing at a step where it's trying to download some package. Don't think that's related to this PR. Maybe something intermittent in the test harness? |
return r.finder.FindAll(ctx, r.resType, r.paths, dst) | ||
} | ||
|
||
func init() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Optional: I don't think there is a reason to use the init function, I'd just set these up top with the variable.
Required for all PRs:
Addresses issues #4789 and #4989 and allows users to select resources using inventory paths. Each resource type is given a *_include clause in the config file that looks like this:
@glinton and @danielnelson This PR also has the changes provided in #5113. I'd love to get this in for 1.10 and it would probably make sense to merge this one and retire #5113 in that case.