[pull] master from DataDog:master

mongo/changelog.d/20783.fixed

@@ -0,0 +1 @@
+Add deprecated `schemas` option to `config.yaml.example`. This config option is deprecated at Agent 7.69.0 and will be removed in a future release.

mysql/changelog.d/20783.fixed

@@ -0,0 +1 @@
+Add deprecated `collect_schemas` option to `config.yaml.example`. This config option is deprecated at Agent 7.69.0 and will be removed in a future release.

postgres/changelog.d/20774.fixed

@@ -0,0 +1 @@
+Fixed a bug where the AWS configuration was overwritten for the Postgres integration

postgres/datadog_checks/postgres/postgres.py

@@ -203,9 +203,8 @@ def set_resource_tags(self):
             # allow for detecting if the host is an RDS host, and emit
             # the resource properly even if the `aws` config is unset
             self.tags.append("dd.internal.resource:aws_rds_instance:{}".format(self.resolved_hostname))
-            self.cloud_metadata["aws"] = {
-                "instance_endpoint": self.resolved_hostname,
-            }
+            self.cloud_metadata["aws"] = self.cloud_metadata.get("aws", {})
+            self.cloud_metadata["aws"]["instance_endpoint"] = self.resolved_hostname
         if self.cloud_metadata.get("azure") is not None:
             deployment_type = self.cloud_metadata.get("azure")["deployment_type"]
             # some `deployment_type`s map to multiple `resource_type`s

postgres/tests/test_pg_integration.py

@@ -619,7 +619,7 @@ def test_wal_stats(aggregator, integration_check, pg_instance, is_aurora):
         cur.execute("insert into persons (lastname) values ('test');")
 
     # Wait for pg_stat_wal to be updated
-    for _ in range(10):
+    for _ in range(50):
         with conn.cursor() as cur:
             cur.execute("select wal_records, wal_bytes from pg_stat_wal;")
             new_wal_records = cur.fetchall()[0][0]

sqlserver/changelog.d/20781.fixed

@@ -0,0 +1 @@
+Add deprecated `collect_schemas`, `collect_xe` and `collect_deadlocks` option to `config.yaml.example`. These config options are deprecated at Agent 7.70.0 and will be removed in a future release.