Merge branch 'master' into v-prasadboke-workbookmetadata-syncup

Azure · Sep 8, 2023 · 86dd805 · 86dd805
2 parents 90ee4bf + 04941e9
commit 86dd805
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/.script/utils/workbookCheckers/WorkbookPreviewImageValidationSkipList.json b/.script/utils/workbookCheckers/WorkbookPreviewImageValidationSkipList.json
@@ -22,6 +22,12 @@
     "NCProtectWorkbook",
     "SAP-Monitors-AlertsandPerformance",
     "SAP-SecurityAuditlogandInitialAccess",
-    "SAP-AuditControls"
+    "SAP-AuditControls",
+    "IslandAdminAuditOverview",
+    "IslandUserActivityOverview",
+    "BloodHoundEnterpriseAttackPathWorkbook",
+    "BloodHoundEnterprisePostureWorkbook",
+    "UserWorkbook-alexdemichieli-github-update-1",
+    "SalemDashboard"
   ]
 }
diff --git a/Solutions/SAP/sapcon-sentinel-kickstart.sh b/Solutions/SAP/sapcon-sentinel-kickstart.sh
@@ -118,6 +118,10 @@ while [[ $# -gt 0 ]]; do
 		SID="$2"
 		shift 2
 		;;
+    	--hostnetwork)
+		HOSTNETWORK=1
+		shift 1
+		;;
 	--clientnumber)
 		CLIENTNUMBER="$2"
 		shift 2
@@ -265,6 +269,7 @@ while [[ $# -gt 0 ]]; do
 		echo "--abapserver <servername>"
 		echo "--systemnr <system number>"
 		echo "--sid <SID>"
+  		echo "--hostnetwork"
 		echo "--clientnumber <client number>"
 		echo "--messageserverhost <servername>"
 		echo "--messageserverport <servername>"
@@ -787,6 +792,10 @@ cmdparams=" --label Cloud=$CLOUD"
 # Generating SENTINEL_AGENT_GUID
 cmdparams+=" -e SENTINEL_AGENT_GUID=$(uuidgen) "
 
+if [ $HOSTNETWORK ]; then
+	cmdparams+=" --network host"
+fi
+
 if [ "$MODE" == "kvmi" ]; then
 	echo "Creating docker container for use with Azure Key vault and managed VM identity"
 	sudo docker create -v "$sysfileloc":/sapcon-app/sapcon/config/system $cmdparams $sncline $httpproxyline --name "$containername" $dockerimage$tagver >/dev/null

diff --git a/Solutions/SAP/sapcon-sentinel-ui-agent-kickstart.sh b/Solutions/SAP/sapcon-sentinel-ui-agent-kickstart.sh
@@ -61,6 +61,10 @@ while [[ $# -gt 0 ]]; do
 		APPID="$2"
 		shift 2
 		;;
+  	--hostnetwork)
+		HOSTNETWORK=1
+		shift 1
+		;;
 	--appsecret)
 		APPSECRET="$2"
 		shift 2
@@ -132,6 +136,7 @@ while [[ $# -gt 0 ]]; do
 		echo "--keymode [kvmi|kvsi]"
 		echo "--configpath <path>"
 		echo "--sdk <filename>"
+		echo "--hostnetwork"
 		echo "--network <network>"
 		echo "--appid <guid>"
 		echo "--appsecret <secret>"
@@ -424,7 +429,9 @@ elif [ "$MODE" == "kvsi" ]; then
 	log "Creating agent and configuring to use Azure Key vault and application authentication"
 	cmdparams+=" -e AZURE_CLIENT_ID=$APPID -e AZURE_CLIENT_SECRET=$APPSECRET -e AZURE_TENANT_ID=$TENANT"
 fi
-
+if [ $HOSTNETWORK ]; then
+	cmdparams+=" --network host"
+fi
 sudo docker create -v "$sysfileloc":/sapcon-app/sapcon/config/system $cmdparams --name "$containername" $dockerimage$tagver >/dev/null
 
 log 'Created Microsoft Sentinel SAP agent '"$AGENTNAME"