Update deprecated imports

active_directory/datadog_checks/active_directory/active_directory.py

@@ -1,7 +1,7 @@
 # (C) Datadog, Inc. 2013-present
 # All rights reserved
 # Licensed under Simplified BSD License (see LICENSE)
-from datadog_checks.checks.win import PDHBaseCheck
+from datadog_checks.base.checks.win import PDHBaseCheck
 
 DEFAULT_COUNTERS = [
     # counterset, instance of counter, counter name, metric name

activemq_xml/datadog_checks/activemq_xml/activemq_xml.py

@@ -6,8 +6,8 @@
 import requests
 from six import iteritems
 
-from datadog_checks.checks import AgentCheck
-from datadog_checks.config import _is_affirmative
+from datadog_checks.base import AgentCheck
+from datadog_checks.base.config import _is_affirmative
 
 QUEUE_URL = "/admin/xml/queues.jsp"
 TOPIC_URL = "/admin/xml/topics.jsp"

activemq_xml/tests/common.py

@@ -4,7 +4,7 @@
 
 import os
 
-from datadog_checks.utils.common import get_docker_hostname
+from datadog_checks.base.utils.common import get_docker_hostname
 
 CHECK_NAME = 'activemq_xml'
 

ambari/tests/test_ambari.py

@@ -4,8 +4,8 @@
 from mock import MagicMock
 
 from datadog_checks.ambari import AmbariCheck
+from datadog_checks.base import AgentCheck
 from datadog_checks.base.errors import CheckException
-from datadog_checks.checks import AgentCheck
 
 from . import responses
 

btrfs/datadog_checks/btrfs/btrfs.py

@@ -14,7 +14,7 @@
 from six import iteritems
 from six.moves import range
 
-from datadog_checks.checks import AgentCheck
+from datadog_checks.base import AgentCheck
 
 MIXED = "mixed"
 DATA = "data"

cacti/datadog_checks/cacti/cacti.py

@@ -10,7 +10,7 @@
 
 import pymysql
 
-from datadog_checks.checks import AgentCheck
+from datadog_checks.base import AgentCheck
 
 try:
     import rrdtool

cassandra_nodetool/datadog_checks/cassandra_nodetool/cassandra_nodetool.py

@@ -7,8 +7,8 @@
 import re
 from collections import defaultdict
 
-from datadog_checks.checks import AgentCheck
-from datadog_checks.utils.subprocess_output import get_subprocess_output
+from datadog_checks.base import AgentCheck
+from datadog_checks.base.utils.subprocess_output import get_subprocess_output
 
 EVENT_TYPE = SOURCE_TYPE_NAME = 'cassandra_nodetool'
 DEFAULT_HOST = 'localhost'

ceph/datadog_checks/ceph/ceph.py

@@ -9,9 +9,9 @@
 import simplejson as json
 from six import iteritems
 
-from datadog_checks.checks import AgentCheck
-from datadog_checks.config import _is_affirmative
-from datadog_checks.utils.subprocess_output import get_subprocess_output
+from datadog_checks.base import AgentCheck
+from datadog_checks.base.config import _is_affirmative
+from datadog_checks.base.utils.subprocess_output import get_subprocess_output
 
 
 class Ceph(AgentCheck):

cilium/tests/conftest.py

@@ -6,9 +6,9 @@
 import mock
 import pytest
 
+from datadog_checks.base.utils.common import get_docker_hostname
 from datadog_checks.dev.kube_port_forward import port_forward
 from datadog_checks.dev.terraform import terraform_run
-from datadog_checks.utils.common import get_docker_hostname
 
 from .common import ADDL_AGENT_METRICS, AGENT_DEFAULT_METRICS, OPERATOR_AWS_METRICS, OPERATOR_METRICS
 

cisco_aci/datadog_checks/cisco_aci/cisco.py

@@ -6,9 +6,9 @@
 
 from six import iteritems
 
-from datadog_checks.checks import AgentCheck
-from datadog_checks.config import _is_affirmative
-from datadog_checks.utils.containers import hash_mutable
+from datadog_checks.base import AgentCheck
+from datadog_checks.base.config import _is_affirmative
+from datadog_checks.base.utils.containers import hash_mutable
 
 from . import aci_metrics
 from .api import Api

cisco_aci/datadog_checks/cisco_aci/tags.py

@@ -6,7 +6,7 @@
 
 from six import iteritems
 
-from datadog_checks.utils.containers import hash_mutable
+from datadog_checks.base.utils.containers import hash_mutable
 
 from . import exceptions, helpers
 

cisco_aci/tests/test_capacity.py

@@ -2,10 +2,10 @@
 # All rights reserved
 # Licensed under Simplified BSD License (see LICENSE)
 
+from datadog_checks.base.utils.containers import hash_mutable
 from datadog_checks.cisco_aci import CiscoACICheck
 from datadog_checks.cisco_aci.api import Api
 from datadog_checks.cisco_aci.capacity import Capacity
-from datadog_checks.utils.containers import hash_mutable
 
 from . import common
 

cisco_aci/tests/test_cisco.py

@@ -7,9 +7,9 @@
 import pytest
 from mock import MagicMock
 
+from datadog_checks.base.utils.containers import hash_mutable
 from datadog_checks.cisco_aci import CiscoACICheck
 from datadog_checks.cisco_aci.api import Api, SessionWrapper
-from datadog_checks.utils.containers import hash_mutable
 
 from . import common
 

cisco_aci/tests/test_fabric.py

@@ -2,9 +2,9 @@
 # All rights reserved
 # Licensed under Simplified BSD License (see LICENSE)
 
+from datadog_checks.base.utils.containers import hash_mutable
 from datadog_checks.cisco_aci import CiscoACICheck
 from datadog_checks.cisco_aci.api import Api
-from datadog_checks.utils.containers import hash_mutable
 
 from . import common
 

cisco_aci/tests/test_tags.py

@@ -6,8 +6,8 @@
 
 import pytest
 
+from datadog_checks.base.utils.containers import hash_mutable
 from datadog_checks.cisco_aci.tags import CiscoTags
-from datadog_checks.utils.containers import hash_mutable
 
 log = logging.getLogger('test_cisco_aci')
 

cisco_aci/tests/test_tenant.py

@@ -2,10 +2,10 @@
 # All rights reserved
 # Licensed under Simplified BSD License (see LICENSE)
 
+from datadog_checks.base.utils.containers import hash_mutable
 from datadog_checks.cisco_aci import CiscoACICheck
 from datadog_checks.cisco_aci.api import Api
 from datadog_checks.cisco_aci.tenant import Tenant
-from datadog_checks.utils.containers import hash_mutable
 
 from . import common
 

cockroachdb/datadog_checks/cockroachdb/cockroachdb.py

@@ -1,7 +1,7 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from datadog_checks.checks.openmetrics import OpenMetricsBaseCheck
+from datadog_checks.base.checks.openmetrics import OpenMetricsBaseCheck
 
 from .metrics import METRIC_MAP
 

coredns/tests/conftest.py

@@ -8,9 +8,9 @@
 import pytest
 import requests
 
+from datadog_checks.base.utils.common import get_docker_hostname
 from datadog_checks.dev import WaitFor, docker_run
 from datadog_checks.dev.utils import ON_WINDOWS
-from datadog_checks.utils.common import get_docker_hostname
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 CONFIG_FOLDER = os.path.join(HERE, 'docker', 'coredns')

couch/datadog_checks/couch/couch.py

@@ -10,9 +10,9 @@
 from six import iteritems
 from six.moves.urllib.parse import quote, urljoin
 
-from datadog_checks.checks import AgentCheck
+from datadog_checks.base import AgentCheck
+from datadog_checks.base.utils.headers import headers
 from datadog_checks.couch import errors
-from datadog_checks.utils.headers import headers
 
 
 class CouchDb(AgentCheck):

couch/tests/common.py

@@ -5,7 +5,7 @@
 import os
 import re
 
-from datadog_checks.utils.common import get_docker_hostname
+from datadog_checks.base.utils.common import get_docker_hostname
 
 CHECK_NAME = "couch"
 CHECK_ID = 'test:123'

couchbase/datadog_checks/couchbase/couchbase.py

@@ -12,7 +12,8 @@
 import requests
 from six import string_types
 
-from datadog_checks.checks import AgentCheck
+from datadog_checks.base import AgentCheck
+from datadog_checks.base.utils.containers import hash_mutable
 from datadog_checks.couchbase.couchbase_consts import (
     BUCKET_STATS,
     COUCHBASE_STATS_PATH,
@@ -27,7 +28,6 @@
     SOURCE_TYPE_NAME,
     TO_SECONDS,
 )
-from datadog_checks.utils.containers import hash_mutable
 
 
 class Couchbase(AgentCheck):

couchbase/datadog_checks/couchbase/couchbase_consts.py

@@ -1,6 +1,6 @@
 import re
 
-from datadog_checks.checks import AgentCheck
+from datadog_checks.base import AgentCheck
 
 # Paths
 COUCHBASE_STATS_PATH = '/pools/default'

couchbase/tests/common.py

@@ -3,7 +3,7 @@
 # Licensed under a 3-clause BSD style license (see LICENSE)
 import os
 
-from datadog_checks.utils.common import get_docker_hostname
+from datadog_checks.base.utils.common import get_docker_hostname
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 

crio/datadog_checks/crio/crio.py

@@ -1,7 +1,7 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from datadog_checks.checks.openmetrics import OpenMetricsBaseCheck
+from datadog_checks.base.checks.openmetrics import OpenMetricsBaseCheck
 
 
 class CrioCheck(OpenMetricsBaseCheck):

directory/datadog_checks/directory/directory.py

@@ -6,9 +6,7 @@
 from re import compile as re_compile
 from time import time
 
-from datadog_checks.checks import AgentCheck
-from datadog_checks.config import is_affirmative
-from datadog_checks.errors import ConfigurationError
+from datadog_checks.base import AgentCheck, ConfigurationError, is_affirmative
 
 from .traverse import walk
 

directory/tests/test_directory.py

@@ -8,10 +8,10 @@
 import mock
 import pytest
 
+from datadog_checks.base.errors import ConfigurationError
 from datadog_checks.dev.utils import create_file
 from datadog_checks.dev.utils import temp_dir as temp_directory
 from datadog_checks.directory import DirectoryCheck
-from datadog_checks.errors import ConfigurationError
 
 from . import common
 

dns_check/datadog_checks/dns_check/dns_check.py

@@ -9,7 +9,7 @@
 import dns.resolver
 
 from datadog_checks.base import AgentCheck
-from datadog_checks.utils.platform import Platform
+from datadog_checks.base.utils.platform import Platform
 
 # These imports are necessary because otherwise dynamic type
 # resolution will fail on windows without it.

ecs_fargate/datadog_checks/ecs_fargate/ecs_fargate.py

@@ -6,8 +6,8 @@
 import requests
 from six import iteritems
 
+from datadog_checks.base import AgentCheck
 from datadog_checks.base.utils.common import round_value
-from datadog_checks.checks import AgentCheck
 
 try:
     from tagger import get_tags

envoy/datadog_checks/envoy/envoy.py

@@ -6,7 +6,7 @@
 
 import requests
 
-from datadog_checks.checks import AgentCheck
+from datadog_checks.base import AgentCheck
 
 from .errors import UnknownMetric, UnknownTags
 from .parser import parse_histogram, parse_metric

envoy/tests/common.py

@@ -1,6 +1,6 @@
 import os
 
-from datadog_checks.utils.common import get_docker_hostname
+from datadog_checks.base.utils.common import get_docker_hostname
 
 try:
     from functools import lru_cache

fluentd/datadog_checks/fluentd/fluentd.py

@@ -7,9 +7,8 @@
 
 from six.moves.urllib.parse import urlparse
 
-from datadog_checks.base import ConfigurationError
+from datadog_checks.base import AgentCheck, ConfigurationError
 from datadog_checks.base.utils.subprocess_output import get_subprocess_output
-from datadog_checks.checks import AgentCheck
 
 
 class Fluentd(AgentCheck):

fluentd/tests/common.py

@@ -4,7 +4,7 @@
 
 import os
 
-from datadog_checks.utils.common import get_docker_hostname
+from datadog_checks.base.utils.common import get_docker_hostname
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 ROOT = os.path.dirname(os.path.dirname(HERE))

gearmand/datadog_checks/gearmand/gearmand.py

@@ -5,7 +5,7 @@
 
 from six import PY2
 
-from datadog_checks.checks import AgentCheck
+from datadog_checks.base import AgentCheck
 
 # Python 3 compatibility is a different library
 # It's a drop in replacement but has a different name

gearmand/tests/common.py

@@ -4,7 +4,7 @@
 
 import os
 
-from datadog_checks.utils.common import get_docker_hostname
+from datadog_checks.base.utils.common import get_docker_hostname
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 ROOT = os.path.dirname(os.path.dirname(HERE))

gitlab/datadog_checks/gitlab/gitlab.py

@@ -6,8 +6,8 @@
 import requests
 from six.moves.urllib.parse import urlparse
 
-from datadog_checks.checks.openmetrics import OpenMetricsBaseCheck
-from datadog_checks.errors import CheckException
+from datadog_checks.base.checks.openmetrics import OpenMetricsBaseCheck
+from datadog_checks.base.errors import CheckException
 
 from .metrics import METRICS_MAP
 

gitlab/tests/common.py

@@ -4,7 +4,7 @@
 
 import os
 
-from datadog_checks.utils.common import get_docker_hostname
+from datadog_checks.base.utils.common import get_docker_hostname
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 

gitlab_runner/datadog_checks/gitlab_runner/gitlab_runner.py

@@ -7,8 +7,8 @@
 import requests
 from six.moves.urllib.parse import urlparse
 
-from datadog_checks.checks.openmetrics import OpenMetricsBaseCheck
-from datadog_checks.errors import CheckException
+from datadog_checks.base.checks.openmetrics import OpenMetricsBaseCheck
+from datadog_checks.base.errors import CheckException
 
 
 class GitlabRunnerCheck(OpenMetricsBaseCheck):

gitlab_runner/tests/common.py

@@ -4,7 +4,7 @@
 
 import os
 
-from datadog_checks.utils.common import get_docker_hostname
+from datadog_checks.base.utils.common import get_docker_hostname
 
 HERE = os.path.dirname(os.path.abspath(__file__))