datadog-checks-base 37.3.0__py2.py3-none-any.whl → 37.5.0__py2.py3-none-any.whl

datadog_checks/base/__about__.py

@@ -1,4 +1,4 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-__version__ = "37.3.0"
+__version__ = "37.5.0"

datadog_checks/base/utils/agent/packages.py

@@ -1,12 +1,7 @@
 # (C) Datadog, Inc. 2019-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-import sys
-
-if sys.version_info >= (3, 8):
-    from importlib.metadata import distributions
-else:
-    from importlib_metadata import distributions
+from importlib.metadata import distributions
 
 DATADOG_CHECK_PREFIX = 'datadog-'
 

datadog_checks/base/utils/http.py

@@ -52,6 +52,8 @@ LOGGER = logging.getLogger(__file__)
 # https://tools.ietf.org/html/rfc2988
 DEFAULT_TIMEOUT = 10
 
+DEFAULT_EXPIRATION = 300
+
 # 16 KiB seems optimal, and is also the standard chunk size of the Bittorrent protocol:
 # https://www.bittorrent.org/beps/bep_0003.html
 DEFAULT_CHUNK_SIZE = 16
@@ -92,6 +94,7 @@ STANDARD_FIELDS = {
     'tls_private_key': None,
     'tls_protocols_allowed': DEFAULT_PROTOCOL_VERSIONS,
     'tls_verify': True,
+    'tls_ciphers': 'ALL',
     'timeout': DEFAULT_TIMEOUT,
     'use_legacy_auth_encoding': True,
     'username': None,
@@ -153,6 +156,7 @@ class RequestsWrapper(object):
         'auth_token_handler',
         'request_size',
         'tls_protocols_allowed',
+        'tls_ciphers_allowed',
     )
 
     def __init__(self, instance, init_config, remapper=None, logger=None, session=None):
@@ -347,6 +351,14 @@ class RequestsWrapper(object):
         if config['kerberos_cache']:
             self.request_hooks.append(lambda: handle_kerberos_cache(config['kerberos_cache']))
 
+        ciphers = config.get('tls_ciphers')
+        if ciphers:
+            if 'ALL' in ciphers:
+                updated_ciphers = "ALL"
+            else:
+                updated_ciphers = ":".join(ciphers)
+        self.tls_ciphers_allowed = updated_ciphers
+
     def get(self, url, **options):
         return self._request('get', url, options)
 
@@ -465,6 +477,7 @@ class RequestsWrapper(object):
             try:
                 context = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS)
                 context.verify_mode = ssl.CERT_NONE
+                context.set_ciphers(self.tls_ciphers_allowed)
 
                 with context.wrap_socket(sock, server_hostname=hostname) as secure_sock:
                     der_cert = secure_sock.getpeercert(binary_form=True)
@@ -856,8 +869,16 @@ class AuthTokenOAuthReader(object):
 
             # https://www.rfc-editor.org/rfc/rfc6749#section-4.4.3
             self._token = response['access_token']
-            self._expiration = get_timestamp() + response['expires_in']
-
+            self._expiration = get_timestamp()
+            try:
+                # According to https://www.rfc-editor.org/rfc/rfc6749#section-5.1, the `expires_in` field is optional
+                self._expiration += _parse_expires_in(response.get('expires_in'))
+            except TypeError:
+                LOGGER.debug(
+                    'The `expires_in` field of the OAuth2 response is not a number, defaulting to %s',
+                    DEFAULT_EXPIRATION,
+                )
+                self._expiration += DEFAULT_EXPIRATION
             return self._token
 
 
@@ -991,6 +1012,21 @@ def quote_uds_url(url):
     return urlunparse(parsed)
 
 
+def _parse_expires_in(token_expiration):
+    if isinstance(token_expiration, int) or isinstance(token_expiration, float):
+        return token_expiration
+    if isinstance(token_expiration, str):
+        try:
+            token_expiration = int(token_expiration)
+        except ValueError:
+            LOGGER.debug('Could not convert %s to an integer', token_expiration)
+    else:
+        LOGGER.debug('Unexpected type for `expires_in`: %s.', type(token_expiration))
+        token_expiration = None
+
+    return token_expiration
+
+
 # For documentation generation
 # TODO: use an enum and remove STANDARD_FIELDS when mkdocstrings supports it
 class StandardFields(object):

