Merge branch 'master' into kyle.neale/test-mapr

Author: Kyle-Neale

.github/CODEOWNERS

@@ -301,6 +301,11 @@ datadog_checks_base/datadog_checks/base/checks/windows/              @DataDog/wi
 /metabase/manifest.json                                             @DataDog/saas-integrations @DataDog/documentation
 /metabase/assets/logs/                                              @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend
 
+/microsoft_sysmon/                                                  @DataDog/agent-integrations
+/microsoft_sysmon/*.md                                              @DataDog/agent-integrations @DataDog/documentation
+/microsoft_sysmon/manifest.json                                     @DataDog/agent-integrations @DataDog/documentation
+/microsoft_sysmon/assets/logs/                                      @DataDog/agent-integrations @DataDog/documentation @DataDog/logs-backend @DataDog/logs-core
+
 /mimecast/                                                          @DataDog/saas-integrations
 /mimecast/*.md                                                      @DataDog/saas-integrations @DataDog/documentation
 /mimecast/manifest.json                                             @DataDog/saas-integrations @DataDog/documentation
@@ -513,6 +518,11 @@ plaid/assets/logs/                                                  @DataDog/saa
 /gpu/*.md                                                            @DataDog/ebpf-platform @DataDog/documentation
 /gpu/manifest.json                                                   @DataDog/ebpf-platform @DataDog/agent-integrations @DataDog/documentation
 
+/openvpn/                                                           @DataDog/agent-integrations
+/openvpn/*.md                                                       @DataDog/agent-integrations @DataDog/documentation
+/openvpn/manifest.json                                              @DataDog/agent-integrations @DataDog/documentation
+/openvpn/assets/logs/                                               @DataDog/agent-integrations @DataDog/documentation @DataDog/logs-backend @DataDog/logs-core
+
 # To keep Security up-to-date with changes to the signing tool.
 /datadog_checks_dev/datadog_checks/dev/tooling/signing.py             @DataDog/agent-integrations
 # As well as the secure downloader.

.github/workflows/config/labeler.yml

@@ -176,6 +176,8 @@ integration/dcgm:
 - dcgm/**/*
 integration/delinea_privilege_manager:
 - delinea_privilege_manager/**/*
+integration/delinea_secret_server:
+- delinea_secret_server/**/*
 integration/directory:
 - directory/**/*
 integration/disk:
@@ -314,6 +316,8 @@ integration/jmeter:
 - jmeter/**/*
 integration/journald:
 - journald/**/*
+integration/juniper_srx_firewall:
+- juniper_srx_firewall/**/*
 integration/kafka:
 - kafka/**/*
 integration/kafka_consumer:
@@ -390,6 +394,8 @@ integration/mesos_slave:
 - mesos_slave/**/*
 integration/metabase:
 - metabase/**/*
+integration/microsoft_sysmon:
+- microsoft_sysmon/**/*
 integration/milvus:
 - milvus/**/*
 integration/mimecast:
@@ -440,6 +446,8 @@ integration/openstack:
 - openstack/**/*
 integration/openstack_controller:
 - openstack_controller/**/*
+integration/openvpn:
+- openvpn/**/*
 integration/oracle:
 - oracle/**/*
 integration/orca_security:

.github/workflows/datadog-static-analysis.yml

@@ -13,8 +13,8 @@ jobs:
       id: datadog-static-analysis
       uses: DataDog/datadog-static-analyzer-github-action@v1
       with:
-        dd_api_key: ${{ secrets.DD_API_KEY_2 }}
-        dd_app_key: ${{ secrets.DD_STATIC_ANALYSIS_APP_KEY_2 }}
+        dd_api_key: ${{ secrets.DD_API_KEY }}
+        dd_app_key: ${{ secrets.DD_STATIC_ANALYSIS_APP_KEY }}
         dd_service: integration-core
         dd_env: ci
         dd_site: datadoghq.com

.github/workflows/flaky-tests.yml

@@ -29,6 +29,10 @@ jobs:
       pytest-args: '-m flaky'
     secrets: inherit
 
+    # needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
+    permissions:
+       id-token: write
+
   publish-test-results:
     needs:
     - test

.github/workflows/submit-traces.yml

@@ -18,7 +18,7 @@ jobs:
         ports:
         - "8126:8126"
         env:
-          DD_API_KEY: "${{ secrets.DD_API_KEY_2 }}"
+          DD_API_KEY: "${{ secrets.DD_API_KEY }}"
           DD_HOSTNAME: "none"
           DD_INSIDE_CI: "true"
           DD_LOG_LEVEL: "warn"

.github/workflows/test-agent.yml

@@ -49,6 +49,9 @@ jobs:
       agent-image-windows: "${{ inputs.agent-image-windows }}"
       agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
     secrets: inherit
