Merge branch 'main' into vpl/ga-bulk

vplauzon · vplauzon · commit e1670ded5a16 · 2025-12-11T09:59:57.000-05:00
diff --git a/data-explorer/follower.md b/data-explorer/follower.md
@@ -3,7 +3,7 @@ title: Use follower database feature to attach databases in Azure Data Explorer
 description: Learn about how to attach databases in Azure Data Explorer using the follower database feature.
 ms.reviewer: gabilehner
 ms.topic: how-to
-ms.date: 06/10/2025
+ms.date: 12/11/2025
 ms.custom:
   - devx-track-azurepowershell
   - sfi-image-nochange
@@ -99,29 +99,22 @@ You can optionally make the database name in the follower cluster different from
 ### C\# example
 
 ```csharp
-var tenantId = "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx"; //Directory (tenant) ID
-var clientId = "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx"; //Application ID
-var clientSecret = "PlaceholderClientSecret"; //Client Secret
-var followerSubscriptionId = "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx";
-var credentials = new ClientSecretCredential(tenantId, clientId, clientSecret);
-var resourceManagementClient = new ArmClient(credentials, followerSubscriptionId);
-var followerResourceGroupName = "followerResourceGroup";
-var followerClusterName = "follower";
-var subscription = await resourceManagementClient.GetDefaultSubscriptionAsync();
-var resourceGroup = (await subscription.GetResourceGroupAsync(followerResourceGroupName)).Value;
-var cluster = (await resourceGroup.GetKustoClusterAsync(followerClusterName)).Value;
-var attachedDatabaseConfigurations = cluster.GetKustoAttachedDatabaseConfigurations();
-var attachedDatabaseConfigurationName = "attachedDatabaseConfiguration"
-var leaderSubscriptionId = "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx";
-var leaderResourceGroup = "leaderResourceGroup";
-var leaderClusterName = "leader";
+var followerClusterId = KustoClusterResource.CreateResourceIdentifier(subscriptionId: "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx", resourceGroupName: "followerResourceGroup", clusterName: "follower");
+var leaderClusterId = KustoClusterResource.CreateResourceIdentifier(subscriptionId: "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx", resourceGroupName: "leaderResourceGroup", clusterName: "leader");
+var attachedDatabaseConfigurationName = "attachedDatabaseConfiguration";
+
+var credentials = new ManagedIdentityCredential();
+var resourceManagementClient = new ArmClient(credentials);
+var followerCluster = resourceManagementClient.GetKustoClusterResource(followerClusterId);
+var attachedDatabaseConfigurations = followerCluster.GetKustoAttachedDatabaseConfigurations();
 var attachedDatabaseConfigurationData = new KustoAttachedDatabaseConfigurationData
 {
-    ClusterResourceId = new ResourceIdentifier($"/subscriptions/{leaderSubscriptionId}/resourceGroups/{leaderResourceGroup}/providers/Microsoft.Kusto/Clusters/{leaderClusterName}"),
+    ClusterResourceId = leaderClusterId,
     DatabaseName = "<databaseName>", // Can be a specific database name in a leader cluster or * for all databases
     DefaultPrincipalsModificationKind = KustoDatabaseDefaultPrincipalsModificationKind.Union,
     Location = AzureLocation.NorthCentralUS
 };
+
 // Table level sharing properties are not supported when using '*' all databases notation.
 if (attachedDatabaseConfigurationData.DatabaseName != "*")
 {
@@ -136,6 +129,7 @@ if (attachedDatabaseConfigurationData.DatabaseName != "*")
     attachedDatabaseConfigurationData.TableLevelSharingProperties.FunctionsToInclude.Add("func1");
     attachedDatabaseConfigurationData.TableLevelSharingProperties.FunctionsToExclude.Add("func2");
 }
+
 await attachedDatabaseConfigurations.CreateOrUpdateAsync(WaitUntil.Completed, attachedDatabaseConfigurationName, attachedDatabaseConfigurationData);
 ```
 
