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

Aligning config and lang en values to match a standard. #1653

Merged
merged 12 commits into from
Feb 15, 2024
Merged

Aligning config and lang en values to match a standard. #1653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1d3a30c
Aligning the Amazon and Microsoft display names.
DerekRushton Jan 30, 2024
7900b17
Standardized any fields that were shared across multiple modules
DerekRushton Feb 13, 2024
9fed17b
Added test to confirm that the fields are standard across all Connect…
DerekRushton Feb 13, 2024
9da5380
Correction to the regex and added a placeholder check in the test.
DerekRushton Feb 13, 2024
16ab10b
Removing an unintended file.
DerekRushton Feb 13, 2024
8c40460
Changed "communication" to "communicate"
DerekRushton Feb 13, 2024
b3b3973
Updated the hostname to remove the mention of CP4S
DerekRushton Feb 13, 2024
6a39d5a
CAR Connectors had better descriptions + reverted the regex.
DerekRushton Feb 14, 2024
87eb4b4
Unified the optional setting in the Amazon Connectors
DerekRushton Feb 14, 2024
c6ca585
Merge branch 'develop' into Aligning_config_and_lang_en_values
mdazam1942 Feb 14, 2024
85ae81b
Small adjustments to descriptions
DerekRushton Feb 14, 2024
80fead2
Adding a unittest to confirm that all conifgs have a group.
DerekRushton Feb 15, 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
1 change: 0 additions & 1 deletion docs/adapter-guide/develop-configuration-json.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ Below example json is the language translation file of the above QRadar config j
"connection": {
"host": {
"label": "Management IP address or Hostname",
"placeholder": "192.168.1.10",
"description": "Specify the IP address or hostname of the data source"
},
"port": {
Expand Down
2 changes: 1 addition & 1 deletion stix_shifter_modules/alertflex/configuration/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"host": {
"type": "text",
"regex": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$"
"regex": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9_:/\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9_:/\\-]*[A-Za-z0-9])$"
},
"port": {
"default": 8181,
Expand Down
5 changes: 2 additions & 3 deletions stix_shifter_modules/alertflex/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"connection": {
"host": {
"label": "Management IP address or hostname",
"placeholder": "192.168.1.10",
"description": "Specify the IP address or hostname of the data source"
},
"port": {
Expand All @@ -14,8 +13,8 @@
"description": "More details on the data source setting can be found in the specified link"
},
"selfSignedCert": {
"label": "Alertflex connection certificate",
"description": "Use self-signed SSL certificate and CA content(root and intermediate) of data source"
"label": "PEM Formatted SSL certificate(s)",
"description": "Provide a self-signed or CA-signed certificate to securely communicate with the data source."
}
},
"configuration": {
Expand Down
6 changes: 4 additions & 2 deletions stix_shifter_modules/arcsight/configuration/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"group": "microfocus"
},
"host": {
"type": "text"
"type": "text",
"regex": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9_:/\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9_:/\\-]*[A-Za-z0-9])$"
},
"port": {
"type": "number",
Expand All @@ -18,7 +19,8 @@
"default": "data-sources-arcsight.html"
},
"selfSignedCert": {
"type": "password"
"type": "password",
"optional": true
}
},
"configuration": {
Expand Down
4 changes: 2 additions & 2 deletions stix_shifter_modules/arcsight/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"description": "More details on the datasource setting can be found in the specified link"
},
"selfSignedCert": {
"label": "Connection certificate",
"description": "Use self-signed SSL certificate and CA content (root and intermediate) of datasource"
"label": "PEM Formatted SSL certificate(s)",
"description": "Provide a self-signed or CA-signed certificate to securely communicate with the data source."
}
},
"configuration": {
Expand Down
6 changes: 4 additions & 2 deletions stix_shifter_modules/async_template/configuration/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"connection": {
"type": {
"displayName": "Async Sample"
"displayName": "Async Sample",
"group":"async_sample"
},
"host": {
"type": "text"
"type": "text",
"regex": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9_:/\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9_:/\\-]*[A-Za-z0-9])$"
},
"port": {
"type": "number",
Expand Down
5 changes: 2 additions & 3 deletions stix_shifter_modules/async_template/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"connection": {
"host": {
"label": "Management IP address or hostname",
"placeholder": "192.168.1.10",
"description": "Specify the IP address or hostname of the data source"
},
"port": {
Expand All @@ -14,8 +13,8 @@
"description": "More details on the data source setting can be found in the specified link"
},
"selfSignedCert": {
"label": "<Module> connection certificate",
"description": "Use self-signed SSL certificate and CA content(root and intermediate) of data source"
"label": "PEM Formatted SSL certificate(s)",
"description": "Provide a self-signed or CA-signed certificate to securely communicate with the data source."
}
},
"configuration": {
Expand Down
8 changes: 4 additions & 4 deletions stix_shifter_modules/aws_athena/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"connection": {
"help": {
"label": "Need additional help?",
"description": "More details on the datasource setting can be found in the specified link"
"description": "More details on the data source setting can be found in the specified link"
},
"region": {
"label": "Region",
"placeholder": "us-east-1",
"description": "Specify the region of the Amazon Athena data source"
"label": "AWS Region Name",
"placeholder": "us-east-2",
"description": "Specify the region the data source is located in."
},
"s3_bucket_location": {
"label": "Amazon S3 bucket location",
Expand Down
6 changes: 4 additions & 2 deletions stix_shifter_modules/aws_cloud_watch_logs/configuration/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@
"auth": {
"type" : "fields",
"aws_access_key_id": {
"type": "password"
"type": "password",
"optional": true
},
"aws_iam_role": {
"type": "password",
"optional": true
},
"aws_secret_access_key": {
"type": "password"
"type": "password",
"optional": true
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions stix_shifter_modules/aws_cloud_watch_logs/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"description": "More details on the data source setting can be found in the specified link"
},
"region": {
"label": "Region",
"label": "AWS Region Name",
"placeholder": "us-east-2",
"description": "Specify the region of the CloudWatch Logs for the data source"
"description": "Specify the region the data source is located in."
},
"log_group_names": {
"label": "Log group names",
Expand Down
6 changes: 4 additions & 2 deletions stix_shifter_modules/aws_guardduty/configuration/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@
"auth": {
"type" : "fields",
"aws_access_key_id": {
"type": "password"
"type": "password",
"optional": true
},
"aws_iam_role": {
"type": "password",
"optional": true
},
"aws_secret_access_key": {
"type": "password"
"type": "password",
"optional": true
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions stix_shifter_modules/aws_guardduty/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"connection": {
"region": {
"label": "AWS GuardDuty Region Name",
"description": "Specify the region name of the GuardDuty data source"
"label": "AWS Region Name",
"placeholder": "us-east-2",
"description": "Specify the region the data source is located in."
},
"help": {
"label": "Need additional help?",
Expand Down
16 changes: 8 additions & 8 deletions stix_shifter_modules/azure_log_analytics/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"connection": {
"host": {
"label": "Management IP address or Hostname",
"label": "Management IP address or hostname",
"description": "Specify the IP address or hostname of the data source"
},
"port": {
"label": "Host port",
"description": "Set the port number that is associated with the Host name or IP"
"description": "Set the port number that is associated with the hostname or IP address"
},
"help": {
"label": "Need additional help?",
"description": "More details on the data source setting can be found in the specified link"
},
"selfSignedCert": {
"label": "Microsoft Azure certificate",
"description": "Use SSL certificate for Microsoft Azure."
},
"label": "PEM Formatted SSL certificate(s)",
"description": "Provide a self-signed or CA-signed certificate to securely communicate with the data source."
},
"workpaceId": {
"label": "Log Analytics workspace ID",
"description": "ID of the Azure Log Analytics workspace"
Expand All @@ -25,15 +25,15 @@
"auth": {
"tenant": {
"label": "Tenant ID",
"description": "Tenant ID of Azure Active directory Application with access to the Log Analytics Workspace"
"description": "Tenant ID of Azure Active directory Application with access to the data source"
},
"clientId": {
"label": "Client ID",
"description": "Client ID of Azure Active directory Application with access to the Log Analytics Workspace"
"description": "Client ID of Azure Active directory Application with access to the data source"
},
"clientSecret": {
"label": "Client secret",
"description": "Client Secret of Azure Active directory Application with access to the Log Analytics Workspace"
"description": "Client Secret of Azure Active directory Application with access to the data source"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions stix_shifter_modules/azure_sentinel/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"description": "More details on the data source setting can be found in the specified link"
},
"selfSignedCert": {
"label": "Microsoft Azure Sentinel certificate",
"description": "Use SSL certificate for Microsoft Azure Sentinel."
"label": "PEM Formatted SSL certificate(s)",
"description": "Provide a self-signed or CA-signed certificate to securely communicate with the data source."
},
"options": {
"alert": {
Expand Down
5 changes: 2 additions & 3 deletions stix_shifter_modules/bigfix/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"connection": {
"host": {
"label": "Management IP address or hostname",
"placeholder": "192.168.1.10",
"description": "Specify the IP address or hostname of the data source"
},
"port": {
Expand All @@ -14,8 +13,8 @@
"description": "More details on the data source setting can be found in the specified link"
},
"selfSignedCert": {
"label": "BigFix certificate",
"description": "Use self-signed Security Sockets Layer (SSL) or CA-signed certificate for secure communication between web reports or REST API server and the authorized user"
"label": "PEM Formatted SSL certificate(s)",
"description": "Provide a self-signed or CA-signed certificate to securely communicate with the data source."
}
},
"configuration": {
Expand Down
7 changes: 3 additions & 4 deletions stix_shifter_modules/carbonblack/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"connection": {
"host": {
"label": "Management IP address or hostname",
"placeholder": "192.168.1.10",
"description": "Specify the IP address or hostname of the data source"
},
"port": {
Expand All @@ -14,8 +13,8 @@
"description": "More details on the data source setting can be found in the specified link"
},
"selfSignedCert": {
"label": "CB Response connection certificate",
"description": "Use self-signed Security Sockets Layer (SSL) or CA-signed certificate for secure communication"
"label": "PEM Formatted SSL certificate(s)",
"description": "Provide a self-signed or CA-signed certificate to securely communicate with the data source."
},
"options": {
"events_mode": {
Expand All @@ -29,7 +28,7 @@
"type": "fields",
"token": {
"label": "API token",
"description": "API token of the CarbonBlack response account"
"description": "API token of the data source"
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions stix_shifter_modules/cbcloud/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"connection": {
"host": {
"label": "Management IP address or hostname",
"placeholder": "192.168.1.10",
"description": "Specify the IP address or hostname of the data source"
},
"port": {
Expand All @@ -21,8 +20,8 @@
"description": "Organization key"
},
"token": {
"label": "Token",
"description": "API token"
"label": "API token",
"description": "API token of the data source"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion stix_shifter_modules/cisco_secure_email/configuration/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"host": {
"type": "text",
"regex": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$"
"regex": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9_:/\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9_:/\\-]*[A-Za-z0-9])$"
},
"port": {
"type": "number",
Expand Down
4 changes: 2 additions & 2 deletions stix_shifter_modules/cisco_secure_email/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"description": "More details on the data source setting can be found in the specified link"
},
"selfSignedCert": {
"label": "Cisco Secure Email HTTPS connection certificate",
"description": "Use self-signed Security Sockets Layer (SSL) or CA certificate for HTTPS services"
"label": "PEM Formatted SSL certificate(s)",
"description": "Provide a self-signed or CA-signed certificate to securely communicate with the data source."
}
},
"configuration": {
Expand Down
1 change: 0 additions & 1 deletion stix_shifter_modules/crowdstrike/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"connection": {
"host": {
"label": "Management IP address or hostname",
"placeholder": "192.168.1.10",
"description": "Specify the IP address or hostname of the data source"
},
"port": {
Expand Down
2 changes: 1 addition & 1 deletion stix_shifter_modules/cybereason/configuration/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"host": {
"type": "text",
"regex": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$"
"regex": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9_:/\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9_:/\\-]*[A-Za-z0-9])$"
},
"port": {
"type": "number",
Expand Down
5 changes: 2 additions & 3 deletions stix_shifter_modules/cybereason/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"connection": {
"host": {
"label": "Management IP address or hostname",
"placeholder": "192.168.1.10",
"description": "Specify the IP address or hostname of the data source"
},
"port": {
Expand All @@ -19,11 +18,11 @@
"auth": {
"username": {
"label": "Username",
"description": "Username with access to the search API"
"description": "Username required for data source authentication"
},
"password": {
"label": "Password",
"description": "Password of the user with access to the search API"
"description": "Password required for data source authentication"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion stix_shifter_modules/darktrace/configuration/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"host": {
"type": "text",
"regex": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$"
"regex": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9_:/\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9_:/\\-]*[A-Za-z0-9])$"
},
"help": {
"type": "link",
Expand Down
4 changes: 2 additions & 2 deletions stix_shifter_modules/datadog/configuration/lang_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"description": "Specify the Site URL of the datasource"
},
"selfSignedCert": {
"label": "Datadog certificate",
"placeholder": "Paste your certificate"
"label": "PEM Formatted SSL certificate(s)",
"description": "Provide a self-signed or CA-signed certificate to securely communicate with the data source."
},
"help": {
"label": "Need additional help?",
Expand Down
6 changes: 4 additions & 2 deletions stix_shifter_modules/demo_template/configuration/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"connection": {
"type": {
"displayName": "Demo Sample"
"displayName": "Demo Sample",
"group": "demo_sample"
},
"host": {
"type": "text"
"type": "text",
"regex": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9_:/\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9_:/\\-]*[A-Za-z0-9])$"
},
"port": {
"type": "number",
Expand Down
Loading
Loading