Skip to content

Commit cf548ea

Browse files
Merge branch 'master' of https://github.com/Azure/azure-powershell into getazvmaassignedhostgroup
2 parents f2058d8 + eadbb6e commit cf548ea

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

.azure-pipelines/daily-build.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,19 @@ schedules:
77
include:
88
- master
99

10+
pr: none
11+
1012
pool:
1113
vmImage: 'windows-2019'
1214

1315
steps:
16+
- task: DotNetCoreCLI@2
17+
displayName: Build for Version Bump
18+
inputs:
19+
command: 'custom'
20+
custom: 'msbuild'
21+
arguments: 'build.proj'
22+
1423
- task: ComponentGovernanceComponentDetection@0
1524
displayName: Component Detection
1625
inputs:
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
### Example 1: New SAP monitor
22
```powershell
3-
PS C:\> $workspace = New-AzOperationalInsightsWorkspace -ResourceGroupName nancyc-hn1 -Name sapmonitor-test -Location westus2 -Sku "Standard"
4-
PS C:\> $workspace = Get-AzOperationalInsightsWorkspaceSharedKey -ResourceGroupName nancyc-hn1 -Name sapmonitor-test
5-
PS C:\> New-AzSapMonitor -Name ps-sapmonitor-t01 -ResourceGroupName nancyc-hn1 -Location westus2 -EnableCustomerAnalytic -MonitorSubnet "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/nancyc-hn1/providers/Microsoft.Network/virtualNetworks/vnet-sap/subnets/subnet-admin" -LogAnalyticsWorkspaceSharedKey $workspace.PrimarySharedKey -LogAnalyticsWorkspaceId $workspace.CustomerId -LogAnalyticsWorkspaceResourceId $workspace.ResourceId
3+
PS C:\> $Workspace = New-AzOperationalInsightsWorkspace -ResourceGroupName nancyc-hn1 -Name sapmonitor-test -Location westus2 -Sku "Standard"
4+
PS C:\> $WorkspaceKey = Get-AzOperationalInsightsWorkspaceSharedKey -ResourceGroupName nancyc-hn1 -Name sapmonitor-test
5+
PS C:\> New-AzSapMonitor -Name ps-sapmonitor-t01 -ResourceGroupName nancyc-hn1 -Location westus2 -EnableCustomerAnalytic -MonitorSubnet "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/nancyc-hn1/providers/Microsoft.Network/virtualNetworks/vnet-sap/subnets/subnet-admin" -LogAnalyticsWorkspaceSharedKey $WorkspaceKey.PrimarySharedKey -LogAnalyticsWorkspaceId $Workspace.CustomerId -LogAnalyticsWorkspaceResourceId $Workspace.ResourceId
66
77
Location Name Type
88
-------- ---- ----
99
westus2 ps-sapmonitor-t01 Microsoft.HanaOnAzure/sapMonitors
1010
```
1111

1212
This command creates a SAP monitor.
13-

tools/UpdateModules.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ Import-Module "$PSScriptRoot\UpdateModules.psm1"
4040
#################################################>
4141

4242

43+
# Constants (Scopes)
44+
$NetCoreScopes = @('NetCore')
45+
$AzureScopes = @('All', 'Latest', 'ServiceManagement', 'AzureStorage')
46+
$StackScopes = @('All', 'Stack')
4347

4448
# Begin
4549
Write-Host "Updating $Scope package (and its dependencies)"

tools/UpdateModules.psm1

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
#>
1818
$script:TemplateLocation = "$PSScriptRoot\AzureRM.Example.psm1"
1919

20-
# Scopes
21-
$script:NetCoreScopes = @('NetCore')
22-
$script:AzureScopes = @('All', 'Latest', 'ServiceManagement', 'AzureStorage')
23-
$script:StackScopes = @('All', 'Stack')
24-
2520
# Specialty-Scopes used by cmdlets
2621
$script:AzureRMScopes = @('All', 'Latest')
2722
$script:StorageScopes = @('All', 'Latest', 'AzureStorage')

0 commit comments

Comments
 (0)