@@ -447,20 +441,12 @@ To verify that the database was successfully attached, find your attached databa
 The follower cluster can detach any attached follower database as follows:
 
 ```csharp
-var tenantId = "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx"; //Directory (tenant) ID
-var clientId = "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx"; //Application ID
-var clientSecret = "PlaceholderClientSecret"; //Client Secret
-var followerSubscriptionId = "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx";
-var credentials = new ClientSecretCredential(tenantId, clientId, clientSecret);
-var resourceManagementClient = new ArmClient(credentials, followerSubscriptionId);
-var followerResourceGroupName = "testrg";
-//The cluster and database attached database configuration are created as part of the prerequisites
-var followerClusterName = "follower";
-var attachedDatabaseConfigurationsName = "attachedDatabaseConfiguration";
-var subscription = await resourceManagementClient.GetDefaultSubscriptionAsync();
-var resourceGroup = (await subscription.GetResourceGroupAsync(followerResourceGroupName)).Value;
-var cluster = (await resourceGroup.GetKustoClusterAsync(followerClusterName)).Value;
-var attachedDatabaseConfiguration = (await cluster.GetKustoAttachedDatabaseConfigurationAsync(attachedDatabaseConfigurationsName)).Value;
+var attachedDatabaseConfigurationId = KustoAttachedDatabaseConfigurationResource.CreateResourceIdentifier(
+    subscriptionId: "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx", resourceGroupName: "testrg", clusterName: "follower",
+    attachedDatabaseConfigurationName: "attachedDatabaseConfiguration");
+var credentials = new ManagedIdentityCredential();
+var resourceManagementClient = new ArmClient(credentials);
+var attachedDatabaseConfiguration = resourceManagementClient.GetKustoAttachedDatabaseConfigurationResource(attachedDatabaseConfigurationId);
 await attachedDatabaseConfiguration.DeleteAsync(WaitUntil.Completed);
 ```
 
@@ -469,27 +455,16 @@ await attachedDatabaseConfiguration.DeleteAsync(WaitUntil.Completed);
 The leader cluster can detach any attached database as follows:
 
 ```csharp
-var tenantId = "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx"; //Directory (tenant) ID
-var clientId = "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx"; //Application ID
-var clientSecret = "PlaceholderClientSecret"; //Client Secret
-var leaderSubscriptionId = "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx";
-var credentials = new ClientSecretCredential(tenantId, clientId, clientSecret);
-var resourceManagementClient = new ArmClient(credentials, leaderSubscriptionId);
-var leaderResourceGroupName = "testrg";
-var leaderClusterName = "leader";
-var subscription = await resourceManagementClient.GetDefaultSubscriptionAsync();
-var resourceGroup = (await subscription.GetResourceGroupAsync(leaderResourceGroupName)).Value;
-var cluster = (await resourceGroup.GetKustoClusterAsync(leaderClusterName)).Value;
-var followerSubscriptionId = "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx";
-var followerResourceGroupName = "followerResourceGroup";
-//The cluster and attached database configuration that are created as part of the Prerequisites
-var followerClusterName = "follower";
-var attachedDatabaseConfigurationsName = "attachedDatabaseConfiguration";
+var leaderClusterId = KustoClusterResource.CreateResourceIdentifier(subscriptionId: "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx", resourceGroupName: "testrg", clusterName: "leader");
+var followerClusterId = KustoClusterResource.CreateResourceIdentifier(subscriptionId: "xxxxxxxx-xxxxx-xxxx-xxxx-xxxxxxxxx", resourceGroupName: "followerResourceGroup", clusterName: "follower");
 var followerDatabaseDefinition = new KustoFollowerDatabaseDefinition(
-    clusterResourceId: new ResourceIdentifier($"/subscriptions/{followerSubscriptionId}/resourceGroups/{followerResourceGroupName}/providers/Microsoft.Kusto/Clusters/{followerClusterName}"),
-    attachedDatabaseConfigurationName: attachedDatabaseConfigurationsName
+    clusterResourceId: followerClusterId,
+    attachedDatabaseConfigurationName: "attachedDatabaseConfiguration"
 );
-await cluster.DetachFollowerDatabasesAsync(WaitUntil.Completed, followerDatabaseDefinition);
+var credentials = new ManagedIdentityCredential();
+var resourceManagementClient = new ArmClient(credentials);
+var leaderCluster = resourceManagementClient.GetKustoClusterResource(leaderClusterId);
+await leaderCluster.DetachFollowerDatabasesAsync(WaitUntil.Completed, followerDatabaseDefinition);
 ```
 
 ## [Python](#tab/python)
