From d9e70d39d2f8340c63d6bff768327e7cb0a3a4e0 Mon Sep 17 00:00:00 2001
From: Aymon Delbridge <aymon.delbridge@gmail.com>
Date: Wed, 20 May 2020 19:32:25 +0200
Subject: [PATCH] Azure docs

---
 docs/nodes/azure.md | 209 ++++++--------------------------------------
 1 file changed, 29 insertions(+), 180 deletions(-)

diff --git a/docs/nodes/azure.md b/docs/nodes/azure.md
index 4a69c7c0..63e5377c 100644
--- a/docs/nodes/azure.md
+++ b/docs/nodes/azure.md
@@ -5,7 +5,6 @@ title: Azure
 
 Node classes list of azure provider.
 
-<<<<<<< HEAD
 ## azure.mobile
 
 - **diagrams.azure.mobile.AppServiceMobile**
@@ -46,44 +45,6 @@ Node classes list of azure provider.
 - **diagrams.azure.storage.StorsimpleDataManagers**
 - **diagrams.azure.storage.StorsimpleDeviceManagers**
 - **diagrams.azure.storage.TableStorage**
-=======
-## azure.analytics
-
-- **diagrams.azure.analytics.AnalysisServices**
-- **diagrams.azure.analytics.DataExplorerClusters**
-- **diagrams.azure.analytics.DataFactories**
-- **diagrams.azure.analytics.DataLakeAnalytics**
-- **diagrams.azure.analytics.DataLakeStoreGen1**
-- **diagrams.azure.analytics.Databricks**
-- **diagrams.azure.analytics.EventHubClusters**
-- **diagrams.azure.analytics.EventHubs**
-- **diagrams.azure.analytics.Hdinsightclusters**
-- **diagrams.azure.analytics.LogAnalyticsWorkspaces**
-- **diagrams.azure.analytics.StreamAnalyticsJobs**
-
-## azure.compute
-
-- **diagrams.azure.compute.AvailabilitySets**
-- **diagrams.azure.compute.BatchAccounts**
-- **diagrams.azure.compute.CitrixVirtualDesktopsEssentials**
-- **diagrams.azure.compute.CloudServicesClassic**
-- **diagrams.azure.compute.CloudServices**
-- **diagrams.azure.compute.CloudsimpleVirtualMachines**
-- **diagrams.azure.compute.ContainerInstances**
-- **diagrams.azure.compute.ContainerRegistries**, **ACR** (alias)
-- **diagrams.azure.compute.DiskSnapshots**
-- **diagrams.azure.compute.Disks**
-- **diagrams.azure.compute.FunctionApps**
-- **diagrams.azure.compute.KubernetesServices**, **AKS** (alias)
-- **diagrams.azure.compute.MeshApplications**
-- **diagrams.azure.compute.SAPHANAOnAzure**
-- **diagrams.azure.compute.ServiceFabricClusters**
-- **diagrams.azure.compute.VMClassic**
-- **diagrams.azure.compute.VMImages**
-- **diagrams.azure.compute.VMLinux**
-- **diagrams.azure.compute.VMWindows**
-- **diagrams.azure.compute.VM**
->>>>>>> upstream/master
 
 ## azure.database
 
@@ -116,24 +77,18 @@ Node classes list of azure provider.
 - **diagrams.azure.devops.Repos**
 - **diagrams.azure.devops.TestPlans**
 
-<<<<<<< HEAD
 ## azure.web
-=======
-## azure.identity
 
-- **diagrams.azure.identity.AccessReview**
-- **diagrams.azure.identity.ActiveDirectoryConnectHealth**
-- **diagrams.azure.identity.ActiveDirectory**
-- **diagrams.azure.identity.ADB2C**
-- **diagrams.azure.identity.ADDomainServices**
-- **diagrams.azure.identity.ADIdentityProtection**
-- **diagrams.azure.identity.ADPrivilegedIdentityManagement**
-- **diagrams.azure.identity.AppRegistrations**
-- **diagrams.azure.identity.ConditionalAccess**
-- **diagrams.azure.identity.EnterpriseApplications**
-- **diagrams.azure.identity.IdentityGovernance**
-- **diagrams.azure.identity.InformationProtection**
-- **diagrams.azure.identity.ManagedIdentities**
+- **diagrams.azure.web.APIConnections**
+- **diagrams.azure.web.AppServiceCertificates**
+- **diagrams.azure.web.AppServiceDomains**
+- **diagrams.azure.web.AppServiceEnvironments**
+- **diagrams.azure.web.AppServicePlans**
+- **diagrams.azure.web.AppServices**
+- **diagrams.azure.web.MediaServices**
+- **diagrams.azure.web.NotificationHubNamespaces**
+- **diagrams.azure.web.Search**
+- **diagrams.azure.web.Signalr**
 
 ## azure.iot
 
