Skip to content

Commit dd816a4

Browse files
authored
Merge pull request MicrosoftDocs#8098 from Microsoft/FromPublicRepo
From public repo
2 parents 50b5d34 + 32de34a commit dd816a4

File tree

4 files changed

+24
-11
lines changed

4 files changed

+24
-11
lines changed

articles/azure-government/documentation-government-image-gallery.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ ms.author: brendal
2121
## Overview
2222
The Microsoft Azure Government Marketplace is a similar experience to public Azure portal. Customers can choose to deploy pre-built images from Microsoft and our partners, or upload their own VHDs. This provides flexibility to deploy your own standardized images if needed.
2323

24+
## Variations
25+
* Marketplace images are not currently supported in DoD
26+
2427
The below provides a list of available images within the Azure Government Marketplace. Some of the prebuilt images do include pay as you go licensing for specific software. Please review <a href="http://azure.microsoft.com/pricing/details/virtual-machines/">Virtual Machine Pricing</a> page for more guidance and work with your Microsoft account team or reseller for Azure Government specific pricing.
2528

2629
## Images - Azure Resource Manager

articles/iot-hub/iot-hub-devguide-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ The [Azure IoT device SDK for .NET][lnk-client-sdk] (version 1.0.11+) supports t
329329

330330
### C\# Support
331331
The class **DeviceAuthenticationWithX509Certificate** supports the creation of
332-
**DeviceClient** instances using an X.509 certificate.
332+
**DeviceClient** instances using an X.509 certificate. The X.509 certificate must be in the PFX (also called PKCS #12) format which includes the private key.
333333

334334
Here is a sample code snippet:
335335

articles/log-analytics/log-analytics-azure-networking-analytics.md

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,25 @@ ms.author: richrund
1919
---
2020
# Azure networking monitoring solutions in Log Analytics
2121

22-
You can use the Azure Application Gateway analytics solution in Log Analytics to review:
23-
24-
* Azure Application Gateway logs
25-
* Azure Application Gateway metrics
26-
27-
You can use the Azure Network Security Group analytics solution in Log Analytics to review:
28-
29-
* Azure Network Security Group logs
30-
22+
Log Analytics offers the following solutions for monitoring your networks:
23+
* Network Performance Monitor (NPM)
24+
* Monitor the health of your network
25+
* Azure Application Gateway analytics to review
26+
* Azure Application Gateway logs
27+
* Azure Application Gateway metrics
28+
* Azure Network Security Group analytics to review
29+
* Azure Network Security Group logs
30+
31+
## Network Performance Monitor (NPM)
32+
NPM is a network monitoring solution, that monitors the health, availability and reachability of networks. It is used to monitor connectivity between:
33+
* public cloud and on-premises
34+
* data centers and user locations (branch offices)
35+
* subnets hosting various tiers of a multi-tiered application.
36+
37+
![image of Network Performance Monitor](./media/log-analytics-network-performance-monitor/npm-topology.png)
38+
More information on NPM is available [online](https://docs.microsoft.com/en-us/azure/log-analytics/log-analytics-network-performance-monitor).
39+
40+
## Azure Application Gateway and Network Security Group analytics
3141
To use the solutions, enable diagnostics for Azure Application Gateway logs and Azure Network Security Groups and direct the diagnostics to a Log Analytics workspace. It is not necessary to write the logs to Azure Blob storage.
3242

3343
You can enable diagnostics and the corresponding solution for either one or both of Application Gateway and Networking Security Groups.

articles/service-fabric/service-fabric-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ In addition, you need to install the Microsoft Azure Service Fabric SDK, using W
5252
### To use Visual Studio 2015 (requires Visual Studio 2015 Update 2 or later)
5353
For Visual Studio 2015, Service Fabric tools are installed together with the SDK, using the Web Platform Installer:
5454

55-
* [Install the Microsoft Azure Service Fabric SDK and Tools)][full-bundle-vs2015]
55+
* [Install the Microsoft Azure Service Fabric SDK and Tools][full-bundle-vs2015]
5656

5757
### SDK installation only
5858
If you only need the SDK, you can install this package:

0 commit comments

Comments
 (0)