Skip to content

Commit a123779

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into load-balancer-seo
2 parents 80dc515 + 88ecd0c commit a123779

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

articles/aks/concepts-scale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Currently, you can't tune these cooldown values from the default.
4747

4848
## Cluster autoscaler
4949

50-
To respond to changing pod demands, Kubernetes has a cluster autoscaler, which is currently in preview in AKS, that adjusts the number of nodes based on the requested compute resources in the node pool. By default, the cluster autoscaler checks the Metrics API server every 10 seconds for any required changes in node count. If the cluster autoscale determines that a change is required, the number of nodes in your AKS cluster is increased or decreased accordingly. The cluster autoscaler works with RBAC-enabled AKS clusters that run Kubernetes 1.10.x or higher.
50+
To respond to changing pod demands, Kubernetes has a cluster autoscaler, that adjusts the number of nodes based on the requested compute resources in the node pool. By default, the cluster autoscaler checks the Metrics API server every 10 seconds for any required changes in node count. If the cluster autoscale determines that a change is required, the number of nodes in your AKS cluster is increased or decreased accordingly. The cluster autoscaler works with RBAC-enabled AKS clusters that run Kubernetes 1.10.x or higher.
5151

5252
![Kubernetes cluster autoscaler](media/concepts-scale/cluster-autoscaler.png)
5353

articles/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4135,7 +4135,7 @@ featureFlags:
41354135
</div>
41364136
<div class="cardText">
41374137
<h3>IoT Central</h3>
4138-
<p>Experience SaaS for IoT, with no cloud expertise required</p>
4138+
<p>Accelerate the creation of IoT solutions</p>
41394139
</div>
41404140
</div>
41414141
</div>

articles/iot-central/core/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
### YamlMime:Landing
22
title: Azure IoT Central documentation
3-
summary: Azure IoT Central is a fully managed SaaS (software-as-a-service) solution that makes it easy to connect, monitor, and manage your IoT assets at scale. Azure IoT Central simplifies the initial setup of your IoT solution and reduces the management burden, operational costs, and overhead of a typical IoT project. Learn how to create, customize, manage, and use an Azure IoT Central application with our quickstarts and tutorials. # < 160 chars
3+
summary: Azure IoT Central is an IoT application platform that simplifies the creation of IoT solutions. Azure IoT Central simplifies the initial setup of your IoT solution and reduces the management burden, operational costs, and overhead of a typical IoT project. Learn how to create, customize, manage, and use an Azure IoT Central application with our quickstarts and tutorials. # < 160 chars
44

55
metadata:
66
title: Azure IoT Central documentation
7-
description: Azure IoT Central is a fully managed SaaS (software-as-a-service) solution that makes it easy to connect, monitor, and manage your IoT assets at scale. Azure IoT Central simplifies the initial setup of your IoT solution and reduces the management burden, operational costs, and overhead of a typical IoT project. Learn how to create, customize, manage, and use an Azure IoT Central application with our quickstarts and tutorials. # Required; article description that is displayed in search results. < 160 chars.
7+
description: Azure IoT Central is an IoT application platform that simplifies the creation of IoT solutions. Azure IoT Central simplifies the initial setup of your IoT solution and reduces the management burden, operational costs, and overhead of a typical IoT project. Learn how to create, customize, manage, and use an Azure IoT Central application with our quickstarts and tutorials. # Required; article description that is displayed in search results. < 160 chars.
88
services: iot-central
99
ms.service: iot-central
1010
ms.topic: landing-page

articles/iot-central/core/overview-iot-central.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 IoT Central | Microsoft Docs
3-
description: Azure IoT Central is an end-to-end SaaS solution you can use to build and manage your custom IoT solution. This article provides an overview of the features of Azure IoT Central.
3+
description: Azure IoT Central is an IoT application platform that simplifies the creation of IoT solutions. This article provides an overview of the features of Azure IoT Central.
44
author: dominicbetts
55
ms.author: dobett
66
ms.date: 08/26/2019

articles/iot-central/core/overview-iot-options.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ manager: timlt
1515

1616
Microsoft Azure IoT Central and Azure IoT offer several options for building an IoT solution. These options are appropriate for different sets of customer requirements:
1717

18-
* [Azure IoT Central](overview-iot-central.md) is a software as a service (SaaS) solution that uses a model-based approach to help you to build enterprise-grade IoT solutions without requiring expertise in cloud-solution development.
18+
* [Azure IoT Central](overview-iot-central.md) is an IoT application platform that uses a model-based approach to help you to build enterprise-grade IoT solutions without requiring expertise in cloud-solution development.
1919

