Skip to content

Commit b0780ec

Browse files
authored
Merge pull request #247473 from MicrosoftDocs/main
Publish to live, Monday 4 AM PST, 8/7
2 parents d73fc4c + 6b4b724 commit b0780ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+235
-117
lines changed

articles/active-directory/saas-apps/cloudbees-ci-tutorial.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: saas-app-tutorial
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 07/21/2023
12+
ms.date: 08/04/2023
1313
ms.author: jeedes
1414

1515
---
@@ -108,11 +108,7 @@ Complete the following steps to enable Azure AD single sign-on in the Azure port
108108

109109
## Configure CloudBees CI SSO
110110

111-
To configure single sign-on on **CloudBees CI** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [CloudBees CI support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
112-
113-
### Create CloudBees CI test user
114-
115-
In this section, you create a user called Britta Simon at CloudBees CI SSO. Work with [CloudBees CI support team](mailto:[email protected]) to add the users in the CloudBees CI SSO platform. Users must be created and activated before you use single sign-on.
111+
To configure single sign-on in CloudBees CI, please follow [Configure Azure](https://github.com/jenkinsci/saml-plugin/blob/main/doc/CONFIGURE_AZURE.md) using the Federation Metadata XML and copied URLs from the Azure portal.
116112

117113
## Test SSO
118114

articles/aks/use-node-public-ips.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,24 +203,22 @@ az aks create \
203203

204204
### Add a new node pool with allowed ports and application security groups
205205

206-
```azurecli-interactive
207-
az aks nodepool add \
206+
```az aks nodepool add \
208207
--resource-group <resourceGroup> \
209208
--cluster-name <clusterName> \
210209
--name <nodepoolName> \
211-
--nodepool-allowed-host-ports 80/tcp,443/tcp,53/udp,40000-60000/tcp,40000-50000/udp\
212-
--nodepool-asg-ids "<asgId>,<asgId>"
210+
--allowed-host-ports 80/tcp,443/tcp,53/udp,40000-60000/tcp,40000-50000/udp \
211+
--asg-ids "<asgId>,<asgId>"
213212
```
214213

215214
### Update the allowed ports and application security groups for a node pool
216215

217-
```azurecli-interactive
218-
az aks nodepool update \
216+
```az aks nodepool update \
219217
--resource-group <resourceGroup> \
220218
--cluster-name <clusterName> \
221219
--name <nodepoolName> \
222-
--nodepool-allowed-host-ports 80/tcp,443/tcp,53/udp,40000-60000/tcp,40000-50000/udp\
223-
--nodepool-asg-ids "<asgId>,<asgId>"
220+
--allowed-host-ports 80/tcp,443/tcp,53/udp,40000-60000/tcp,40000-50000/udp \
221+
--asg-ids "<asgId>,<asgId>"
224222
```
225223

226224
## Automatically assign host ports for pod workloads (PREVIEW)

articles/application-gateway/configuration-listeners.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: greg-lindsay
66
ms.service: application-gateway
77
ms.topic: conceptual
8-
ms.date: 05/19/2023
8+
ms.date: 07/19/2023
99
ms.author: greglin
1010
---
1111

@@ -89,11 +89,10 @@ WebSocket support is enabled by default. There's no user-configurable setting to
8989

9090
## Custom error pages
9191

92-
You can define custom error at the global level or the listener level, however creating global-level custom error pages from the Azure portal is currently not supported. You can configure a custom error page for a 403 web application firewall error or a 502 maintenance page at the listener level. You must specify a publicly accessible blob URL for the given error status code. For more information, see [Create Application Gateway custom error pages](./custom-error.md).
92+
You can define customized error pages for different response codes returned by the Application Gateway. The response codes for which you can configure error pages are 400, 403, 405, 408, 500, 502, 503, and 504. You can use global-level or listener-specific error page configuration to set them granularly for each listener. For more information, see [Create Application Gateway custom error pages](./custom-error.md).
9393

94-
![Application Gateway error codes](/azure/application-gateway/media/custom-error/ag-error-codes.png)
95-
96-
To configure a global custom error page, see [Azure PowerShell configuration](./custom-error.md#azure-powershell-configuration).
94+
> [!NOTE]
95+
> An error originating from the backend server is passed along unmodified by the Application Gateway to the client.
9796
9897
## TLS policy
9998

articles/application-gateway/custom-error.md

Lines changed: 50 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,80 @@ services: application-gateway
55
author: greg-lindsay
66
ms.service: application-gateway
77
ms.topic: how-to
8-
ms.date: 11/09/2022
9-
ms.author: greglin
8+
ms.date: 07/19/2023
9+
ms.author: jaysoni
1010
ms.custom: devx-track-azurepowershell
1111
---
1212

1313
# Create Application Gateway custom error pages
1414

15-
Application Gateway allows you to create custom error pages instead of displaying default error pages. You can use your own branding and layout using a custom error page.
15+
Application Gateway allows you to create customized error pages instead of displaying default ones. You can use your branding and layout for errors related to different response codes. Some scenarios for setting custom error pages are
1616

17-
For example, you can define your own maintenance page if your web application isn't reachable. Or, you can create an unauthorized access page if a malicious request is sent to a web application.
17+
- Showing a **maintenance or status page** for 502 Bad Gateway response code. This is useful when your application gateway has no backend server to route traffic to during scheduled maintenance or an unforeseen issue with backend pool servers.
18+
- Showing a customized **unauthorized access page** for 403 Forbidden response code that occurs when the WAF is in prevention mode and blocks malicious traffic.
19+
- Showing a company-branded page with contact details in case of an issue.
1820

19-
Custom error pages are supported for the following two scenarios:
21+
## Supported response codes
22+
The custom error pages are supported for the following response codes:
2023

21-
- **Maintenance page** - This custom error page is sent instead of a 502 bad gateway page. It's shown when Application Gateway has no backend to route traffic to. For example, when there's scheduled maintenance or when an unforeseen issue effects backend pool access.
22-
- **Unauthorized access page** - This custom error page is sent instead of a 403 unauthorized access page. It's shown when the Application Gateway WAF detects malicious traffic and blocks it.
24+
| Response code | Description |
25+
| ---------- | ---------- |
26+
| 400 | Bad request (In preview) |
27+
| 403 | Forbidden |
28+
| 405 | Method not allowed (In preview) |
29+
| 408 | Request timeout (In preview) |
30+
| 500 | Internal Server Error (In preview) |
31+
| 502 | Bad gateway |
32+
| 503 | Service unavailable (In preview) |
33+
| 504 | Gateway timeout (In preview) |
2334

24-
If an error originates from backend targets of your backend pool, the error is passed along unmodified back to the caller. Custom error pages will only be displayed when a request can't reach the backend or when WAF is in prevention mode and blocks the request.
35+
> [!Note]
36+
> - API version 2022-09-01 or later should be used to configure error pages for the new response codes (in preview).
37+
> - Response code 404 (Page not found) is currently unsupported.
38+
> - The custom error pages are displayed for response codes generated by Application Gateway. If an error originates from the backend server, it is passed along unmodified to the client.
39+
40+
## Configuration levels
41+
42+
The custom error pages can be defined at a Global or Listener level:
2543

26-
Custom error pages can be defined at the global level and the listener level:
44+
- **Global level** - The error pages set at a global level are applied to all the listeners of that application gateway. Its configuration through the Azure portal is currently not supported.
45+
- **Listener level** - The error pages at a listener level gives you granular control to set error pages for application served by that listener.
2746

28-
- **Global level** - the error page applies to traffic for all the web applications deployed on that application gateway.
29-
- **Listener level** - the error page is applied to traffic received on that listener.
30-
- **Both** - the custom error page defined at the listener level overrides the one set at global level.
47+
> [!Note]
48+
> When using a combination of Global and Listener-level error pages for a gateway, you must explicitly mention the URLs for all desired response codes for that listener. A listener-specific configuration overrides all preceding global configurations applicable to that listener.
3149
32-
To create a custom error page, you must have:
50+
## Requirements
3351

34-
- an HTTP response status code.
35-
- corresponding location for the error page.
36-
- error page should be internet accessible and return 200 response.
37-
- error page should be in \*.htm or \*.html extension type.
38-
- error page size must be less than 1 MB.
39-
- error page must be hosted in Azure blob storage
52+
To create a custom error page, you should
53+
- know the response code for which a custom error page is needed.
54+
- know the corresponding remote location (URL) for the HTML page. This must be a publicly accessible file.
55+
- ensure the error page is publicly accessible and return a 200 response.
56+
- ensure the error page should be in \*.htm or \*.html extension type.
57+
- ensure the page size is less than 1 MB.
4058

41-
You may reference either internal or external images/CSS for this HTML file. For externally referenced resources, use absolute URLs that are publicly accessible. Be aware of the HTML file size when using base64-encoded inline images, javascript, or CSS.
59+
You may reference internal or external images/CSS for this HTML file. For externally referenced resources, use absolute URLs that are publicly accessible. Be aware of the HTML file size when using base64-encoded inline images, JavaScript, or CSS.
4260

4361
> [!Note]
44-
> Relative links with files in the same location are not supported.
62+
> - Relative links are not supported.
63+
64+
## How it works?
65+
After you specify an error page in your application gateway's configuration, your gateway verifies the connectivity to the HTML page over the internet. It then downloads the file on its local cache.
66+
67+
When a client faces an error, your application gateway returns a response code and that HTML page. Any externally referenced resources (such as images, JavaScript, and CSS files) are fetched directly by the client.
4568

46-
After you specify an error page, application gateway verifies internet connectivity to the file and will save the file to the local application gateway cache. The HTML page will be served by the application gateway, whereas externally referenced resources (such as images, javascript, css files) are fetched directly by the client. To modify an existing custom error page, you must point to a different blob location in the application gateway configuration. Application gateway doesn't periodically check the blob location to fetch new versions.
69+
Your application gateway doesn't periodically check the source file's location to fetch a new version. You can perform any configuration update on the gateway to manually update the file's cache. For example, changing the error URL from page 1 to page 2 and then back to page 1, or upon adding a new listener.
4770

4871
## Portal configuration
4972

50-
1. Navigate to Application Gateway in the portal and choose an application gateway.
73+
Steps to configure **listener-specific** custom error pages:
5174

52-
2. Select **Listeners** and navigate to a particular listener where you want to specify an error page.
75+
1. Navigate to Application Gateway in the portal and choose the required resource.
5376

54-
3. Configure a custom error page for a 403 WAF error or a 502 maintenance page at the listener level.
77+
2. Select **Listeners** and navigate to a particular listener for which you want to specify an error page.
5578

56-
> [!NOTE]
57-
> Creating global level custom error pages from the Azure portal is currently not supported.
79+
3. Under **Custom error pages** section, specify publicly accessible URLs for the required status codes.
5880

59-
4. Under **Error page url**, select **Yes**, and then configure a publicly accessible blob URL for a given error status code. Select **Save**. The Application Gateway is now configured with the custom error page.
81+
4. Select Save.
6082

6183
![Screenshot of Application Gateway custom error page.](media/custom-error/ag-error-codes.png)
6284

-71.5 KB
Loading

articles/azure-monitor/containers/container-insights-cost-config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Container insights Collected Data can be customized through the Azure portal, us
119119
| Grouping | Tables | Notes |
120120
| --- | --- | --- |
121121
| All (Default) | All standard container insights tables | Required for enabling the default container insights visualizations |
122-
| Performance | Perf, Insights Metrics | |
122+
| Performance | Perf, InsightsMetrics | |
123123
| Logs and events | ContainerLog or ContainerLogV2, KubeEvents, KubePodInventory | Recommended if you have enabled managed Prometheus metrics |
124124
| Workloads, Deployments, and HPAs | InsightsMetrics, KubePodInventory, KubeEvents, ContainerInventory, ContainerNodeInventory, KubeNodeInventory, KubeServices | |
125125
| Persistent Volumes | InsightsMetrics, KubePVInventory | |

articles/azure-monitor/logs/create-custom-table.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ To delete a table using PowerShell:
184184
You can modify the schema of custom tables and add custom columns to, or delete columns from, a standard table.
185185

186186
> [!NOTE]
187-
> Column names must start with a letter and can consist of up to 45 alphanumeric characters and the characters `_` and `-`. The following are reserved column names: `Type`, `TenantId`, `resource`, `resourceid`, `resourcename`, `resourcetype`, `subscriptionid`, `tenanted`.
187+
> Column names must start with a letter and can consist of up to 45 alphanumeric characters and underscores (`_`). The following are reserved column names: `Type`, `TenantId`, `resource`, `resourceid`, `resourcename`, `resourcetype`, `subscriptionid`, `tenanted`.
188188

189189
# [Portal](#tab/azure-portal-3)
190190

articles/azure-monitor/logs/custom-logs-migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ This call is idempotent, so it has no effect if the table has already been conve
6565
The API call enables all DCR-based custom logs features on the table. The Data Collector API will continue to ingest data into existing columns, but won't create any new columns. Any previously defined [custom fields](../logs/custom-fields.md) won't continue to be populated. Another way to migrate an existing table to using data collection rules, but not necessarily the Log Ingestion API is applying a [workspace transformation](../logs/tutorial-workspace-transformations-portal.md) to the table.
6666

6767
> [!IMPORTANT]
68-
> - Column names must start with a letter and can consist of up to 45 alphanumeric characters and the characters `_` and `-`.
68+
> - Column names must start with a letter and can consist of up to 45 alphanumeric characters and underscores (`_`).
6969
> - The following are reserved column names: `Type`, `TenantId`, `resource`, `resourceid`, `resourcename`, `resourcetype`, `subscriptionid`, `tenanted`.
7070
> - Custom columns you add to an Azure table must have the suffix `_CF`.
7171
> - If you update the table schema in your Log Analytics workspace, you must also update the input stream definition in the data collection rule to ingest data into new or modified columns.

articles/azure-monitor/logs/ingest-logs-event-hub.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ To create a custom table into which to ingest events, in the Azure portal:
112112
```
113113
114114
> [!IMPORTANT]
115-
> - Column names must start with a letter and can consist of up to 45 alphanumeric characters and the characters `_` and `-`.
115+
> - Column names must start with a letter and can consist of up to 45 alphanumeric characters and underscores (`_`).
116116
> - The following are reserved column names: `Type`, `TenantId`, `resource`, `resourceid`, `resourcename`, `resourcetype`, `subscriptionid`, `tenanted`.
117117
> - Column names are case-sensitive. Make sure to use the correct case in your data collection rule.
118118

articles/azure-monitor/logs/logs-ingestion-api-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The following tables can receive data from the ingestion API.
4444
| Azure tables | The Logs Ingestion API can send data to the following Azure tables. Other tables may be added to this list as support for them is implemented.<br><br>- [CommonSecurityLog](/azure/azure-monitor/reference/tables/commonsecuritylog)<br>- [SecurityEvents](/azure/azure-monitor/reference/tables/securityevent)<br>- [Syslog](/azure/azure-monitor/reference/tables/syslog)<br>- [WindowsEvents](/azure/azure-monitor/reference/tables/windowsevent)
4545

4646
> [!NOTE]
47-
> Column names must start with a letter and can consist of up to 45 alphanumeric characters and the characters `_` and `-`. The following are reserved column names: `Type`, `TenantId`, `resource`, `resourceid`, `resourcename`, `resourcetype`, `subscriptionid`, `tenanted`. Custom columns you add to an Azure table must have the suffix `_CF`.
47+
> Column names must start with a letter and can consist of up to 45 alphanumeric characters and underscores (`_`). The following are reserved column names: `Type`, `TenantId`, `resource`, `resourceid`, `resourcename`, `resourcetype`, `subscriptionid`, `tenanted`. Custom columns you add to an Azure table must have the suffix `_CF`.
4848
4949
## Authentication
5050

0 commit comments

Comments
 (0)