Skip to content

Commit c5de079

Browse files
authored
Merge pull request #261996 from MicrosoftDocs/main
12/27/2023 PM Publish
2 parents 0b98f42 + a023948 commit c5de079

29 files changed

+147
-49
lines changed

articles/aks/draft-devx-extension-aks.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ title: Use Draft and the DevX extension for Visual Studio Code with Azure Kubern
33
description: Learn how to use Draft and the DevX extension for Visual Studio Code with Azure Kubernetes Service (AKS)
44
author: schaffererin
55
ms.topic: article
6-
ms.date: 05/17/2023
6+
ms.date: 12/27/2023
77
ms.author: schaffererin
88
---
99

1010
# Use Draft and the DevX extension for Visual Studio Code with Azure Kubernetes Service (AKS)
1111

12-
[Draft][draft] is an open-source project that streamlines Kubernetes development by taking a non-containerized application and generating the DockerFiles, Kubernetes manifests, Helm charts, Kustomize configurations, and other artifacts associated with a containerized application. The Azure Kubernetes Service (AKS) DevX extension for Visual Studio Code enhances non-cluster experiences, allowing you to create deployment files to deploy your applications to AKS. Draft is the available feature included in the DevX extension.
12+
[Draft][draft] is an open-source project that streamlines Kubernetes development. It takes a non-containerized application and generates the DockerFiles, Kubernetes manifests, Helm charts, Kustomize configurations, and other artifacts associated the application. The Azure Kubernetes Service (AKS) DevX extension for Visual Studio Code enhances non-cluster experiences, allowing you to create deployment files to deploy your applications to AKS. Draft is the available feature included in the DevX extension.
1313

1414
This article shows you how to use Draft with the DevX extension to draft a DockerFile, draft a Kubernetes deployment and service, and build an image on Azure Container Registry (ACR).
1515

@@ -20,7 +20,7 @@ This article shows you how to use Draft with the DevX extension to draft a Docke
2020

2121
## Draft with the DevX extension for Visual Studio Code
2222

23-
To get started with Draft in Visual Studio Code, press **Ctrl + Shift + P** in your Visual Studio Code window and enter **AKS Developer**. From here, you'll see available Draft commands:
23+
To get started with Draft in Visual Studio Code, press **Ctrl + Shift + P** in your Visual Studio Code window and enter **AKS Developer**. From here, you see the available Draft commands:
2424

2525
* Get started
2626
* Draft a DockerFile

articles/aks/quickstart-dapr.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Use the Dapr cluster extension for Azure Kubernetes Service (AKS) o
44
author: nickomang
55
ms.author: nickoman
66
ms.topic: quickstart
7-
ms.date: 06/22/2023
7+
ms.date: 12/27/2023
88
ms.custom: template-quickstart, mode-other, event-tier1-build-2022, ignite-2022, devx-track-js, devx-track-python, devx-track-linux
99
---
1010

@@ -34,7 +34,7 @@ In this quickstart, you use the [Dapr cluster extension][dapr-overview] in an AK
3434

3535
## Create and configure a state store
3636

37-
Dapr can use many different state stores such as, Redis, Azure Cosmos DB, DynamoDB, and Cassandra to persist and retrieve state. For this example, we use Redis.
37+
Dapr can use many different state stores, such as Redis, Azure Cosmos DB, DynamoDB, and Cassandra, to persist and retrieve state. For this example, we use Redis.
3838

3939
### Create a Redis store
4040

