Skip to content

Commit cfb1c23

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into yelevin/bugfix-various
2 parents c8859bc + bfd0fdd commit cfb1c23

21 files changed

+244
-62
lines changed

articles/aks/csi-secrets-store-nginx-tls.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ helm install ingress-nginx/ingress-nginx --generate-name \
120120
--namespace $NAMESPACE \
121121
--set controller.replicaCount=2 \
122122
--set controller.nodeSelector."beta\.kubernetes\.io/os"=linux \
123+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz \
123124
--set defaultBackend.nodeSelector."beta\.kubernetes\.io/os"=linux
124125
```
125126

@@ -136,6 +137,7 @@ helm install ingress-nginx/ingress-nginx --generate-name \
136137
--set controller.replicaCount=2 \
137138
--set controller.nodeSelector."beta\.kubernetes\.io/os"=linux \
138139
--set defaultBackend.nodeSelector."beta\.kubernetes\.io/os"=linux \
140+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz \
139141
--set controller.podLabels.aadpodidbinding=$AAD_POD_IDENTITY_NAME \
140142
-f - <<EOF
141143
controller:

articles/aks/ingress-basic.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ NAMESPACE=ingress-basic
5454
helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
5555
helm repo update
5656

57-
helm install ingress-nginx ingress-nginx/ingress-nginx --create-namespace --namespace $NAMESPACE
57+
helm install ingress-nginx ingress-nginx/ingress-nginx \
58+
--create-namespace \
59+
--namespace $NAMESPACE \
60+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz
5861
```
5962

6063
### [Azure PowerShell](#tab/azure-powershell)
@@ -65,7 +68,10 @@ $Namespace = 'ingress-basic'
6568
helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
6669
helm repo update
6770
68-
helm install ingress-nginx ingress-nginx/ingress-nginx --create-namespace --namespace $Namespace
71+
helm install ingress-nginx ingress-nginx/ingress-nginx `
72+
--create-namespace `
73+
--namespace $Namespace `
74+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz
6975
```
7076

7177
---
@@ -153,6 +159,7 @@ helm install nginx-ingress ingress-nginx/ingress-nginx \
153159
--set controller.image.tag=$CONTROLLER_TAG \
154160
--set controller.image.digest="" \
155161
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux \
162+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz \
156163
--set controller.admissionWebhooks.patch.image.registry=$ACR_URL \
157164
--set controller.admissionWebhooks.patch.image.image=$PATCH_IMAGE \
158165
--set controller.admissionWebhooks.patch.image.tag=$PATCH_TAG \
@@ -183,6 +190,7 @@ helm install nginx-ingress ingress-nginx/ingress-nginx `
183190
--set controller.image.tag=$ControllerTag `
184191
--set controller.image.digest="" `
185192
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux `
193+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz `
186194
--set controller.admissionWebhooks.patch.image.registry=$AcrUrl `
187195
--set controller.admissionWebhooks.patch.image.image=$PatchImage `
188196
--set controller.admissionWebhooks.patch.image.tag=$PatchTag `

articles/aks/ingress-internal-ip.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ helm install nginx-ingress ingress-nginx/ingress-nginx \
138138
--set controller.admissionWebhooks.patch.image.tag=$PATCH_TAG \
139139
--set controller.admissionWebhooks.patch.image.digest="" \
140140
--set defaultBackend.nodeSelector."kubernetes\.io/os"=linux \
141+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz \
141142
--set defaultBackend.image.registry=$ACR_URL \
142143
--set defaultBackend.image.image=$DEFAULTBACKEND_IMAGE \
143144
--set defaultBackend.image.tag=$DEFAULTBACKEND_TAG \
@@ -163,6 +164,7 @@ helm install nginx-ingress ingress-nginx/ingress-nginx `
163164
--set controller.image.tag=$ControllerTag `
164165
--set controller.image.digest="" `
165166
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux `
167+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz `
166168
--set controller.admissionWebhooks.patch.image.registry=$AcrUrl `
167169
--set controller.admissionWebhooks.patch.image.image=$PatchImage `
168170
--set controller.admissionWebhooks.patch.image.tag=$PatchTag `

articles/aks/ingress-own-tls.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ helm install nginx-ingress ingress-nginx/ingress-nginx \
121121
--set controller.image.tag=$CONTROLLER_TAG \
122122
--set controller.image.digest="" \
123123
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux \
124+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz \
124125
--set controller.admissionWebhooks.patch.image.registry=$ACR_URL \
125126
--set controller.admissionWebhooks.patch.image.image=$PATCH_IMAGE \
126127
--set controller.admissionWebhooks.patch.image.tag=$PATCH_TAG \
@@ -154,6 +155,7 @@ helm install nginx-ingress ingress-nginx/ingress-nginx `
154155
--set controller.image.tag=$ControllerTag `
155156
--set controller.image.digest="" `
156157
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux `
158+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz `
157159
--set controller.admissionWebhooks.patch.image.registry=$AcrUrl `
158160
--set controller.admissionWebhooks.patch.image.image=$PatchImage `
159161
--set controller.admissionWebhooks.patch.image.tag=$PatchTag `

