Skip to content

Commit 1ca9ee0

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into two-iot-hub-articles
2 parents 1b8f757 + 86a6451 commit 1ca9ee0

File tree

12 files changed

+20
-12
lines changed

12 files changed

+20
-12
lines changed

articles/frontdoor/waf-faq.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.devlang: na
99
ms.topic: article
1010
ms.tgt_pltfrm: na
1111
ms.workload: infrastructure-services
12-
ms.date: 04/02/2019
12+
ms.date: 06/10/2019
1313
ms.author: kumud;tyao
1414
---
1515

@@ -27,9 +27,6 @@ An Azure WAF policy can be applied to web applications hosted on Application Gat
2727

2828
Azure Front Door is a highly scalable, globally distributed application and content delivery network. Azure WAF, when integrated with Front Door, stops denial-of-service and targeted application attacks at the Azure network edge, close to attack sources before they enter your virtual network, offers protection without sacrificing performance.
2929

30-
## How will I be charged for Azure WAF for Front Door?
31-
During public preview, WAF usage at Front Door are free of charge. Note that Front Door charge is extra. See Front Door Service pricing [here](https://azure.microsoft.com/pricing/details/frontdoor/).
32-
3330
## Does Azure WAF support HTTPS?
3431

3532
Front Door Service offers SSL offloading. WAF is natively integrated with Front Door and can inspect a request after it is decrypted.
83.6 KB
Loading

articles/service-fabric/service-fabric-visualizing-your-cluster.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,22 @@ EventStore is a feature offered by the platform that provides Service Fabric pla
119119
>[!NOTE]
120120
>As of Service Fabric version 6.4. the EventStore APIs are only available for Windows clusters running on Azure only. We are working on porting this functionality to Linux as well as our Standalone clusters.
121121
122+
## Image Store Viewer
123+
Image store viewer is a feature offered if using Native Image Store that allows for viewing the current contents of the Image store and get file and folder information, along with removing files/folders.
124+
125+
![Service Fabric Explorer cluster map][sfx-imagestore]
126+
122127

123128
## Next steps
124129
* [Managing your Service Fabric applications in Visual Studio](service-fabric-manage-application-in-visual-studio.md)
125130
* [Service Fabric application deployment using PowerShell](service-fabric-deploy-remove-applications.md)
126131

127132
<!--Image references-->
128-
[sfx-cluster-dashboard]: ./media/service-fabric-visualizing-your-cluster/SfxClusterDashboard.png
129-
[sfx-cluster-map]: ./media/service-fabric-visualizing-your-cluster/SfxClusterMap.png
130-
[sfx-application-tree]: ./media/service-fabric-visualizing-your-cluster/SfxApplicationTree.png
131-
[sfx-service-essentials]: ./media/service-fabric-visualizing-your-cluster/SfxServiceEssentials.png
132-
[sfx-delete-application]: ./media/service-fabric-visualizing-your-cluster/SfxDeleteApplication.png
133-
[sfx-create-app-instance]: ./media/service-fabric-visualizing-your-cluster/SfxCreateAppInstance.png
133+
[sfx-cluster-dashboard]: ./media/service-fabric-visualizing-your-cluster/sfx-cluster-dashboard.png
134+
[sfx-cluster-map]: ./media/service-fabric-visualizing-your-cluster/sfx-cluster-map.png
135+
[sfx-application-tree]: ./media/service-fabric-visualizing-your-cluster/sfx-application-tree.png
136+
[sfx-service-essentials]: ./media/service-fabric-visualizing-your-cluster/sfx-service-essentials.png
137+
[sfx-delete-application]: ./media/service-fabric-visualizing-your-cluster/sfx-delete-application.png
138+
[sfx-create-app-instance]: ./media/service-fabric-visualizing-your-cluster/sfx-create-app-instance.png
134139
[sfx-eventstore]: ./media/service-fabric-diagnostics-eventstore/eventstore.png
140+
[sfx-imagestore]: ./media/service-fabric-visualizing-your-cluster/sfx-image-store.png

0 commit comments

Comments
 (0)