[pdh] Make the admin share configurable #5485

hithwen · 2020-01-16T11:33:36Z

Adds the ability to change the administrative share to connect to on pdh check

codecov · 2020-01-16T11:37:23Z

Codecov Report

Merging #5485 into master will decrease coverage by 37.26%.
The diff coverage is n/a.

Impacted Files	Coverage Δ
...ts/tooling/configuration/consumers/test_example.py
clickhouse/datadog_checks/clickhouse/utils.py
...checks_dev/tests/plugin/test_environment_runner.py
riakcs/datadog_checks/riakcs/riakcs.py
oracle/tests/test_oracle.py
...r/datadog_checks/openstack_controller/__about__.py
twistlock/datadog_checks/twistlock/twistlock.py
linkerd/datadog_checks/linkerd/linkerd.py
...oller/datadog_checks/openstack_controller/utils.py
istio/tests/test_e2e.py
... and 883 more

datadog_checks_base/datadog_checks/base/checks/win/winpdh_base.py

codecov · 2020-01-16T12:27:11Z

Codecov Report

❗ No coverage uploaded for pull request base (master@88f353e). Click here to learn what that means.
The diff coverage is 66.66%.

Impacted Files	Coverage Δ
spark/datadog_checks/spark/spark.py	`82.44% <ø> (ø)`
apache/tests/test_apache.py	`90.78% <ø> (ø)`
spark/datadog_checks/spark/__about__.py	`100% <ø> (ø)`
snmp/datadog_checks/snmp/__about__.py	`100% <ø> (ø)`
ibm_mq/tests/test_ibm_mq.py	`97.8% <ø> (ø)`
apache/datadog_checks/apache/apache.py	`96% <ø> (ø)`
snmp/datadog_checks/snmp/snmp.py	`87.84% <ø> (ø)`
kubelet/datadog_checks/kubelet/kubelet.py	`83.1% <ø> (ø)`
...tadog_checks_base/datadog_checks/base/__about__.py	`100% <ø> (ø)`
ibm_mq/datadog_checks/ibm_mq/metrics.py	`92.59% <ø> (ø)`
... and 7 more

datadog_checks_base/datadog_checks/base/checks/win/winpdh_base.py

…ction-string

hithwen · 2020-01-17T11:31:51Z

The IBM was issue is known, there is a temporary fix in #5493

pdh_check/datadog_checks/pdh_check/data/conf.yaml.example

FlorianVeaux · 2020-01-17T20:10:51Z

Adding [pdh] to the title to make it clear in datadog_checks_base changelog

Co-Authored-By: FlorianVeaux <[email protected]>

florimondmanca

Just a subtle potential bug, then this looks good to me! (Nice prose that sheds some light on Windows obscure behaviors. 💡)

florimondmanca · 2020-01-20T21:21:52Z

pdh_check/setup.py

@@ -26,7 +26,7 @@ def get_requirements(fpath):
        return f.readlines()


-CHECKS_BASE_REQ = 'datadog_checks_base'
+CHECKS_BASE_REQ = 'datadog_checks_base>10.2'


I assume we are targeting 10.3 and up, but this would also match e.g. 10.2.1, so we should probably change this to…

Suggested change

CHECKS_BASE_REQ = 'datadog_checks_base>10.2'

CHECKS_BASE_REQ = 'datadog_checks_base>=10.3'

I think that'll have to be in a separate PR until datadog_checks_base is released.

I removed the pin for now to unblock this, we can add the pin back once released.

Co-Authored-By: Florimond Manca <[email protected]>

florimondmanca

* Add the option to provide a different administrative share * Add admin_share config option * Bump check base dependency * Add tests for new config option * Fix typo * call initialize_pdh_tests * Allow for empty admin share * Inline rstrip * Update conf.yaml.example * Apply suggestions from code review Co-Authored-By: FlorianVeaux <[email protected]> * Update conf.yaml.example * Update pdh_check/setup.py Co-Authored-By: Florimond Manca <[email protected]> * Remove pin on unreleased base version Co-authored-by: FlorianVeaux <[email protected]> Co-authored-by: Florimond Manca <[email protected]>

This reverts commit 1abcf9a.

* Add the option to provide a different administrative share * Add admin_share config option * Bump check base dependency * Add tests for new config option * Fix typo * call initialize_pdh_tests * Allow for empty admin share * Inline rstrip * Update conf.yaml.example * Apply suggestions from code review Co-Authored-By: FlorianVeaux <[email protected]> * Update conf.yaml.example * Update pdh_check/setup.py Co-Authored-By: Florimond Manca <[email protected]> * Remove pin on unreleased base version Co-authored-by: FlorianVeaux <[email protected]> Co-authored-by: Florimond Manca <[email protected]>

hithwen added 3 commits January 16, 2020 12:26

Add the option to provide a different administrative share

87d9527

Add admin_share config option

b508ca0

Bump check base dependency

4688d62

hithwen requested review from a team as code owners January 16, 2020 11:33