articles/aks/ingress-static-ip.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ helm install nginx-ingress ingress-nginx/ingress-nginx \
192192
--set controller.image.tag=$CONTROLLER_TAG \
193193
--set controller.image.digest="" \
194194
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux \
195+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz \
195196
--set controller.admissionWebhooks.patch.image.registry=$ACR_URL \
196197
--set controller.admissionWebhooks.patch.image.image=$PATCH_IMAGE \
197198
--set controller.admissionWebhooks.patch.image.tag=$PATCH_TAG \
@@ -225,6 +226,7 @@ helm install nginx-ingress ingress-nginx/ingress-nginx `
225226
--set controller.image.tag=$ControllerTag `
226227
--set controller.image.digest="" `
227228
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux `
229+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz `
228230
--set controller.admissionWebhooks.patch.image.registry=$AcrUrl `
229231
--set controller.admissionWebhooks.patch.image.image=$PatchImage `
230232
--set controller.admissionWebhooks.patch.image.tag=$PatchTag `

articles/aks/ingress-tls.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ helm install nginx-ingress ingress-nginx/ingress-nginx \
147147
--set controller.image.tag=$CONTROLLER_TAG \
148148
--set controller.image.digest="" \
149149
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux \
150+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz \
150151
--set controller.admissionWebhooks.patch.image.registry=$ACR_URL \
151152
--set controller.admissionWebhooks.patch.image.image=$PATCH_IMAGE \
152153
--set controller.admissionWebhooks.patch.image.tag=$PATCH_TAG \
@@ -180,6 +181,7 @@ helm install nginx-ingress ingress-nginx/ingress-nginx `
180181
--set controller.image.tag=$ControllerTag `
181182
--set controller.image.digest="" `
182183
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux `
184+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz `
183185
--set controller.admissionWebhooks.patch.image.registry=$AcrUrl `
184186
--set controller.admissionWebhooks.patch.image.image=$PatchImage `
185187
--set controller.admissionWebhooks.patch.image.tag=$PatchTag `

articles/aks/kubernetes-helm.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ helm install nginx-ingress ingress-nginx/ingress-nginx \
134134
--set controller.image.tag=$CONTROLLER_TAG \
135135
--set controller.image.digest="" \
136136
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux \
137+
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-health-probe-request-path"=/healthz \
137138
--set controller.admissionWebhooks.patch.image.registry=$ACR_URL \
138139
--set controller.admissionWebhooks.patch.image.image=$PATCH_IMAGE \
139140
--set controller.admissionWebhooks.patch.image.tag=$PATCH_TAG \

articles/azure-monitor/alerts/itsmc-definition.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Action groups provide a modular and reusable way to trigger actions for your Azu
8080
8181
### Define a template
8282

