Merge branch 'adyen-assets-v1.0.0' of https://github.com/bhargavnariy…

…anicrest/integrations-core into adyen-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,29 +15,12 @@ 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 && \
+RUN yum install -y perl-IPC-Cmd perl-CPANPLUS && \
+ cpanp -i List::Util 1.66 && \
  DOWNLOAD_URL="https://www.openssl.org/source/openssl-{{version}}.tar.gz" \
- VERSION="3.0.13" \
- SHA256="88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313" \
+ VERSION="3.3.2" \
+ SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281" \
  RELATIVE_PATH="openssl-{{version}}" \
  # https://docs.python.org/3/using/unix.html#custom-openssl
  INSTALL_COMMAND="make install_sw" \

.builders/images/linux-aarch64/build_script.sh

@@ -21,7 +21,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then
     LDFLAGS="${LDFLAGS} -L/usr/local/lib -lkrb5 -lgssapi_krb5 -llmdb" \
     DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \
         VERSION="${kafka_version}" \
-        SHA256="3dc62de731fd516dfb1032861d9a580d4d0b5b0856beb0f185d06df8e6c26259" \
+        SHA256="0ddf205ad8d36af0bc72a2fec20639ea02e1d583e353163bf7f4683d949e901b" \
         RELATIVE_PATH="librdkafka-{{version}}" \
         bash install-from-source.sh --enable-sasl --enable-curl
     always_build+=("confluent-kafka")

.builders/images/linux-x86_64/Dockerfile

@@ -15,28 +15,12 @@ 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 && \
+RUN yum install -y perl-IPC-Cmd perl-CPANPLUS && \
+ cpanp -i List::Util 1.66 && \
  DOWNLOAD_URL="https://www.openssl.org/source/openssl-{{version}}.tar.gz" \
- VERSION="3.0.13" \
- SHA256="88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313" \
+ VERSION="3.3.2" \
+ SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281" \
  RELATIVE_PATH="openssl-{{version}}" \
  # https://docs.python.org/3/using/unix.html#custom-openssl
  INSTALL_COMMAND="make install_sw" \

.builders/images/linux-x86_64/build_script.sh

@@ -18,7 +18,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then
     LDFLAGS="${LDFLAGS} -L/usr/local/lib -lkrb5 -lgssapi_krb5 -llmdb" \
     DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \
         VERSION="${kafka_version}" \
-        SHA256="3dc62de731fd516dfb1032861d9a580d4d0b5b0856beb0f185d06df8e6c26259" \
+        SHA256="0ddf205ad8d36af0bc72a2fec20639ea02e1d583e353163bf7f4683d949e901b" \
         RELATIVE_PATH="librdkafka-{{version}}" \
         bash install-from-source.sh --enable-sasl --enable-curl
     always_build+=("confluent-kafka")

.builders/images/macos-x86_64/builder_setup.sh

@@ -23,8 +23,8 @@ cp -R /opt/mqm "${DD_PREFIX_PATH}"
 
 # openssl
 DOWNLOAD_URL="https://www.openssl.org/source/openssl-{{version}}.tar.gz" \
-VERSION="3.0.13" \
-SHA256="88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313" \
+VERSION="3.3.2" \
+SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281" \
 RELATIVE_PATH="openssl-{{version}}" \
 CONFIGURE_SCRIPT="./config" \
   install-from-source \

.builders/images/macos-x86_64/extra_build.sh

@@ -13,7 +13,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then
     LDFLAGS="${LDFLAGS} -L${DD_PREFIX_PATH}/lib -lgssapi_krb5 -llmdb" \
     DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \
       VERSION="${kafka_version}" \
-      SHA256="3dc62de731fd516dfb1032861d9a580d4d0b5b0856beb0f185d06df8e6c26259" \
+      SHA256="0ddf205ad8d36af0bc72a2fec20639ea02e1d583e353163bf7f4683d949e901b" \
       RELATIVE_PATH="librdkafka-{{version}}" \
       bash install-from-source.sh --prefix="${DD_PREFIX_PATH}" --enable-sasl --enable-curl
 

.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

@@ -54,6 +54,10 @@ coverage:
         target: 75
         flags:
         - apache
+      Appgate_SDP:
+        target: 75
+        flags:
+        - appgate_sdp
       ArangoDB:
         target: 75
         flags:
@@ -310,14 +314,18 @@ coverage:
         target: 75
         flags:
         - kong
