Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log Analytics new parameters Group By ApplicationId and UserAgent #14015

Merged
merged 14 commits into from
Jan 29, 2021
Merged

Log Analytics new parameters Group By ApplicationId and UserAgent #14015

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
101c266
data dog work, signed nuget packages
Sandido Jan 6, 2021
b0e1286
nuget pkg from signed location .net
Sandido Jan 6, 2021
f418af3
using the package that released data dog functionality
Sandido Jan 25, 2021
700257a
sync to master
Sandido Jan 25, 2021
4f630d9
update nuget and disk objs
Sandido Jan 25, 2021
a053cf4
back to 42 to avoid test failures
Sandido Jan 25, 2021
9a7e21c
v42
Sandido Jan 25, 2021
5ce0a72
Update RecoveryServices.Backup.Test.csproj
Sandido Jan 27, 2021
4e89164
Update RecoveryServices.SiteRecovery.Test.csproj
Sandido Jan 27, 2021
5939f87
Update SqlVirtualMachine.Test.csproj
Sandido Jan 27, 2021
e10d8ad
Merge branch 'master' into SandidoDataDogRelease2
Sandido Jan 28, 2021
12d10ea
remove bad cmdlet to see if resolves CI errors
Sandido Jan 28, 2021
3889bbe
Merge branch 'SandidoDataDogRelease2' of https://github.com/Azure/azu…
Sandido Jan 28, 2021
07bc448
Update LogAnalyticTests.ps1
msJinLei Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Compute/Compute.Test/Compute.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PsModuleName>Compute</PsModuleName>
Expand All @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="39.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="42.0.0" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.3.0" />
</ItemGroup>
Expand Down
7 changes: 7 additions & 0 deletions src/Compute/Compute.Test/ScenarioTests/LogAnalyticTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ public void TestExportLogAnalyticRequestRateByIntervalNegative()
TestRunner.RunTestScript("Test-ExportLogAnalyticRequestRateByIntervalNegative");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestExportLogAnalyticGroupByParameters()
{
TestRunner.RunTestScript("Test-ExportLogAnalyticGroupByParameters");
}

[Fact(Skip = "BUG: LogAnalytics does not work.")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait("Re-record", "ClientRuntime changes")]
Expand Down
61 changes: 61 additions & 0 deletions src/Compute/Compute.Test/ScenarioTests/LogAnalyticTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,67 @@ function Test-ExportLogAnalyticRequestRateByIntervalNegative
"the given SAS URI";
}

<#
.SYNOPSIS
Test Export Log Analytics group by parameters
#>
function Test-ExportLogAnalyticGroupByParameters
{

# Setup
$rgname = Get-ComputeTestResourceName;
$loc = "westus2";

try
{
New-AzResourceGroup -Name $rgname -Location $loc -Force;
$stoname = 'sto' + $rgname;
$stotype = 'Standard_GRS';
$container = "contain";
New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
$key = Get-AzStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
Assert-NotNull $key;

$from = Get-Date -Year 2021 -Month 1 -Day 4 -Hour 9;
$to = Get-Date -Year 2021 -Month 1 -Day 5 -Hour 9;

$context = New-AzStorageContext -StorageAccountName $stoname -StorageAccountKey $key.Value[0];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check the way your module depends on Az.Storage to see whey New-AzStorageContext cannot be recognized.

Copy link
Member Author

@Sandido Sandido Jan 26, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@msJinLei , this build error is not present on my local VS.

Compute.Test.csproj does not directly refer to Az.Storage, rather it refers to Az.Compute, https://github.com/Azure/azure-powershell/blob/SandidoDataDogRelease2/src/Compute/Compute.Test/Compute.Test.csproj#L15 .

Compute.csproj refers to WindowsAzure.Storage 9.3.0 https://github.com/Azure/azure-powershell/blob/SandidoDataDogRelease2/src/Compute/Compute/Compute.csproj#L19,
and this cmdlet has been used before without a build error, https://github.com/Azure/azure-powershell/blob/SandidoDataDogRelease2/src/Compute/Compute.Test/ScenarioTests/LogAnalyticTests.ps1#L123.

Copy link
Member Author

@Sandido Sandido Jan 26, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this error be due to the CredScan check failing instead? New-AzVMConfig is also not recognized as a cmdlet.
Error:
Exception:System.IO.FileLoadException: Could not load file or assembly 'Microsoft.Azure.Management.Compute, Version=42.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'.

This may be causing all Az Compute cmdlets to not function. And the Az Storage cmdlets which is a dependency from Az Compute.


if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
{
New-AzStorageContainer -Name $container -Context $context;
$sastoken = Get-AzStorageContainer -Name $container -Context $context | New-AzStorageContainerSASToken -Permission rwdl -Context $context;
}

$sasuri = "https://$stoname.blob.core.windows.net/$container$sastoken";

$result = Export-AzLogAnalyticThrottledRequest -Location $loc -FromTime $from -ToTime $to -BlobContainerSasUri $sasuri -GroupByUserAgent;
Assert-AreEqual "Succeeded" $result.Status;

if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
{
$blobs = Get-AzStorageBlob -Container $container -Context $context;
$throttle_blob = $blobs | where {$_.name.contains("ThrottledRequests")};
Assert-NotNull $throttle_blob;
}

$result = Export-AzLogAnalyticThrottledRequest -Location $loc -FromTime $from -ToTime $to -BlobContainerSasUri $sasuri -GroupByApplicationId;
Assert-AreEqual "Succeeded" $result.Status;

if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
{
$blobs = Get-AzStorageBlob -Container $container -Context $context;
$throttle_blob = $blobs | where {$_.name.contains("ThrottledRequests")};
Assert-NotNull $throttle_blob;
}
}
finally
{
# Cleanup
Clean-ResourceGroup $rgname
}
}

<#
.SYNOPSIS
Test Export Log Analytics positive scenario
Expand Down
Loading