diff --git a/data-explorer/ingestion-supported-formats.md b/data-explorer/ingestion-supported-formats.md
@@ -29,6 +29,7 @@ Data ingestion is the process by which data is added to a table and is made avai
 |---------|------------|-----------|
 |ApacheAvro|`.avro`    |An [AVRO](https://avro.apache.org/docs/current/) format with support for [logical types](https://avro.apache.org/docs/++version++/specification/#Logical+Types). The following compression codecs are supported: `null`, `deflate`, and `snappy`. Reader implementation of the `apacheavro` format is based on the official [Apache Avro library](https://github.com/apache/avro). For information about ingesting Event Hubs Capture Avro files, see [Ingesting Event Hubs Capture Avro files](ingest-data-event-hub-overview.md#schema-mapping-for-event-hubs-capture-avro-files). |
 |Avro     |`.avro`     |A legacy implementation for [AVRO](https://avro.apache.org/docs/current/) format based on [.NET library](https://www.nuget.org/packages/Microsoft.Hadoop.Avro). The following compression codecs are supported: `null`, `deflate` (for `snappy` - use `ApacheAvro` data format). |
+|AzMonStream     |N/A     |Azure Monitor [exports data in this format](/azure/azure-monitor/platform/stream-monitoring-data-event-hubs#data-formats) to Azure Event Hubs.  This format is supported only by Azure Event Hubs. |
 |CSV      |`.csv`      |A text file with comma-separated values (`,`). See [RFC 4180: _Common Format and MIME Type for Comma-Separated Values (CSV) Files_](https://www.ietf.org/rfc/rfc4180.txt).|
 |JSON     |`.json`     |A text file with JSON objects delimited by `\n` or `\r\n`. See [JSON Lines (JSONL)](http://jsonlines.org/).|
 |MultiJSON|`.multijson`|A text file with a JSON array of property bags (each representing a record), or any number of property bags delimited by whitespace, `\n`, or `\r\n`. Each property bag can be spread on multiple lines.|
diff --git a/data-explorer/kusto/management/data-ingestion/ingest-from-storage-queued.md b/data-explorer/kusto/management/data-ingestion/ingest-from-storage-queued.md
@@ -38,7 +38,7 @@ You must have at least [Table Ingestor](../../access-control/role-based-access-c
 |*SkipBatching*| `boolean` | | If set to  `true`, the blobs are ingested individually rather than batched together with other blobs. The default value is `false`.|
 |*CompressionFactor*| `real` | |The compression factor (ratio) between the original size and the compressed size of blobs. Compression factor is used to estimate the original size of the data for batching purposes, when blobs are provided in a compressed format.|
 |*IngestionPropertyName*, *IngestionPropertyValue* | `string` | |Optional ingestion properties. For more information about ingestion properties, see [Data ingestion properties](../../ingestion-properties.md).|
-|*IngestionSource* | `string` | :heavy_check_mark: | The ingestion source. The source can be a URL, source file, or a list of blobs returned using the [.list blobs](list-blobs.md) command. |
+|*IngestionSource* | `string` | :heavy_check_mark: | The ingestion source. The source can be a URL or a list of blobs returned using [.list blobs](list-blobs.md) command. |
 
 > [!NOTE]
 > The `.list blobs` command can be used with the `.ingest-from-storage-queued` command to return the blobs you want to ingest. For detailed information about the command and a full list of its parameters, see [.list blobs command](list-blobs.md).
