Skip to content

Commit 745e5f4

Browse files
authored
Merge pull request #219615 from MicrosoftDocs/main
Publish to live, Monday 4 AM PST, 11/28
2 parents 32f6098 + 923e1d3 commit 745e5f4

File tree

15 files changed

+48
-256
lines changed

15 files changed

+48
-256
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
5656
"redirect_document_id": false
5757
},
58+
{
59+
"source_path_from_root": "/articles/active-directory/governance/lifecycle-workflows-developer-reference.md",
60+
"redirect_url": "/graph/api/resources/identitygovernance-workflow",
61+
"redirect_document_id": false
62+
},
5863
{
5964
"source_path_from_root": "/articles/active-directory/governance/tutorial-offboard-custom-workflow-graph.md",
6065
"redirect_url": "/graph/tutorial-lifecycle-workflows-offboard-custom-workflow",

articles/active-directory/governance/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,6 @@
249249
href: /graph/api/resources/identitygovernance-lifecycleworkflows-overview
250250
- name: Lifecycle Workflows - FAQs
251251
href: workflows-faqs.md
252-
- name: Developer API reference Lifecycle Workflows- Azure Active Directory
253-
href: lifecycle-workflows-developer-reference.md
254252
- name: Set EmployeeLeaveDateTime for leaver workflows
255253
href: /graph/tutorial-lifecycle-workflows-set-employeeleavedatetime?toc=/azure/active-directory/governance/toc.json&bc=/azure/active-directory/governance/breadcrumb/toc.json
256254
- name: Preparing user accounts for Lifecycle workflows tutorials

articles/active-directory/governance/lifecycle-workflows-developer-reference.md

Lines changed: 0 additions & 224 deletions
This file was deleted.

articles/active-directory/reports-monitoring/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ metadata:
1010
ms.service: active-directory
1111
ms.subservice: devices
1212
ms.topic: landing-page
13-
author: MarkusVi
14-
ms.author: markvi
13+
author: shlipsey3
14+
ms.author: sarahlipsey
1515
ms.date: 08/29/2019
1616
ms.collection: M365-identity-device-management
1717

articles/azure-monitor/essentials/prometheus-rule-groups.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ Below is a sample template that creates a Prometheus rule group, including one r
8181
{
8282
"record": "instance:node_cpu_utilisation:rate5m",
8383
"expression": "1 - avg without (cpu) (sum without (mode)(rate(node_cpu_seconds_total{job=\"node\", mode=~\"idle|iowait|steal\"}[5m])))",
84+
"labels": {
85+
"workload_type": "job"
86+
},
8487
"enabled": true
8588
},
8689
{
@@ -138,6 +141,7 @@ The `rules` section will have the following properties for recording rules.
138141
|:---|:---|:---|:---|
139142
| `record` | True | string | Recording rule name. This is the name that will be used for the new time series. |
140143
| `expression` | True | string | PromQL expression to calculate the new time series value. |
144+
| `labels` | True | string | Prometheus rule labels key-value pairs, will be added to the recorded time series. |
141145
| `enabled` | False | boolean | Enable/disable group. Default is true. |
142146

143147

@@ -149,7 +153,7 @@ The `rules` section will have the following properties for alerting rules.
149153
| `alert` | False | string | Alert rule name |
150154
| `expression` | True | string | PromQL expression to evaluate. |
151155
| `for` | False | string | Alert firing timeout. Values - 'PT1M', 'PT5M' etc. |
152-
| `labels` | False | object | labels key-value pairs | Prometheus alert rule labels |
156+
| `labels` | False | object | labels key-value pairs | Prometheus alert rule labels, will be added to the fired alert. |
153157
| `rules.annotations` | False | object | Annotations key-value pairs to add to the alert. |
154158
| `enabled` | False | boolean | Enable/disable group. Default is true. |
155159
| `rules.severity` | False | integer | Alert severity. 0-4, default is 3 (informational) |

articles/azure-monitor/logs/basic-logs-configure.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,17 @@ By default, all tables in your Log Analytics workspace are Analytics tables, and
4949
| Table | Details|
5050
|:---|:---|
5151
| Custom tables | All custom tables created with or migrated to the [data collection rule (DCR)-based logs ingestion API.](logs-ingestion-api-overview.md) |
52+
| [ACSCallAutomationIncomingOperations](/azure/azure-monitor/reference/tables/ACSCallAutomationIncomingOperations) | Communication Services incoming requests Calls. |
5253
| [ACSCallRecordingSummary](/azure/azure-monitor/reference/tables/acscallrecordingsummary) | Communication Services recording summary logs. |
5354
| [ACSRoomsIncomingOperations](/azure/azure-monitor/reference/tables/acsroomsincomingoperations) | Communication Services Rooms incoming requests operations. |
5455
| [AppTraces](/azure/azure-monitor/reference/tables/apptraces) | Application Insights Freeform traces. |
56+
| [AMSLiveEventOperations](/azure/azure-monitor/reference/tables/AMSLiveEventOperations) | Azure Media Services encoder connects, disconnects, or discontinues. |
5557
| [AMSKeyDeliveryRequests](/azure/azure-monitor/reference/tables/AMSKeyDeliveryRequests) | Azure Media Services HTTP request details for key, or license acquisition. |
56-
| [AMSMediaAccountHealth](/azure/azure-monitor/reference/tables/AMSMediaAccountHealth) | Azure Media Account Health Status. |
58+
| [AMSMediaAccountHealth](/azure/azure-monitor/reference/tables/AMSMediaAccountHealth) | Azure Media Services account health status. |
59+
| [AMSStreamingEndpointRequests](/azure/azure-monitor/reference/tables/AMSStreamingEndpointRequests) | Azure Media Services information about requests to streaming endpoints. |
5760
| [ContainerAppConsoleLogs](/azure/azure-monitor/reference/tables/containerappconsoleLogs) | Azure Container Apps logs, generated within a Container Apps environment. |
5861
| [ContainerLogV2](/azure/azure-monitor/reference/tables/containerlogv2) | Used in [Container insights](../containers/container-insights-overview.md) and includes verbose text-based log records. |
62+
| [DevCenterDiagnosticLogs](/azure/azure-monitor/reference/tables/DevCenterDiagnosticLogs) | Data plane audit related to Dev Center resources, e.g. dev boxes and environments stop, start, deletes. |
5963

6064
> [!NOTE]
6165
> Tables created with the [Data Collector API](data-collector-api.md) don't support Basic Logs.

articles/defender-for-cloud/TOC.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
- name: What are the enhanced security features?
1111
displayName: azure defender
1212
href: enhanced-security-features-overview.md
13+
- name: Security posture at-a-glance with the Overview dashboard
14+
displayName: overview, compliance, inventory
15+
href: overview-page.md
1316
- name: What's new?
1417
displayName: changelog, news, release notes
1518
href: release-notes.md
@@ -181,9 +184,6 @@
181184
items:
182185
- name: Cloud security posture
183186
items:
184-
- name: Security posture at-a-glance with the Overview dashboard
185-
displayName: overview, compliance, inventory
186-
href: overview-page.md
187187
- name: See all of your workloads in the workload protections dashboard
188188
displayName: workloads, dashboard, protections
189189
href: workload-protections-dashboard.md

articles/defender-for-cloud/concept-defender-for-cosmos.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.topic: conceptual
66
ms.custom: ignite-2022
77
ms.author: benmansheim
88
author: bmansheim
9-
ms.date: 03/01/2022
9+
ms.date: 11/27/2022
1010
---
1111

1212
# Overview of Microsoft Defender for Azure Cosmos DB
@@ -25,8 +25,8 @@ Defender for Azure Cosmos DB doesn't access the Azure Cosmos DB account data, an
2525

2626
|Aspect|Details|
2727
|----|:----|
28-
|Release state:|Preview.<br>[!INCLUDE [Legalese](../../includes/defender-for-cloud-preview-legal-text.md)]|
29-
|Protected Azure Cosmos DB API | :::image type="icon" source="./media/icons/yes-icon.png"::: Azure Cosmos DB for NoSQL <br> :::image type="icon" source="./media/icons/no-icon.png"::: Azure Cosmos DB for Apache Cassandra <br> :::image type="icon" source="./media/icons/no-icon.png"::: Azure Cosmos DB for MongoDB <br> :::image type="icon" source="./media/icons/no-icon.png"::: Azure Cosmos DB for Table <br> :::image type="icon" source="./media/icons/no-icon.png"::: Azure Cosmos DB for Apache Gremlin |
28+
|Release state:| General Availability (GA) |
29+
| Protected Azure Cosmos DB API | :::image type="icon" source="./media/icons/yes-icon.png"::: Azure Cosmos DB for NoSQL <br> :::image type="icon" source="./media/icons/no-icon.png"::: Azure Cosmos DB for Apache Cassandra <br> :::image type="icon" source="./media/icons/no-icon.png"::: Azure Cosmos DB for MongoDB <br> :::image type="icon" source="./media/icons/no-icon.png"::: Azure Cosmos DB for Table <br> :::image type="icon" source="./media/icons/no-icon.png"::: Azure Cosmos DB for Apache Gremlin |
3030
|Clouds:|:::image type="icon" source="./media/icons/yes-icon.png"::: Commercial clouds<br>:::image type="icon" source="./media/icons/no-icon.png"::: Azure Government <br>:::image type="icon" source="./media/icons/no-icon.png"::: Azure China 21Vianet |
3131

3232
## What are the benefits of Microsoft Defender for Azure Cosmos DB

articles/defender-for-cloud/defender-for-databases-enable-cosmos-protections.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
title: Enable Microsoft Defender for Azure Cosmos DB
33
description: Learn how to enable enhanced security features in Microsoft Defender for Azure Cosmos DB.
44
titleSuffix: Microsoft Defender for Azure Cosmos DB
5+
author: bmansheim
6+
ms.author: benmansheim
57
ms.topic: how-to
68
ms.custom: ignite-2022
7-
ms.date: 06/07/2022
9+
ms.date: 11/28/2022
810
---
911

1012
# Enable Microsoft Defender for Azure Cosmos DB
@@ -67,7 +69,7 @@ You can enable Microsoft Defender for Cloud on a specific Azure Cosmos DB accoun
6769

6870
1. Select **Enable Microsoft Defender for Azure Cosmos DB**.
6971

70-
:::image type="content" source="media/quickstart-enable-defender-for-cosmos/enable-storage.png" alt-text="Screenshot of the option to enable Microsoft Defender for Azure Cosmos DB on your specified Azure Cosmos DB account.":::
72+
:::image type="content" source="media/quickstart-enable-defender-for-cosmos/enable-storage.png" alt-text="Screenshot of the option to enable Microsoft Defender for Azure Cosmos DB on your specified Azure Cosmos DB account." lightbox="media/quickstart-enable-defender-for-cosmos/enable-storage.png":::
7173

7274
### [PowerShell](#tab/azure-powershell)
7375

0 commit comments

Comments
 (0)