Merge branch 'master' into sdk/versions

Author: cswatt

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-06-16 16:47:23.427246",
-            "spec_repo_commit": "6e1eb13f"
+            "regenerated": "2025-06-17 18:24:17.637707",
+            "spec_repo_commit": "b1a1c000"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-06-16 16:47:32.544875",
-            "spec_repo_commit": "6e1eb13f"
+            "regenerated": "2025-06-17 18:24:26.946951",
+            "spec_repo_commit": "b1a1c000"
         }
     }
 }

config/_default/config.yaml

@@ -44,7 +44,7 @@ markup:
     guessSyntax: true
 
 module:
-  imports:  
+  imports:
    - path: github.com/DataDog/websites-modules
      disabled: false
      mounts:
@@ -151,6 +151,39 @@ security:
       # as suggested here https://github.com/gohugoio/hugo/issues/9333#issuecomment-1022435616
       - (?i)^(PATH|PATHEXT|APPDATA|TMP|TEMP|TERM|HOME|SSH_AUTH_SOCK|USERPROFILE|XDG_CONFIG_HOME)$
 
+deployment:
+    order:
+      - "^.+\\.(woff2|woff|ttf|css|js|jpg|jpeg|png|avif|gif|mp4|vtt)$"
+    matchers:
+      # temporarily lets nocache this sh file
+      - pattern: "^resources/sh/rpm_check.sh$"
+        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
+      # dont cache rum/logs config
+      - pattern: "^static/dd-browser-logs-rum.js$"
+        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
+        gzip: true
+      - pattern: "^.+\\.(js|css|svg)$"
+        cacheControl: "max-age=31536000, no-transform, public"
+        gzip: true
+      - pattern: "^.+\\.(eot|ttf|woff|woff2|ico)$"
+        cacheControl: "max-age=31536000, no-transform, public"
+        gzip: false
+      - pattern: "^.+\\.(png|jpg|jpeg|gif|mp4|zip|pdf|txt|csv)$"
+        cacheControl: "max-age=31536000, no-transform, public"
+        gzip: false
+      - pattern: "^.+\\.html$"
+        gzip: true
+        contentType: "text/html; charset=utf-8"
+        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
+      - pattern: "^.+\\.xml$"
+        gzip: true
+        contentType: "text/xml; charset=utf-8"
+        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
+      - pattern: "^.+\\.json$"
+        gzip: true
+        contentType: "application/json; charset=utf-8"
+        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
+
 outputFormats:
   Search:
     baseName: "search"

config/_default/menus/api.en.yaml

@@ -9151,7 +9151,7 @@ menu:
         operationids:
           - GetUserMemberships
         unstable: []
-        order: 1
+        order: 19
     - name: Update permission setting for team
       url: '#update-permission-setting-for-team'
       identifier: teams-update-permission-setting-for-team
@@ -9320,6 +9320,45 @@ menu:
           - DeleteTeam
         unstable: []
         order: 5
+    - name: Remove a member team
+      url: '#remove-a-member-team'
+      identifier: teams-remove-a-member-team
+      parent: teams
+      generated: true
+      params:
+        versions:
+          - v2
+        operationids:
+          - RemoveMemberTeam
+        unstable:
+          - v2
+        order: 22
+    - name: Add a member team
+      url: '#add-a-member-team'
+      identifier: teams-add-a-member-team
+      parent: teams
+      generated: true
+      params:
+        versions:
+          - v2
+        operationids:
+          - AddMemberTeam
+        unstable:
+          - v2
+        order: 20
+    - name: Get all member teams
+      url: '#get-all-member-teams'
+      identifier: teams-get-all-member-teams
+      parent: teams
+      generated: true
+      params:
+        versions:
+          - v2
+        operationids:
+          - ListMemberTeams
+        unstable:
+          - v2
+        order: 21
     - name: Create a team
       url: '#create-a-team'
       identifier: teams-create-a-team

config/_default/params.en.yaml

@@ -3,10 +3,10 @@ meta_title: Getting Started with Datadog
 meta_description: Datadog, the leading service for cloud-scale monitoring.
 disclaimer: "This page is not yet available in English. We are working on its translation. <br> If you have any questions or feedback about our current translation project, <a href=\"https://docs.datadoghq.com/fr/help/\">feel free to reach out to us!</a>"
 announcement_banner:
-  desktop_message: '<i class="icon-right-arrow-slim"></i><span>DASH 2025: June 10-11 | Join thousands of devs, SREs, and security experts at Datadog’s conference in NYC.</span><span>Register Now</span>'
-  mobile_message: 'June 10-11 | Join us in NYC for DASH 2025'
+  desktop_message: '<i class="icon-right-arrow-slim"></i><span>DASH 2025 | Catch up on Keynote highlights and everything new from Datadog.</span><span>Learn More</span>'
+  mobile_message: 'Catch up on Keynote highlights from DASH'
   background_color: "#000000"
   custom_classes: 'dash-announcement-banner'
-  external_link: https://dtdg.co/dash-docs
+  external_link: https://www.datadoghq.com/blog/dash-2025-new-feature-roundup-keynote/
 translate_status_banner: "This translation isn't up-to-date. For the latest English version, click here"
 site_support_banner: "This product is not supported for your selected <a href=\"/getting_started/site\">Datadog site</a>."

