Skip to content

Commit c1bdc20

Browse files
chrisberkhoutchrisberkhout
authored
[tanium] Add options to configure non-public S3 (#16080)
The options are: - endpoint - region - extenal_id - default_region This also makes all `aws-s3.yml.hbs` files identical, and matches the S3 sections of `./data_stream/*/manifest.yml` files.
1 parent 27e5ea3 commit c1bdc20

File tree

9 files changed

+127
-22
lines changed

9 files changed

+127
-22
lines changed

‎packages/tanium/changelog.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "1.17.0"
3+
changes:
4+
- description: Add options to configure non-public S3.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/16080
27
- version: "1.16.2"
38
changes:
49
- description: Fix handling of SQS worker count configuration.

‎packages/tanium/data_stream/action_history/agent/stream/aws-s3.yml.hbs‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ file_selectors:
4444
number_of_workers: {{number_of_workers}}
4545
{{/if}}
4646

47+
{{#if endpoint}}
48+
endpoint: {{endpoint}}
49+
{{/if}}
50+
{{#if region}}
51+
region: {{region}}
52+
{{/if}}
53+
{{#if default_region}}
54+
default_region: {{default_region}}
55+
{{/if}}
4756
{{#if access_key_id}}
4857
access_key_id: {{access_key_id}}
4958
{{/if}}
@@ -53,15 +62,18 @@ secret_access_key: {{secret_access_key}}
5362
{{#if session_token}}
5463
session_token: {{session_token}}
5564
{{/if}}
56-
{{#if shared_credential_file}}
57-
shared_credential_file: {{shared_credential_file}}
58-
{{/if}}
5965
{{#if credential_profile_name}}
6066
credential_profile_name: {{credential_profile_name}}
6167
{{/if}}
68+
{{#if shared_credential_file}}
69+
shared_credential_file: {{shared_credential_file}}
70+
{{/if}}
6271
{{#if role_arn}}
6372
role_arn: {{role_arn}}
6473
{{/if}}
74+
{{#if external_id}}
75+
external_id: {{external_id}}
76+
{{/if}}
6577
{{#if fips_enabled}}
6678
fips_enabled: {{fips_enabled}}
6779
{{/if}}

‎packages/tanium/data_stream/client_status/agent/stream/aws-s3.yml.hbs‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ file_selectors:
4444
number_of_workers: {{number_of_workers}}
4545
{{/if}}
4646

47+
{{#if endpoint}}
48+
endpoint: {{endpoint}}
49+
{{/if}}
50+
{{#if region}}
51+
region: {{region}}
52+
{{/if}}
53+
{{#if default_region}}
54+
default_region: {{default_region}}
55+
{{/if}}
4756
{{#if access_key_id}}
4857
access_key_id: {{access_key_id}}
4958
{{/if}}
@@ -53,15 +62,18 @@ secret_access_key: {{secret_access_key}}
5362
{{#if session_token}}
5463
session_token: {{session_token}}
5564
{{/if}}
56-
{{#if shared_credential_file}}
57-
shared_credential_file: {{shared_credential_file}}
58-
{{/if}}
5965
{{#if credential_profile_name}}
6066
credential_profile_name: {{credential_profile_name}}
6167
{{/if}}
68+
{{#if shared_credential_file}}
69+
shared_credential_file: {{shared_credential_file}}
70+
{{/if}}
6271
{{#if role_arn}}
6372
role_arn: {{role_arn}}
6473
{{/if}}
74+
{{#if external_id}}
75+
external_id: {{external_id}}
76+
{{/if}}
6577
{{#if fips_enabled}}
6678
fips_enabled: {{fips_enabled}}
6779
{{/if}}

‎packages/tanium/data_stream/discover/agent/stream/aws-s3.yml.hbs‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ file_selectors:
4444
number_of_workers: {{number_of_workers}}
4545
{{/if}}
4646

47+
{{#if endpoint}}
48+
endpoint: {{endpoint}}
49+
{{/if}}
50+
{{#if region}}
51+
region: {{region}}
52+
{{/if}}
53+
{{#if default_region}}
54+
default_region: {{default_region}}
55+
{{/if}}
4756
{{#if access_key_id}}
4857
access_key_id: {{access_key_id}}
4958
{{/if}}
@@ -53,15 +62,18 @@ secret_access_key: {{secret_access_key}}
5362
{{#if session_token}}
5463
session_token: {{session_token}}
5564
{{/if}}
56-
{{#if shared_credential_file}}
57-
shared_credential_file: {{shared_credential_file}}
58-
{{/if}}
5965
{{#if credential_profile_name}}
6066
credential_profile_name: {{credential_profile_name}}
6167
{{/if}}
68+
{{#if shared_credential_file}}
69+
shared_credential_file: {{shared_credential_file}}
70+
{{/if}}
6271
{{#if role_arn}}
6372
role_arn: {{role_arn}}
6473
{{/if}}
74+
{{#if external_id}}
75+
external_id: {{external_id}}
76+
{{/if}}
6577
{{#if fips_enabled}}
6678
fips_enabled: {{fips_enabled}}
6779
{{/if}}

‎packages/tanium/data_stream/endpoint_config/agent/stream/aws-s3.yml.hbs‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ file_selectors:
4444
number_of_workers: {{number_of_workers}}
4545
{{/if}}
4646

47+
{{#if endpoint}}
48+
endpoint: {{endpoint}}
49+
{{/if}}
50+
{{#if region}}
51+
region: {{region}}
52+
{{/if}}
53+
{{#if default_region}}
54+
default_region: {{default_region}}
55+
{{/if}}
4756
{{#if access_key_id}}
4857
access_key_id: {{access_key_id}}
4958
{{/if}}
@@ -53,17 +62,17 @@ secret_access_key: {{secret_access_key}}
5362
{{#if session_token}}
5463
session_token: {{session_token}}
5564
{{/if}}
56-
{{#if shared_credential_file}}
57-
shared_credential_file: {{shared_credential_file}}
58-
{{/if}}
5965
{{#if credential_profile_name}}
6066
credential_profile_name: {{credential_profile_name}}
6167
{{/if}}
68+
{{#if shared_credential_file}}
69+
shared_credential_file: {{shared_credential_file}}
70+
{{/if}}
6271
{{#if role_arn}}
6372
role_arn: {{role_arn}}
6473
{{/if}}
65-
{{#if endpoint}}
66-
endpoint: {{endpoint}}
74+
{{#if external_id}}
75+
external_id: {{external_id}}
6776
{{/if}}
6877
{{#if fips_enabled}}
6978
fips_enabled: {{fips_enabled}}

‎packages/tanium/data_stream/reporting/agent/stream/aws-s3.yml.hbs‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ file_selectors:
4444
number_of_workers: {{number_of_workers}}
4545
{{/if}}
4646

47+
{{#if endpoint}}
48+
endpoint: {{endpoint}}
49+
{{/if}}
50+
{{#if region}}
51+
region: {{region}}
52+
{{/if}}
53+
{{#if default_region}}
54+
default_region: {{default_region}}
55+
{{/if}}
4756
{{#if access_key_id}}
4857
access_key_id: {{access_key_id}}
4958
{{/if}}
@@ -53,15 +62,18 @@ secret_access_key: {{secret_access_key}}
5362
{{#if session_token}}
5463
session_token: {{session_token}}
5564
{{/if}}
56-
{{#if shared_credential_file}}
57-
shared_credential_file: {{shared_credential_file}}
58-
{{/if}}
5965
{{#if credential_profile_name}}
6066
credential_profile_name: {{credential_profile_name}}
6167
{{/if}}
68+
{{#if shared_credential_file}}
69+
shared_credential_file: {{shared_credential_file}}
70+
{{/if}}
6271
{{#if role_arn}}
6372
role_arn: {{role_arn}}
6473
{{/if}}
74+
{{#if external_id}}
75+
external_id: {{external_id}}
76+
{{/if}}
6577
{{#if fips_enabled}}
6678
fips_enabled: {{fips_enabled}}
6779
{{/if}}

‎packages/tanium/data_stream/threat_response/agent/stream/aws-s3.yml.hbs‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ file_selectors:
4444
number_of_workers: {{number_of_workers}}
4545
{{/if}}
4646

47+
{{#if endpoint}}
48+
endpoint: {{endpoint}}
49+
{{/if}}
50+
{{#if region}}
51+
region: {{region}}
52+
{{/if}}
53+
{{#if default_region}}
54+
default_region: {{default_region}}
55+
{{/if}}
4756
{{#if access_key_id}}
4857
access_key_id: {{access_key_id}}
4958
{{/if}}
@@ -53,15 +62,18 @@ secret_access_key: {{secret_access_key}}
5362
{{#if session_token}}
5463
session_token: {{session_token}}
5564
{{/if}}
56-
{{#if shared_credential_file}}
57-
shared_credential_file: {{shared_credential_file}}
58-
{{/if}}
5965
{{#if credential_profile_name}}
6066
credential_profile_name: {{credential_profile_name}}
6167
{{/if}}
68+
{{#if shared_credential_file}}
69+
shared_credential_file: {{shared_credential_file}}
70+
{{/if}}
6271
{{#if role_arn}}
6372
role_arn: {{role_arn}}
6473
{{/if}}
74+
{{#if external_id}}
75+
external_id: {{external_id}}
76+
{{/if}}
6577
{{#if fips_enabled}}
6678
fips_enabled: {{fips_enabled}}
6779
{{/if}}

‎packages/tanium/data_stream/threat_response/manifest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ streams:
7575
show_user: false
7676
default: |
7777
- regex: "threat_response/"
78-
description: If the SQS queue will have events that correspond to files that this integration shouldn’t process, file_selectors can be used to limit the files that are downloaded. This is a list of selectors which are made up of regex and expand_event_list_from_field options. The regex should match the S3 object key in the SQS message, and the optional expand_event_list_from_field is the same as the global setting. If file_selectors is given, then any global expand_event_list_from_field value is ignored in favor of the ones specified in the file_selectors. Multiple regexes are used [RE2 syntax](https://pkg.go.dev/regexp/syntax). Files that don’t match any of the regexes will not be processed.
78+
description: If the SQS queue will have events that correspond to files that this integration shouldn’t process, file_selectors can be used to limit the files that are downloaded. This is a list of selectors which are made up of regex and expand_event_list_from_field options. The regex should match the S3 object key in the SQS message, and the optional expand_event_list_from_field is the same as the global setting. If file_selectors is given, then any global expand_event_list_from_field value is ignored in favor of the ones specified in the file_selectors. Regexes use [RE2 syntax](https://pkg.go.dev/regexp/syntax). Files that don’t match one of the regexes will not be processed.
7979
- name: tags
8080
type: text
8181
title: Tags

‎packages/tanium/manifest.yml‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: "3.0.3"
22
name: tanium
33
title: Tanium
4-
version: "1.16.2"
4+
version: "1.17.0"
55
description: This Elastic integration collects logs from Tanium with Elastic Agent.
66
type: integration
77
categories:
@@ -124,6 +124,22 @@ policy_templates:
124124
required: false
125125
show_user: false
126126
description: AWS IAM Role to assume.
127+
- name: endpoint
128+
type: text
129+
title: Endpoint
130+
multi: false
131+
required: false
132+
show_user: false
133+
default: ""
134+
description: URL of the entry point for an AWS web service.
135+
- name: region
136+
type: text
137+
title: Region
138+
multi: false
139+
required: false
140+
show_user: false
141+
default: ""
142+
description: The name of the AWS region of the end point.
127143
- name: fips_enabled
128144
type: bool
129145
title: Enable S3 FIPS
@@ -132,6 +148,21 @@ policy_templates:
132148
required: false
133149
show_user: false
134150
description: Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
151+
- name: external_id
152+
type: text
153+
title: External ID
154+
multi: false
155+
required: false
156+
show_user: false
157+
description: External ID to use when assuming a role in another account, see [the AWS documentation for use of external IDs](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html).
158+
- name: default_region
159+
type: text
160+
title: Default AWS Region
161+
multi: false
162+
required: false
163+
show_user: false
164+
default: ""
165+
description: Default region to use prior to connecting to region specific services/endpoints if no AWS region is set from environment variable, credentials or instance profile. If none of the above are set and no default region is set as well, `us-east-1` is used. A region, either from environment variable, credentials or instance profile or from this default region setting, needs to be set when using regions in non-regular AWS environments such as AWS China or US Government Isolated.
135166
- name: proxy_url
136167
type: text
137168
title: Proxy URL

0 commit comments

Comments
 (0)