Merge branch 'master' into extrahop-assets-v1.0.0

.builders/deps/build_dependencies.txt

@@ -9,5 +9,5 @@ setuptools-scm==5.0.2; python_version < '3.0'
 setuptools-rust>=1.7.0; python_version > '3.0'
 maturin; python_version > '3.0'
 cffi>=1.12
-cython<3.0.0
+cython==3.0.11
 tomli>=2.0.1; python_version > '3.0'

.builders/images/linux-aarch64/Dockerfile

@@ -15,24 +15,6 @@ ENV CXXFLAGS="${CFLAGS}"
 # --strip-debug reduces binary sizes and improves reproducibility
 ENV LDFLAGS="-Wl,-rpath,'\$\$ORIGIN' -Wl,--strip-debug"
 
-# For Python 2, we get openssl(1) via yum just to get the necessary headers,
-# and we remove the package after compilation to prevent it from interfering
-# with the use of openssl3 everywhere else
-ENV PYTHON2_VERSION=2.7.18
-RUN yum install -y openssl-devel && \
- DOWNLOAD_URL="https://python.org/ftp/python/${PYTHON2_VERSION}/Python-${PYTHON2_VERSION}.tgz" \
- VERSION="${PYTHON2_VERSION}" \
- SHA256="da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814" \
- RELATIVE_PATH=Python-{{version}} \
- INSTALL_COMMAND="make altinstall" \
- bash install-from-source.sh \
- --prefix=/opt/python/${PYTHON2_VERSION} --with-ensurepip=yes --enable-ipv6 --enable-unicode=ucs4 \
- && yum remove -y openssl-devel
-
-# Set up virtual environment for Python 2
-RUN /opt/python/${PYTHON2_VERSION}/bin/python2.7 -m pip install --no-warn-script-location virtualenv \
- && /opt/python/${PYTHON2_VERSION}/bin/python2.7 -m virtualenv /py2
-
 # openssl
 RUN yum install -y perl-IPC-Cmd perl-CPANPLUS && \
  cpanp -i List::Util 1.66 && \

.builders/images/linux-x86_64/Dockerfile

@@ -15,23 +15,6 @@ ENV CXXFLAGS="${CFLAGS}"
 # --strip-debug reduces binary sizes and improves reproducibility
 ENV LDFLAGS="-Wl,-rpath,'\$\$ORIGIN' -Wl,--strip-debug"
 
-# For Python 2, we get openssl(1) via yum just to get the necessary headers,
-# and we remove the package after compilation to prevent it from interfering
-# with the use of openssl3 everywhere else
-ENV PYTHON2_VERSION=2.7.18
-RUN yum install -y openssl-devel && \
- DOWNLOAD_URL="https://python.org/ftp/python/${PYTHON2_VERSION}/Python-${PYTHON2_VERSION}.tgz" \
- VERSION="${PYTHON2_VERSION}" \
- SHA256="da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814" \
- RELATIVE_PATH=Python-{{version}} \
- bash install-from-source.sh \
- --prefix=/opt/python/${PYTHON2_VERSION} --with-ensurepip=yes --enable-ipv6 --enable-unicode=ucs4 \
- && yum remove -y openssl-devel
-
-# Set up virtual environment for Python 2
-RUN /opt/python/${PYTHON2_VERSION}/bin/python -m pip install --no-warn-script-location virtualenv \
- && /opt/python/${PYTHON2_VERSION}/bin/python -m virtualenv /py2
-
 # openssl
 RUN yum install -y perl-IPC-Cmd perl-CPANPLUS && \
  cpanp -i List::Util 1.66 && \

.builders/images/windows-x86_64/Dockerfile

@@ -85,24 +85,6 @@ RUN Get-RemoteFile `
     & 'C:\Program Files\Python312\python.exe' -m virtualenv 'C:\py3'; `
     Add-ToPath -Append 'C:\Program Files\Python312'
 
-# Install Python 2
-ENV PYTHON_VERSION="2.7.18"
-RUN Get-RemoteFile `
-      -Uri https://www.python.org/ftp/python/$Env:PYTHON_VERSION/python-$Env:PYTHON_VERSION.amd64.msi `
-      -Path python-$Env:PYTHON_VERSION.amd64.msi `
-      -Hash 'b74a3afa1e0bf2a6fc566a7b70d15c9bfabba3756fb077797d16fffa27800c05'; `
-    Start-Process -Wait -FilePath msiexec -ArgumentList '/i', python-$Env:PYTHON_VERSION.amd64.msi, '/quiet', '/norestart', 'InstallAllUsers=1'; `
-    Remove-Item python-$Env:PYTHON_VERSION.amd64.msi; `
-    & 'C:\Python27\python.exe' -m pip install --no-warn-script-location --upgrade pip; `
-    & 'C:\Python27\python.exe' -m pip install --no-python-version-warning --no-warn-script-location virtualenv; `
-    & 'C:\Python27\python.exe' -m virtualenv 'C:\py2'
-RUN Get-RemoteFile `
-      -Uri https://s3.amazonaws.com/dd-agent-omnibus/VCForPython27.msi `
-      -Path VCForPython27.msi `
-      -Hash '070474db76a2e625513a5835df4595df9324d820f9cc97eab2a596dcbc2f5cbf'; `
-    Start-Process -Wait -FilePath msiexec -ArgumentList '/i', VCForPython27.msi, '/quiet'; `
-    Remove-Item VCForPython27.msi
-
 # Install IBM MQ
 ENV IBM_MQ_VERSION="9.2.4.0"
 RUN Get-RemoteFile `

