Skip to content

Commit 4840544

Browse files
committed
Merge branch 'master' into Srinivas-AWS-Netwrok-Firewall
2 parents af04609 + de21a7a commit 4840544

File tree

1,082 files changed

+91801
-43686
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,082 files changed

+91801
-43686
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export async function IsValidDataConnectorSchema(filePath: string): Promise<Exit
4747
}
4848

4949
function isPotentialConnectorJson(jsonFile: any) {
50-
if(typeof jsonFile.id != "undefined" && typeof jsonFile.connectivityCriterias != "undefined")
50+
if(typeof jsonFile.id != "undefined" && typeof jsonFile.connectivityCriterias != "undefined" && jsonFile.dataTypes.length > 0)
5151
{
5252
return true;
5353
}

.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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ 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) {
7777
$resourceLevelInvalidFields = @();
@@ -80,15 +80,15 @@ try {
8080
foreach ($param in $parameters) {
8181
$type = $param.Value.type.ToLower()
8282

83-
if ($type -ne 'securestring' -and $type -ne 'object') {
83+
if ($type -ne 'securestring' -and $type -ne 'object' -and $type -ne 'array') {
8484
$resourceLevelInvalidFields += $param.Name
8585
}
8686
}
8787
}
8888

8989
if ($resourceLevelInvalidFields.Count -gt 0) {
9090
$hasInvalidResourceParameterType = $true
91-
Write-Host "Invalid resource level parameters field(s) type. Please update the 'type' value for below given list to 'securestring' or 'object'"
91+
Write-Host "Invalid resource level parameters field(s) type. Please update the 'type' value for below given list to 'securestring', 'object' or 'array'."
9292
foreach ($item in $resourceLevelInvalidFields) {
9393
Write-Host "--> $item"
9494
}
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
{
2+
"Name": "Communication_Data_CL",
3+
"Properties": [
4+
{
5+
"Name": "TimeGenerated",
6+
"Type": "datetime"
7+
},
8+
{
9+
"Name": "proto_d",
10+
"Type": "real"
11+
},
12+
{
13+
"Name": "proto_text_s",
14+
"Type": "string"
15+
},
16+
{
17+
"Name": "local_ip_s",
18+
"Type": "string"
19+
},
20+
{
21+
"Name": "local_min_port_d",
22+
"Type": "real"
23+
},
24+
{
25+
"Name": "local_max_port_d",
26+
"Type": "real"
27+
},
28+
{
29+
"Name": "local_country_codes_s",
30+
"Type": "string"
31+
},
32+
{
33+
"Name": "local_as_info_s",
34+
"Type": "string"
35+
},
36+
{
37+
"Name": "local_tags_s",
38+
"Type": "string"
39+
},
40+
{
41+
"Name": "local_unique_ports_d",
42+
"Type": "real"
43+
},
44+
{
45+
"Name": "local_top_services_s",
46+
"Type": "string"
47+
},
48+
{
49+
"Name": "peer_ip_s",
50+
"Type": "string"
51+
},
52+
{
53+
"Name": "peer_min_port_d",
54+
"Type": "real"
55+
},
56+
{
57+
"Name": "peer_max_port_d",
58+
"Type": "real"
59+
},
60+
{
61+
"Name": "peer_country_codes_s",
62+
"Type": "string"
63+
},
64+
{
65+
"Name": "peer_as_info_s",
66+
"Type": "string"
67+
},
68+
{
69+
"Name": "peer_tags_s",
70+
"Type": "string"
71+
},
72+
{
73+
"Name": "peer_unique_ports_d",
74+
"Type": "real"
75+
},
76+
{
77+
"Name": "peer_top_services_s",
78+
"Type": "string"
79+
},
80+
{
81+
"Name": "event_count_d",
82+
"Type": "real"
83+
},
84+
{
85+
"Name": "first_seen_s",
86+
"Type": "string"
87+
},
88+
{
89+
"Name": "last_seen_s",
90+
"Type": "string"
91+
},
92+
{
93+
"Name": "ip_s",
94+
"Type": "string"
95+
},
96+
{
97+
"Name": "Type",
98+
"Type": "string"
99+
}
100+
]
101+
}

0 commit comments

Comments
 (0)