config/live/config.yaml

@@ -4,15 +4,6 @@ builddrafts: false
 enableGitInfo: true
 
 deployment:
-    order:
-      - ".woff2$"
-      - ".woff$"
-      - ".css$"
-      - ".js$"
-      - ".jpg$"
-      - ".png$"
-      - ".gif$"
-      - ".mp4$"
 
     targets:
     - name: "live"
@@ -22,33 +13,3 @@ deployment:
     - name: "liveAssets"
       URL: "s3://origin-static-assets?region=us-east-1&prefix=documentation/"
       include: "**.{jpg,jpeg,png,gif,mp4,svg,json}"
-
-    matchers:
-      # temporarily lets nocache this sh file
-      - pattern: "^resources/sh/rpm_check.sh$"
-        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
-      # dont cache rum/logs config
-      - pattern: "^static/dd-browser-logs-rum.js$"
-        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
-        gzip: true
-      - pattern: "^.+\\.(js|css|svg)$"
-        cacheControl: "max-age=31536000, no-transform, public"
-        gzip: true
-      - pattern: "^.+\\.(eot|ttf|woff|woff2|ico)$"
-        cacheControl: "max-age=31536000, no-transform, public"
-        gzip: false
-      - pattern: "^.+\\.(png|jpg|jpeg|gif|mp4|zip|pdf|txt|csv)$"
-        cacheControl: "max-age=31536000, no-transform, public"
-        gzip: false
-      - pattern: "^.+\\.html$"
-        gzip: true
-        contentType: "text/html; charset=utf-8"
-        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
-      - pattern: "^.+\\.xml$"
-        gzip: true
-        contentType: "text/xml; charset=utf-8"
-        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
-      - pattern: "^.+\\.json$"
-        gzip: true
-        contentType: "application/json; charset=utf-8"
-        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"

config/preview/config.yaml

@@ -4,15 +4,6 @@ builddrafts: true
 enableGitInfo: true
 
 deployment:
-    order:
-      - ".woff2$"
-      - ".woff$"
-      - ".css$"
-      - ".js$"
-      - ".jpg$"
-      - ".png$"
-      - ".gif$"
-      - ".mp4$"
 
     targets:
     - name: "preview"
@@ -22,33 +13,3 @@ deployment:
     - name: "previewAssets"
       URL: "s3://dd-staging-static-assets?region=us-east-1&prefix=documentation/"
       include: "**.{jpg,jpeg,png,gif,mp4,mov,svg,json}"
-
-    matchers:
-      # temporarily lets nocache this sh file
-      - pattern: "^resources/sh/rpm_check.sh$"
-        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
-      # dont cache rum/logs config
-      - pattern: "^static/dd-browser-logs-rum.js$"
-        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
-        gzip: true
-      - pattern: "^.+\\.(js|css|svg)$"
-        cacheControl: "max-age=31536000, no-transform, public"
-        gzip: true
-      - pattern: "^.+\\.(eot|ttf|woff|woff2|ico)$"
-        cacheControl: "max-age=31536000, no-transform, public"
-        gzip: false
-      - pattern: "^.+\\.(png|jpg|jpeg|gif|mp4|zip|pdf|txt|csv)$"
-        cacheControl: "max-age=31536000, no-transform, public"
-        gzip: false
-      - pattern: "^.+\\.html$"
-        gzip: true
-        contentType: "text/html; charset=utf-8"
-        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
-      - pattern: "^.+\\.xml$"
-        gzip: true
-        contentType: "text/xml; charset=utf-8"
-        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"
-      - pattern: "^.+\\.json$"
-        gzip: true
-        contentType: "application/json; charset=utf-8"
-        cacheControl: "public, must-revalidate, proxy-revalidate, max-age=0"

content/en/account_management/billing/serverless.md

@@ -6,7 +6,7 @@ title: Serverless Billing
 
 You can track the billable and total Serverless usage in your account by checking the Datadog Usage Page. You can see both the Month-To-Date summary, as well as usage over time.
 
-Datadog Serverless monitoring is billed based on a combination of the invocations and active Lambda functions that are tracked and monitored within Datadog. The relevant metrics based on your plan are visible in the Plan and Usage page's Serverless tab under the [Billable filter][1]. For more information about your plan and usage, contact your [Customer Success][3] Manager.
+Datadog Serverless monitoring is billed based on a combination of the invocations and active Lambda functions that are tracked and monitored within Datadog. For more information about your plan and usage, contact your [Customer Success][3] Manager.
 
 Lambda functions can be monitored through the [Datadog AWS Integration][10] or by direct instrumentation with the [Lambda Extension][11] and [Forwarder][12] layers.
 

content/en/agent/faq/proxy_example_haproxy.md

@@ -706,6 +706,10 @@ remote_configuration:
     rc_dd_url: haproxy.example.com:3846
     # Comment the line below to use encryption between the Agent and HAProxy
     no_tls: true
+
+installer:
+  registry:
+    url: haproxy.example.com:3847
 ```
 
 When using encryption between the Agent and HAProxy, if the Agent does not have access to the proxy certificate, is unable to validate it, or the validation is not needed, you can edit the `datadog.yaml` Agent configuration file and set `skip_ssl_validation` to `true`.