.codecov.yml

@@ -314,18 +314,18 @@ coverage:
         target: 75
         flags:
         - kong
-      KubeVirt_Handler:
+      KubeVirt_API:
         target: 75
         flags:
-        - kubevirt_handler
+        - kubevirt_api
       KubeVirt_Controller:
         target: 75
         flags:
         - kubevirt_controller
-      KubeVirt_API:
+      KubeVirt_Handler:
         target: 75
         flags:
-        - kubevirt_api
+        - kubevirt_handler
       Kube_DNS:
         target: 75
         flags:
@@ -550,6 +550,10 @@ coverage:
         target: 75
         flags:
         - singlestore
+      Slurm:
+        target: 75
+        flags:
+        - slurm
       Snowflake:
         target: 75
         flags:
@@ -1175,21 +1179,21 @@ flags:
     paths:
     - kubernetes_state/datadog_checks/kubernetes_state
     - kubernetes_state/tests
-  kubevirt_handler:
+  kubevirt_api:
     carryforward: true
     paths:
-    - kubevirt_handler/datadog_checks/kubevirt_handler
-    - kubevirt_handler/tests
+    - kubevirt_api/datadog_checks/kubevirt_api
+    - kubevirt_api/tests
   kubevirt_controller:
     carryforward: true
     paths:
     - kubevirt_controller/datadog_checks/kubevirt_controller
     - kubevirt_controller/tests
-  kubevirt_api:
+  kubevirt_handler:
     carryforward: true
     paths:
-    - kubevirt_api/datadog_checks/kubevirt_api
-    - kubevirt_api/tests
+    - kubevirt_handler/datadog_checks/kubevirt_handler
+    - kubevirt_handler/tests
   kyototycoon:
     carryforward: true
     paths:
@@ -1410,6 +1414,11 @@ flags:
     paths:
     - singlestore/datadog_checks/singlestore
     - singlestore/tests
+  slurm:
+    carryforward: true
+    paths:
+    - slurm/datadog_checks/slurm
+    - slurm/tests
   snmp:
     carryforward: true
     paths:

.ddev/ci/scripts/traces.py

@@ -40,10 +40,10 @@ def replay(*, record_file: str, port: int) -> None:
             record = json.loads(line)
             path = record['path']
             body = b64decode(record['body'])
-
-            print(f'PUT {path} {len(body)} bytes: ', end='')
             conn.request('PUT', path, body=body, headers=record['headers'])
-            print(conn.getresponse().read().decode('utf-8'))
+            response = conn.getresponse()
+            response.read() # Needs to be done to prevent ResponseNotReady.
+            print(response.status, response.reason)
 
 
 def main():

.ddqa/config.toml

@@ -78,6 +78,28 @@ jira_statuses = [
 github_team = "network-device-monitoring"
 github_labels = ["team/network-device-monitoring"]
 
+[teams."Network Device Monitoring Core"]
+jira_project = "NDMII"
+jira_issue_type = "Task"
+jira_statuses = [
+  "To Do",
+  "In Progress",
+  "Done",
+]
+github_team = "ndm-core"
+github_labels = ["team/ndm-core"]
+
+[teams."Network Device Monitoring Integrations"]
+jira_project = "NDINT"
+jira_issue_type = "Task"
+jira_statuses = [
+  "To Do",
+  "In Progress",
+  "Done",
+]
+github_team = "ndm-integrations"
+github_labels = ["team/ndm-integrations"]
+
 [teams."Windows Agent"]
 jira_project = "WINA"
 jira_issue_type = "QA Task"

.deps/image_digests.json

@@ -1,5 +1,5 @@
 {
-  "linux-aarch64": "sha256:f3834f630ad669a0876dafb95a9ffd5b485171536cffbc1170ffbd3cbfab9c1d",
-  "linux-x86_64": "sha256:952783e733c9c0d08568394a0e925d1f8428d8f04507a2b10bcfd2a1486da2db",
-  "windows-x86_64": "sha256:2fd9816b42a300080a0bcc57753e577f0140bb8b0d06e14c54fc8f634d93a2db"
+  "linux-aarch64": "sha256:e7583b37a4304416d2d3e131861e0d5512298efebd726622de5ce52520881b3a",
+  "linux-x86_64": "sha256:35e5383e3e778d37ee0b23281bfab1eda205a1a2b7d657a701bc5f982187b47e",
+  "windows-x86_64": "sha256:deff9de8721c3815a3926a0726f16d15f2c2fba6f0d67fb0d9080ef6fa6887c3"
 }

.deps/metadata.json

@@ -1,3 +1,3 @@
 {
-  "sha256": "05fd51b6a78ab27c9e34b4be47740485e54a0b1cdc9c5dcefbbad7a53ce23c80"
+  "sha256": "69faeb7567d2ef2f7ebef4f91120ef0ff5231c16a91ec710cb5429364791ca71"
 }