github-actions bot added integration/datadog_checks_base integration/pdh_check labels Jan 16, 2020

hithwen commented Jan 16, 2020

View reviewed changes

datadog_checks_base/datadog_checks/base/checks/win/winpdh_base.py Outdated Show resolved Hide resolved

Add tests for new config option

148fea3

hithwen requested review from derekwbrown, ofek and FlorianVeaux January 16, 2020 12:08

hithwen added the changelog/Added label Jan 16, 2020

Fix typo

17f54e4

call initialize_pdh_tests

579a226

FlorianVeaux reviewed Jan 16, 2020

View reviewed changes

datadog_checks_base/datadog_checks/base/checks/win/winpdh_base.py Show resolved Hide resolved

FlorianVeaux reviewed Jan 16, 2020

View reviewed changes

datadog_checks_base/datadog_checks/base/checks/win/winpdh_base.py Show resolved Hide resolved

hithwen added 3 commits January 17, 2020 10:40

Allow for empty admin share

511bbd0

Inline rstrip

88f353e

Merge remote-tracking branch 'origin/master' into julia/fix-pdh-conne…

89466e5

…ction-string

Update conf.yaml.example

98dd528

FlorianVeaux reviewed Jan 17, 2020

View reviewed changes

pdh_check/datadog_checks/pdh_check/data/conf.yaml.example Outdated Show resolved Hide resolved

pdh_check/datadog_checks/pdh_check/data/conf.yaml.example Outdated Show resolved Hide resolved

pdh_check/datadog_checks/pdh_check/data/conf.yaml.example Outdated Show resolved Hide resolved

FlorianVeaux changed the title ~~Julia/fix pdh connection string~~ Make the admin share configurable Jan 17, 2020

FlorianVeaux changed the title ~~Make the admin share configurable~~ [pdh] Make the admin share configurable Jan 17, 2020

hithwen and others added 2 commits January 20, 2020 13:19

Apply suggestions from code review

47111ea

Co-Authored-By: FlorianVeaux <[email protected]>

Update conf.yaml.example

dc29c9d

florimondmanca suggested changes Jan 20, 2020

View reviewed changes

Update pdh_check/setup.py

cb36574

Co-Authored-By: Florimond Manca <[email protected]>

hithwen requested a review from florimondmanca January 21, 2020 13:18

therve changed the title ~~[pdh] Make the admin share configurable~~ Make the admin share configurable Jan 21, 2020

therve changed the title ~~Make the admin share configurable~~ [pdh] Make the admin share configurable Jan 21, 2020

florimondmanca previously approved these changes Jan 21, 2020

View reviewed changes

Remove pin on unreleased base version

7650046

florimondmanca dismissed their stale review via 7650046 January 21, 2020 19:24

FlorianVeaux approved these changes Jan 21, 2020

View reviewed changes

florimondmanca approved these changes Jan 21, 2020

View reviewed changes

florimondmanca merged commit 1abcf9a into master Jan 21, 2020

florimondmanca deleted the julia/fix-pdh-connection-string branch January 21, 2020 19:53

florimondmanca mentioned this pull request Jan 21, 2020

Release pending fixes for 7.17.0-rc.4 #5522

Merged

4 tasks

AlexandreYang added a commit that referenced this pull request Jan 27, 2020

Revert "[pdh] Make the admin share configurable (#5485)"

ec01a32

This reverts commit 1abcf9a.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[pdh] Make the admin share configurable #5485

[pdh] Make the admin share configurable #5485

hithwen commented Jan 16, 2020

codecov bot commented Jan 16, 2020 •

edited

Loading

codecov bot commented Jan 16, 2020 •

edited

Loading

hithwen commented Jan 17, 2020

FlorianVeaux commented Jan 17, 2020

florimondmanca left a comment

florimondmanca Jan 20, 2020

FlorianVeaux Jan 21, 2020

florimondmanca Jan 21, 2020 •

edited

Loading

florimondmanca left a comment

	CHECKS_BASE_REQ = 'datadog_checks_base>10.2'
	CHECKS_BASE_REQ = 'datadog_checks_base>=10.3'

[pdh] Make the admin share configurable #5485

[pdh] Make the admin share configurable #5485

Conversation

hithwen commented Jan 16, 2020

codecov bot commented Jan 16, 2020 • edited Loading

Codecov Report

codecov bot commented Jan 16, 2020 • edited Loading

Codecov Report

hithwen commented Jan 17, 2020

FlorianVeaux commented Jan 17, 2020

florimondmanca left a comment

Choose a reason for hiding this comment

florimondmanca Jan 20, 2020

Choose a reason for hiding this comment

FlorianVeaux Jan 21, 2020

Choose a reason for hiding this comment

florimondmanca Jan 21, 2020 • edited Loading

Choose a reason for hiding this comment

florimondmanca left a comment

Choose a reason for hiding this comment

codecov bot commented Jan 16, 2020 •

edited

Loading

codecov bot commented Jan 16, 2020 •

edited

Loading

florimondmanca Jan 21, 2020 •

edited

Loading