Skip to content

Commit 29723e4

Browse files
Merge pull request #2705 from MicrosoftDocs/main638906329400100737sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 3bf923a + b521c0b commit 29723e4

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

data-explorer/kusto/api/connection-strings/sql-connection-strings.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@ Regardless of the authentication method used, the principal must have the necess
2727

2828
The following table shows the supported authentication methods for each type of database acting as the source for the external table.
2929

30+
::: moniker range="azure-data-explorer"
3031
> [!NOTE]
3132
> Where possible, the preferred authentication method is managed identity.
3233
34+
::: moniker-end
35+
3336
::: moniker range="microsoft-fabric"
3437

3538
| Authentication method | SQL Server | PostgreSQL | MySQL | Cosmos DB |

data-explorer/kusto/management/data-ingestion/cancel-queued-ingestion-operation-command.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ You must have at least [Table Ingestor](../../access-control/role-based-access-c
5050
|Database | `string` |The database where the ingestion process is occurring.|
5151
|Table | `string` | The table where the ingestion process is occurring.|
5252

53+
>[!NOTE]
54+
> If the ingestion operation was initiated with tracking disabled, cancellation commands execute on a best‑effort basis. The returned state may indicate: "Cancellation request received – service will attempt best effort cancellation (tracking isn't enabled on operation)"
55+
5356
## Example
5457

5558
The following example cancels the ingestion of operation `00001111;11112222;00001111-aaaa-2222-bbbb-3333cccc4444`.

data-explorer/kusto/management/data-ingestion/ingest-from-storage-queued.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ The result of the command is a table with one row and one column.
5151
| IngestionOperationId | `string` | A unique ID used to track the set of blobs, whether or not tracking is enabled. |
5252
| ClientRequestId | `string` | The client request ID of the command. |
5353
| OperationInfo | `string` | Displays the command to run to retrieve the current status of the operation. |
54+
| CancelationInfo | `string` | Displays the command to run to cancel the operation. |
5455

5556
>[!NOTE]
5657
> This command doesn't modify the schema of the target table. If necessary, the data is converted to fit the table's schema during ingestion. Extra columns are ignored and missing columns are treated as null values.

data-explorer/kusto/management/data-ingestion/queued-ingestion-use-case.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ with (format='parquet')
7777

7878
The `OperationInfo`, which includes the `IngestionOperationId`, is then used to [track the ingestion status](#track-ingestion-status).
7979

80+
The `CancelationInfo`, which includes the `IngestionOperationId`, is then used to [cancel the ingestion operation](#cancel-ingestion).
81+
8082
### Track ingestion status
8183

8284
You run the `.show queued ingestion operations` command to check whether the ingestion is complete or if there are any errors.
@@ -169,9 +171,9 @@ with (format='parquet')
169171

170172
**Output**
171173

172-
| IngestionOperationId | ClientRequestId | OperationInfo |
173-
|----------------------|-----------------|---------------|
174-
|22223333;22223333;11110000-bbbb-2222-cccc-4444dddd5555|Kusto.Web.KWE,Query;22223333;22223333;33334444-dddd-4444-eeee-5555eeee5555|.show queued ingestion operations "22223333;22223333;11110000-bbbb-2222-cccc-4444dddd5555" |
174+
| IngestionOperationId | ClientRequestId | OperationInfo | CancelationInfo |
175+
|----------------------|-----------------|---------------|---------------|
176+
|22223333;22223333;11110000-bbbb-2222-cccc-4444dddd5555|Kusto.Web.KWE,Query;22223333;22223333;33334444-dddd-4444-eeee-5555eeee5555|.show queued ingestion operations "22223333;22223333;11110000-bbbb-2222-cccc-4444dddd5555" |.cancel queued ingestion operations "22223333;22223333;11110000-bbbb-2222-cccc-4444dddd5555" |
175177

176178
The `OperationInfo` is then used to [track the ingestion status](#track-ingestion-status).
177179

0 commit comments

Comments
 (0)