2020
* [Azure IoT solution accelerators](https://docs.microsoft.com/azure/iot-accelerators/) are an enterprise-grade collection of [solution accelerators](../../iot-accelerators/iot-accelerators-what-are-solution-accelerators.md) built on Azure platform as a service (PaaS) that help you accelerate the development of custom IoT solutions.
2121

@@ -37,7 +37,7 @@ The following table summarizes the key differences between IoT solution accelera
3737
| | Azure IoT Central | Azure IoT solution accelerators |
3838
| --- | ----------- | --------- |
3939
| Primary usage | To accelerate time to market for straightforward IoT solutions that don’t require deep service customization. | To accelerate development of a custom IoT solution that needs maximum flexibility. |
40-
| Access to underlying PaaS services | SaaS. Because it is a fully managed solution, the underlying services aren't exposed. | You have access to the underlying Azure services to manage them, or replace them as needed. |
40+
| Access to underlying PaaS services | Because it is a fully managed solution, the underlying services aren't exposed. | You have access to the underlying Azure services to manage them, or replace them as needed. |
4141
| Flexibility | Medium. You can use the built-in browser-based user experience to customize the solution model and aspects of the UI. The infrastructure isn't customizable because the different components aren't exposed. | High. The code for the microservices is open source, and you can modify it in any way you see fit. Additionally, you can customize the deployment infrastructure. |
4242
| Skill level | Low. You need modeling skills to customize the solution. No coding skills are required. | Medium-high. You need Java or .NET skills to customize the solution's back end. You need JavaScript skills to customize the visualization. |
4343
| Getting started experience | Application templates and device templates provide prebuilt models. Can be deployed in minutes. | Preconfigured solutions implement common IoT scenarios. Can be deployed in minutes. |

articles/iot-central/preview/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
### YamlMime:Landing
22
title: Azure IoT Central documentation (preview features)
3-
summary: Azure IoT Central is a fully managed SaaS (software-as-a-service) solution that makes it easy to connect, monitor, and manage your IoT assets at scale. Azure IoT Central simplifies the initial setup of your IoT solution and reduces the management burden, operational costs, and overhead of a typical IoT project. Learn how to create, customize, manage, and use an Azure IoT Central application with our quickstarts and tutorials. # < 160 chars
3+
summary: Azure IoT Central is an IoT application platform that simplifies the creation of IoT solutions. Azure IoT Central simplifies the initial setup of your IoT solution and reduces the management burden, operational costs, and overhead of a typical IoT project. Learn how to create, customize, manage, and use an Azure IoT Central application with our quickstarts and tutorials. # < 160 chars
44

55
metadata:
66
title: Azure IoT Central documentation
7-
description: Azure IoT Central is a fully managed SaaS (software-as-a-service) solution that makes it easy to connect, monitor, and manage your IoT assets at scale. Azure IoT Central simplifies the initial setup of your IoT solution and reduces the management burden, operational costs, and overhead of a typical IoT project. Learn how to create, customize, manage, and use an Azure IoT Central application with our quickstarts and tutorials. # Required; article description that is displayed in search results. < 160 chars.
7+
description: Azure IoT Central is an IoT application platform that simplifies the creation of IoT solutions. Azure IoT Central simplifies the initial setup of your IoT solution and reduces the management burden, operational costs, and overhead of a typical IoT project. Learn how to create, customize, manage, and use an Azure IoT Central application with our quickstarts and tutorials. # Required; article description that is displayed in search results. < 160 chars.
88
services: iot-central
99
ms.service: iot-central
1010
ms.topic: landing-page

articles/iot-central/preview/overview-iot-central.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 IoT Central | Microsoft Docs
3-
description: Azure IoT Central is an end-to-end SaaS solution you can use to build and manage your custom IoT solution. This article provides an overview of the features of Azure IoT Central.
3+
description: Azure IoT Central is an IoT application platform that simplifies the creation of IoT solutions and helps to reduce the burden and cost of IoT management operations, and development. This article provides an overview of the features of Azure IoT Central.
44
author: dominicbetts
55
ms.author: dobett
66
ms.date: 11/12/2019

articles/iot-fundamentals/iot-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Implementing this IoT solution made it possible for the company to check and tre
101101

102102
There are several IoT-related services in Azure and it can be confusing to figure out which one you want to use. Some, such as IoT Central and the IoT solution accelerators, provide templates to help you create your own solution and get started quickly. You can also fully develop your own solutions using other services available -- it all depends on how much help you want, and how much control. Here is a list of the services available, as well as what you may use them for.
103103

104-
1. [**IoT Central**](../iot-central/core/overview-iot-central.md): This is a SaaS solution that helps you connect, monitor, and manage your IoT devices. To start, you select a template for your device type and create and test a basic IoT Central application that the operators of the device will use. The IoT Central application will also enable you to monitor the devices and provision new devices. This service is for straightforward solutions that don't require deep service customization.
104+
1. [**IoT Central**](../iot-central/core/overview-iot-central.md): This is an IoT application platform that simplifies the creation of IoT solutions and helps to reduce the burden and cost of IoT management operations, and development. To start, you select a template for your device type and create and test a basic IoT Central application that the operators of the device will use. The IoT Central application will also enable you to monitor the devices and provision new devices. This service is for straightforward solutions that don't require deep service customization.
105105

106106
2. [**IoT solution accelerators**](/azure/iot-suite): This is a collection of PaaS solutions you can use to accelerate your development of an IoT solution. You start with a provided IoT solution and then fully customize that solution to your requirements. You need Java or .NET skills to customize the back-end, and JavaScript skills to customize the visualization.
107107

0 commit comments

Comments
 (0)