83-
Certain work item types can use templates that you define in the ITSM tool. By using templates, you can define fields that will be automatically populated according to fixed values for an action group. You can define which template you want to use as a part of the definition of an action group. You can find in ServiceNow docs information about how to create templates - (here)[https://docs.servicenow.com/bundle/paris-platform-administration/page/administer/form-administration/task/t_CreateATemplateUsingTheTmplForm.html].
83+
Certain work item types can use templates that you define in the ITSM tool. Using templates, you can define fields that will be automatically populated using fixed values for an action group. You can define which template you want to use as a part of the definition of an action group. Find information about how to create templates [here](https://docs.servicenow.com/bundle/paris-platform-administration/page/administer/form-administration/task/t_CreateATemplateUsingTheTmplForm.html).
8484

8585
To create an action group:
8686

articles/azure-monitor/alerts/itsmc-overview.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
---
2-
title: IT Service Management Connector overview
3-
description: This article provides an overview of IT Service Management Connector (ITSMC).
2+
title: IT Service Management integration
3+
description: This article provides an overview of the ways you can integrate with an IT Service Management product.
44
ms.topic: conceptual
55
ms.date: 3/30/2022
66
ms.custom: references_regions
77

88
---
99

10-
# IT Service Management Connector Overview
10+
# IT Service Management (ITSM) Integration
1111

1212
:::image type="icon" source="media/itsmc-overview/itsmc-symbol.png":::
1313

14-
IT Service Management Connector allows you to connect Azure Monitor to supported IT Service Management (ITSM) products or services using either ITSM actions or Secure webhook actions.
14+
This article describes how you can integrate Azure Monitor with supported IT Service Management (ITSM) products.
1515

16-
Azure services like Azure Log Analytics and Azure Monitor provide tools to detect, analyze, and troubleshoot problems with your Azure and non-Azure resources. But the work items related to an issue typically reside in an ITSM product or service. The ITSM Connector provides a bi-directional connection between Azure and ITSM tools to help you resolve issues faster. You can create work items in your ITSM tool, based on your Azure alerts (Metric Alerts, Activity Log Alerts, and Log Analytics alerts).
16+
Azure services like Azure Log Analytics and Azure Monitor provide tools to detect, analyze, and troubleshoot problems with your Azure and non-Azure resources. But the work items related to an issue typically reside in an ITSM product or service.
1717

18-
The ITSM Connector supports connections with the following ITSM tools:
18+
Azure Monitor provides a bi-directional connection between Azure and ITSM tools to help you resolve issues faster. You can create work items in your ITSM tool, based on your Azure alerts (Metric Alerts, Activity Log Alerts, and Log Analytics alerts).
19+
20+
Azure Monitor supports connections with the following ITSM tools:
1921

2022
- ServiceNow ITSM or ITOM
21-
- System Center Service Manager (SCSM)
2223
- BMC
2324
>[!NOTE]
2425
> As of March 1, 2022, System Center ITSM integrations with Azure alerts is no longer enabled for new customers. New System Center ITSM Connections are not supported.
2526
> Existing ITSM connections are supported.
2627
2728
For information about legal terms and the privacy policy, see [Microsoft Privacy Statement](https://go.microsoft.com/fwLink/?LinkID=522330&clcid=0x9).
28-
## ITSM Connector Workflow
29-
Depending on your integration, start using the ITSM Connector with these steps:
29+
## ITSM Integration Workflow
30+
Depending on your integration, start connecting to your ITSM with these steps:
3031
- For Service Now ITOM events and BMC Helix use the Secure webhook action:
3132
1. [Register your app with Azure AD.](./itsm-connector-secure-webhook-connections-azure-configuration.md#register-with-azure-active-directory)
3233
1. [Define Service principal.](./itsm-connector-secure-webhook-connections-azure-configuration.md#define-service-principal)
@@ -35,14 +36,14 @@ Depending on your integration, start using the ITSM Connector with these steps:
3536
- [ServiceNow ITOM](./itsmc-secure-webhook-connections-servicenow.md)
3637
- [BMC Helix](./itsmc-secure-webhook-connections-bmc.md).
3738

38-
- For Service Now ITSM and SCSM use the ITSM action:
39+
- For Service Now ITSM, use the ITSM action:
3940

4041
1. Connect to your ITSM.
4142
- For ServiceNow ITSM, see [the ServiceNow connection instructions](./itsmc-connections-servicenow.md).
4243
- For SCSM, see [the System Center Service Manager connection instructions](./itsmc-connections-scsm.md).
43-
1. (Optional) Set up the IP Ranges. In order to list the ITSM IP addresses in order to allow ITSM connections from partners ITSM tools, we recommend the to list the whole public IP range of Azure region where their LogAnalytics workspace belongs. [details here](https://www.microsoft.com/en-us/download/details.aspx?id=56519). For regions EUS/WEU/EUS2/WUS2/US South Central the customer can list ActionGroup network tag only.)
44-
1. [Configure Azure ITSM Solution](./itsmc-definition.md#add-it-service-management-connector)
45-
1. [Configure Azure ITSM connector for your ITSM environment.](./itsmc-definition.md#create-an-itsm-connection)
44+
1. (Optional) Set up the IP Ranges. In order to list the ITSM IP addresses to allow ITSM connections from partner ITSM tools, we recommend listing the whole public IP range of Azure region where their LogAnalytics workspace belongs. [details here](https://www.microsoft.com/en-us/download/details.aspx?id=56519). For regions EUS/WEU/EUS2/WUS2/US South Central the customer can list ActionGroup network tag only.)
45+
1. [Configure your Azure ITSM Solution](./itsmc-definition.md#add-it-service-management-connector)
46+
1. [Configure the Azure ITSM connector for your ITSM environment.](./itsmc-definition.md#create-an-itsm-connection)
4647
1. [Configure Action Group to leverage ITSM connector.](./itsmc-definition.md#define-a-template)
4748

4849
## Next steps

articles/azure-monitor/logs/private-link-configure.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ This zone covers the global endpoints used by Azure Monitor, meaning endpoints t
266266
* **live** - Application Insights live metrics endpoint
267267
* **profiler** - Application Insights profiler endpoint
268268
* **snapshot** - Application Insights snapshots endpoint
269+
* **diagservices-query** - Application Insights Profiler and Snapshot Debugger (used when accessing profiler/debugger results in the Azure Portal)
269270

270271
This zone also covers the resource specific endpoints for [Data Collection Endpoints](../essentials/data-collection-endpoint-overview.md):
271272
* `<unique-dce-identifier>.<regionname>.handler.control` - Private configuration endpoint, part of a Data Collection Endpoint (DCE) resource

0 commit comments

Comments
 (0)