Skip to content

Commit 4f9e25d

Browse files
authored
Merge pull request #86408 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 082c3b3 + ed9c8e4 commit 4f9e25d

File tree

3 files changed

+14
-36
lines changed

3 files changed

+14
-36
lines changed

articles/azure-monitor/app/live-stream.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,13 @@ If you want to monitor a particular server role instance, you can filter by serv
102102
![Sampled live failures](./media/live-stream/live-stream-filter.png)
103103

104104
## SDK Requirements
105+
106+
### .NET
105107
Custom Live Metrics Stream is available with version 2.4.0-beta2 or newer of [Application Insights SDK for web](https://www.nuget.org/packages/Microsoft.ApplicationInsights.Web/). Remember to select "Include Prerelease" option from NuGet package manager.
106108

109+
### Node.js
110+
Live Metrics Stream is available with version 1.3.0 or newer of the [Application Insights SDK for Node.JS](https://npmjs.com/package/applicationinsights). Remember to use `setSendLiveMetrics(true)` while configuring the SDK in your code.
111+
107112
## Secure the control channel
108113
The custom filters criteria you specify are sent back to the Live Metrics component in the Application Insights SDK. The filters could potentially contain sensitive information such as customerIDs. You can make the channel secure with a secret API key in addition to the instrumentation key.
109114
### Create an API Key

articles/azure-monitor/app/micrometer-java.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Steps
5858
Add the following dependencies to your pom.xml or build.gradle file:
5959

6060
* Application Insights Spring-boot-starter 2.1.2 or above
61-
* Azure-spring-boot-metrics-starters 2.0.7 or above
61+
* Azure-spring-boot-metrics-starters 2.1.5 or above
6262
* [Application Insights Resource](../../azure-monitor/app/create-new-resource.md )
6363

6464
Steps:
@@ -69,12 +69,12 @@ Steps:
6969
<dependency>
7070
<groupId>com.microsoft.azure</groupId>
7171
<artifactId>azure-spring-boot-metrics-starter</artifactId>
72-
<version>2.0.7</version>
72+
<version>2.1.6</version>
7373
</dependency>
7474
```
7575
1. Update the application.properties or yml file with the Application Insights Instrumentation key using the following property:
7676

77-
`azure.application-insights.instrumentation-key=<your-instrumentation-key-here>`
77+
`management.metrics.export.azuremonitor.instrumentation-key=<your-instrumentation-key-here>`
7878
3. Build your application and run
7979
4. The above should get you running with pre-aggregated metrics auto collected to Azure Monitor. For details on how to fine-tune Application Insights Spring Boot starter refer to the [readme on GitHub](https://github.com/Microsoft/azure-spring-boot/releases/latest).
8080

articles/marketplace/add-bank-tax-info.md

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: Add bank and tax information | Azure Marketplace
33
description: Add bank and tax information to your Dev Center account.
44
services: Azure, Marketplace, Compute, Storage, Networking, Blockchain, Security
55

6-
author: jm-aditi-ms
7-
manager: pabutler
6+
author: qianw211
7+
manager: evansma
88

99
ms.service: marketplace
1010

@@ -13,45 +13,18 @@ ms.service: marketplace
1313

1414
ms.topic: article
1515
ms.date: 06/05/2018
16-
ms.author: ellacroi
16+
ms.author: blevens
1717

1818
---
1919

2020
# Add bank and tax information
21-
The bank and tax information is required for all commercial offers using the transact listing type.
22-
* If you are publishing commercial offers for purchase, then you must add payout and tax information and request validation in Dev Center.
23-
>[!IMPORTANT]
24-
>For commercial offers (transact), you must complete the bank and tax information before you are able to push your offers to production.
25-
26-
* If you are publishing only free or BYOL offers, then you are not required to add the information. You may add the information later, but validation of the tax information takes some time. If you plan to offer commercial offers for purchase, then you should add the information as soon as possible.
27-
28-
## Add bank information
29-
1. Sign into Dev Center using your Microsoft ID.
30-
* To sign into Dev Center, visit the Windows Dev Center page located at [dev.windows.com](https://dev.windows.com).
31-
2. Select Payout account on the left menu.
32-
3. On the `Choose payment method` page, select `Bank account` or `PayPal`.
33-
>[!IMPORTANT]
34-
>If you have commercial offers that customers purchase on the Marketplace, then your payout account is where you receive payout for the purchases.
3521

36-
4. Enter the payment information. After you have verified that the information is correct, click on the Save button.
37-
>[!IMPORTANT]
38-
>If you update or change your payout account, then you must follow the same steps replacing the current information with the new information. Changes to your payout account may delay payments up to one payment cycle. This delay occurs because Microsoft must verify the account change, this is the same as when you first set-up your payout account. You get paid the full amount after your account has been verified. Any payments due from the current payment cycle are added to the next cycle.
22+
The bank and tax information is required for all commercial offers using the transact listing type.
3923

40-
4. Click on the Next button.
24+
## Partner Center
4125

42-
---
26+
Bank and tax information is now managed within Partner Center. Instructions to configure these settings can be found in the "Financial Details" section of [Manage Your Partner Center Account](https://docs.microsoft.com/azure/marketplace/partner-center-portal/manage-account#financial-details).
4327

44-
## Add tax information
45-
1. Sign into Dev Center using your Microsoft ID.
46-
* To sign into Dev Center, visit the Windows Dev Center page located at [dev.windows.com](https://dev.windows.com).
47-
2. Select Tax profile on the left menu.
48-
3. On the `Set up your tax form` page, select the country or region where you have permanent residency.
49-
50-
Select the country or region where you hold primary citizenship.
51-
52-
Click on the Next button.
53-
4. Enter your tax details.
54-
5. Click on the Next button.
5528

5629
## Next steps
5730
* Visit the [Azure Marketplace and AppSource Publisher Guide](./marketplace-publishers-guide.md) page.

0 commit comments

Comments
 (0)