Skip to content
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

Jump to bottom

Team cymru scout azure deploy tool tip changes #11355

Merged
merged 4 commits into from
Nov 15, 2024
Merged

Team cymru scout azure deploy tool tip changes #11355

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a72641f
Team Cymru Scout Tooltip Changes
Oct 28, 2024
7903ae4
Merge branch 'Azure:master' into TeamCymruScoutAzureDeployToolTipChanges
dhwanishah-crest Oct 28, 2024
9b89e26
Merge branch 'master' into TeamCymruScoutAzureDeployToolTipChanges
Nov 11, 2024
dcba950
Merge branch 'TeamCymruScoutAzureDeployToolTipChanges' of https://git…
Nov 11, 2024
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
78 changes: 40 additions & 38 deletions ...ut/Data Connectors/TeamCymruScout/azuredeploy_Connector_TeamCymruScout_AzureFunction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,38 @@
"maxLength": 11,
"type": "string"
},
"WorkspaceID": {
"type": "string",
"minLength": 1,
"metadata": {
"description": "Enter Workspace ID of Log Analytics Workspace"
}
},
"WorkspaceKey": {
"type": "securestring",
"minLength": 1,
"metadata": {
"description": "Enter Primary Key of Log Analytics Workspace"
}
},
"TeamCymruScoutBaseURL": {
"type": "string",
"metadata": {
"description": "Base URL starting with \"https://\" followed by hostname (Ex: https://scout.cymru.com)."
"description": "Enter Base URL starting with \"https://\" followed by hostname (Ex: https://scout.cymru.com)"
}
},
"AuthenticationType": {
"type": "string",
"defaultValue": "Basic Auth",
"metadata": {
"description": "Please select Authentication Type for Team Cymru Scout APIs. By default it is set to Basic Auth."
"description": "Select Authentication Type for Team Cymru Scout APIs. Default is 'Basic Auth'"
},
"allowedValues": [
"API Key",
"Basic Auth"
]
},
"Username": {
"UserName": {
"type": "string",
"defaultValue": "",
"metadata": {
Expand All @@ -50,28 +64,28 @@
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Enter comma separated ip values for which data should be collected. e.g. 1.2.3.4,10.20.30.40,2.4.3.6"
"description": "Enter comma separated ip values for which data should be collected (Example: 1.2.3.4,10.20.30.40,2.4.3.6)"
}
},
"DomainValues": {
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Enter comma separated domain values for which data should be collected. e.g. abc.com,xyz.com,def.ai"
"description": "Enter comma separated domain values for which data should be collected (Example: abc.com,xyz.com,def.ai)"
}
},
"APIType": {
"type": "string",
"defaultValue": "Foundation",
"metadata": {
"description": "Select the type of API to collect data for IP. By default it is set to Foundation."
"description": "Select the type of API to collect data for IP. Default is Foundation"
},
"allowedValues": [
"Foundation",
"Details"
]
},
"AzureClientId": {
"AzureClientID": {
"type": "string",
"minLength": 1,
"metadata": {
Expand All @@ -85,76 +99,63 @@
"description": "Enter Azure Client Secret that you have created during creating the client secret"
}
},
"TenantId":{
"type": "string",
"minLength": 1,
"metadata": {
"description": "Enter Tenant Id of your Microsoft Entra Id"
}
},
"WorkspaceID": {
"TenantID":{
"type": "string",
"minLength": 1,
"metadata": {
"description": "Enter Workspace ID of Log Analytics Workspace"
}
},
"WorkspaceKey": {
"type": "securestring",
"minLength": 1,
"metadata": {
"description": "Enter Primary Key of Log Analytics Workspace"
"description": "Enter Tenant Id of your Microsoft Entra ID"
}
},
"IPTableName": {
"type": "string",
"defaultValue": "Cymru_Scout_IP_Data",
"minLength": 1,
"metadata": {
"description": "Please do not keep this field as empty else you will get validation error"
"description": "Enter name of the table used to store IP Data logs. Please do not keep this field as empty else you will get validation error"
}
},
"DomainTableName": {
"type": "string",
"defaultValue": "Cymru_Scout_Domain_Data",
"minLength": 1,
"metadata": {
"description": "Please do not keep this field as empty else you will get validation error"
"description": "Enter name of the table used to store Domain Data logs. Please do not keep this field as empty else you will get validation error"
}
},
"AccountUsageTableName": {
"type": "string",
"defaultValue": "Cymru_Scout_Account_Usage_Data",
"minLength": 1,
"metadata": {
"description": "Please do not keep this field as empty else you will get validation error"
"description": "Enter name of the table used to store Account Usage Data logs. Please do not keep this field as empty else you will get validation error"
}
},
"Schedule": {
"type": "string",
"defaultValue": "0 0 0 * * *",
"metadata": {
"description": "Enter a valid Quartz cron-expression. The default value is every day at midnight(00:00) for ip and domain data collection."
"description": "Enter a valid Quartz Cron-Expression. The default value is every day at midnight(00:00) for ip and domain data collection."
}
},
"AccountUsageSchedule": {
"type": "string",
"defaultValue": "0 0 * * * *",
"metadata": {
"description": "Enter a valid Quartz cron-expression. The default value is every hour for Account usage."
"description": "Enter a valid Quartz Cron-Expression. The default value is every hour for Account usage."
}
},
"LogLevel": {
"type": "string",
"defaultValue": "INFO",
"metadata": {
"description": "Please select log level or log severity value. By default it is set to INFO."
"description": "Add log level or log severity value. Default is 'INFO'"
},
"allowedValues": [
"DEBUG",
"INFO",
"ERROR"
]
"Debug",
"Info",
"Error",
"Warning"
],
"defaultValue": "Info"
},
"AppInsightsWorkspaceResourceID": {
"type": "string",
Expand Down Expand Up @@ -213,7 +214,8 @@
}
},
"keySource": "Microsoft.Storage"
}
},
"minimumTlsVersion": "TLS1_2"
}
},
{
Expand Down Expand Up @@ -293,15 +295,15 @@
"logAnalyticsUri": "[variables('LogAnaltyicsUri')]",
"CymruScoutBaseURL": "[trim(parameters('TeamCymruScoutBaseURL'))]",
"AuthenticationType": "[parameters('AuthenticationType')]",
"TeamCymruScoutUsername": "[trim(parameters('Username'))]",
"TeamCymruScoutUsername": "[trim(parameters('UserName'))]",
"TeamCymruScoutPassword": "[trim(parameters('Password'))]",
"APIKey": "[trim(parameters('APIKey'))]",
"IPValues": "[parameters('IPValues')]",
"DomainValues": "[parameters('DomainValues')]",
"APIType": "[parameters('APIType')]",
"AZURE_CLIENT_ID": "[trim(parameters('AzureClientId'))]",
"AZURE_CLIENT_ID": "[trim(parameters('AzureClientID'))]",
"AZURE_CLIENT_SECRET": "[trim(parameters('AzureClientSecret'))]",
"AZURE_TENANT_ID": "[trim(parameters('TenantId'))]",
"AZURE_TENANT_ID": "[trim(parameters('TenantID'))]",
"WorkspaceID": "[trim(parameters('WorkspaceID'))]",
"WorkspaceKey": "[trim(parameters('WorkspaceKey'))]",
"IPTableName": "[trim(parameters('IPTableName'))]",
Expand Down
Loading