[pull] master from DataDog:master

.github/workflows/backport-pr.yml

@@ -24,7 +24,7 @@ jobs:
         id: token-generator
         with:
           app-id: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_APP_ID }}
-          private-key: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY_2 }}
+          private-key: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY }}
           repositories: integrations-core
       - uses: tibdex/backport@9565281eda0731b1d20c4025c43339fb0a23812e # v2.0.4
         with:

.github/workflows/labeler-community.yml

@@ -20,4 +20,4 @@ jobs:
     uses: ./.github/workflows/labeler-reusable.yml
     secrets:
       app-id: "${{ secrets.DD_AGENT_INTEGRATIONS_BOT_APP_ID }}"
-      private-key: "${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY_2 }}"
+      private-key: "${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY }}"

.github/workflows/labeler.yml

@@ -18,4 +18,4 @@ jobs:
     uses: ./.github/workflows/labeler-reusable.yml
     secrets:
       app-id: "${{ secrets.DD_AGENT_INTEGRATIONS_BOT_APP_ID }}"
-      private-key: "${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY_2 }}"
+      private-key: "${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY }}"

.github/workflows/update-agent-changelog.yml

@@ -41,7 +41,7 @@ jobs:
       id: token-generator
       with:
         app-id: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_APP_ID }}
-        private-key: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY_2 }}
+        private-key: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY }}
         repositories: integrations-core
     - name: Create Pull Request
       id: cpr

.github/workflows/update-dependencies.yml

@@ -32,7 +32,7 @@ jobs:
       id: token-generator
       with:
         app-id: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_APP_ID }}
-        private-key: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY_2 }}
+        private-key: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY }}
         repositories: integrations-core
     - name: Update dependencies
       run: |-

.gitlab/build_agent.yaml

@@ -7,9 +7,9 @@
     BUCKET_BRANCH: "dev"
     DEPLOY_AGENT: "false"
     INTEGRATIONS_CORE_VERSION: ${CI_COMMIT_REF_NAME}
-    # disable kitchen and e2e tests
+    RUN_E2E_TESTS: "on"
+    # disable kitchen tests
     RUN_KITCHEN_TESTS: "false"
-    RUN_E2E_TESTS: "off"
   stage: build
   trigger:
     project: DataDog/datadog-agent

blazemeter/manifest.json

