Skip to content

Commit 1681edc

Browse files
committed
Resolve conflicts
2 parents fc83669 + 6458f55 commit 1681edc

205 files changed

Lines changed: 16079 additions & 176783 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ci/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pipeline {
1212
AWS_ACCOUNT_SECRET = "secret/observability-team/ci/elastic-observability-aws-account-auth"
1313
HOME = "${env.WORKSPACE}"
1414
KIND_VERSION = "v0.11.1"
15-
K8S_VERSION = "v1.20.2"
15+
K8S_VERSION = "v1.23.0"
1616
JOB_GCS_BUCKET = 'beats-ci-temp'
1717
JOB_GCS_BUCKET_INTERNAL = 'beats-ci-temp-internal'
1818
JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin'

go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.17
44

55
require (
66
github.com/blang/semver v3.5.1+incompatible
7-
github.com/elastic/elastic-package v0.31.0
7+
github.com/elastic/elastic-package v0.32.1
88
github.com/elastic/package-registry v1.5.1
99
github.com/magefile/mage v1.11.0
1010
github.com/pkg/errors v0.9.1
@@ -21,9 +21,9 @@ require (
2121
github.com/Microsoft/go-winio v0.5.1 // indirect
2222
github.com/PaesslerAG/gval v1.1.2 // indirect
2323
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
24-
github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3 // indirect
24+
github.com/ProtonMail/go-crypto v0.0.0-20211221144345-a4f6767435ab // indirect
2525
github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a // indirect
26-
github.com/ProtonMail/gopenpgp/v2 v2.3.0 // indirect
26+
github.com/ProtonMail/gopenpgp/v2 v2.4.0 // indirect
2727
github.com/PuerkitoBio/purell v1.1.1 // indirect
2828
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2929
github.com/acomagu/bufpipe v1.0.3 // indirect
@@ -110,7 +110,7 @@ require (
110110
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
111111
github.com/sergi/go-diff v1.2.0 // indirect
112112
github.com/sirupsen/logrus v1.8.1 // indirect
113-
github.com/spf13/cobra v1.2.1 // indirect
113+
github.com/spf13/cobra v1.3.0 // indirect
114114
github.com/spf13/pflag v1.0.5 // indirect
115115
github.com/ulikunitz/xz v0.5.10 // indirect
116116
github.com/xanzy/ssh-agent v0.3.1 // indirect
@@ -143,11 +143,11 @@ require (
143143
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
144144
helm.sh/helm/v3 v3.7.2 // indirect
145145
howett.net/plist v0.0.0-20201203080718-1454fab16a06 // indirect
146-
k8s.io/api v0.23.0 // indirect
146+
k8s.io/api v0.23.1 // indirect
147147
k8s.io/apiextensions-apiserver v0.23.0 // indirect
148-
k8s.io/apimachinery v0.23.0 // indirect
149-
k8s.io/cli-runtime v0.23.0 // indirect
150-
k8s.io/client-go v0.23.0 // indirect
148+
k8s.io/apimachinery v0.23.1 // indirect
149+
k8s.io/cli-runtime v0.23.1 // indirect
150+
k8s.io/client-go v0.23.1 // indirect
151151
k8s.io/component-base v0.23.0 // indirect
152152
k8s.io/klog/v2 v2.30.0 // indirect
153153
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect

go.sum

Lines changed: 158 additions & 12 deletions
Large diffs are not rendered by default.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Route 53
2+
3+
This integration is used to fetch logs from [Route 53](https://aws.amazon.com/route53/).
4+
## Logs
5+
6+
### Public Hosted Zone Logs
7+
8+
The `route53_public_logs` dataset collects information about public DNS queries that Route 53 receives.
9+
10+
Query logs contain only the queries that DNS resolvers forward to Route 53. If a DNS resolver has already cached the response to a query (such as the IP address for a load balancer for example.com), the resolver will continue to return the cached response without forwarding the query to Route 53 until the TTL for the corresponding record expires.
11+
12+
Depending on how many DNS queries are submitted for a domain name (example.com) or subdomain name (www.example.com), which resolvers your users are using, and the TTL for the record, query logs might contain information about only one query out of every several thousand queries that are submitted to DNS resolvers.
13+
14+
See [Route 53 Documentation](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/query-logs.html) for more information
15+
16+
{{event "route53_public_logs"}}
17+
18+
{{fields "route53_public_logs"}}
19+
20+
### Resolver Logs
21+
22+
The `route53_resolver_logs` dataset collects all DNS queries & responses for:
23+
* Queries that originate in Amazon Virtual Private Cloud VPCs that you specify, as well as the responses to those DNS queries.
24+
* Queries from on-premises resources that use an inbound Resolver endpoint.
25+
* Queries that use an outbound Resolver endpoint for recursive DNS resolution.
26+
* Queries that use Route 53 Resolver DNS Firewall rules to block, allow, or monitor domain lists.
27+
28+
As is standard for DNS resolvers, resolvers cache DNS queries for a length of time determined by the time-to-live (TTL) for the resolver. The Route 53 Resolver caches queries that originate in your VPCs, and responds from the cache whenever possible to speed up responses. Resolver query logging logs only unique queries, not queries that Resolver is able to respond to from the cache.
29+
30+
For example, suppose that an EC2 instance in one of the VPCs that a query logging configuration is logging queries for, submits a request for accounting.example.com. Resolver caches the response to that query, and logs the query. If the same instance’s elastic network interface makes a query for accounting.example.com within the TTL of the Resolver’s cache, Resolver responds to the query from the cache. The second query is not logged.
31+
32+
See [Route 53 Documentation](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resolver-query-logs.html) for more information
33+
34+
{{event "route53_resolver_logs"}}
35+
36+
{{fields "route53_resolver_logs"}}

packages/aws/changelog.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
# newer versions go on top
2+
- version: "1.10.0"
3+
changes:
4+
- description: Add cloudwatch input into AWS package for log collection
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/2323
7+
- version: "1.9.0"
8+
changes:
9+
- description: Add Route 53 Resolver Logs Datastream
10+
type: enhancement
11+
link: https://github.com/elastic/integrations/pull/2341
12+
- version: "1.8.0"
13+
changes:
14+
- description: Add Route 53 Public Zone Logs Datastream
15+
type: enhancement
16+
link: https://github.com/elastic/integrations/pull/2316
217
- version: "1.7.1"
318
changes:
419
- description: Regenerate test files using the new GeoIP database
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
{{#unless log_group_name}}
2+
{{#unless log_group_name_prefix}}
3+
{{#if log_group_arn }}
4+
log_group_arn: {{ log_group_arn }}
5+
{{/if}}
6+
{{/unless}}
7+
{{/unless}}
8+
9+
{{#unless log_group_arn}}
10+
{{#unless log_group_name}}
11+
{{#if log_group_name_prefix }}
12+
log_group_name_prefix: {{ log_group_name_prefix }}
13+
{{/if}}
14+
{{/unless}}
15+
{{/unless}}
16+
17+
{{#unless log_group_arn}}
18+
{{#unless log_group_name_prefix}}
19+
{{#if log_group_name }}
20+
log_group_name: {{ log_group_name }}
21+
{{/if}}
22+
{{/unless}}
23+
{{/unless}}
24+
25+
{{#unless log_group_arn}}
26+
region_name: {{ region_name }}
27+
{{/unless}}
28+
29+
{{#unless log_stream_prefix}}
30+
{{#if log_streams }}
31+
log_streams: {{ log_streams }}
32+
{{/if}}
33+
{{/unless}}
34+
35+
{{#unless log_streams}}
36+
{{#if log_stream_prefix }}
37+
log_stream_prefix: {{ log_stream_prefix }}
38+
{{/if}}
39+
{{/unless}}
40+
41+
{{#if start_position }}
42+
start_position: {{ start_position }}
43+
{{/if}}
44+
45+
{{#if scan_frequency }}
46+
scan_frequency: {{ scan_frequency }}
47+
{{/if}}
48+
49+
{{#if api_sleep }}
50+
api_sleep: {{ api_sleep }}
51+
{{/if}}
52+
53+
{{#if credential_profile_name}}
54+
credential_profile_name: {{credential_profile_name}}
55+
{{/if}}
56+
{{#if shared_credential_file}}
57+
shared_credential_file: {{shared_credential_file}}
58+
{{/if}}
59+
{{#if api_timeout}}
60+
api_timeout: {{api_timeout}}
61+
{{/if}}
62+
{{#if endpoint}}
63+
endpoint: {{endpoint}}
64+
{{/if}}
65+
{{#if access_key_id}}
66+
access_key_id: {{access_key_id}}
67+
{{/if}}
68+
{{#if secret_access_key}}
69+
secret_access_key: {{secret_access_key}}
70+
{{/if}}
71+
{{#if session_token}}
72+
session_token: {{session_token}}
73+
{{/if}}
74+
{{#if role_arn}}
75+
role_arn: {{role_arn}}
76+
{{/if}}
77+
{{#if proxy_url }}
78+
proxy_url: {{proxy_url}}
79+
{{/if}}
80+
tags:
81+
{{#if preserve_original_event}}
82+
- preserve_original_event
83+
{{/if}}
84+
{{#each tags as |tag i|}}
85+
- {{tag}}
86+
{{/each}}
87+
{{#contains "forwarded" tags}}
88+
publisher_pipeline.disable_host: true
89+
{{/contains}}
90+
{{#if processors}}
91+
processors:
92+
{{processors}}
93+
{{/if}}

packages/aws/data_stream/cloudtrail/manifest.yml

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,109 @@ streams:
193193
type: bool
194194
multi: false
195195
default: false
196+
- input: aws-cloudwatch
197+
template_path: aws-cloudwatch.yml.hbs
198+
title: AWS CloudTrail Logs
199+
description: Collect AWS CloudTrail logs using cloudwatch input
200+
enabled: false
201+
vars:
202+
- name: log_group_arn
203+
type: text
204+
title: Log Group ARN
205+
multi: false
206+
required: false
207+
show_user: true
208+
description: ARN of the log group to collect logs from.
209+
- name: log_group_name
210+
type: text
211+
title: Log Group Name
212+
multi: false
213+
required: false
214+
show_user: false
215+
description: Name of the log group to collect logs from. `region_name` is required when `log_group_name` is given.
216+
- name: log_group_name_prefix
217+
type: text
218+
title: Log Group Name Prefix
219+
multi: false
220+
required: false
221+
show_user: false
222+
description: The prefix for a group of log group names. `region_name` is required when `log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
223+
- name: region_name
224+
type: text
225+
title: Region Name
226+
multi: false
227+
required: false
228+
show_user: false
229+
description: Region that the specified log group or log group prefix belongs to.
230+
- name: log_streams
231+
type: text
232+
title: Log Streams
233+
multi: true
234+
required: false
235+
show_user: false
236+
description: A list of strings of log streams names that Filebeat collect log events from.
237+
- name: log_streams_prefix
238+
type: text
239+
title: Log Stream Prefix
240+
multi: false
241+
required: false
242+
show_user: false
243+
description: A string to filter the results to include only log events from log streams that have names starting with this prefix.
244+
- name: start_position
245+
type: text
246+
title: Start Position
247+
multi: false
248+
required: false
249+
default: beginning
250+
show_user: true
251+
description: Allows user to specify if this input should read log files from the beginning or from the end.
252+
- name: scan_frequency
253+
type: text
254+
title: Scan Frequency
255+
multi: false
256+
required: false
257+
show_user: false
258+
default: 1m
259+
description: This config parameter sets how often Filebeat checks for new log events from the specified log group.
260+
- name: api_timeput
261+
type: text
262+
title: API Timeout
263+
multi: false
264+
required: false
265+
show_user: false
266+
default: 120s
267+
description: The maximum duration of AWS API can take. If it exceeds the timeout, AWS API will be interrupted.
268+
- name: api_sleep
269+
type: text
270+
title: API Sleep
271+
multi: false
272+
required: false
273+
show_user: false
274+
default: 200ms
275+
description: This is used to sleep between AWS FilterLogEvents API calls inside the same collection period. `FilterLogEvents` API has a quota of 5 transactions per second (TPS)/account/Region. This value should only be adjusted when there are multiple Filebeats or multiple Filebeat inputs collecting logs from the same region and AWS account.
276+
- name: tags
277+
type: text
278+
title: Tags
279+
multi: true
280+
required: true
281+
show_user: false
282+
default:
283+
- forwarded
284+
- aws-cloudtrail
285+
- name: processors
286+
type: yaml
287+
title: Processors
288+
multi: false
289+
required: false
290+
show_user: false
291+
description: >
292+
Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the logs are parsed. See [Processors](https://www.elastic.co/guide/en/beats/filebeat/current/filtering-and-enhancing-data.html) for details.
293+
294+
- name: preserve_original_event
295+
required: true
296+
show_user: true
297+
title: Preserve original event
298+
description: Preserves a raw copy of the original event, added to the field `event.original`
299+
type: bool
300+
multi: false
301+
default: false

0 commit comments

Comments
 (0)