articles/azure-monitor/alerts/resource-manager-alerts-service-health.md

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,17 @@ This article includes samples of [Azure Resource Manager templates](../../azure-
1515
[!INCLUDE [azure-monitor-samples](../../../includes/azure-monitor-resource-manager-samples.md)]
1616

1717

18-
## Template to send service health alerts
19-
The following template creates an action group with an email target and enables all service health notifications for the target subscription. Save this template as `CreateServiceHealthAlert.json`.
18+
## Template for creating service health alert rules
19+
20+
The following template creates a service health alert rule that sends notifications of service health events for the target subscription. Save this template as `CreateServiceHealthAlert.json` and modify it as needed.
21+
22+
Points to note:
23+
24+
1. The 'scopes' of a service health alert rule can only contain a single subscription, which must be the same subscription in which the rule is created. Multiple subscriptions, a resource group, or other types of scope aren't supported.
25+
1. You can create service health alert rules only in the "Global" location.
26+
1. The "properties.incidentType", "properties.impactedServices[*].ServiceName" and "properties.impactedServices[*].ImpactedRegions[*].RegionName" clauses within the rule condition are optional. You can remove these clauses to be notified on events sent for all incident types, all services, and/or all regions, respectively.
27+
1. The service names used in the "properties.impactedServices[*].ServiceName" must be a valid Azure service name. A list of valid names can be retrieved at the [Resource Health Metadata List API](https://learn.microsoft.com/rest/api/resourcehealth/metadata/list)
28+
2029

2130
```json
2231
{
@@ -41,7 +50,7 @@ The following template creates an action group with an email target and enables
4150
"resources": [
4251
{
4352
"type": "microsoft.insights/actionGroups",
44-
"apiVersion": "2019-06-01",
53+
"apiVersion": "2020-10-01",
4554
"name": "[parameters('actionGroups_name')]",
4655
"location": "Global",
4756
"properties": {
@@ -75,6 +84,19 @@ The following template creates an action group with an email target and enables
7584
{
7685
"field": "properties.incidentType",
7786
"equals": "Incident"
87+
},
88+
{
89+
"field": "properties.impactedServices[*].ServiceName",
90+
"containsAny": [
91+
"SQL Database",
92+
"SQL Managed Instance"
93+
]
94+
},
95+
{
96+
"field": "properties.impactedServices[*].ImpactedRegions[*].RegionName",
97+
"containsAny": [
98+
"Australia Central"
99+
]
78100
}
79101
]
80102
},
@@ -84,7 +106,7 @@ The following template creates an action group with an email target and enables
84106
"actionGroupId": "[resourceId('microsoft.insights/actionGroups', parameters('actionGroups_name'))]",
85107
"webhookProperties": {}
86108
}
87-
]
109+
]
88110
},
89111
"enabled": true
90112
},
@@ -100,3 +122,4 @@ The following template creates an action group with an email target and enables
100122

101123
- [Get other sample templates for Azure Monitor](../resource-manager-samples.md).
102124
- [Learn more about alert rules](./alerts-overview.md).
125+

articles/azure-monitor/app/app-insights-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Application Insights overview
33
description: Learn how Application Insights in Azure Monitor provides performance management and usage tracking of your live web application.
44
ms.topic: overview
5-
ms.date: 10/09/2023
5+
ms.date: 12/15/2023
66
---
77

88
# Application Insights overview

articles/azure-monitor/app/asp-net-trace-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Search logs generated by Trace, NLog, or Log4Net.
44
ms.topic: conceptual
55
ms.devlang: csharp
66
ms.custom: devx-track-csharp, devx-track-dotnet, devx-track-python
7-
ms.date: 04/18/2023
7+
ms.date: 12/15/2023
88
ms.reviewer: mmcc
99
---
1010

articles/azure-monitor/app/codeless-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Autoinstrumentation for Azure Monitor Application Insights
33
description: Overview of autoinstrumentation for Azure Monitor Application Insights codeless application performance management.
44
ms.topic: conceptual
55
ms.custom: devx-track-js
6-
ms.date: 11/15/2023
6+
ms.date: 12/15/2023
77
ms.reviewer: abinetabate
88
---
99

articles/azure-monitor/app/nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Monitor Node.js services with Application Insights | Microsoft Docs
33
description: Monitor performance and diagnose problems in Node.js services with Application Insights.
44
ms.topic: conceptual
5-
ms.date: 10/11/2023
5+
ms.date: 12/15/2023
66
ms.devlang: javascript
77
ms.custom: devx-track-js
88
ms.reviewer: mmcc

articles/azure-monitor/app/opentelemetry-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure Azure Monitor OpenTelemetry for .NET, Java, Node.js, and Python applications
33
description: This article provides configuration guidance for .NET, Java, Node.js, and Python applications.
44
ms.topic: conceptual
5-
ms.date: 11/15/2023
5+
ms.date: 12/27/2023
66
ms.devlang: csharp, javascript, typescript, python
77
ms.custom: devx-track-dotnet, devx-track-extended-java, devx-track-python
88
ms.reviewer: mmcc

articles/azure-monitor/app/opentelemetry-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Data Collection Basics of Azure Monitor Application Insights
33
description: This article provides an overview of how to collect telemetry to send to Azure Monitor Application Insights.
44
ms.topic: conceptual
5-
ms.date: 09/12/2023
5+
ms.date: 12/15/2023
66
ms.reviewer: mmcc
77
---
88

articles/azure-monitor/containers/container-insights-livedata-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.reviewer: aul
1212
The Live Data feature in Container insights gives you direct access to your Azure Kubernetes Service (AKS) container logs (stdout/stderror), events, and pod metrics. It exposes direct access to `kubectl logs -c`, `kubectl get` events, and `kubectl top pods`. A console pane shows the logs, events, and metrics generated by the container engine to help with troubleshooting issues in real time.
1313

1414
> [!NOTE]
15-
> AKS uses [Kubernetes cluster-level logging architectures](https://kubernetes.io/docs/concepts/cluster-administration/logging/#cluster-level-logging-architectures). You can use tools such as Fluentd or Fluent Bit to collect logs.
15+
> AKS uses [Kubernetes cluster-level logging architectures](https://kubernetes.io/docs/concepts/cluster-administration/logging/#cluster-level-logging-architectures). The container logs are located inside `/var/log/containers` on the node. To access a node, see [Connect to Azure Kubernetes Service (AKS) cluster nodes](../../aks/node-access.md).
1616
1717
This article provides an overview of this feature and helps you understand how to use it.
1818

0 commit comments

Comments
 (0)