@@ -148,43 +103,25 @@ Node classes list of azure provider.
 - **diagrams.azure.iot.TimeSeriesInsightsEventsSources**
 - **diagrams.azure.iot.Windows10IotCoreServices**
 
-## azure.migration
->>>>>>> upstream/master
-
-- **diagrams.azure.migration.DatabaseMigrationServices**
-- **diagrams.azure.migration.MigrationProjects**
-- **diagrams.azure.migration.RecoveryServicesVaults**
-
-## azure.ml
-
-- **diagrams.azure.ml.BatchAI**
-- **diagrams.azure.ml.BotServices**
-- **diagrams.azure.ml.CognitiveServices**
-- **diagrams.azure.ml.GenomicsAccounts**
-- **diagrams.azure.ml.MachineLearningServiceWorkspaces**
-- **diagrams.azure.ml.MachineLearningStudioWebServicePlans**
-- **diagrams.azure.ml.MachineLearningStudioWebServices**
-- **diagrams.azure.ml.MachineLearningStudioWorkspaces**
-
-## azure.mobile
-
-- **diagrams.azure.mobile.AppServiceMobile**
-- **diagrams.azure.mobile.MobileEngagement**
-- **diagrams.azure.mobile.NotificationHubs**
-
-<<<<<<< HEAD
-## azure.iot
+## azure.integration
 
-- **diagrams.azure.iot.DeviceProvisioningServices**
-- **diagrams.azure.iot.DigitalTwins**
-- **diagrams.azure.iot.IotCentralApplications**
-- **diagrams.azure.iot.IotHubSecurity**
-- **diagrams.azure.iot.IotHub**
-- **diagrams.azure.iot.Maps**
-- **diagrams.azure.iot.Sphere**
-- **diagrams.azure.iot.TimeSeriesInsightsEnvironments**
-- **diagrams.azure.iot.TimeSeriesInsightsEventsSources**
-- **diagrams.azure.iot.Windows10IotCoreServices**
+- **diagrams.azure.integration.APIForFhir**
+- **diagrams.azure.integration.APIManagement**
+- **diagrams.azure.integration.AppConfiguration**
+- **diagrams.azure.integration.DataCatalog**
+- **diagrams.azure.integration.EventGridDomains**
+- **diagrams.azure.integration.EventGridSubscriptions**
+- **diagrams.azure.integration.EventGridTopics**
+- **diagrams.azure.integration.IntegrationAccounts**
+- **diagrams.azure.integration.IntegrationServiceEnvironments**
+- **diagrams.azure.integration.LogicAppsCustomConnector**
+- **diagrams.azure.integration.LogicApps**
+- **diagrams.azure.integration.SendgridAccounts**
+- **diagrams.azure.integration.ServiceBusRelays**
+- **diagrams.azure.integration.ServiceBus**
+- **diagrams.azure.integration.ServiceCatalogManagedApplicationDefinitions**
+- **diagrams.azure.integration.SoftwareAsAService**
+- **diagrams.azure.integration.StorsimpleDeviceManagers**
 
 ## azure.ml
 
@@ -202,76 +139,9 @@ Node classes list of azure provider.
 - **diagrams.azure.migration.DatabaseMigrationServices**
 - **diagrams.azure.migration.MigrationProjects**
 - **diagrams.azure.migration.RecoveryServicesVaults**
