Merge pull request #907 from anosov1960/master

Major update

Author: anosov1960

DiscoverSql.ps1

@@ -0,0 +1,11 @@
+
+    
+    # This function is to run on each VM to detect if SQL server is installed
+    
+    [bool] $SqlInstalled = $false 
+    $regPath = 'HKLM:\SOFTWARE\Microsoft\Microsoft SQL Server'
+    if (Test-Path $regPath) {
+        $inst = (get-itemproperty $regPath).InstalledInstances
+        $SqlInstalled = ($inst.Count -gt 0)
+    }
+    Write-Output $SqlInstalled

mysubscriptions.csv

@@ -0,0 +1,16 @@
+Id,Name,State,SubscriptionId,TenantId,HomeTenantId,ManagedByTenantIds,CurrentStorageAccountName,SubscriptionPolicies,ExtendedProperties,CurrentStorageAccount
+10a238d6-a139-46d0-818d-d091394072b6,geodr_m2_365640,Enabled,10a238d6-a139-46d0-818d-d091394072b6,72f988bf-86f1-41af-91ab-2d7cd011db47,72f988bf-86f1-41af-91ab-2d7cd011db47,System.String[],,"{
+  ""LocationPlacementId"": ""Internal_2014-09-01"",
+  ""QuotaId"": ""Internal_2014-09-01"",
+  ""SpendingLimit"": ""Off""
+}","System.Collections.Generic.Dictionary`2[System.String,System.String]",
+a5082b19-8a6e-4bc5-8fdd-8ef39dfebc39,ADS TINA Engineering,Enabled,a5082b19-8a6e-4bc5-8fdd-8ef39dfebc39,72f988bf-86f1-41af-91ab-2d7cd011db47,72f988bf-86f1-41af-91ab-2d7cd011db47,System.String[],,"{
+  ""LocationPlacementId"": ""Internal_2014-09-01"",
+  ""QuotaId"": ""Internal_2014-09-01"",
+  ""SpendingLimit"": ""Off""
+}","System.Collections.Generic.Dictionary`2[System.String,System.String]",
+741fd0f5-9cb8-442c-91c3-3ef4ca231c2a,Workload Insight dev/test subscription,Enabled,741fd0f5-9cb8-442c-91c3-3ef4ca231c2a,72f988bf-86f1-41af-91ab-2d7cd011db47,72f988bf-86f1-41af-91ab-2d7cd011db47,System.String[],,"{
+  ""LocationPlacementId"": ""Internal_2014-09-01"",
+  ""QuotaId"": ""Internal_2014-09-01"",
+  ""SpendingLimit"": ""Off""
+}","System.Collections.Generic.Dictionary`2[System.String,System.String]",

samples/manage/azure-hybrid-benefit/README.md

@@ -3,12 +3,12 @@ services: Azure SQL
 platforms: Azure
 author: anosov1960
 ms.author: sashan
-ms.date: 2/2/2021
+ms.date: 3/5/2021
 ---
 
 # Overview
 
-This script provides a simple solution to analyze and track the consolidated utilization of SQL Server licenses by all of the SQL resources in a specific subscription or the entire account. By default, the script scans all subscriptions the user account has access to. Alternatively, you can specify a single subscription or a .CSV file with a list of subscription. The usage report includes the following information for each scanned subscription.
+This script provides a simple solution to analyze and track the consolidated utilization of SQL Server licenses by all of the SQL resources in a specific subscription or the entire account. By default, the script scans all subscriptions the user account has access to. Alternatively, you can specify a single subscription or a .CSV file with a list of subscriptions. 
 
 | **Category** | **Description** |
 |:--|:--|
@@ -24,6 +24,8 @@ This script provides a simple solution to analyze and track the consolidated uti
 |HADR Ent vCores|Total vCores used by HADR replicas running SQL Server Enterprise edition|
 |Developer vCores|Total vCores used by SQL Server Developer edition|
 |Express vCores|Total vCores used by SQL Server Express edition|
+|Unregistered SQLVM vCores|Total vCores used by SQL Server VM that are not registered with SQL IaaS Agent Extension |
+|Unknown vCores|Total vCores used by Azure SQL Server resources with an unknown edition or service tier|
 
 The following resources are in scope for the license utilization analysis:
 - Azure SQL databases (vCore-based purchasing model only) 
@@ -38,7 +40,8 @@ The following resources are in scope for the license utilization analysis:
 > - The usage data is a snapshot at the time of the script execution based on the size of the deployed SQL resources in vCores.
 > - For IaaS workloads, such as SQL Server in Virtual Machines or SSIS integration runtimes, each vCPU is counted as one vCore.
 > - For PaaS workloads, each vCore of Business Critical service tier is counted as one Enterprise vCore and each vCore of General Purpose service tier is counted as one Standard vCore.
-> - In the DTU-based purchasing model, the SQL license cost is built into the individual SKU prices. These resources are not eligible for Azure Hybrid Benefit or HADR benefit, and therefore are not in scope of the tool.
+> - In the DTU-based purchasing model, the SQL license cost is built into the individual SKU prices. These resources are not eligible for Azure Hybrid Benefit or HADR benefit, and therefore are not in scope of the tool. 
+> - You must be at least a *Reader* of each subscription you scan. However, to collect Unregistered SQLVM vCores you must be a subscription *Contributor* or *Owner*, otherwise this column will show a zero value.
 > - The values AHB ECs and PAYG ECs are reserved for the future use and should be ignored
 
 # Launching the script 
@@ -129,7 +132,7 @@ You can track your license utilization over time by running this script on sched
 curl https://raw.githubusercontent.com/microsoft/sql-server-samples/master/samples/manage/azure-hybrid-benefit/sql-license-usage.ps1 -o sql-license-usage.ps1
 ```
 2. [Create a new automation account](https://ms.portal.azure.com/#create/Microsoft.AutomationAccount)  or open an existing one.
-1. Select *Rus as accounts* in the **Account Settings** group, open the automatically created *Azure Run As Account* and note or copy the Display Name property. You must add this user to all the subscriptions you wish to scan with the *Reader* access role.  See [Role assignment portal](https://docs.microsoft.com/en-us/azure/role-based-access-control/role-assignments-portal) for the instructions about role assignments.
+1. Select *Rus as accounts* in the **Account Settings** group, open the automatically created *Azure Run As Account* and note or copy the Display Name property. You must add this user to all the target subscriptions with at least a *Reader* access role. To collect the Unregistered SQLVM vCores, the user must be at least a *Contributor*. See [Role assignment portal](https://docs.microsoft.com/en-us/azure/role-based-access-control/role-assignments-portal) for the instructions about role assignments.
 1. Select *Credentials* in the **Shared resources** group and create a credential object with the database username and password. The script will use these to connect to the specified database to save the license utilization data.
 1. Select *Modules* in the **Shared resources** group and make sure your automation account have the following PowerShell modules installed. If not, add them from the Gallery.
     - Az.Accounts