@@ -13,17 +13,7 @@
     "media": [
         {
             "caption": "BlazeMeter - Functional Test Results",
-            "image_url": "images/blazemeter_functional_test_results_1.png",
-            "media_type": "image"
-          },
-          {
-            "caption": "BlazeMeter - Functional Test Results",
-            "image_url": "images/blazemeter_functional_test_results_2.png",
-            "media_type": "image"
-          },
-          {
-            "caption": "BlazeMeter - Functional Test Results",
-            "image_url": "images/blazemeter_functional_test_results_3.png",
+            "image_url": "images/blazemeter_functional_test_results.png",
             "media_type": "image"
           },
           {

ddev/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 <!-- towncrier release notes start -->
 
+## 13.0.0 / 2025-08-25
+
+***Removed***:
+
+* Remove `ddev size create-dashboard` ([#20766](https://github.com/DataDog/integrations-core/pull/20766))
+
+***Added***:
+
+* Add support for Vagrant VMs in testing ([#20353](https://github.com/DataDog/integrations-core/pull/20353))
+* Adds logic to ensure `ddev size` filters integrations by the specified Python version. ([#20742](https://github.com/DataDog/integrations-core/pull/20742))
+* Updated the set of allowed Metric Metadata units with the latest additions ([#21048](https://github.com/DataDog/integrations-core/pull/21048))
+* Bump Datadog Checks Dev requirement in DDEV ([#21124](https://github.com/DataDog/integrations-core/pull/21124))
+* Add a utils.hatch module to centralize hatch operations ([#21135](https://github.com/DataDog/integrations-core/pull/21135))
+* Use ddev to target Agent branch in build_agent.yaml ([#21136](https://github.com/DataDog/integrations-core/pull/21136))
+
+***Fixed***:
+
+* Modify the CI matrix generation by spliting jobs in 2 groups: windows and linux tests. This is done to reduce the number of jobs each workflow runs. ([#20963](https://github.com/DataDog/integrations-core/pull/20963))
+* Skip E2E test execution for packages that do not define them. ([#20967](https://github.com/DataDog/integrations-core/pull/20967))
+* Add is:pull-request to pull request search to avoid 422s on private repos ([#21021](https://github.com/DataDog/integrations-core/pull/21021))
+* Fix ddev env test to respect e2e-env config flag even when an environment is specified ([#21119](https://github.com/DataDog/integrations-core/pull/21119))
+
 ## 12.2.0 / 2025-07-31
 
 ***Added***:

ddev/src/ddev/cli/release/branch/create.py

@@ -44,6 +44,15 @@ def create(app: Application, branch_name):
     app.repo.git.run('checkout', '-B', branch_name)
     app.display_success("Done.")
 
+    app.display_waiting("Updating the .gitlab/build_agent.yaml file...")
+    update_build_agent_yaml(app, branch_name)
+    app.display_success("Done.")
+
+    app.display_waiting("Adding and committing the changes...")
+    app.repo.git.run('add', '.gitlab/build_agent.yaml')
+    app.repo.git.run('commit', '-m', f"Update build_agent.yaml to use agent branch: {branch_name}")
+    app.display_success("Done.")
+
     app.display_waiting(f"Pushing the release branch `{branch_name}`...")
     app.repo.git.run('push', 'origin', branch_name)
     app.display_success("Done.")
@@ -53,3 +62,41 @@ def create(app: Application, branch_name):
     app.display_success("Done.")
 
     app.display_success("All done.")
+
+
+def update_build_agent_yaml(app: Application, branch_name: str) -> None:
+    """
+    Update the .gitlab/build_agent.yaml file to use the correct agent branch for release builds.
+
+    Args:
+        branch_name: The release branch name (e.g., '7.45.x')
+    """
+    from ddev.utils.fs import Path
+
+    build_agent_yaml = Path('.gitlab/build_agent.yaml')
+
+    if not build_agent_yaml.exists():
+        app.display_warning(f'Warning: {build_agent_yaml} not found')
+        return
+
+    # Read the current content
+    with open(build_agent_yaml, 'r') as f:
+        content = f.read()
+
+    # Update the build-agent-manual-release job to use the correct agent branch
+    # Find the line with 'branch: main' and replace it
+    old_pattern = r'(\s+branch:\s+)main'
+
+    def replacement(match):
+        return match.group(1) + branch_name
+
+    if re.search(old_pattern, content):
+        updated_content = re.sub(old_pattern, replacement, content)
+
+        # Write the updated content back
+        with open(build_agent_yaml, 'w') as f:
+            f.write(updated_content)
+
+        app.display_success(f'Updated build_agent.yaml file to use Agent branch: {branch_name}')
+    else:
+        app.display_warning(f'Warning: Could not find branch pattern to update in {build_agent_yaml}')

ddev/tests/cli/release/branch/test_create.py

@@ -3,6 +3,9 @@
 # Licensed under a 3-clause BSD style license (see LICENSE)
 import pytest
 
+from ddev.cli.release.branch.create import update_build_agent_yaml
+from ddev.utils.fs import Path
+
 
 @pytest.mark.parametrize(
     'name',
@@ -30,9 +33,48 @@ def test_create_branch(ddev, mocker):
         mocker.call('checkout', 'master'),
         mocker.call('pull', 'origin', 'master'),
         mocker.call('checkout', '-B', '5.5.x'),
+        mocker.call('add', '.gitlab/build_agent.yaml'),
+        mocker.call('commit', '-m', 'Update build_agent.yaml to use agent branch: 5.5.x'),
         mocker.call('push', 'origin', '5.5.x'),
     ]
 
     assert create_label_mock.call_args_list == [
         mocker.call('backport/5.5.x', '5319e7'),
     ]
+
+
+def test_update_build_agent_yaml_success(mocker, tmp_path):
+    """Test successful update of build_agent.yaml"""
+
+    # Create a temporary build_agent.yaml file
+    build_agent_path = Path(tmp_path / '.gitlab' / 'build_agent.yaml')
+    build_agent_path.parent.ensure_dir_exists()
+
+    original_content = """---
+.build-agent-tpl:
+  variables:
+    RELEASE_VERSION_6: "nightly"
+    RELEASE_VERSION_7: "nightly-a7"
+  trigger:
+    project: DataDog/datadog-agent
+    branch: main
+    strategy: depend
+
+build-agent-auto:
+  extends: .build-agent-tpl
+  rules:
+    - if: $CI_COMMIT_BRANCH =~ /^7\\.\\d+\\.x$/
+      when: never
+"""
+
+    build_agent_path.write_text(original_content)
+
+    app_mock = mocker.MagicMock()
+
+    with Path(tmp_path).as_cwd():
+        update_build_agent_yaml(app_mock, '7.99.x')
+
+    updated_content = build_agent_path.read_text()
+
+    assert 'branch: 7.99.x' in updated_content
+    assert 'branch: main' not in updated_content

extrahop/manifest.json

@@ -13,9 +13,15 @@
     "media": [
       {
         "caption": "ExtraHop - Detections",
-        "image_url": "images/extrahop_detections.png",
+        "image_url": "images/extrahop_dashboard_1.png",
+        "media_type": "image"
+      },
+      {
+        "caption": "ExtraHop - Detections",
+        "image_url": "images/extrahop_dashboard_2.png",
         "media_type": "image"
       }
+
     ],
     "classifier_tags": [
       "Category::Log Collection",

falco/manifest.json

@@ -14,7 +14,12 @@
       {
         "media_type": "image",
         "caption": "Falco - Alerts",
-        "image_url": "images/falco_alerts.png"
+        "image_url": "images/falco_alerts_1.png"
+      },
+      {
+        "media_type": "image",
+        "caption": "Falco - Alerts",
+        "image_url": "images/falco_alerts_2.png"
       }
     ],
     "classifier_tags": [

gpu/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG - GPU
 
+## 0.4.1
+
+***Added***:
+
+* Added GPU device level memory metrics: `gpu.memory.free`, `gpu.memory.reserved`.
+* Renamed gpu.core.usage to gpu.process.core.usage for naming consistency.
+* Renamed gpu.memory.usage to gpu.process.memory.usage for naming consistency.
 
 ## 0.4.0
 

gpu/metadata.csv

@@ -15,7 +15,6 @@ gpu.clock.throttle_reasons.sw_power_cap,gauge,,,,GPU clocks that are throttled t
 gpu.clock.throttle_reasons.sw_thermal_slowdown,gauge,,,,GPU clocks that are throttled to avoid exceeding temperaturelimits,0,gpu,clock.throttle_reasons.sw_thermal_slowdown,,
 gpu.clock.throttle_reasons.sync_boost,gauge,,,,GPU clocks that are throttled to match clock speed of another GPU in the current sync boost group,0,gpu,clock.throttle_reasons.sync_boost,,
 gpu.core.limit,gauge,,core,,Number of GPU cores that the process/container/device has available,0,gpu,core.limit,,
-gpu.core.usage,gauge,,core,,Average number of GPU cores that a process was using in the interval. Only emitted when processes are active.,0,gpu,core.usage,,
 gpu.decoder_utilization,gauge,,percent,,Percentage of time the decoder was active,0,gpu,decoder_utilization,,
 gpu.device.total,gauge,,,,Number of devices active in the host,0,gpu,device.total,,
 gpu.dram_active,gauge,,percent,,Percentage of time the DRAM was active,0,gpu,dram_active,,
@@ -29,9 +28,10 @@ gpu.integer_active,gauge,,percent,,Percentage of the time that the integer calcu
 gpu.memory.bar1.free,gauge,,byte,,Unallocated BAR1 memory (in bytes),0,gpu,memory.bar1.free,,
 gpu.memory.bar1.total,gauge,,byte,,Total BAR1 memory (in bytes).,0,gpu,memory.bar1.total,,
 gpu.memory.bar1.used,gauge,,byte,,Allocated used memory (in bytes),0,gpu,memory.bar1.used,,
+gpu.memory.free,gauge,,byte,,Unallocated device memory (in bytes).,0,gpu,memory.free,,
 gpu.memory.limit,gauge,,byte,,The maximum amount of memory a process/container/device could allocate,0,gpu,memory.limit,,
+gpu.memory.reserved,gauge,,byte,,Device memory (in bytes) reserved for system use (driver or firmware)..,0,gpu,memory.reserved,,
 gpu.memory.temperature,gauge,,degree celsius,,Temperature of the memory chip,0,gpu,memory.temperature,,
-gpu.memory.usage,gauge,,byte,,The memory used by this process at the point the metric was given. Only emitted when processes are active.,0,gpu,memory.usage,,
 gpu.nvlink.count.active,gauge,,,,Number of active nvlinks for the device,0,gpu,,,
 gpu.nvlink.count.inactive,gauge,,,,Number of inactive nvlinks for the device,0,gpu,,,
 gpu.nvlink.count.total,gauge,,,,Number of total nvlinks for the device,0,gpu,,,
@@ -52,9 +52,11 @@ gpu.pci.throughput.tx,gauge,,byte,second,Bytes transmitted through PCI to the GP
 gpu.performance_state,gauge,,,,Returns the current performance state of the device,0,gpu,performance_state,,
 gpu.power.management_limit,gauge,,milliwatt,,Upper boundary for the device power draw.,0,gpu,power.management_limit,,
 gpu.power.usage,gauge,,milliwatt,,"Power usage for the GPU device. On GA100 and older architectures this is the instantaneous power at that moment, in newer ones it represents the average power draw over one second",0,gpu,power.usage,,
+gpu.process.core.usage,gauge,,core,,Average number of GPU cores that a process was using in the interval. Only emitted when processes are active.,0,gpu,process.core.usage,,
 gpu.process.decoder_utilization,gauge,,percent,,Percentage of time the decoder was active for a specific process,0,gpu,process.decoder_utilization,,
 gpu.process.dram_active,gauge,,percent,,Percentage of time the DRAM was active for a specific process,0,gpu,process.dram_active,,
 gpu.process.encoder_utilization,gauge,,percent,,Percentage of time the encoder was active for a specific process,0,gpu,process.encoder_utilization,,
+gpu.process.memory.usage,gauge,,byte,,The memory used by this process at the point the metric was given. Only emitted when processes are active.,0,gpu,process.memory.usage,,
 gpu.process.sm_active,gauge,,percent,,Percentage of time the streaming multiprocessor was active for a specific process,0,gpu,process.sm_active,,
 gpu.remapped_rows.correctable,count,,,,Number of rows remapped due to correctable errors,0,gpu,remapped_rows.correctable,,
 gpu.remapped_rows.failed,count,,,,Number of rows that failed remapping,0,gpu,remapped_rows.failed,,

infiniband/assets/dashboards/infiniband_overview.json

@@ -39,8 +39,8 @@
                             "margin": "md",
                             "sizing": "cover",
                             "type": "image",
-                            "url": "/static/images/logos/Infiniband_large.svg",
-                            "url_dark_theme": "/static/images/logos/Infiniband_reversed_large.svg",
+                            "url": "/static/images/logos/infiniband_large.svg",
+                            "url_dark_theme": "/static/images/logos/infiniband_reversed_large.svg",
                             "vertical_align": "center"
                         },
                         "id": 6676885668580031,

ivanti_nzta/manifest.json

@@ -13,7 +13,17 @@
     "media": [
       {
         "caption": "Ivanti nZTA - Analytics Logs",
-        "image_url": "images/ivanti_nzta_analytics_logs.png",
+        "image_url": "images/ivanti_nzta_analytics_logs_1.png",
+        "media_type": "image"
+      },
+      {
+        "caption": "Ivanti nZTA - Analytics Logs",
+        "image_url": "images/ivanti_nzta_analytics_logs_2.png",
+        "media_type": "image"
+      },
+      {
+        "caption": "Ivanti nZTA - Analytics Logs",
+        "image_url": "images/ivanti_nzta_analytics_logs_3.png",
         "media_type": "image"
       },
       {

juniper_srx_firewall/manifest.json

@@ -23,7 +23,22 @@
       },
       {
         "caption": "Juniper SRX Firewall - Security Logs",
-        "image_url": "images/juniper_srx_firewall_security_logs.png",
+        "image_url": "images/juniper_srx_firewall_security_logs_1.png",
+        "media_type": "image"
+      },
+      {
+        "caption": "Juniper SRX Firewall - Security Logs",
+        "image_url": "images/juniper_srx_firewall_security_logs_2.png",
+        "media_type": "image"
+      },
+      {
+        "caption": "Juniper SRX Firewall - Security Logs",
+        "image_url": "images/juniper_srx_firewall_security_logs_3.png",
+        "media_type": "image"
+      },
+      {
+        "caption": "Juniper SRX Firewall - Security Logs",
+        "image_url": "images/juniper_srx_firewall_security_logs_4.png",
         "media_type": "image"
       },
       {

kafka_consumer/changelog.d/20716.fixed

@@ -0,0 +1 @@
+Improve kafka consumer highwater offset collection time