-=======
-## azure.network
-
-- **diagrams.azure.network.ApplicationGateway**
-- **diagrams.azure.network.ApplicationSecurityGroups**
-- **diagrams.azure.network.CDNProfiles**
-- **diagrams.azure.network.Connections**
-- **diagrams.azure.network.DDOSProtectionPlans**
-- **diagrams.azure.network.DNSPrivateZones**
-- **diagrams.azure.network.DNSZones**
-- **diagrams.azure.network.ExpressrouteCircuits**
-- **diagrams.azure.network.Firewall**
-- **diagrams.azure.network.FrontDoors**
-- **diagrams.azure.network.LoadBalancers**
-- **diagrams.azure.network.LocalNetworkGateways**
-- **diagrams.azure.network.NetworkInterfaces**
-- **diagrams.azure.network.NetworkSecurityGroupsClassic**
-- **diagrams.azure.network.NetworkWatcher**
-- **diagrams.azure.network.OnPremisesDataGateways**
-- **diagrams.azure.network.PublicIpAddresses**
-- **diagrams.azure.network.ReservedIpAddressesClassic**
-- **diagrams.azure.network.RouteFilters**
-- **diagrams.azure.network.RouteTables**
-- **diagrams.azure.network.ServiceEndpointPolicies**
-- **diagrams.azure.network.TrafficManagerProfiles**
-- **diagrams.azure.network.VirtualNetworkClassic**
-- **diagrams.azure.network.VirtualNetworkGateways**
-- **diagrams.azure.network.VirtualNetworks**
-- **diagrams.azure.network.VirtualWans**
-
-## azure.security
-
-- **diagrams.azure.security.KeyVaults**
-- **diagrams.azure.security.SecurityCenter**
-- **diagrams.azure.security.Sentinel**
-
-## azure.storage
 
-- **diagrams.azure.storage.ArchiveStorage**
-- **diagrams.azure.storage.Azurefxtedgefiler**
-- **diagrams.azure.storage.BlobStorage**
-- **diagrams.azure.storage.DataBoxEdgeDataBoxGateway**
-- **diagrams.azure.storage.DataBox**
-- **diagrams.azure.storage.DataLakeStorage**
-- **diagrams.azure.storage.GeneralStorage**
-- **diagrams.azure.storage.NetappFiles**
-- **diagrams.azure.storage.QueuesStorage**
-- **diagrams.azure.storage.StorageAccountsClassic**
-- **diagrams.azure.storage.StorageAccounts**
-- **diagrams.azure.storage.StorageExplorer**
-- **diagrams.azure.storage.StorageSyncServices**
-- **diagrams.azure.storage.StorsimpleDataManagers**
-- **diagrams.azure.storage.StorsimpleDeviceManagers**
-- **diagrams.azure.storage.TableStorage**
-
-## azure.web
->>>>>>> upstream/master
-
-- **diagrams.azure.web.APIConnections**
-- **diagrams.azure.web.AppServiceCertificates**
-- **diagrams.azure.web.AppServiceDomains**
-- **diagrams.azure.web.AppServiceEnvironments**
-- **diagrams.azure.web.AppServicePlans**
-- **diagrams.azure.web.AppServices**
-- **diagrams.azure.web.MediaServices**
-- **diagrams.azure.web.NotificationHubNamespaces**
-- **diagrams.azure.web.Search**
-- **diagrams.azure.web.Signalr**
+## azure.analytics
 
-<<<<<<< HEAD
 - **diagrams.azure.analytics.AnalysisServices**
 - **diagrams.azure.analytics.DataExplorerClusters**
 - **diagrams.azure.analytics.DataFactories**
@@ -370,24 +240,3 @@ Node classes list of azure provider.
 - **diagrams.azure.network.VirtualNetworkGateways**
 - **diagrams.azure.network.VirtualNetworks**
 - **diagrams.azure.network.VirtualWans**
-=======
-## azure.integration
-
-- **diagrams.azure.integration.APIForFhir**
-- **diagrams.azure.integration.APIManagement**
-- **diagrams.azure.integration.AppConfiguration**
-- **diagrams.azure.integration.DataCatalog**
-- **diagrams.azure.integration.EventGridDomains**
-- **diagrams.azure.integration.EventGridSubscriptions**
-- **diagrams.azure.integration.EventGridTopics**
-- **diagrams.azure.integration.IntegrationAccounts**
-- **diagrams.azure.integration.IntegrationServiceEnvironments**
-- **diagrams.azure.integration.LogicAppsCustomConnector**
-- **diagrams.azure.integration.LogicApps**
-- **diagrams.azure.integration.SendgridAccounts**
-- **diagrams.azure.integration.ServiceBusRelays**
-- **diagrams.azure.integration.ServiceBus**
-- **diagrams.azure.integration.ServiceCatalogManagedApplicationDefinitions**
-- **diagrams.azure.integration.SoftwareAsAService**
-- **diagrams.azure.integration.StorsimpleDeviceManagers**
->>>>>>> upstream/master