+    # needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
+    permissions:
+      id-token: write
 
   submit-traces:
     needs:

.github/workflows/test-fips-e2e.yml

@@ -94,10 +94,10 @@ jobs:
     - name: Prepare for testing
       env:
         PYTHONUNBUFFERED: "1"
-        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME_2 }}
-        DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN_2 }}
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
         ORACLE_DOCKER_USERNAME: ${{ secrets.ORACLE_DOCKER_USERNAME }}
-        ORACLE_DOCKER_PASSWORD: ${{ secrets.ORACLE_DOCKER_PASSWORD_2 }}
+        ORACLE_DOCKER_PASSWORD: ${{ secrets.ORACLE_DOCKER_PASSWORD }}
         DD_GITHUB_USER: ${{ github.actor }}
         DD_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: ddev ci setup ${{ inputs.target || 'tls' }}
@@ -112,14 +112,14 @@ jobs:
     - name: Run E2E tests with FIPS disabled
       env:
         DDEV_E2E_AGENT: "${{ inputs.agent-image || 'datadog/agent-dev:master-py3' }}"
-        DD_API_KEY: "${{ secrets.DD_API_KEY_2 }}"
+        DD_API_KEY: "${{ secrets.DD_API_KEY }}"
       run: |
         ddev env test --base --new-env --junit ${{ inputs.target || 'tls' }} -- all -m "fips_off"
 
     - name: Run E2E tests with FIPS enabled
       env:
         DDEV_E2E_AGENT: "${{ inputs.agent-image-fips || 'datadog/agent-dev:master-fips' }}"
-        DD_API_KEY: "${{ secrets.DD_API_KEY_2 }}"
+        DD_API_KEY: "${{ secrets.DD_API_KEY }}"
       run: |
         ddev env test --base --new-env --junit ${{ inputs.target || 'tls' }} -- all -k "fips_on"
 

.github/workflows/test-target.yml

@@ -202,10 +202,10 @@ jobs:
             "DD_GITHUB_USER": "{4}",
             "DD_GITHUB_TOKEN": "{5}"
           }}',
-          secrets.DOCKER_USERNAME_2,
-          secrets.DOCKER_ACCESS_TOKEN_2,
+          secrets.DOCKER_USERNAME,
+          secrets.DOCKER_ACCESS_TOKEN,
           secrets.ORACLE_DOCKER_USERNAME,
-          secrets.ORACLE_DOCKER_PASSWORD_2,
+          secrets.ORACLE_DOCKER_PASSWORD,
           github.actor,
           secrets.GITHUB_TOKEN
         ))}}
@@ -260,7 +260,7 @@ jobs:
     - name: Run E2E tests with latest base package
       if: inputs.standard && inputs.repo == 'core' && !inputs.minimum-base-package
       env:
-        DD_API_KEY: "${{ secrets.DD_API_KEY_2 }}"
+        DD_API_KEY: "${{ secrets.DD_API_KEY }}"
       run: |
         # '-- all' is passed for e2e tests if pytest args are provided
         # This is done to avoid ddev from interpreting the arguments as environments
@@ -298,7 +298,7 @@ jobs:
     - name: Run E2E tests
       if: inputs.standard && inputs.repo != 'core'
       env:
-        DD_API_KEY: "${{ secrets.DD_API_KEY_2 }}"
+        DD_API_KEY: "${{ secrets.DD_API_KEY }}"
       run: |
         # '-- all' is passed for e2e tests if pytest args are provided
         # This is done to avoid ddev from interpreting the arguments as environments
@@ -344,7 +344,7 @@ jobs:
     - name: Run E2E tests for the latest version
       if: inputs.latest
       env:
-        DD_API_KEY: "${{ secrets.DD_API_KEY_2 }}"
+        DD_API_KEY: "${{ secrets.DD_API_KEY }}"
         DDEV_TEST_ENABLE_TRACING: "${{ inputs.repo == 'core' && '1' || '0' }}"
       run: |
         # '-- all' is passed for e2e tests if pytest args are provided

.github/workflows/weekly-latest.yml

@@ -14,6 +14,9 @@ jobs:
       # Options
       latest: true
     secrets: inherit
+    # needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
+    permissions:
+      id-token: write
 
   submit-traces:
     needs:

AGENT_CHANGELOG.md

