diff --git a/gitlab/datadog_checks/gitlab/gitlab_v2.py b/gitlab/datadog_checks/gitlab/gitlab_v2.py index ee6effeee409f..8febf5710b6de 100644 --- a/gitlab/datadog_checks/gitlab/gitlab_v2.py +++ b/gitlab/datadog_checks/gitlab/gitlab_v2.py @@ -7,9 +7,9 @@ import requests from datadog_checks.base import AgentCheck, OpenMetricsBaseCheckV2 +from datadog_checks.base.checks.openmetrics.v2.scraper import OpenMetricsCompatibilityScraper from datadog_checks.gitlab.config_models import ConfigMixin -from ..base.checks.openmetrics.v2.scraper import OpenMetricsCompatibilityScraper from .common import get_gitlab_version, get_tags from .metrics import GITALY_METRICS_MAP, METRICS_MAP, construct_metrics_config diff --git a/ibm_mq/datadog_checks/ibm_mq/collectors/channel_metric_collector.py b/ibm_mq/datadog_checks/ibm_mq/collectors/channel_metric_collector.py index 18145329f8ef2..af6ae9ce6a07f 100644 --- a/ibm_mq/datadog_checks/ibm_mq/collectors/channel_metric_collector.py +++ b/ibm_mq/datadog_checks/ibm_mq/collectors/channel_metric_collector.py @@ -5,9 +5,8 @@ from datadog_checks.base import AgentCheck, to_string from datadog_checks.base.log import CheckLoggingAdapter # noqa: F401 - -from .. import metrics -from ..config import IBMMQConfig # noqa: F401 +from datadog_checks.ibm_mq import metrics +from datadog_checks.ibm_mq.config import IBMMQConfig # noqa: F401 try: import pymqi diff --git a/ibm_mq/datadog_checks/ibm_mq/collectors/queue_metric_collector.py b/ibm_mq/datadog_checks/ibm_mq/collectors/queue_metric_collector.py index 51eb9fa793196..00be8eae77b72 100644 --- a/ibm_mq/datadog_checks/ibm_mq/collectors/queue_metric_collector.py +++ b/ibm_mq/datadog_checks/ibm_mq/collectors/queue_metric_collector.py @@ -6,11 +6,10 @@ from datadog_checks.base import AgentCheck, to_string from datadog_checks.base.types import ServiceCheck # noqa: F401 +from datadog_checks.ibm_mq import metrics +from datadog_checks.ibm_mq.config import IBMMQConfig # noqa: F401 from datadog_checks.ibm_mq.metrics import GAUGE -from .. import metrics -from ..config import IBMMQConfig # noqa: F401 - try: import pymqi except ImportError as e: diff --git a/ibm_mq/datadog_checks/ibm_mq/collectors/stats_collector.py b/ibm_mq/datadog_checks/ibm_mq/collectors/stats_collector.py index ecbf99ed9307f..a4adbb6ccc605 100644 --- a/ibm_mq/datadog_checks/ibm_mq/collectors/stats_collector.py +++ b/ibm_mq/datadog_checks/ibm_mq/collectors/stats_collector.py @@ -5,12 +5,11 @@ from dateutil.tz import UTC from pymqi.CMQCFC import MQCMD_STATISTICS_CHANNEL, MQCMD_STATISTICS_Q +from datadog_checks.ibm_mq.metrics import METRIC_PREFIX, channel_stats_metrics, queue_stats_metrics +from datadog_checks.ibm_mq.stats import ChannelStats from datadog_checks.ibm_mq.stats.base_stats import BaseStats from datadog_checks.ibm_mq.stats.queue_stats import QueueStats -from ..metrics import METRIC_PREFIX, channel_stats_metrics, queue_stats_metrics -from ..stats import ChannelStats - try: import pymqi from pymqi import Queue diff --git a/ibm_mq/datadog_checks/ibm_mq/stats/base_stats.py b/ibm_mq/datadog_checks/ibm_mq/stats/base_stats.py index b579592b12a73..6a3854236b644 100644 --- a/ibm_mq/datadog_checks/ibm_mq/stats/base_stats.py +++ b/ibm_mq/datadog_checks/ibm_mq/stats/base_stats.py @@ -6,7 +6,7 @@ from dateutil.tz import UTC from pymqi.CMQCFC import MQCAMO_START_DATE, MQCAMO_START_TIME -from ..utils import sanitize_strings +from datadog_checks.ibm_mq.utils import sanitize_strings try: import pymqi diff --git a/ibm_mq/datadog_checks/ibm_mq/stats/channel_stats.py b/ibm_mq/datadog_checks/ibm_mq/stats/channel_stats.py index cccd09934ed1c..12fbdf11771eb 100644 --- a/ibm_mq/datadog_checks/ibm_mq/stats/channel_stats.py +++ b/ibm_mq/datadog_checks/ibm_mq/stats/channel_stats.py @@ -5,8 +5,7 @@ from pymqi.CMQCFC import MQCACH_CHANNEL_NAME, MQCACH_CONNECTION_NAME, MQGACF_CHL_STATISTICS_DATA, MQIACH_CHANNEL_TYPE from datadog_checks.ibm_mq.stats.base_stats import BaseStats - -from ..utils import sanitize_strings +from datadog_checks.ibm_mq.utils import sanitize_strings try: import pymqi diff --git a/ibm_mq/datadog_checks/ibm_mq/stats/queue_stats.py b/ibm_mq/datadog_checks/ibm_mq/stats/queue_stats.py index ee6a11b61e761..9626ecc677a09 100644 --- a/ibm_mq/datadog_checks/ibm_mq/stats/queue_stats.py +++ b/ibm_mq/datadog_checks/ibm_mq/stats/queue_stats.py @@ -5,8 +5,7 @@ from pymqi.CMQCFC import MQGACF_Q_STATISTICS_DATA from datadog_checks.ibm_mq.stats.base_stats import BaseStats - -from ..utils import sanitize_strings +from datadog_checks.ibm_mq.utils import sanitize_strings try: import pymqi diff --git a/marklogic/datadog_checks/marklogic/parsers/common.py b/marklogic/datadog_checks/marklogic/parsers/common.py index 6f2517eb4e6ec..3f8f7cbe1940c 100644 --- a/marklogic/datadog_checks/marklogic/parsers/common.py +++ b/marklogic/datadog_checks/marklogic/parsers/common.py @@ -3,7 +3,7 @@ # Licensed under a 3-clause BSD style license (see LICENSE) from typing import Any, List, Optional, Tuple # noqa: F401 -from ..constants import GAUGE_UNITS +from datadog_checks.marklogic.constants import GAUGE_UNITS class MarkLogicParserException(RuntimeError): diff --git a/marklogic/datadog_checks/marklogic/parsers/health.py b/marklogic/datadog_checks/marklogic/parsers/health.py index 47f971ea251d1..ce02045c0aed5 100644 --- a/marklogic/datadog_checks/marklogic/parsers/health.py +++ b/marklogic/datadog_checks/marklogic/parsers/health.py @@ -4,8 +4,7 @@ from typing import Any, Dict # noqa: F401 from datadog_checks.base import AgentCheck - -from ..constants import STATE_HEALTH_MAPPER +from datadog_checks.marklogic.constants import STATE_HEALTH_MAPPER def parse_summary_health(data): diff --git a/marklogic/datadog_checks/marklogic/parsers/resources.py b/marklogic/datadog_checks/marklogic/parsers/resources.py index 1f3dc063dbf77..965da4911d1d8 100644 --- a/marklogic/datadog_checks/marklogic/parsers/resources.py +++ b/marklogic/datadog_checks/marklogic/parsers/resources.py @@ -3,7 +3,7 @@ # Licensed under a 3-clause BSD style license (see LICENSE) from typing import Any, Dict, List # noqa: F401 -from ..constants import BASE_ENDPOINT, RESOURCE_TYPES +from datadog_checks.marklogic.constants import BASE_ENDPOINT, RESOURCE_TYPES def parse_resources(data): diff --git a/marklogic/datadog_checks/marklogic/parsers/status.py b/marklogic/datadog_checks/marklogic/parsers/status.py index 20ca0459773fa..374a86b96714b 100644 --- a/marklogic/datadog_checks/marklogic/parsers/status.py +++ b/marklogic/datadog_checks/marklogic/parsers/status.py @@ -3,8 +3,8 @@ # Licensed under a 3-clause BSD style license (see LICENSE) from typing import Any, Dict, Generator, List, Tuple # noqa: F401 -from ..constants import RESOURCE_TYPES -from .common import build_metric_to_submit, is_metric +from datadog_checks.marklogic.constants import RESOURCE_TYPES +from datadog_checks.marklogic.parsers.common import build_metric_to_submit, is_metric def parse_summary_status_resource_metrics(resource_type, data, tags): diff --git a/mongo/datadog_checks/mongo/mongo.py b/mongo/datadog_checks/mongo/mongo.py index c252885e885c0..5fa64fa52391a 100644 --- a/mongo/datadog_checks/mongo/mongo.py +++ b/mongo/datadog_checks/mongo/mongo.py @@ -50,7 +50,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent long = int diff --git a/mysql/datadog_checks/mysql/activity.py b/mysql/datadog_checks/mysql/activity.py index ac8524700de7a..84a01e0c5d1b4 100644 --- a/mysql/datadog_checks/mysql/activity.py +++ b/mysql/datadog_checks/mysql/activity.py @@ -23,7 +23,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent ACTIVITY_QUERY = """\ diff --git a/mysql/datadog_checks/mysql/databases_data.py b/mysql/datadog_checks/mysql/databases_data.py index bf2a72c027ced..79826dc308dd1 100644 --- a/mysql/datadog_checks/mysql/databases_data.py +++ b/mysql/datadog_checks/mysql/databases_data.py @@ -5,7 +5,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent import json import time from collections import defaultdict diff --git a/mysql/datadog_checks/mysql/metadata.py b/mysql/datadog_checks/mysql/metadata.py index dbe1619e3b432..7769066d8c65b 100644 --- a/mysql/datadog_checks/mysql/metadata.py +++ b/mysql/datadog_checks/mysql/metadata.py @@ -15,7 +15,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent from datadog_checks.base import is_affirmative from datadog_checks.base.utils.db.utils import ( diff --git a/mysql/datadog_checks/mysql/mysql.py b/mysql/datadog_checks/mysql/mysql.py index 3d8f1f815f9c8..1dcdd19351e44 100644 --- a/mysql/datadog_checks/mysql/mysql.py +++ b/mysql/datadog_checks/mysql/mysql.py @@ -93,7 +93,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent class MySql(AgentCheck): diff --git a/mysql/datadog_checks/mysql/statement_samples.py b/mysql/datadog_checks/mysql/statement_samples.py index a47cf574325c1..e4c04f449234d 100644 --- a/mysql/datadog_checks/mysql/statement_samples.py +++ b/mysql/datadog_checks/mysql/statement_samples.py @@ -17,7 +17,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent from datadog_checks.base import is_affirmative from datadog_checks.base.utils.common import to_native_string diff --git a/mysql/datadog_checks/mysql/statements.py b/mysql/datadog_checks/mysql/statements.py index 7c6e56594dd65..7172bd183fded 100644 --- a/mysql/datadog_checks/mysql/statements.py +++ b/mysql/datadog_checks/mysql/statements.py @@ -25,7 +25,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent PyMysqlRow = Dict[str, Any] Row = Dict[str, Any] diff --git a/postgres/datadog_checks/postgres/metadata.py b/postgres/datadog_checks/postgres/metadata.py index 41d0e5b16d36c..f4e126ca43185 100644 --- a/postgres/datadog_checks/postgres/metadata.py +++ b/postgres/datadog_checks/postgres/metadata.py @@ -13,7 +13,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent from datadog_checks.base import is_affirmative from datadog_checks.base.utils.db.utils import DBMAsyncJob, default_json_event_encoding diff --git a/postgres/datadog_checks/postgres/postgres.py b/postgres/datadog_checks/postgres/postgres.py index fd8e43b8caaa3..344df4c3dffc7 100644 --- a/postgres/datadog_checks/postgres/postgres.py +++ b/postgres/datadog_checks/postgres/postgres.py @@ -78,7 +78,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent MAX_CUSTOM_RESULTS = 100 diff --git a/postgres/datadog_checks/postgres/statement_samples.py b/postgres/datadog_checks/postgres/statement_samples.py index c95ebb5b22309..1d233a4d938e3 100644 --- a/postgres/datadog_checks/postgres/statement_samples.py +++ b/postgres/datadog_checks/postgres/statement_samples.py @@ -16,7 +16,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent from datadog_checks.base import is_affirmative from datadog_checks.base.utils.common import to_native_string diff --git a/postgres/datadog_checks/postgres/statements.py b/postgres/datadog_checks/postgres/statements.py index 8cac0e9f3cf66..5c6093a05931f 100644 --- a/postgres/datadog_checks/postgres/statements.py +++ b/postgres/datadog_checks/postgres/statements.py @@ -26,7 +26,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent QUERYID_TO_CALLS_QUERY = """ SELECT queryid, calls diff --git a/pyproject.toml b/pyproject.toml index b82ea60f20c81..f8b0182c4d2fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -77,6 +77,7 @@ select = [ "G", "W", "I", + "TID", ] ignore = [ # From legacy flake8 settings @@ -101,7 +102,7 @@ unfixable = [ known-first-party = ["{template_config['package_name']}"] [tool.ruff.lint.flake8-tidy-imports] -ban-relative-imports = "all" +ban-relative-imports = "parents" [tool.ruff.lint.per-file-ignores] #Tests can use assertions and relative imports diff --git a/snmp/datadog_checks/snmp/parsing/metric_tags.py b/snmp/datadog_checks/snmp/parsing/metric_tags.py index 9e023ca1a2540..705106ae6347c 100644 --- a/snmp/datadog_checks/snmp/parsing/metric_tags.py +++ b/snmp/datadog_checks/snmp/parsing/metric_tags.py @@ -8,10 +8,10 @@ from typing import Dict, List, NamedTuple, TypedDict from datadog_checks.base import ConfigurationError +from datadog_checks.snmp.models import OID +from datadog_checks.snmp.pysnmp_types import ObjectIdentity +from datadog_checks.snmp.resolver import OIDResolver # noqa: F401 -from ..models import OID -from ..pysnmp_types import ObjectIdentity -from ..resolver import OIDResolver # noqa: F401 from .parsed_metrics import ParsedMatchMetricTag, ParsedMetricTag, ParsedSimpleMetricTag SymbolTag = NamedTuple('SymbolTag', [('parsed_metric_tag', ParsedMetricTag), ('symbol', str)]) diff --git a/snmp/datadog_checks/snmp/parsing/metrics.py b/snmp/datadog_checks/snmp/parsing/metrics.py index 92b8707509793..8bd8dfdb3e97f 100644 --- a/snmp/datadog_checks/snmp/parsing/metrics.py +++ b/snmp/datadog_checks/snmp/parsing/metrics.py @@ -9,10 +9,10 @@ from typing import Dict, List, NamedTuple, Optional, Pattern, Sequence, TypedDict, Union, cast from datadog_checks.base import ConfigurationError +from datadog_checks.snmp.models import OID +from datadog_checks.snmp.pysnmp_types import ObjectIdentity +from datadog_checks.snmp.resolver import OIDResolver # noqa: F401 -from ..models import OID -from ..pysnmp_types import ObjectIdentity -from ..resolver import OIDResolver # noqa: F401 from .metric_tags import MetricTag, parse_metric_tag from .metrics_types import ( ColumnTableMetricTag, diff --git a/sqlserver/datadog_checks/sqlserver/activity.py b/sqlserver/datadog_checks/sqlserver/activity.py index 2bea785bc3446..be94e763f726d 100644 --- a/sqlserver/datadog_checks/sqlserver/activity.py +++ b/sqlserver/datadog_checks/sqlserver/activity.py @@ -24,7 +24,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent DEFAULT_COLLECTION_INTERVAL = 10 MAX_PAYLOAD_BYTES = 19e6 diff --git a/sqlserver/datadog_checks/sqlserver/agent_history.py b/sqlserver/datadog_checks/sqlserver/agent_history.py index cc551c04c290a..3e0b0fd2aeddc 100644 --- a/sqlserver/datadog_checks/sqlserver/agent_history.py +++ b/sqlserver/datadog_checks/sqlserver/agent_history.py @@ -12,7 +12,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent DEFAULT_COLLECTION_INTERVAL = 15 DEFAULT_ROW_LIMIT = 10000 diff --git a/sqlserver/datadog_checks/sqlserver/deadlocks.py b/sqlserver/datadog_checks/sqlserver/deadlocks.py index 29171c9e85888..810a767465b05 100644 --- a/sqlserver/datadog_checks/sqlserver/deadlocks.py +++ b/sqlserver/datadog_checks/sqlserver/deadlocks.py @@ -27,7 +27,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent DEFAULT_COLLECTION_INTERVAL = 600 MAX_DEADLOCKS = 100 diff --git a/sqlserver/datadog_checks/sqlserver/metadata.py b/sqlserver/datadog_checks/sqlserver/metadata.py index 4550118a9b0c4..ee70400ae45b7 100644 --- a/sqlserver/datadog_checks/sqlserver/metadata.py +++ b/sqlserver/datadog_checks/sqlserver/metadata.py @@ -15,7 +15,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent from datadog_checks.sqlserver.const import STATIC_INFO_ENGINE_EDITION, STATIC_INFO_VERSION diff --git a/sqlserver/datadog_checks/sqlserver/schemas.py b/sqlserver/datadog_checks/sqlserver/schemas.py index 7672cfcb7b478..54420673f87b9 100644 --- a/sqlserver/datadog_checks/sqlserver/schemas.py +++ b/sqlserver/datadog_checks/sqlserver/schemas.py @@ -5,7 +5,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent import json import time diff --git a/sqlserver/datadog_checks/sqlserver/sqlserver.py b/sqlserver/datadog_checks/sqlserver/sqlserver.py index 6c76973641f4f..44e1b9c7b6fee 100644 --- a/sqlserver/datadog_checks/sqlserver/sqlserver.py +++ b/sqlserver/datadog_checks/sqlserver/sqlserver.py @@ -54,7 +54,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent from datadog_checks.sqlserver import metrics from datadog_checks.sqlserver.__about__ import __version__ diff --git a/sqlserver/datadog_checks/sqlserver/statements.py b/sqlserver/datadog_checks/sqlserver/statements.py index bc32ca111a759..3f160ef96b22d 100644 --- a/sqlserver/datadog_checks/sqlserver/statements.py +++ b/sqlserver/datadog_checks/sqlserver/statements.py @@ -28,7 +28,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent from datadog_checks.sqlserver.const import STATIC_INFO_ENGINE_EDITION, STATIC_INFO_VERSION diff --git a/sqlserver/datadog_checks/sqlserver/stored_procedures.py b/sqlserver/datadog_checks/sqlserver/stored_procedures.py index bd834c081e3fd..511e425aba87a 100644 --- a/sqlserver/datadog_checks/sqlserver/stored_procedures.py +++ b/sqlserver/datadog_checks/sqlserver/stored_procedures.py @@ -17,7 +17,7 @@ try: import datadog_agent except ImportError: - from ..stubs import datadog_agent + from datadog_checks.base.stubs import datadog_agent from datadog_checks.sqlserver.const import STATIC_INFO_ENGINE_EDITION, STATIC_INFO_VERSION diff --git a/vsphere/datadog_checks/vsphere/legacy/vsphere_legacy.py b/vsphere/datadog_checks/vsphere/legacy/vsphere_legacy.py index 158a87723ad01..50616e7a857e0 100644 --- a/vsphere/datadog_checks/vsphere/legacy/vsphere_legacy.py +++ b/vsphere/datadog_checks/vsphere/legacy/vsphere_legacy.py @@ -24,8 +24,8 @@ from datadog_checks.base.checks.libs.vmware.all_metrics import ALL_METRICS from datadog_checks.base.checks.libs.vmware.basic_metrics import BASIC_METRICS from datadog_checks.base.config import is_affirmative +from datadog_checks.vsphere.event import VSphereEvent -from ..event import VSphereEvent from .cache_config import CacheConfig from .common import REALTIME_RESOURCES, SOURCE_TYPE from .errors import BadConfigError, ConnectionError