[pull] master from DataDog:master

apache/assets/configuration/spec.yaml

@@ -12,13 +12,16 @@ files:
     - name: apache_status_url
       fleet_configurable: true
       required: true
-      display_priority: 2
+      display_priority: 4
       description: Status URL of your Apache server.
       formats: ["url"]
       value:
         example: http://localhost/server-status?auto
         type: string
     - template: instances/http
+      overrides:
+        persist_connections.display_priority: 2
+        tls_verify.display_priority: 1
     - template: instances/default
       overrides:
         disable_generic_tags.display_priority: 1
@@ -27,6 +30,7 @@ files:
         disable_generic_tags.description: |
             Generic tags such as `host` will be replaced by `apache_host` to prevent
             mixing them up with tags from other integrations. Datadog recommends setting this to `true` to avoid confusion.
+        tags.display_priority: 3
   - template: logs
     example:
     - type: file

apache/changelog.d/23277.fixed

@@ -0,0 +1 @@
+Re-order configuration fields by usage frequency.

apache/datadog_checks/apache/data/conf.yaml.example

@@ -50,6 +50,25 @@ instances:
     #
   - apache_status_url: http://localhost/server-status?auto
 
+    ## @param tags - list of strings - optional
+    ## A list of tags to attach to every metric and service check emitted by this instance.
+    ##
+    ## Learn more about tagging at https://docs.datadoghq.com/tagging
+    #
+    # tags:
+    #   - <KEY_1>:<VALUE_1>
+    #   - <KEY_2>:<VALUE_2>
+
+    ## @param persist_connections - boolean - optional - default: false
+    ## Whether or not to persist cookies and use connection pooling for improved performance.
+    #
+    # persist_connections: false
+
+    ## @param tls_verify - boolean - optional - default: true
+    ## Instructs the check to validate the TLS certificate of services.
+    #
+    # tls_verify: true
+
     ## @param disable_generic_tags - boolean - optional - default: false
     ## Generic tags such as `host` will be replaced by `apache_host` to prevent
     ## mixing them up with tags from other integrations. Datadog recommends setting this to `true` to avoid confusion.
@@ -261,11 +280,6 @@ instances:
     #
     # aws_service: <AWS_SERVICE>
 
-    ## @param tls_verify - boolean - optional - default: true
-    ## Instructs the check to validate the TLS certificate of services.
-    #
-    # tls_verify: true
-
     ## @param tls_use_host_header - boolean - optional - default: false
     ## If a `Host` header is set, this enables its use for SNI (matching against the TLS certificate CN or SAN).
     #
@@ -367,25 +381,11 @@ instances:
     #
     # log_requests: false
 
-    ## @param persist_connections - boolean - optional - default: false
-    ## Whether or not to persist cookies and use connection pooling for improved performance.
-    #
-    # persist_connections: false
-
     ## @param allow_redirects - boolean - optional - default: true
     ## Whether or not to allow URL redirection.
     #
     # allow_redirects: true
 
-    ## @param tags - list of strings - optional
-    ## A list of tags to attach to every metric and service check emitted by this instance.
-    ##
-    ## Learn more about tagging at https://docs.datadoghq.com/tagging
-    #
-    # tags:
-    #   - <KEY_1>:<VALUE_1>
-    #   - <KEY_2>:<VALUE_2>
-
     ## @param service - string - optional
     ## Attach the tag `service:<SERVICE>` to every metric, event, and service check emitted by this integration.
     ##

datadog_checks_dev/changelog.d/23478.changed

@@ -0,0 +1 @@
+Legacy migration: remove the legacy `clean`, `config`, `test`, `validate all`, `validate licenses`, and `agent requirements` commands from `python -m datadog_checks.dev`. ddev provides native equivalents for the first five; `agent requirements` is unreachable and unsupported.

datadog_checks_dev/datadog_checks/dev/tooling/commands/__init__.py

@@ -1,15 +1,11 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-from .agent import agent
 from .ci import ci
-from .clean import clean
-from .config import config
 from .create import create
 from .meta import meta
 from .release import release
 from .run import run
-from .test import test
 from .validate import validate
 
-ALL_COMMANDS = (agent, ci, clean, config, create, meta, release, run, test, validate)
+ALL_COMMANDS = (ci, create, meta, release, run, validate)