From 2c2f8e855dff76e3018900188ca990b8f3ae0d44 Mon Sep 17 00:00:00 2001 From: Olivier Vielpeau Date: Thu, 15 Jun 2017 19:33:30 -0400 Subject: [PATCH 1/2] [util] Stop using helpers from `util`, use `utils` instead Apart from `headers`, the helpers from `util` are deprecated, let's use their equivalent from `utils` instead. --- disk/check.py | 2 +- dns_check/check.py | 2 +- vsphere/check.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/disk/check.py b/disk/check.py index 252c8ac09b451..3d64daef76755 100644 --- a/disk/check.py +++ b/disk/check.py @@ -15,7 +15,7 @@ # datadog from checks import AgentCheck from config import _is_affirmative -from util import Platform +from utils.platform import Platform from utils.subprocess_output import get_subprocess_output from utils.timeout import ( timeout, diff --git a/dns_check/check.py b/dns_check/check.py index 152479122a328..d79e2a9efa0e2 100644 --- a/dns_check/check.py +++ b/dns_check/check.py @@ -9,7 +9,7 @@ import dns.resolver # project -from util import Platform +from utils.platform import Platform from checks.network_checks import NetworkCheck, Status # These imports are necessary because otherwise dynamic type diff --git a/vsphere/check.py b/vsphere/check.py index 4b470f7944e02..b8246c257d2ba 100644 --- a/vsphere/check.py +++ b/vsphere/check.py @@ -21,7 +21,7 @@ from checks.libs.thread_pool import Pool from checks.libs.vmware.basic_metrics import BASIC_METRICS from checks.libs.vmware.all_metrics import ALL_METRICS -from util import Timer +from utils.timer import Timer SOURCE_TYPE = 'vsphere' REAL_TIME_INTERVAL = 20 # Default vCenter sampling interval From 60a4851a781a7378506c54870a26dee40ca197e1 Mon Sep 17 00:00:00 2001 From: Olivier Vielpeau Date: Thu, 15 Jun 2017 19:44:48 -0400 Subject: [PATCH 2/2] [metadata] Update changelog and manifests --- disk/CHANGELOG.md | 12 +++++++++++- disk/manifest.json | 2 +- dns_check/CHANGELOG.md | 12 ++++++++++-- dns_check/manifest.json | 2 +- vsphere/CHANGELOG.md | 8 ++++++++ vsphere/manifest.json | 4 ++-- 6 files changed, 33 insertions(+), 7 deletions(-) diff --git a/disk/CHANGELOG.md b/disk/CHANGELOG.md index c2c353b1ea946..5cf8659774a2b 100644 --- a/disk/CHANGELOG.md +++ b/disk/CHANGELOG.md @@ -1,8 +1,18 @@ # CHANGELOG - disk -1.0.003-22-2017 +1.0.1 / Unreleased +================== + +### Changes + +* [SANITY] Import `Platform` helper from `utils.platform` instead of deprecated `util`. See [#484][] + +1.0.0 / 03-22-2017 ================== ### Changes * [FEATURE] adds disk integration. + + +[#484]: https://github.com/DataDog/integrations-core/issues/484 diff --git a/disk/manifest.json b/disk/manifest.json index a0d1bb6c0f162..c19d01c64930b 100644 --- a/disk/manifest.json +++ b/disk/manifest.json @@ -11,6 +11,6 @@ "mac_os", "windows" ], - "version": "1.0.0", + "version": "1.0.1", "guid": "94588b23-111e-4ed2-a2af-fd6e4caeea04" } diff --git a/dns_check/CHANGELOG.md b/dns_check/CHANGELOG.md index 31cd5a8e5f9c5..1e39e32c3252e 100644 --- a/dns_check/CHANGELOG.md +++ b/dns_check/CHANGELOG.md @@ -1,13 +1,21 @@ # CHANGELOG - dns_check -1.0.1/2017-04-24 + +1.0.2 / Unreleased +================== + +### Changes + +* [SANITY] Import `Platform` helper from `utils.platform` instead of deprecated `util`. See [#484][] + +1.0.1 / 2017-04-24 ================== ### Changes * [BUGFIX] use time.clock under windows. See [#330][] -1.0.003-22-2017 +1.0.0 / 03-22-2017 ================== ### Changes diff --git a/dns_check/manifest.json b/dns_check/manifest.json index ed6852dd78971..782dba24f8475 100644 --- a/dns_check/manifest.json +++ b/dns_check/manifest.json @@ -11,6 +11,6 @@ "mac_os", "windows" ], - "version": "1.0.0", + "version": "1.0.2", "guid": "31e4c84c-fc4b-4cd4-97ed-0331bf4e2023" } diff --git a/vsphere/CHANGELOG.md b/vsphere/CHANGELOG.md index 9efe6e0956f10..72171c9ccd198 100644 --- a/vsphere/CHANGELOG.md +++ b/vsphere/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG - vsphere +1.0.2 / Unreleased +================== + +### Changes + +* [SANITY] Import `Timer` helper from `utils.timer` instead of deprecated `util`. See [#484][] + 1.0.1 Unreleased ================== @@ -16,3 +23,4 @@ [#346]: https://github.com/DataDog/integrations-core/issues/346 +[#484]: https://github.com/DataDog/integrations-core/issues/484 diff --git a/vsphere/manifest.json b/vsphere/manifest.json index 14929d1f987db..48d1a67367e2d 100644 --- a/vsphere/manifest.json +++ b/vsphere/manifest.json @@ -2,7 +2,7 @@ "maintainer": "help@datadoghq.com", "manifest_version": "0.1.0", "max_agent_version": "6.0.0", - "min_agent_version": "5.6.3", + "min_agent_version": "5.15.0", "name": "vsphere", "short_description": "Understand how vSphere resource usage affects your application.", "support": "core", @@ -11,6 +11,6 @@ "mac_os", "windows" ], - "version": "1.0.1", + "version": "1.0.2", "guid": "930b1839-cc1f-4e7a-b706-0e8cf3218464" }