Skip to content

Commit 3dc8d03

Browse files
azurekidazurekid
authored
Merge branch 'Azure:master' into azurekid/asim/tools/ConvertFrom-ASim
2 parents 5036e8c + 347a62d commit 3dc8d03

File tree

1,675 files changed

+168633
-59573
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,675 files changed

+168633
-59573
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
language: [ 'javascript', 'python', 'ruby' ]
36-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
35+
language: [ 'javascript', 'python', 'ruby', 'actions' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'actions' ]
3737
# Learn more about CodeQL language support at https://git.io/codeql-language-support
3838

3939
steps:

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ bld/
2626
[Oo]bj/
2727
[Ll]og/
2828

29+
# Execution results
30+
[Ll]ogs/
31+
2932
# Visual Studio 2015/2017 cache/options directory
3033
.vs/
3134
# Uncomment if you have tasks that create the project's static files in wwwroot
@@ -336,4 +339,4 @@ Hunting Queries/DeployedQueries.json
336339

337340
#Mac OSx
338341
.DS_Store
339-
!*Microsoft.Azure.Sentinel.KustoServices.*.nupkg
342+
!*Microsoft.Azure.Sentinel.KustoServices.*.nupkg

‎.script/dataConnectorValidator.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ export async function IsValidDataConnectorSchema(filePath: string): Promise<Exit
1616