datadog_checks/base/utils/tls.py

@@ -28,6 +28,7 @@ STANDARD_FIELDS = {
     'tls_private_key': None,
     'tls_private_key_password': None,
     'tls_validate_hostname': True,
+    'tls_ciphers': 'ALL',
 }
 
 
@@ -115,6 +116,15 @@ class TlsContextWrapper(object):
         else:
             context.check_hostname = False
 
+        ciphers = self.config.get('tls_ciphers')
+        if ciphers:
+            if 'ALL' in ciphers:
+                updated_ciphers = "ALL"
+            else:
+                updated_ciphers = ":".join(ciphers)
+
+            context.set_ciphers(updated_ciphers)
+
         # https://docs.python.org/3/library/ssl.html#ssl.SSLContext.load_verify_locations
         # https://docs.python.org/3/library/ssl.html#ssl.SSLContext.load_default_certs
         ca_cert = self.config['tls_ca_cert']

{datadog_checks_base-37.3.0.dist-info → datadog_checks_base-37.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datadog-checks-base
-Version: 37.3.0
+Version: 37.5.0
 Summary: The Datadog Check Toolkit
 Project-URL: Source, https://github.com/DataDog/integrations-core
 Author-email: Datadog <packages@datadoghq.com>
@@ -13,40 +13,39 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
 Provides-Extra: db
-Requires-Dist: mmh3==4.1.0; extra == 'db'
+Requires-Dist: mmh3==5.0.1; extra == 'db'
 Provides-Extra: deps
 Requires-Dist: binary==1.0.1; extra == 'deps'
 Requires-Dist: cachetools==5.5.0; extra == 'deps'
 Requires-Dist: cryptography==43.0.1; extra == 'deps'
 Requires-Dist: ddtrace==2.10.6; extra == 'deps'
-Requires-Dist: importlib-metadata==2.1.3; (python_version < '3.8') and extra == 'deps'
-Requires-Dist: jellyfish==1.1.0; extra == 'deps'
-Requires-Dist: prometheus-client==0.20.0; extra == 'deps'
-Requires-Dist: protobuf==5.27.3; extra == 'deps'
-Requires-Dist: pydantic==2.8.2; extra == 'deps'
+Requires-Dist: jellyfish==1.1.3; extra == 'deps'
+Requires-Dist: prometheus-client==0.21.1; extra == 'deps'
+Requires-Dist: protobuf==5.29.3; extra == 'deps'
+Requires-Dist: pydantic==2.10.5; extra == 'deps'
 Requires-Dist: python-dateutil==2.9.0.post0; extra == 'deps'
-Requires-Dist: pywin32==306; (sys_platform == 'win32') and extra == 'deps'
+Requires-Dist: pywin32==308; (sys_platform == 'win32') and extra == 'deps'
 Requires-Dist: pyyaml==6.0.2; extra == 'deps'
 Requires-Dist: requests-toolbelt==1.0.0; extra == 'deps'
 Requires-Dist: requests-unixsocket2==0.4.2; extra == 'deps'
 Requires-Dist: requests==2.32.3; extra == 'deps'
 Requires-Dist: simplejson==3.19.3; extra == 'deps'
 Requires-Dist: uptime==3.0.1; extra == 'deps'
-Requires-Dist: wrapt==1.16.0; extra == 'deps'
+Requires-Dist: wrapt==1.17.2; extra == 'deps'
 Provides-Extra: http
 Requires-Dist: aws-requests-auth==0.4.3; extra == 'http'
-Requires-Dist: botocore==1.35.10; extra == 'http'
+Requires-Dist: botocore==1.36.1; extra == 'http'
 Requires-Dist: oauthlib==3.2.2; extra == 'http'
-Requires-Dist: pyjwt==2.9.0; extra == 'http'
+Requires-Dist: pyjwt==2.10.1; extra == 'http'
 Requires-Dist: pyopenssl==24.2.1; extra == 'http'
 Requires-Dist: pysocks==1.7.1; extra == 'http'
 Requires-Dist: requests-kerberos==0.15.0; extra == 'http'
 Requires-Dist: requests-ntlm==1.3.0; extra == 'http'
 Requires-Dist: requests-oauthlib==2.0.0; extra == 'http'
 Provides-Extra: json
-Requires-Dist: orjson==3.10.7; extra == 'json'
+Requires-Dist: orjson==3.10.14; extra == 'json'
 Provides-Extra: kube
-Requires-Dist: kubernetes==30.1.0; extra == 'kube'
+Requires-Dist: kubernetes==31.0.0; extra == 'kube'
 Requires-Dist: requests-oauthlib==2.0.0; extra == 'kube'
 Description-Content-Type: text/markdown
 

{datadog_checks_base-37.3.0.dist-info → datadog_checks_base-37.5.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ datadog_checks/config.py,sha256=PrAXGdlLnoV2VMQff_noSaSJJ0wg4BAiGnw7jCQLSik,196
 datadog_checks/errors.py,sha256=eFwmnrX-batIgbu-iJyseqAPNO_4rk1UuaKK89evLhg,155
 datadog_checks/log.py,sha256=orvOgMKGNEsqSTLalCAQpWP-ouorpG1A7Gn-j2mRD80,301
 datadog_checks/py.typed,sha256=la67KBlbjXN-_-DfGNcdOcjYumVpKG_Tkw-8n5dnGB4,8
-datadog_checks/base/__about__.py,sha256=QRM3_bwJhzb7uJLn2DucBJ-GivjWqyQ1VQY7Sj8SWC8,138
+datadog_checks/base/__about__.py,sha256=5AzFfItx9URe8lFWie_oC3dNfFosQs7be2xVIkuGnko,138
 datadog_checks/base/__init__.py,sha256=rSTDo6-2p_RX6I6wnuXrNMglaatoLRyZFTE5wbHZY8s,1466
 datadog_checks/base/agent.py,sha256=nX9x_BYYizRKGNYfXq5z7S0FZ9xcX_wd2tuxpGe3_8k,350
 datadog_checks/base/config.py,sha256=qcAA4X9sXQZRdwQe8DgiGd2980VBp1SQA0d695tX_tU,604
@@ -101,7 +101,7 @@ datadog_checks/base/utils/diagnose.py,sha256=eLMe0tISpkzS3yxVR83IHxorQJfHT_Xi6Cq
 datadog_checks/base/utils/fips.py,sha256=G92RNoZkrMojaTKi1DiccbvfMFO3adktDZgKjpxkkTw,1400
 datadog_checks/base/utils/functions.py,sha256=iGlybxR6aPPElNxNb2ELOzbk328j9OVBAxredJxdCRw,695
 datadog_checks/base/utils/headers.py,sha256=0SSdC71jwaB61BODfusahCVr1c56GvT9iwt7cidcHP0,1779
-datadog_checks/base/utils/http.py,sha256=MWmPVsCQEkl02X0J4gIte1ACjB3LeK3cwZL2gPDhIX8,39116
+datadog_checks/base/utils/http.py,sha256=TcOdwoFKggxr_VsCEQoXlxFFGS-n9UYz4pDZH2zxjoM,40516
 datadog_checks/base/utils/limiter.py,sha256=YRTrPCX1S5EtHLVcP_-GEfzRots_LTcy1f_uHZVs90g,3027
 datadog_checks/base/utils/network.py,sha256=YXo9JQgWUtFn4dFefWZap20OMmSReLSPOjgzodJbddw,1814
 datadog_checks/base/utils/platform.py,sha256=wW8f6XKo4JHxvu1sN0DpLDmYjS_cCu8GoKvfTjIj4yM,2499
@@ -112,14 +112,14 @@ datadog_checks/base/utils/tagging.py,sha256=AEUEGIxJjNvoOIEQQFkit8ZT2OyRxiym1FzC
 datadog_checks/base/utils/tailfile.py,sha256=x_pM5pgmVaW4eJBwS6GXZKOqifpmqfrwHOU3gWthYtM,3894
 datadog_checks/base/utils/time.py,sha256=cNy7CtsJzSUMi7J-3WReZVUvNyYOGkJwItqJMY01qqA,1373
 datadog_checks/base/utils/timeout.py,sha256=eOBZofFN-hOu5xJeMOF3ac_ofcy9EY6-kvmBvP4QEFg,2140
-datadog_checks/base/utils/tls.py,sha256=MUoZbAZKDMTeVRK0SDmYYIigyCjOJTi1YFBoE6zps8M,5411
+datadog_checks/base/utils/tls.py,sha256=m_puDc6JGhVqJ0ADqeA736H05DuaNKrLAE9pPMUJCDo,5700
 datadog_checks/base/utils/tracing.py,sha256=NPt5h-QXT_XL8D2FhNlNbBO-Lnwrr_sdS4DFpKRV9IU,5759
 datadog_checks/base/utils/tracking.py,sha256=FYIouqu3KB-JsxgxM1iX5Ipv_cWhs8zQOTN4SxXOkJ4,3701
 datadog_checks/base/utils/agent/__init__.py,sha256=o3aWvy3PhykD_h7YT3s628O0W2YpHis0NlQsSV1PI04,115
 datadog_checks/base/utils/agent/common.py,sha256=1XRsPJWdpmbxAKKBVHGBPUm4WHdviq0ovuggtpx7LWo,217
 datadog_checks/base/utils/agent/debug.py,sha256=zeBbNLt3Y_Wxpf9OdAklldLy1gmL0U6bMDmOHSDGM3M,2274
 datadog_checks/base/utils/agent/memory.py,sha256=mG10PFFgjWCLetF6ihC463VQz1V3S4STMs_F8bADkvY,10514
-datadog_checks/base/utils/agent/packages.py,sha256=q4i77Oj50KONsRTxIbOqe6v0Mjneu-QGndI2z8dC2Pk,633
+datadog_checks/base/utils/agent/packages.py,sha256=mpkkq01sizzz-0Mdbd_t_deMakHAX1oiZ1rSFGD-luE,531
 datadog_checks/base/utils/agent/utils.py,sha256=FV_o6rccU5B0MrXyma-4yAqmKghklzTeOf1nhYcmY7o,1360
 datadog_checks/base/utils/concurrency/__init__.py,sha256=ORssE5bXZuYua5UCLesGfPvcrQKcADHaDsXrUyfARF0,115
 datadog_checks/base/utils/concurrency/limiter.py,sha256=is2ZpUEjfsI4nBGtXG2D0Zgv0GD38_i5jJQCkdzPW_Y,3170
@@ -200,6 +200,6 @@ datadog_checks/utils/tracing.py,sha256=HQbQakKM-Lw75MDkItaYJYipS6YO24Z_ymDVxDsx5
 datadog_checks/utils/prometheus/__init__.py,sha256=8WwXnM9g1sfS5267QYCJX_hd8MZl5kRgBgQ_SzdNdXs,161
 datadog_checks/utils/prometheus/functions.py,sha256=4vWsTGLgujHwdYZo0tlAQkqDPHofqUJM3k9eItJqERQ,197
 datadog_checks/utils/prometheus/metrics_pb2.py,sha256=xg3UdUHe4TjeR4s13LUKZ2U1WVSt6U6zjsVRG6lX6dc,173
-datadog_checks_base-37.3.0.dist-info/METADATA,sha256=VlGpxGtTRr5mXjDKJMVVrEc2qC0m5XO2yDNPMAs-6lA,3675
-datadog_checks_base-37.3.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-datadog_checks_base-37.3.0.dist-info/RECORD,,
+datadog_checks_base-37.5.0.dist-info/METADATA,sha256=GZWGd2TVn8CrN5OELUHpk6gXVM5OejdzkZnkcHXfpWc,3590
+datadog_checks_base-37.5.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+datadog_checks_base-37.5.0.dist-info/RECORD,,