[pull] master from DataDog:master

agent_requirements.in

@@ -40,7 +40,7 @@ pyjwt==2.10.1
 pymongo[srv]==4.8.0; python_version >= '3.9'
 pymqi==1.12.11
 pymysql==1.1.1
-pyodbc==5.2.0; sys_platform != 'darwin' or platform_machine != 'arm64'
+pyodbc==5.2.0
 pyopenssl==25.1.0
 pysmi==1.2.1
 pysnmp-mibs==0.1.6

ecs_fargate/README.md

@@ -201,7 +201,7 @@ partial -->
 
 ```hcl
 module "ecs_fargate_task" {
-  source  = "https://registry.terraform.io/modules/DataDog/ecs-datadog/aws/latest"
+  source  = "DataDog/ecs-datadog/aws//modules/ecs_fargate"
   version = "1.0.0"
 
   # Configure Datadog
@@ -1038,7 +1038,7 @@ To enable logging through the [Datadog ECS Fargate Terraform][71] module, config
 
 ```hcl
 module "ecs_fargate_task" {
-  source  = "https://registry.terraform.io/modules/DataDog/ecs-datadog/aws/latest"
+  source  = "DataDog/ecs-datadog/aws//modules/ecs_fargate"
   version = "1.0.0"
 
   # Configure Datadog

ibm_i/changelog.d/20812.fixed

@@ -0,0 +1 @@
+Lift `pyodbc` dependency exclusion for macOS on AArch64/ARM64

ibm_i/pyproject.toml

@@ -37,7 +37,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "pyodbc==5.2.0; sys_platform != 'darwin' or platform_machine != 'arm64'",
+    "pyodbc==5.2.0",
 ]
 
 [project.urls]

kafka_consumer/datadog_checks/kafka_consumer/kafka_consumer.py

@@ -418,7 +418,7 @@ def data_streams_live_message(self, highwater_offsets, cluster_id):
             config_id = cfg["id"]
             if self._messages_have_been_retrieved(config_id):
                 continue
-            if cluster != cluster_id:
+            if not cluster or not cluster_id or cluster.lower() != cluster_id.lower():
                 continue
             start_offsets = resolve_start_offsets(highwater_offsets, topic, partition, start_offset, n_messages)
 

kafka_consumer/tests/test_unit.py

@@ -26,15 +26,15 @@ def fake_consumer_offsets_for_times(partitions):
     return [(t, p, 80) for t, p in partitions]
 
 
-def seed_mock_client():
+def seed_mock_client(cluster_id="cluster_id"):
     """Set some common defaults for the mock client to kafka."""
     client = mock.create_autospec(KafkaClient)
     client.list_consumer_groups.return_value = ["consumer_group1"]
     client.get_partitions_for_topic.return_value = ['partition1']
     client.list_consumer_group_offsets.return_value = [("consumer_group1", [("topic1", "partition1", 2)])]
     client.describe_consumer_group.return_value = 'STABLE'
     client.consumer_get_cluster_id_and_list_topics.return_value = (
-        "cluster_id",
+        cluster_id,
         # topics
         [
             # Used in unit tets
@@ -618,7 +618,7 @@ def test_data_streams_messages(
             }
         ),
     )
-    mock_client = seed_mock_client()
+    mock_client = seed_mock_client(cluster_id="Cluster_id")
     mock_client.get_next_message.side_effect = [
         MockedMessage(
             b'{"name": "Peter Parker", "age": 18, "transaction_amount": 123, "currency": "dollar"}',

microsoft_sysmon/README.md

@@ -40,6 +40,8 @@ Run powershell.exe as admin and execute the following command:
         sourcecategory: windowsevent
     ```
 
+See the [sample microsoft_sysmon.d/conf.yaml][9] for available configuration options.
+
 3. [Restart the Agent][3].
 
 #### Configure Sysmon
@@ -115,3 +117,4 @@ Need help? Contact [Datadog support][1].
 [6]: https://docs.datadoghq.com/agent/guide/integration-management/?tab=windowspowershell#install
 [7]: https://learn.microsoft.com/en-us/sysinternals/downloads/sysmon#configuration-files
 [8]: https://docs.datadoghq.com/agent/guide/agent-commands/#agent-status-and-information
+[9]: https://github.com/DataDog/integrations-core/blob/master/microsoft_sysmon/datadog_checks/microsoft_sysmon/data/conf.yaml.example

mongo/changelog.d/20819.added

@@ -0,0 +1 @@
+Collect index stats metric `mongodb.collection.indexes.accesses.opsps` on replica set secondary nodes. 

mongo/datadog_checks/mongo/collectors/index_stats.py

@@ -5,6 +5,7 @@
 from pymongo.errors import OperationFailure
 
 from datadog_checks.mongo.collectors.base import MongoCollector, collection_interval_checker
+from datadog_checks.mongo.common import ReplicaSetDeployment
 from datadog_checks.mongo.metrics import INDEX_METRICS
 
 
@@ -20,7 +21,16 @@ def __init__(self, check, db_name, tags, coll_names=None):
         self._collector_key = (self.__class__.__name__, db_name)  # db_name is part of collector key
 
     def compatible_with(self, deployment):
-        # Can only be run once per cluster.
+        if isinstance(deployment, ReplicaSetDeployment):
+            # Collecting index stats on both primary and secondary nodes for replica set
+            if deployment.is_arbiter:
+                self.log.debug("IndexStatsCollector can not be run on arbiter nodes.")
+                return False
+            if deployment.use_shards:
+                self.log.debug("IndexStatsCollector can not be run on shards on sharded clusters.")
+                return False
+            return True
+        # Collecting index stats for standalone or mongos on sharding deployments
         return deployment.is_principal()
 
     def _get_collections(self, api):

mongo/tests/test_integration.py

@@ -782,6 +782,7 @@ def test_integration_replicaset_secondary(
         'dbstats-local',
         'fsynclock',
         'hostinfo',
+        'indexes-stats',
     ]
     if collect_custom_queries:
         metrics_categories.append('custom-queries')

sqlserver/changelog.d/20812.fixed

@@ -0,0 +1 @@
+Lift `pyodbc` dependency exclusion for macOS on AArch64/ARM64

sqlserver/pyproject.toml

@@ -39,7 +39,7 @@ license = "BSD-3-Clause"
 deps = [
     "azure-identity==1.23.0",
     "lxml==5.1.1",
-    "pyodbc==5.2.0; sys_platform != 'darwin' or platform_machine != 'arm64'",
+    "pyodbc==5.2.0",
     "pywin32==310; sys_platform == 'win32'",
 ]