1717
if(isPotentialConnectorJson(jsonFile))
1818
{
19+
//WHEN DATATYPES ARRAY OBJECT IS NOT PRESENT OR EMPTY, SKIP VALIDATION
20+
if (!jsonFile.dataTypes && jsonFile.dataTypes.length === 0) {
21+
console.warn(`Skipping Files under Templates folder : ${filePath} - No dataTypes found`);
22+
return ExitCode.SUCCESS;
23+
}
24+
1925
if(!jsonFile.dataTypes[0].name.includes("Event"))
2026
{
2127
let connectorCategory = getConnectorCategory(jsonFile.dataTypes, jsonFile.instructionSteps);
@@ -47,7 +53,7 @@ export async function IsValidDataConnectorSchema(filePath: string): Promise<Exit
4753
}
4854

4955
function isPotentialConnectorJson(jsonFile: any) {
50-
if(typeof jsonFile.id != "undefined" && typeof jsonFile.connectivityCriterias != "undefined")
56+
if(typeof jsonFile.id != "undefined" && typeof jsonFile.connectivityCriterias != "undefined" && jsonFile.dataTypes.length > 0)
5157
{
5258
return true;
5359
}

‎.script/package-automation/hyperlink-validation.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ foreach($item in $filteredFiles)
111111
$exclusionList = @(".py$",".png$",".jpg$",".jpeg$",".conf$", ".svg$", ".html$", ".ps1$", ".psd1$", "requirements.txt$", "host.json$", "proxies.json$", "/function.json$", ".xml$", ".zip$", ".md$")
112112
$filterOutExclusionList = $finalFilteredFiles | Where-Object { $_ -notmatch ($exclusionList -join '|') }
113113

114-
$exclusionDomainList = @("&&sudo","schema.management","schemas.microsoft","twitter.com", "s-platform.api.opendns.com", "github.com", "azure.microsoft.com", "sts.windows.net")
114+
$exclusionDomainList = @("&&sudo","schema.management","schemas.microsoft","twitter.com", "s-platform.api.opendns.com", "github.com", "azure.microsoft.com", "sts.windows.net", "oauth2.googleapis.com", "monitoring.googleapis.com")
115115

116116
foreach ($currentFile in $filterOutExclusionList)
117117
{

‎.script/package-automation/validateFieldTypes.ps1‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,26 @@ try {
7171
}
7272

7373
# identify in active resource parameters
74-
$resourceContent = $mainTemplateFileContent.resources | Where-Object { $_.type -eq 'Microsoft.OperationalInsights/workspaces/providers/contentTemplates' }
74+
$resourceContent = $mainTemplateFileContent.resources | Where-Object { $_.type -eq 'Microsoft.OperationalInsights/workspaces/providers/contentTemplates' -and $_.properties.contentKind -eq "ResourcesDataConnector" }
7575

7676
if ($null -ne $resourceContent -and $resourceContent.Count -gt 0) {
77-
foreach($rc in $resourceContent) {
78-
$rcParam = $rc.properties.mainTemplate.parameters
79-
$resourceInvalidFieldsList = @();
80-
$resourceInvalidFieldsList = GetInvalidFields -resourceParameterProp $rcParam
81-
82-
if ($resourceInvalidFieldsList.Count -gt 0) {
83-
$hasInvalidResourceParameterType = $true
84-
Write-Host "Invalid resource level parameters field(s) type. Please update the 'type' value for below given list to 'securestring'"
85-
foreach ($item in $resourceInvalidFieldsList) {
86-
Write-Host "--> $item"
87-
}
77+
$resourceLevelInvalidFields = @();
78+
foreach ($rc in $resourceContent) {
79+
$parameters = $rc.properties.mainTemplate.parameters.PSObject.Properties
80+
foreach ($param in $parameters) {
81+
$type = $param.Value.type.ToLower()
82+
83+
if ($type -ne 'securestring' -and $type -ne 'object' -and $type -ne 'array') {
84+
$resourceLevelInvalidFields += $param.Name
85+
}
86+
}
87+
}
88+
89+
if ($resourceLevelInvalidFields.Count -gt 0) {
90+
$hasInvalidResourceParameterType = $true
91+
Write-Host "Invalid resource level parameters field(s) type. Please update the 'type' value for below given list to 'securestring', 'object' or 'array'."
92+
foreach ($item in $resourceLevelInvalidFields) {
93+
Write-Host "--> $item"
8894
}
8995
}
9096
}
@@ -95,6 +101,6 @@ try {
95101
}
96102
}
97103
catch {
98-
Write-Host "Error occured in validateFieldTypes file. Error Details : $_"
104+
Write-Host "Error occurred in validateFieldTypes file. Error Details : $_"
99105
exit 1
100106
}

‎.script/tests/KqlvalidationsTests/CustomFunctions/ADOAuditLogs.json‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
{
2+
"FunctionName": "ADOAuditLogs",
3+
"FunctionParameters": [],
4+
"FunctionResultColumns": [
5+
{
6+
"name": "TimeGenerated",
7+
"type": "datetime"
8+
},
9+
{
10+
"name": "ActivityId",
11+
"type": "string"
12+
},
13+
{
14+
"name": "ActorCUID",
15+
"type": "string"
16+
},
17+
{
18+
"name": "ActorClientId",
19+
"type": "string"
20+
},
21+
{
22+
"name": "ActorDisplayName",
23+
"type": "string"
24+
},
25+
{
26+
"name": "ActorImageUrl",
27+
"type": "string"
28+
},
29+
{
30+
"name": "ActorUPN",
31+
"type": "string"
32+
},
33+
{
34+
"name": "ActorUserId",
35+
"type": "string"
36+
},
37+
{
38+
"name": "Area",
39+
"type": "string"
40+
},
41+
{
42+
"name": "AuthenticationMechanism",
43+
"type": "string"
44+
},
45+
{
46+
"name": "Category",
47+
"type": "string"
48+
},
49+
{
50+
"name": "CategoryDisplayName",
51+
"type": "string"
52+
},
53+
{
54+
"name": "CorrelationId",
55+
"type": "string"
56+
},
57+
{
58+
"name": "Data",
59+
"type": "dynamic"
60+
},
61+
{
62+
"name": "Details",
63+
"type": "string"
64+
},
65+
{
66+
"name": "Id",
67+
"type": "string"
68+
},
69+
{
70+
"name": "IpAddress",
71+
"type": "string"
72+
},
73+
{
74+
"name": "OperationName",
75+
"type": "string"
76+
},
77+
{
78+
"name": "ProjectId",
79+
"type": "string"
80+
},
81+
{
82+
"name": "ProjectName",
83+
"type": "string"
84+
},
85+
{
86+
"name": "ScopeDisplayName",
87+
"type": "string"
88+
},
89+
{
90+
"name": "ScopeId",
91+
"type": "string"
92+
},
93+
{
94+
"name": "ScopeType",
95+
"type": "string"
96+
},
97+
{
98+
"name": "UserAgent",
99+
"type": "string"
100+
},
101+
{
102+
"name": "Type",
103+
"type": "string"
104+
},
105+
{
106+
"name": "TenantId",
107+
"type": "string"
108+
},
109+
{
110+
"name": "SourceSystem",
111+
"type": "string"
112+
}
113+
]
114+
}

‎.script/tests/KqlvalidationsTests/CustomTables/ADOAuditLogs_CL.json‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
{
2+
"Name": "ADOAuditLogs_CL",
3+
"Properties": [
4+
{
5+
"name": "TimeGenerated",
6+
"type": "datetime"
7+
},
8+
{
9+
"name": "ActionId",
10+
"type": "string"
11+
},
12+
{
13+
"name": "ActivityId",
14+
"type": "string"
15+
},
16+
{
17+
"name": "ActorCUID",
18+
"type": "string"
19+
},
20+
{
21+
"name": "ActorClientId",
22+
"type": "string"
23+
},
24+
{
25+
"name": "ActorDisplayName",
26+
"type": "string"
27+
},
28+
{
29+
"name": "ActorImageUrl",
30+
"type": "string"
31+
},
32+
{
33+
"name": "ActorUPN",
34+
"type": "string"
35+
},
36+
{
37+
"name": "ActorUserId",
38+
"type": "string"
39+
},
40+
{
41+
"name": "Area",
42+
"type": "string"
43+
},
44+
{
45+
"name": "AuthenticationMechanism",
46+
"type": "string"
47+
},
48+
{
49+
"name": "Category",
50+
"type": "string"
51+
},
52+
{
53+
"name": "CategoryDisplayName",
54+
"type": "string"
55+
},
56+
{
57+
"name": "CorrelationId",
58+
"type": "string"
59+
},
60+
{
61+
"name": "Data",
62+
"type": "dynamic"
63+
},
64+
{
65+
"name": "Details",
66+
"type": "string"
67+
},
68+
{
69+
"name": "Id",
70+
"type": "string"
71+
},
72+
{
73+
"name": "IpAddress",
74+
"type": "string"
75+
},
76+
{
77+
"name": "ProjectId",
78+
"type": "string"
79+
},
80+
{
81+
"name": "ProjectName",
82+
"type": "string"
83+
},
84+
{
85+
"name": "ScopeDisplayName",
86+
"type": "string"
87+
},
88+
{
89+
"name": "ScopeId",
90+
"type": "string"
91+
},
92+
{
93+
"name": "ScopeType",
94+
"type": "string"
95+
},
96+
{
97+
"name": "UserAgent",
98+
"type": "string"
99+
}
100+
]
101+
}

0 commit comments

Comments
 (0)