@@ -1,3 +1,40 @@
+## Datadog Agent version [7.65.0](https://github.com/DataDog/datadog-agent/blob/master/CHANGELOG.rst#7650)
+
+* Amazon Kafka [6.4.0](https://github.com/DataDog/integrations-core/blob/master/amazon_msk/CHANGELOG.md)
+* Avi Vantage [5.3.0](https://github.com/DataDog/integrations-core/blob/master/avi_vantage/CHANGELOG.md)
+* Ceph [4.1.0](https://github.com/DataDog/integrations-core/blob/master/ceph/CHANGELOG.md)
+* cert-manager [5.3.0](https://github.com/DataDog/integrations-core/blob/master/cert_manager/CHANGELOG.md)
+* Datadog Checks Base [37.8.0](https://github.com/DataDog/integrations-core/blob/master/datadog_checks_base/CHANGELOG.md)
+* Cisco ACI [4.4.0](https://github.com/DataDog/integrations-core/blob/master/cisco_aci/CHANGELOG.md)
+* Cisco Secure Web Appliance [1.0.0](https://github.com/DataDog/integrations-core/blob/master/cisco_secure_web_appliance/CHANGELOG.md)
+* CouchDB [8.3.0](https://github.com/DataDog/integrations-core/blob/master/couch/CHANGELOG.md)
+* FoundationDB [3.2.0](https://github.com/DataDog/integrations-core/blob/master/foundationdb/CHANGELOG.md)
+* HTTP [11.2.0](https://github.com/DataDog/integrations-core/blob/master/http_check/CHANGELOG.md)
+* Infiniband [1.0.0](https://github.com/DataDog/integrations-core/blob/master/infiniband/CHANGELOG.md)
+* Kafka Consumer [6.5.1](https://github.com/DataDog/integrations-core/blob/master/kafka_consumer/CHANGELOG.md)
+* KubeVirt API [1.2.0](https://github.com/DataDog/integrations-core/blob/master/kubevirt_api/CHANGELOG.md)
+* MarkLogic [6.1.1](https://github.com/DataDog/integrations-core/blob/master/marklogic/CHANGELOG.md)
+* MongoDB [9.0.0](https://github.com/DataDog/integrations-core/blob/master/mongo/CHANGELOG.md) **BREAKING CHANGE**
+* MySQL [14.9.0](https://github.com/DataDog/integrations-core/blob/master/mysql/CHANGELOG.md)
+* Network [5.2.0](https://github.com/DataDog/integrations-core/blob/master/network/CHANGELOG.md)
+* Octopus Deploy [1.0.2](https://github.com/DataDog/integrations-core/blob/master/octopus_deploy/CHANGELOG.md)
+* OpenStack Controller [8.3.1](https://github.com/DataDog/integrations-core/blob/master/openstack_controller/CHANGELOG.md)
+* PGBouncer [8.1.2](https://github.com/DataDog/integrations-core/blob/master/pgbouncer/CHANGELOG.md)
+* Postgres [22.8.0](https://github.com/DataDog/integrations-core/blob/master/postgres/CHANGELOG.md)
+* Redis [7.2.0](https://github.com/DataDog/integrations-core/blob/master/redisdb/CHANGELOG.md)
+* RiakCS [4.3.0](https://github.com/DataDog/integrations-core/blob/master/riakcs/CHANGELOG.md)
+* Silverstripe CMS [1.0.0](https://github.com/DataDog/integrations-core/blob/master/silverstripe_cms/CHANGELOG.md)
+* Slurm [1.1.0](https://github.com/DataDog/integrations-core/blob/master/slurm/CHANGELOG.md)
+* SNMP [9.2.1](https://github.com/DataDog/integrations-core/blob/master/snmp/CHANGELOG.md)
+* SonarQube [5.2.1](https://github.com/DataDog/integrations-core/blob/master/sonarqube/CHANGELOG.md)
+* sonatype_nexus [1.1.0](https://github.com/DataDog/integrations-core/blob/master/sonatype_nexus/CHANGELOG.md)
+* Spark [6.3.0](https://github.com/DataDog/integrations-core/blob/master/spark/CHANGELOG.md)
+* SQL Server [22.0.1](https://github.com/DataDog/integrations-core/blob/master/sqlserver/CHANGELOG.md) **BREAKING CHANGE**
+* TLS [4.3.0](https://github.com/DataDog/integrations-core/blob/master/tls/CHANGELOG.md)
+* Velero [2.0.0](https://github.com/DataDog/integrations-core/blob/master/velero/CHANGELOG.md)
+* vSphere [8.2.1](https://github.com/DataDog/integrations-core/blob/master/vsphere/CHANGELOG.md)
+* Windows Event Log [5.1.1](https://github.com/DataDog/integrations-core/blob/master/win32_event_log/CHANGELOG.md)
+
 ## Datadog Agent version [7.64.2](https://github.com/DataDog/datadog-agent/blob/master/CHANGELOG.rst#7642)
 
 * MongoDB [8.6.0](https://github.com/DataDog/integrations-core/blob/master/mongo/CHANGELOG.md)