Skip to content

Commit 205dc82

Browse files
authored
Merge pull request #299316 from MicrosoftDocs/main
Publish to live, Monday 4 AM PST, 5/5
2 parents ca02cb7 + 5654043 commit 205dc82

File tree

7 files changed

+129
-15
lines changed

7 files changed

+129
-15
lines changed

articles/active-directory-b2c/service-limits.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ As a protection for our customers, Microsoft places some restrictions on telepho
190190
| 221 | Senegal | 10 | 30 |
191191
| 223 | Mali | 20 | 100 |
192192
| 224 | Guinea | 20 | 100 |
193-
| 225 | Ivory Coast| 10 | 30 |
193+
| 225 | Côte d’Ivoire | 10 | 30 |
194194
| 226 | Burina Faso | 10 | 30 |
195195
| 228 | Togo | 10 | 30 |
196196
| 233 | Ghana| 10 | 30 |
@@ -219,7 +219,7 @@ As a protection for our customers, Microsoft places some restrictions on telepho
219219
| 60 | Malaysia | 50 | 200 |
220220
| 62 | Indonesia | 50 | 200 |
221221
| 63 | Philippines | 50 | 200 |
222-
| 670 | East Timor (Timor-Leste)  | 10 | 30 |
222+
| 670 | Timor-Leste  | 10 | 30 |
223223
| 7 | Russia | 100 | 1000 |
224224
| 84 | Vietnam | 150 | 500 |
225225
| 855 | Cambodia | 50 | 200 |
@@ -228,7 +228,7 @@ As a protection for our customers, Microsoft places some restrictions on telepho
228228
| 92 | Pakistan| 100 | 1000 |
229229
| 93 | Afghanistan  | 10 | 30 |
230230
| 94 | Sri Lanka | 100 | 500 |
231-
| 95 | Myanmar (Burma) | 10 | 30 |
231+
| 95 | Myanmar | 10 | 30 |
232232
| 961 | Lebanon  | 10 | 30 |
233233
| 967 | Yemen |10 | 30 |
234234
| 970 | State of Palestine| 10 | 30 |
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
---
2+
title: Azure managed applications
3+
titleSuffix: An Azure Communication Services article
4+
description: This article describes how to offer your customers cloud solutions using Azure managed applications for Azure Communication Services.
5+
author: pgrandhi
6+
manager: rajasekaran2003
7+
services: azure-communication-services
8+
9+
ms.author: pgrandhi
10+
ms.date: 04/09/2025
11+
ms.topic: conceptual
12+
ms.service: azure-communication-services
13+
---
14+
15+
# Managed applications
16+
17+
This article describes how you can use Azure managed applications to offer cloud solutions that are easy for customers to deploy and operate.
18+
19+
Customers also control the permissions that enable full access to resources in the managed resource group. Customers can make sure that all end users are using approved versions, compliant with organizational standards. Your customers don't need to develop application-specific domain knowledge to manage these applications. Your customers automatically acquire application updates without the need to worry about troubleshooting and diagnose issues with the applications.
20+
21+
Azure managed applications enable you to build and manage complete solutions in Azure. Managed applications enable you to offer cloud solutions that are easy for customers to deploy and operate.
22+
23+
You implement the infrastructure and can provide ongoing support. You determine if your managed application is public or private:
24+
25+
- You can offer managed application to all customers by publishing in Azure Marketplace.
26+
- Or, you can make your managed application available only within your organization by publishing to an internal service catalog.
27+
28+
A managed application is similar to a solution template in Azure Marketplace. The main difference is that if you publish a managed application, you specify the cost to your customers for ongoing support of the solution.
29+
30+
Managed applications enable you to define terms for managing the application and all charges are handled through Azure billing. You can deploy managed applications via your subscriptions, but you don't need to maintain, update, or service them.
31+
32+
:::image type="content" source="../../azure-resource-manager/managed-applications/media/overview/managed-apps-resource-group.png" alt-text="Diagram that shows the relationship between customer and publisher Azure subscriptions for a managed resource group.":::
33+
34+
## How to implement
35+
36+
To publish a managed application to your service catalog, you need to:
37+
38+
1. Create an Azure ARM template that defines the Azure resources you want to deploy with the managed application. Every managed application includes a `mainTemplate.json` file.
39+
2. Define the nested ARM templates as needed in their own JSON files in a subfolder, to be included in the `mainTemplate.json` file.
40+
3. Create the portal experience to for the managed application. Use the `createUiDefinition.json` file to generate the portal user interface. Define the portal user interface elements for that customers see when deploying the managed application.
41+
4. Create a `.zip` package that contains the required JSON files. The `.zip` package file has a 120-MB limit for a service catalog's managed application definition.
42+
5. Publish the managed application definition so it's available in your service catalog.
43+
44+
For more information, see [Advantages of managed applications](/azure/azure-resource-manager/managed-applications/overview#advantages-of-managed-applications).
45+
46+
## Sample applications
47+
48+
Azure Communication Services managed applications provide samples that showcase how you can use the Azure Resource Manager (ARM) templates. Use the ARM templates to implement infrastructure for specific Azure Communication Services scenarios.
49+
50+
For example, you can:
51+
52+
- Create an Azure Communication Services resource.
53+
- Create a storage queue.
54+
- Set up the storage queue as event subscription for your resource using managed identities.
55+
- Enable diagnostic settings for the resource for troubleshooting purposes.
56+
- Access diagnostic logs and update any infrastructure as needed over time.
57+
58+
For more information about the sample applications, see GitHub Azure Samples [Managed Communication Services](https://github.com/Azure-Samples/communication-services-azure-managed-apps/blob/fca4bcad7516cf6c001c171272aceda4ed62c7a0/ManagedApplicationSamples/readme.md).
59+
60+
## Next steps
61+
62+
> [!div class="nextstepaction"]
63+
> [Create an Azure Communication Services managed application](https://github.com/Azure-Samples/communication-services-azure-managed-apps/blob/fca4bcad7516cf6c001c171272aceda4ed62c7a0/ManagedApplicationSamples/readme.md)
64+
65+
## Related articles
66+
67+
[Azure managed applications overview](/azure/azure-resource-manager/managed-applications/overview)

articles/communication-services/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ items:
1818
href: quickstarts/create-communication-resource.md
1919
# - name: Geolocation
2020
# href: /rest/api/maps/geolocation
21+
- name: Managed applications
22+
href: concepts/managed-apps.md
2123
- name: SDKs and APIs
2224
href: concepts/sdk-options.md
2325
- name: Service limits

articles/defender-for-iot/organizations/cli-ot-sensor.md

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,51 @@ While this article lists the command syntax for each user, we recommend using th
1919

2020
For more information, see [Access the CLI](../references-work-with-defender-for-iot-cli-commands.md#access-the-cli) and [Privileged user access for OT monitoring](references-work-with-defender-for-iot-cli-commands.md#privileged-user-access-for-ot-monitoring).
2121

22+
## List of available commands
23+
24+
| Category| Command |
25+
|****|*****|
26+
| config | config |
27+
| system | backup </br>date</br>hostname</br>ntp</br>password</br>reboot</br>sanity</br>shell</br>shutdown</br>syslog</br>version|
28+
| network | blink</br>capture-filter</br>list</br>ping</br>reconfigure</br>statistics</br>validate|
29+
30+
### List commands in a category
31+
32+
To list the commands in a category, type ```help```. For example:
33+
34+
```bash
35+
shell> help
36+
config:
37+
network:
38+
system:
39+
40+
shell> help system
41+
backup:
42+
date:
43+
ntp:
44+
```
45+
46+
### Commands at the shell and category level
47+
48+
You can type commands at the shell or category level.
49+
50+
At the shell level type: \<category> \<command> \<parameter>.
51+
52+
Alternatively, type the \<category> and press ENTER. The shell will change to the category name, then type \<command> \<parameter>. For example:
53+
54+
```bash
55+
shell> system ntp enable 10.0.0.1
56+
Starting ntp-enable 10.0.0.1
57+
.....
58+
Finished ntp-enable
59+
60+
shell> system
61+
system> ntp enable 10.0.0.1
62+
Starting ntp-enable 10.0.0.1
63+
.....
64+
Finished ntp-enable
65+
```
66+
2267
## Appliance maintenance
2368

2469
### Check OT monitoring services health
@@ -105,14 +150,14 @@ Use the following commands to show the current system date and time on your OT n
105150

106151
|User |Command |Full command syntax |
107152
|---------|---------|---------|
108-
|**admin** | `date` | No attributes |
153+
|**admin** | `system date` | No attributes |
109154
|**cyberx** , or **admin** with [root access](references-work-with-defender-for-iot-cli-commands.md#access-the-system-root-as-an-admin-user) | `date` | No attributes |
110155
|**cyberx_host** , or **admin** with [root access](references-work-with-defender-for-iot-cli-commands.md#access-the-system-root-as-an-admin-user) | `date` | No attributes |
111156

112157
For example, for the *admin* user:
113158

114159
```bash
115-
shell> date
160+
shell> system date
116161
Thu Sep 29 18:38:23 UTC 2022
117162
shell>
118163
```
@@ -128,16 +173,15 @@ To use these commands, make sure that:
128173

129174
|User |Command |Full command syntax |
130175
|---------|---------|---------|
131-
|**admin** | `ntp enable <IP address>` | No attributes |
176+
|**admin** | `system ntp enable <IP address>` | No attributes |
132177
|**cyberx** , or **admin** with [root access](references-work-with-defender-for-iot-cli-commands.md#access-the-system-root-as-an-admin-user) | `cyberx-xsense-ntp-enable <IP address>` | No attributes |
133178

134179
In these commands, `<IP address>` is the IP address of a valid IPv4 NTP server using port 123.
135180

136181
For example, for the *admin* user:
137182

138183
```bash
139-
shell> ntp enable 129.6.15.28
140-
shell>
184+
shell> system ntp enable 129.6.15.28
141185
```
142186

143187
### Turn off NTP time sync
@@ -146,16 +190,15 @@ Use the following commands to turn off the synchronization for the appliance tim
146190

147191
|User |Command |Full command syntax |
148192
|---------|---------|---------|
149-
|**admin** | `ntp disable <IP address>` | No attributes |
193+
|**admin** | `system ntp disable <IP address>` | No attributes |
150194
|**cyberx** , or **admin** with [root access](references-work-with-defender-for-iot-cli-commands.md#access-the-system-root-as-an-admin-user) | `cyberx-xsense-ntp-disable <IP address>` | No attributes |
151195

152196
In these commands, `<IP address>` is the IP address of a valid IPv4 NTP server using port 123.
153197

154198
For example, for the *admin* user:
155199

156200
```bash
157-
shell> ntp disable 129.6.15.28
158-
shell>
201+
shell> system ntp disable 129.6.15.28
159202
```
160203

161204
## Backup and restore

articles/event-hubs/geo-replication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Geo-replication ensures disaster recovery and business continuity for all stream
6161
Geo-replication can be used to distribute data globally, allowing applications to access data from the nearest region. This reduces latency and improves performance for workloads located in different parts of the world.
6262

6363
### Data Sovereignty and Compliance
64-
Organizations operating in multiple countries often need to comply with data sovereignty laws that require data to be stored within specific geographic boundaries. Geo-replication allows these organizations to replicate data to regions that comply with local regulations, ensuring that they meet legal requirements while still maintaining a unified data platform.
64+
Organizations operating in multiple countries/regions often need to comply with data sovereignty laws that require data to be stored within specific geographic boundaries. Geo-replication allows these organizations to replicate data to regions that comply with local regulations, ensuring that they meet legal requirements while still maintaining a unified data platform.
6565

6666
### Migration and Upgrades
6767
Geo-replication can also be used to facilitate data migration, maintenance and system upgrades. Organizations can migrate their namespace proactively from a primary to a secondary region to allow for any maintenance and upgrades on the primary region.

articles/load-testing/how-to-schedule-tests.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.topic: how-to
1212

1313
# Define schedules on load tests
1414

15-
In this article, you learn how to schedule load tests with Azure Load Testing. Scheduling tests allows you to run tests at a later time or run at a regular cadence. Azure Load Testing supports adding one schedule to a test. You can add a schedule to a test after creating it.
15+
In this article, you learn how to schedule load tests with Azure Load Testing. Scheduling tests allows you to run tests at a later time or run at a regular cadence. Azure Load Testing supports adding multiple schedules to a test. You can add a schedule to a test after creating it.
1616

1717
## Prerequisites
1818

@@ -74,11 +74,11 @@ In this article, you learn how to schedule load tests with Azure Load Testing. S
7474
6. Select **Add** to add the schedule to the test.
7575

7676
> [!NOTE]
77-
> If a scheduled test run is in progress when the next scheduled run is due, the next run is skipped. The next run will be scheduled for the next recurrence time.
77+
> If a scheduled test run is in progress when the next scheduled run is due, the next run is skipped. The next run will be scheduled for the next recurrence time. This happens only for test runs that overlap within a schedule. Overlapping test runs across multiple schedules are not skipped.
7878
7979
## View schedules
8080

81-
You can view the schedule in the Schedule pane of the test. The schedule shows the next run time and the status of the schedule. You can have only one schedule in an active, paused, or disabled state. You can add another schedule after the current schedule is completed or deleted.
81+
You can view the schedule in the Schedule pane of the test. The schedule shows the next run time and the status of the schedule. You can have up to 50 schedules in an active, paused, or disabled state for a test.
8282

8383
You can view the trigger for a test run in the **Test runs** grid of the test. The trigger shows as Scheduled for a scheduled test run. You can filter the test runs grid to view only the scheduled test runs.
8484

articles/migrate/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ items:
6969
href: resource-tagging.md
7070
- name: Create Business case
7171
items:
72+
- name: Business case overview
73+
href: concepts-business-case-calculation.md
7274
- name: Build a business case
7375
href: how-to-build-a-business-case.md
7476
- name: Review business case

0 commit comments

Comments
 (0)