+      KubeVirt_API:
+        target: 75
+        flags:
+        - 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:
@@ -450,10 +458,6 @@ coverage:
         target: 75
         flags:
         - openstack_controller
-      Oracle_Database:
-        target: 75
-        flags:
-        - oracle
       PDH:
         target: 75
         flags:
@@ -546,6 +550,10 @@ coverage:
         target: 75
         flags:
         - singlestore
+      Slurm:
+        target: 75
+        flags:
+        - slurm
       Snowflake:
         target: 75
         flags:
@@ -702,6 +710,10 @@ coverage:
         target: 75
         flags:
         - kyverno
+      nvidia_nim:
+        target: 75
+        flags:
+        - nvidia_nim
       tibco_ems:
         target: 75
         flags:
@@ -751,6 +763,11 @@ flags:
     paths:
     - apache/datadog_checks/apache
     - apache/tests
+  appgate_sdp:
+    carryforward: true
+    paths:
+    - appgate_sdp/datadog_checks/appgate_sdp
+    - appgate_sdp/tests
   arangodb:
     carryforward: true
     paths:
@@ -1166,16 +1183,21 @@ flags:
     paths:
     - kubernetes_state/datadog_checks/kubernetes_state
     - kubernetes_state/tests
+  kubevirt_api:
+    carryforward: true
+    paths:
+    - 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:
@@ -1271,6 +1293,11 @@ flags:
     paths:
     - nginx_ingress_controller/datadog_checks/nginx_ingress_controller
     - nginx_ingress_controller/tests
+  nvidia_nim:
+    carryforward: true
+    paths:
+    - nvidia_nim/datadog_checks/nvidia_nim
+    - nvidia_nim/tests
   nvidia_triton:
     carryforward: true
     paths:
@@ -1296,11 +1323,6 @@ flags:
     paths:
     - openstack_controller/datadog_checks/openstack_controller
     - openstack_controller/tests
-  oracle:
-    carryforward: true
-    paths:
-    - oracle/datadog_checks/oracle
-    - oracle/tests
   pdh_check:
     carryforward: true
     paths:
@@ -1401,6 +1423,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/kafka_consumer/linux/32_install_kerberos.sh

@@ -8,7 +8,7 @@ sudo apt install -y --no-install-recommends build-essential libkrb5-dev wget sof
 # Install librdkafka from source since no binaries are available for the distribution we use on the CI:
 git clone https://github.com/confluentinc/librdkafka
 cd librdkafka
-git checkout v2.5.0
+git checkout v2.6.1
 sudo ./configure --install-deps --prefix=/usr
 make
 sudo make install

.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():

.ddev/config.toml

@@ -57,7 +57,7 @@ runners = { linux = ["ubuntu-20.04"] }
 
 [overrides.ci.sqlserver]
 platforms = ["windows", "linux"]
-runners = { windows = ["windows-2019"] }
+runners = { windows = ["windows-2019"], linux = ["ubuntu-20.04"] }
 
 [overrides.ci.tcp_check]
 platforms = ["linux", "windows"]
@@ -70,6 +70,10 @@ exclude = true
 aerospike = ['Apache-2.0']
 # https://github.com/pyca/cryptography/blob/main/LICENSE
 cryptography = ['Apache-2.0', 'BSD-3-Clause', 'PSF']
+# https://github.com/confluentinc/confluent-kafka-python/blob/master/LICENSE
+# TODO: Remove once confluent-kafka license metadata is fixed:
+# https://github.com/confluentinc/confluent-kafka-python/issues/1857
+confluent-kafka = ['Apache-2.0']
 # https://github.com/rthalley/dnspython/blob/master/LICENSE
 dnspython = ['ISC']
 # https://github.com/cannatag/ldap3/blob/dev/COPYING.txt

.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:0c67a49a4d4ec217dd0f841ee139eaf061616f6e61c6bc758617d4c50c7a8aa2",
+  "linux-x86_64": "sha256:5e421218e377e4c1d0769b148e569f4ff4a8c60fbd2be8411db9158a644a0b0a",
+  "windows-x86_64": "sha256:feefe940fe3f382bf4833bc29a9d614d6f6bb3592258a905a261167184b20eab"
 }

.deps/metadata.json

@@ -1,3 +1,3 @@
 {
-  "sha256": "2566080e6db100ff1cb0b3b98c011fa1d70fed5bfd9042fc4fcf29a10491ca84"
+  "sha256": "5983d33689b7f9b74eb94d7ff13b7eac3c0b2f8cd5084e8ded76c28ca5476a20"
 }