Skip to content

Updates to allow for log folders to be directly in the root of a bucket #14995

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

Open
gallen-ms wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updates to allow for log folders to be directly in the root of a bucket #14995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e698cc8
Update S3 Bucket Prefix notes and requirements
gallen-ms Aug 27, 2026
f332580
Bump solution and data connector version to 3.3.2
gallen-ms Aug 27, 2026
fae8227
Add release notes for version 3.3.2
gallen-ms Aug 27, 2026
b458abf
Update Cisco Umbrella solution version to 3.3.2
gallen-ms Aug 27, 2026
e2c4e3e
removing the leading slash after S3BucketPrefix
gallen-ms Aug 27, 2026
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
12 changes: 9 additions & 3 deletions ...iscoUmbrella/Data Connectors/CiscoUmbrella_CCP/CiscoUmbrella_DataConnectorDefinition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,12 @@
"content": "> **NOTE:**\n> This connector supports both Cisco-managed and customer-managed Amazon S3 buckets."
}
},
{
"type": "Markdown",
"parameters": {
"content": "> **NOTE:**\n> For Customer managed paths, you can leave the S3 Bucket Prefix empty if you want to use the root of the bucket. If you specify a prefix, make sure to include the trailing slash."
}
},
{
"type": "Markdown",
"parameters": {
Expand Down Expand Up @@ -227,7 +233,7 @@
{
"type": "Markdown",
"parameters": {
"content": "For example, the Data Path provided by Cisco is `cisco-managed-us-west-1/2003477-12345`. For the AWS S3 Bucket Name, the input S3 Bucket Name will be `cisco-managed-us-west-1`. The S3 Bucket Region will be `us-west-1`. The S3 Bucket Prefix will be `2003477-12345`."
"content": "For example, the Data Path provided by Cisco is `cisco-managed-us-west-1/2003477-12345`. For the AWS S3 Bucket Name, the input S3 Bucket Name will be `cisco-managed-us-west-1`. The S3 Bucket Region will be `us-west-1`. The S3 Bucket Prefix will be `2003477-12345/`."
}
},
{
Expand Down Expand Up @@ -376,7 +382,7 @@
"type": "text",
"name": "s3BucketPrefix",
"validations": {
"required": true
"required": false
}
}
}
Expand All @@ -390,4 +396,4 @@
]
}
}
}
}
22 changes: 11 additions & 11 deletions Solutions/CiscoUmbrella/Data Connectors/CiscoUmbrella_CCP/CiscoUmbrella_PollingConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/auditlogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'auditlogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaAdminAudit_CL",
Expand Down Expand Up @@ -66,7 +66,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/firewalllogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'firewalllogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaCloudFirewall_CL",
Expand Down Expand Up @@ -107,7 +107,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/dlplogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'dlplogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaDLP_CL",
Expand Down Expand Up @@ -148,7 +148,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/dnslogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'dnslogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaDNS_CL",
Expand Down Expand Up @@ -189,7 +189,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/fileeventlogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'fileeventlogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaFileEvent_CL",
Expand Down Expand Up @@ -230,7 +230,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/intrusionlogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'intrusionlogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaIPS_CL",
Expand Down Expand Up @@ -271,7 +271,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/ravpnlogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'ravpnlogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaRemoteAccessVPN_CL",
Expand Down Expand Up @@ -312,7 +312,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/proxylogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'proxylogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaWebTraffic_CL",
Expand Down Expand Up @@ -353,7 +353,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/ztnalogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'ztnalogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaZeroTrustAccess_CL",
Expand Down Expand Up @@ -394,7 +394,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/ztnaflowlogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'ztnaflowlogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaZeroTrustAccessFlow_CL",
Expand All @@ -409,4 +409,4 @@
},
"condition": "[[equals(parameters('selectedDataType')[0], 'CiscoUmbrellaZeroTrustAccessFlow')]"
}
]
]
2 changes: 1 addition & 1 deletion Solutions/CiscoUmbrella/Data/Solution_CiscoUmbrella.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"Playbooks/CiscoUmbrellaPlaybooks/CiscoUmbrella-GetDomainInfo/azuredeploy.json"
],
"BasePath": "C:\\GitHub\\Azure-Sentinel\\Solutions\\CiscoUmbrella",
"Version": "3.3.1",
"Version": "3.3.2",
"Metadata": "SolutionMetadata.json",
"TemplateSpec": true
}
52 changes: 32 additions & 20 deletions Solutions/CiscoUmbrella/Package/mainTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"email": "support@microsoft.com",
"_email": "[variables('email')]",
"_solutionName": "CiscoUmbrella",
"_solutionVersion": "3.3.1",
"_solutionVersion": "3.3.2",
"solutionId": "azuresentinel.azure-sentinel-solution-ciscoumbrella",
"_solutionId": "[variables('solutionId')]",
"uiConfigId1": "CiscoUmbrellaDataConnector",
Expand All @@ -77,7 +77,7 @@
"dataConnectorVersion2": "1.0.0",
"_dataConnectorcontentProductId2": "[concat(take(variables('_solutionId'),50),'-','dc','-', uniqueString(concat(variables('_solutionId'),'-','DataConnector','-',variables('_dataConnectorContentId2'),'-', variables('dataConnectorVersion2'))))]",
"workspaceResourceId": "[resourceId('microsoft.OperationalInsights/Workspaces', parameters('workspace'))]",
"dataConnectorCCPVersion": "3.3.1",
"dataConnectorCCPVersion": "3.3.2",
"_dataConnectorContentIdConnectorDefinition3": "CiscoUmbrellaConnector",
"dataConnectorTemplateNameConnectorDefinition3": "[concat(parameters('workspace'),'-dc-',uniquestring(variables('_dataConnectorContentIdConnectorDefinition3')))]",
"_dataConnectorContentIdConnections3": "CiscoUmbrellaConnectorConnections",
Expand Down Expand Up @@ -1928,6 +1928,12 @@
"content": "> **NOTE:**\n> This connector supports both Cisco-managed and customer-managed Amazon S3 buckets."
}
},
{
"type": "Markdown",
"parameters": {
"content": "> **NOTE:**\n> For Customer managed paths, you can leave the S3 Bucket Prefix empty if you want to use the root of the bucket. If you specify a prefix, make sure to include the trailing slash."
}
},
{
"type": "Markdown",
"parameters": {
Expand Down Expand Up @@ -1955,7 +1961,7 @@
{
"type": "Markdown",
"parameters": {
"content": "For example, the Data Path provided by Cisco is `cisco-managed-us-west-1/2003477-12345`. For the AWS S3 Bucket Name, the input S3 Bucket Name will be `cisco-managed-us-west-1`. The S3 Bucket Region will be `us-west-1`. The S3 Bucket Prefix will be `2003477-12345`."
"content": "For example, the Data Path provided by Cisco is `cisco-managed-us-west-1/2003477-12345`. For the AWS S3 Bucket Name, the input S3 Bucket Name will be `cisco-managed-us-west-1`. The S3 Bucket Region will be `us-west-1`. The S3 Bucket Prefix will be `2003477-12345/`."
}
},
{
Expand Down Expand Up @@ -2100,11 +2106,11 @@
"type": "Textbox",
"parameters": {
"label": "AWS S3 Bucket Prefix",
"placeholder": "S3 Bucket Prefix",
"placeholder": "S3 Bucket Prefix (include trailing slash if not empty)",
"type": "text",
"name": "s3BucketPrefix",
"validations": {
"required": true
"required": false
}
}
}
Expand Down Expand Up @@ -5583,6 +5589,12 @@
"content": "> **NOTE:**\n> This connector supports both Cisco-managed and customer-managed Amazon S3 buckets."
}
},
{
"type": "Markdown",
"parameters": {
"content": "> **NOTE:**\n> For Customer managed paths, you can leave the S3 Bucket Prefix empty if you want to use the root of the bucket. If you specify a prefix, make sure to include the trailing slash."
}
},
{
"type": "Markdown",
"parameters": {
Expand Down Expand Up @@ -5610,7 +5622,7 @@
{
"type": "Markdown",
"parameters": {
"content": "For example, the Data Path provided by Cisco is `cisco-managed-us-west-1/2003477-12345`. For the AWS S3 Bucket Name, the input S3 Bucket Name will be `cisco-managed-us-west-1`. The S3 Bucket Region will be `us-west-1`. The S3 Bucket Prefix will be `2003477-12345`."
"content": "For example, the Data Path provided by Cisco is `cisco-managed-us-west-1/2003477-12345`. For the AWS S3 Bucket Name, the input S3 Bucket Name will be `cisco-managed-us-west-1`. The S3 Bucket Region will be `us-west-1`. The S3 Bucket Prefix will be `2003477-12345/`."
}
},
{
Expand Down Expand Up @@ -5755,11 +5767,11 @@
"type": "Textbox",
"parameters": {
"label": "AWS S3 Bucket Prefix",
"placeholder": "S3 Bucket Prefix",
"placeholder": "S3 Bucket Prefix (include trailing slash if not empty)",
"type": "text",
"name": "s3BucketPrefix",
"validations": {
"required": true
"required": false
}
}
}
Expand Down Expand Up @@ -5875,8 +5887,8 @@
},
"s3BucketPrefix": {
"defaultValue": "s3BucketPrefix",
"type": "securestring",
"minLength": 1
"type": "securestring"

}
},
"variables": {
Expand Down Expand Up @@ -5935,7 +5947,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/auditlogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'auditlogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaAdminAudit_CL",
Expand Down Expand Up @@ -5976,7 +5988,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/firewalllogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'firewalllogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaCloudFirewall_CL",
Expand Down Expand Up @@ -6017,7 +6029,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/dlplogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'dlplogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaDLP_CL",
Expand Down Expand Up @@ -6058,7 +6070,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/dnslogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'dnslogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaDNS_CL",
Expand Down Expand Up @@ -6099,7 +6111,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/fileeventlogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'fileeventlogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaFileEvent_CL",
Expand Down Expand Up @@ -6140,7 +6152,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/intrusionlogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'intrusionlogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaIPS_CL",
Expand Down Expand Up @@ -6181,7 +6193,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/ravpnlogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'ravpnlogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaRemoteAccessVPN_CL",
Expand Down Expand Up @@ -6222,7 +6234,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/proxylogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'proxylogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaWebTraffic_CL",
Expand Down Expand Up @@ -6263,7 +6275,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/ztnalogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'ztnalogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaZeroTrustAccess_CL",
Expand Down Expand Up @@ -6304,7 +6316,7 @@
"awsSecretKey": "[[parameters('awsSecretKey')]",
"s3BucketName": "[[parameters('s3BucketName')]",
"s3BucketRegion": "[[parameters('s3BucketRegion')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'/ztnaflowlogs/')]",
"s3BucketPrefix": "[[concat(parameters('s3BucketPrefix'),'ztnaflowlogs/')]",
"queryWindowDelayInMin": 10,
"connectorDefinitionName": "CiscoUmbrellaConnector",
"dataType": "Custom-CiscoUmbrellaZeroTrustAccessFlow_CL",
Expand Down
Loading
Loading