diff --git a/psmodules/Check-NetworkWatcherEnabled.zip b/psmodules/Check-NetworkWatcherEnabled.zip index ca7f98ae..5e0b3458 100644 Binary files a/psmodules/Check-NetworkWatcherEnabled.zip and b/psmodules/Check-NetworkWatcherEnabled.zip differ diff --git a/setup/IaC/modules/automationaccount.bicep b/setup/IaC/modules/automationaccount.bicep index 204a030a..4ec7f5d2 100644 --- a/setup/IaC/modules/automationaccount.bicep +++ b/setup/IaC/modules/automationaccount.bicep @@ -258,7 +258,7 @@ resource guardrailsAC 'Microsoft.Automation/automationAccounts@2021-06-22' = if properties: { contentLink: { uri: '${ModuleBaseURL}/Check-NetworkWatcherEnabled.zip' - version: '1.0.5' + version: '1.0.6' } } } diff --git a/setup/IaC/modules/gr.workbook b/setup/IaC/modules/gr.workbook index 38afcd60..37c06f2a 100644 --- a/setup/IaC/modules/gr.workbook +++ b/setup/IaC/modules/gr.workbook @@ -567,7 +567,7 @@ "type": 3, "content": { "version": "KqlItem/1.0", - "query": "let itsgcodes=GRITSGControls_CL | where TimeGenerated == toscalar(GRITSGControls_CL | summarize by TimeGenerated | top 2 by TimeGenerated desc | top 1 by TimeGenerated asc | project TimeGenerated);\r\nlet ctrlprefix=\"GUARDRAIL 9\";\r\nGuardrailsCompliance_CL\r\n| where ControlName_s has ctrlprefix and ReportTime_s == \"{RunTime}\" and Required_s !=tostring(\"{RequiredYesNo}\")\r\n| where TimeGenerated > ago (24h)\r\n|join kind=leftouter (itsgcodes) on itsgcode_s\r\n| project ['VNet Name']=column_ifexists('VNETName_s', ''), Status=case(ComplianceStatus_b == true, \"✔️\", ComplianceStatus_b == false, \"❌\", \"➖\"), Comments=Comments_s,[\"ITSG Control\"]=itsgcode_s, Mitigation=gr_geturl(replace_string(ctrlprefix,\" \",\"\"),itsgcode_s), Profile=iff(isnotempty(column_ifexists('Profile_d', '')), tostring(toint(column_ifexists('Profile_d', ''))), '')\r\n", + "query": "let itsgcodes=GRITSGControls_CL | where TimeGenerated == toscalar(GRITSGControls_CL | summarize by TimeGenerated | top 2 by TimeGenerated desc | top 1 by TimeGenerated asc | project TimeGenerated);\r\nlet ctrlprefix=\"GUARDRAIL 9\";\r\nGuardrailsCompliance_CL\r\n| where ControlName_s has ctrlprefix and ReportTime_s == \"{RunTime}\" and Required_s !=tostring(\"{RequiredYesNo}\")\r\n| where TimeGenerated > ago (24h)\r\n|join kind=leftouter (itsgcodes) on itsgcode_s\r\n| project ['Subscription Name']=SubscriptionName_s, ['Item Name']=ItemName_s, ['VNet Name']=column_ifexists('VNETName_s', ''), Status=case(ComplianceStatus_b == true, \"✔️\", ComplianceStatus_b == false, \"❌\", \"➖\"), Comments=Comments_s, ['ITSG Control']=itsgcode_s, Mitigation=gr_geturl(replace_string(ctrlprefix,\" \",\"\"),itsgcode_s), Profile=iff(isnotempty(column_ifexists('Profile_d', '')), tostring(toint(column_ifexists('Profile_d', ''))), '')", "size": 0, "title": "GR 9", "timeContext": { diff --git a/src/GUARDRAIL 9 NETWORK SECURITY SERVICES/Audit/Check-NetworkWatcherEnabled.psd1 b/src/GUARDRAIL 9 NETWORK SECURITY SERVICES/Audit/Check-NetworkWatcherEnabled.psd1 index d16f58b9..3a3a0385 100644 --- a/src/GUARDRAIL 9 NETWORK SECURITY SERVICES/Audit/Check-NetworkWatcherEnabled.psd1 +++ b/src/GUARDRAIL 9 NETWORK SECURITY SERVICES/Audit/Check-NetworkWatcherEnabled.psd1 @@ -14,7 +14,7 @@ RootModule = '.\Check-NetworkWatcherEnabled.psm1' # Version number of this module. -ModuleVersion = '1.0.5' +ModuleVersion = '1.0.6' # Supported PSEditions # CompatiblePSEditions = @() diff --git a/src/GUARDRAIL 9 NETWORK SECURITY SERVICES/Audit/Check-NetworkWatcherEnabled.psm1 b/src/GUARDRAIL 9 NETWORK SECURITY SERVICES/Audit/Check-NetworkWatcherEnabled.psm1 index 08b3b8e7..f4614171 100644 --- a/src/GUARDRAIL 9 NETWORK SECURITY SERVICES/Audit/Check-NetworkWatcherEnabled.psm1 +++ b/src/GUARDRAIL 9 NETWORK SECURITY SERVICES/Audit/Check-NetworkWatcherEnabled.psm1 @@ -99,7 +99,7 @@ function Get-NetworkWatcherStatus { SubscriptionName = $sub.Name ComplianceStatus = $ComplianceStatus Comments = $msgTable.networkWatcherConfigNoRegions - ItemName = $msgTable.networkWatcherConfigNoRegions + ItemName = $msgTable.networkWatcherConfig itsgcode = $itsgcode ControlName = $ControlName ReportTime = $ReportTime