Skip to content

Commit 0a57012

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-blockchain-metadata
2 parents 0c9bfb1 + e0670e4 commit 0a57012

File tree

63 files changed

+293
-265
lines changed

Some content is hidden

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

63 files changed

+293
-265
lines changed

articles/app-service/deploy-staging-slots.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ ms.tgt_pltfrm: na
1515
ms.topic: article
1616
ms.date: 09/19/2019
1717
ms.author: cephalin
18+
ms.custom: fasttrack-edit
1819

1920
---
2021
# Set up staging environments in Azure App Service
@@ -245,6 +246,10 @@ After the setting is saved, the specified percentage of clients is randomly rout
245246

246247
After a client is automatically routed to a specific slot, it's "pinned" to that slot for the life of that client session. On the client browser, you can see which slot your session is pinned to by looking at the `x-ms-routing-name` cookie in your HTTP headers. A request that's routed to the "staging" slot has the cookie `x-ms-routing-name=staging`. A request that's routed to the production slot has the cookie `x-ms-routing-name=self`.
247248

249+
> [!NOTE]
250+
> Next to the Azure Portal, you can also use the [`az webapp traffic-routing set`](/cli/azure/webapp/traffic-routing.md#az-webapp-traffic-routing-set) command in the Azure CLI to set the routing percentages from CI/CD tools like DevOps pipelines or other automation systems.
251+
>
252+
248253
### Route production traffic manually
249254

250255
In addition to automatic traffic routing, App Service can route requests to a specific slot. This is useful when you want your users to be able to opt in to or opt out of your beta app. To route production traffic manually, you use the `x-ms-routing-name` query parameter.

articles/azure-functions/functions-host-json.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ A list of functions that the job host runs. An empty array means run all functio
149149
## functionTimeout
150150

151151
Indicates the timeout duration for all functions. It follows the timespan string format. In a serverless Consumption plan, the valid range is from 1 second to 10 minutes, and the default value is 5 minutes.
152-
In a Dedicated (App Service) plan, there is no overall limit, and the default value is 30 minutes. A value of `-1` indicates unbounded execution.
152+
In a Dedicated (App Service) plan, there is no overall limit, and the default value is 30 minutes. A value of `-1` indicates unbounded execution, but keeping a fixed upper bound is recommended.
153153

154154
```json
155155
{

articles/azure-monitor/insights/solutions-resources-searches-alerts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Saved searches in management solutions | Microsoft Docs
3-
description: Management solutions typically include saved searches in Log Analytics to analyze data collected by the solution. They may also define alerts to notify the user or automatically take action in response to a critical issue. This article describes how to define Log Analytics saved searches in a Resource Manager template so they can be included in management solutions.
3+
description: Management solutions typically include saved log queries to analyze data collected by the solution. This article describes how to define Log Analytics saved searches in a Resource Manager template.
44
ms.service: azure-monitor
55
ms.subservice:
66
ms.topic: conceptual

articles/azure-monitor/insights/vminsights-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure Monitor for VMs (preview) Frequently Asked Questions | Microsoft Docs
3-
description: Azure Monitor for VMs is a solution in Azure that combines health and performance monitoring of the Azure VM operating system, as well as automatically discovering application components and dependencies with other resources and maps the communication between them. This article answers common questions.
3+
description: Answers to common questions for Azure Monitor for VMs which monitors the health and performance of the Azure VMs in addition to automatically discovering and mapping application components and their dependencies.
44
ms.service: azure-monitor
55
ms.subservice:
66
ms.topic: conceptual

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: What is Azure Monitor for VMs (preview)? | Microsoft Docs
3-
description: Azure Monitor for VMs is a feature of Azure Monitor that combines health and performance monitoring of the Azure VM operating system, as well as automatically discovering application components and dependencies with other resources and maps the communication between them. This article provides an overview.
3+
description: Overview of Azure Monitor for VMs which monitors the health and performance of the Azure VMs in addition to automatically discovering and mapping application components and their dependencies.
44
ms.service: azure-monitor
55
ms.subservice:
66
ms.topic: conceptual

articles/azure-monitor/learn/tutorial-archive-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Archive Azure metric and log data using Azure Storage
3-
description: Archive log and metric data produced within Azure to a storage account.
3+
description: Archive log and metric data generated by Azure resources to a storage account.
44
author: johnkemnetz
55
services: azure-monitor
66
ms.service: azure-monitor

articles/azure-monitor/platform/activity-log-schema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure Activity Log event schema
3-
description: Understand the event schema for data emitted into the Activity Log
3+
description: Describes the event schema for each category in the Azure Activity log.
44
author: johnkemnetz
55
services: azure-monitor
66
ms.service: azure-monitor

articles/azure-monitor/platform/collect-custom-metrics-guestos-vm-cloud-service-classic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Send classic Cloud Services metrics to Azure Monitor metrics database
3-
description: Send Guest OS metrics to the Azure Monitor metric store Cloud Services
3+
description: Describes the process for sending Guest OS performance metrics for Azure classic Cloud Services to the Azure Monitor metric store.
44
author: anirudhcavale
55
services: azure-monitor
66
ms.service: azure-monitor

articles/azure-monitor/platform/collect-custom-metrics-linux-telegraf.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Collect custom metrics for Linux VM with the InfluxData Telegraf agent
3-
description: Collect custom metrics for a Linux VM with the InfluxData Telegraf agent
3+
description: instructions on how to deploy the InfluxData Telegraf agent on a Linux VM in Azure and configure the agent to publish metrics to Azure Monitor.
44
author: anirudhcavale
55
services: azure-monitor
66
ms.service: azure-monitor

articles/azure-monitor/platform/diagnostic-logs-append-blobs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Prepare for format change to Azure Monitor diagnostic logs
3-
description: Azure Diagnostic Logs will be moved to use append blobs on November 1, 2018.
3+
description: Describes the impact and how to update your tooling to handle the new Azure Diagnostic logs that was changed to use append blobs on November 1, 2018.
44
author: johnkemnetz
55
services: monitoring
66
ms.service: azure-monitor

0 commit comments

Comments
 (0)