Skip to content

Commit 3644684

Browse files
authored
Merge branch 'master' into ktff/readd_remove_file_test
2 parents 921fbd2 + 2f2583b commit 3644684

File tree

601 files changed

+28886
-21589
lines changed

Some content is hidden

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

601 files changed

+28886
-21589
lines changed

.cargo/config

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
1-
[target.x86_64-unknown-linux-musl]
1+
[target.x86_64-unknown-linux-gnu]
22
rustflags = ["-C", "link-args=-rdynamic"]
33

4-
[target.x86_64-unknown-linux-gnu]
4+
[target.aarch64-unknown-linux-gnu]
55
rustflags = ["-C", "link-args=-rdynamic"]
6+
7+
[target.'cfg(target_env = "musl")']
8+
# Because the `cross` Docker container sets `CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER`, the
9+
# `linker` key does not work in this file, so we use `rustflags` instead.
10+
# NOTE: This means that any custom `RUSTFLAGS` variable must include this value!
11+
rustflags = "-Clinker=scripts/cross/wrappers/linker.sh"
12+
13+
# x86_64-specific libstdc++ search path. When building for musl, Cargo will merge this with the
14+
# `rustflags` key above.
15+
[target.x86_64-unknown-linux-musl]
16+
rustflags = "-Lnative=/usr/local/x86_64-linux-musl/lib"
17+
18+
[target.aarch64-unknown-linux-musl]
19+
# Deliberately empty.
20+
# See `scripts/cross/wrappers/{linker,rustc}.sh`.
21+
# Basically, we need to carefully edit the ordering of links.
22+
# Rust doesn't let us have great control of that here, so for now we use those wrappers.

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@ indent_size = 4
1616
[Makefile]
1717
indent_style = tab
1818
indent_size = 4
19+
20+
[*.cue]
21+
indent_style = tab
22+
indent_size = 4

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ distribution/* linguist-detectable=false
33
lib/* linguist-vendored
44
scripts/* linguist-detectable=false
55
Makefile linguist-detectable=false
6+
7+
distribution/helm/*/charts/*.tgz filter=lfs diff=lfs merge=lfs -text

.github/CODEOWNERS

Lines changed: 56 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,76 @@
1111
/skaffold.yaml @MOZGIII
1212
/kustomization.yaml @MOZGIII
1313

14+
/docs/reference/components/sinks/*_metrics.cue @lukesteensen
15+
/docs/reference/components/sinks/aws_kinesis_streams.cue @jszwedko
16+
/docs/reference/components/sinks/aws_s3.cue @jszwedko
17+
/docs/reference/components/sinks/console.cue @lukesteensen
18+
/docs/reference/components/sinks/gcp @bruceg
19+
/docs/reference/components/sinks/http.cue @jszwedko
20+
/docs/reference/components/sinks/humio_logs.cue @jszwedko
21+
/docs/reference/components/sinks/splunk_hec.cue @ktff
22+
/docs/reference/components/sinks/kafka.cue @lukesteensen
23+
/docs/reference/components/sinks/prometheus.cue @lukesteensen
24+
/docs/reference/components/sinks/splunk_hec.cue @lukesteensen
25+
/docs/reference/components/sinks/statsd.cue @lukesteensen
26+
/docs/reference/components/sinks/tcp.cue @bruceg @lukesteensen
27+
28+
/docs/reference/components/sources/apache_metrics/ @jszwedko
29+
/docs/reference/components/sources/docker.cue @fanatid
30+
/docs/reference/components/sources/generator.cue @bruceg
31+
/docs/reference/components/sources/host_metrics.cue @bruceg
32+
/docs/reference/components/sources/journald.cue @bruceg
33+
/docs/reference/components/sources/stdin.cue @bruceg
34+
/docs/reference/components/sources/syslog.cue @lukesteensen
35+
/docs/reference/components/sources/tcp.cue @bruceg
36+
/docs/reference/components/sources/udp.cue @bruceg
37+
/docs/reference/components/sources/vector.cue @lukesteensen
38+
/docs/reference/components/sources/kubernetes_* @MOZGIII @JeanMertz
39+
/docs/reference/components/sources/splunk_hec.cue @ktff
40+
41+
/docs/reference/components/transforms/add_tags.cue @lukesteensen
42+
/docs/reference/components/transforms/ansi_stripper.cue @JeanMertz
43+
/docs/reference/components/transforms/coercer.cue @bruceg
44+
/docs/reference/components/transforms/filter.cue @bruceg
45+
/docs/reference/components/transforms/field_filter.cue @lukesteensen
46+
/docs/reference/components/transforms/geoip.cue @lukesteensen
47+
/docs/reference/components/transforms/grok_parser.cue @lukesteensen
48+
/docs/reference/components/transforms/log_to_metric.cue @lukesteensen
49+
/docs/reference/components/transforms/merge.cue @MOZGIII
50+
/docs/reference/components/transforms/regex_parser.cue @lukesteensen
51+
/docs/reference/components/transforms/remap.cue @JeanMertz @FungusHumungus
52+
/docs/reference/components/transforms/remove_tags.cue @lukesteensen
53+
/docs/reference/components/transforms/sampler.cue @lukesteensen
54+
/docs/reference/components/transforms/split.cue @lukesteensen
55+
/docs/reference/components/transforms/tokenzier.cue @lukesteensen
56+
1457
/distribution/ @hoverbear @jamtur01
15-
/distribution/kubernetes/ @MOZGIII
58+
/distribution/docker/ @MOZGIII
1659
/distribution/helm/ @MOZGIII
60+
/distribution/kubernetes/ @MOZGIII
1761

1862
/lib/file-source/src/paths_provider/mod.rs @MOZGIII
1963
/lib/file-source/src/paths_provider/glob.rs @MOZGIII
2064
/lib/k8s-test-framework/ @MOZGIII @JeanMertz
65+
/lib/k8s-e2e-tests/ @MOZGIII @JeanMertz
2166
/lib/prometheus-parser/ @juchiast
2267
/lib/vector-wasm/ @hoverbear @JeanMertz
2368

2469
/proto/ @lukesteensen
2570

2671
/scripts/build-* @hoverbear
2772
/scripts/ci-docker-images/ @hoverbear @jamtur01
28-
/scripts/check-meta.sh @binarylogic @jamtur01
73+
/scripts/check-docs.sh @binarylogic @jamtur01
2974
/scripts/check-* @jamtur01
3075
/scripts/docker-* @jamtur01
3176
/scripts/environment/* @hoverbear @jamtur01
3277
/scripts/load-meta.rb @binarylogic @jamtur01
3378
/scripts/package-* @jamtur01
3479
/scripts/release-* @hoverbear
3580
/scripts/upgrade-* @hoverbear
81+
/scripts/*docker* @MOZGIII
3682
/scripts/ci-setup-minikube.sh @MOZGIII
37-
/scripts/ci-setup-helm.sh @MOZGIII
83+
/scripts/environment/setup-helm.sh @MOZGIII
3884
/scripts/release-helm.sh @MOZGIII
3985
/scripts/deploy-kubernetes-test.sh @MOZGIII @JeanMertz
4086
/scripts/test-e2e-kubernetes.sh @MOZGIII @JeanMertz
@@ -62,14 +108,16 @@
62108

63109
/src/kubernetes/ @MOZGIII @JeanMertz
64110

111+
/src/mapping/ @JeanMertz @FungusHumungus
112+
65113
/src/sinks/*_metrics.rs @lukesteensen
66114
/src/sinks/aws_kinesis_streams.rs @jszwedko
67115
/src/sinks/aws_s3.rs @jszwedko
68116
/src/sinks/console.rs @lukesteensen
69117
/src/sinks/gcp @bruceg
70118
/src/sinks/http.rs @jszwedko
71119
/src/sinks/humio_logs.rs @jszwedko
72-
/src/sinks/splunk_hec.rs @jszwedko
120+
/src/sinks/splunk_hec.rs @ktff
73121
/src/sinks/kafka.rs @lukesteensen
74122
/src/sinks/prometheus.rs @lukesteensen
75123
/src/sinks/splunk_hec.rs @lukesteensen
@@ -79,8 +127,10 @@
79127
/src/sinks/util/auto_concurrency @bruceg
80128

81129
/src/sources/apache_metrics/ @jszwedko
130+
/src/sources/aws_kinesis_firehose/ @jszwedko
82131
/src/sources/docker.rs @fanatid
83132
/src/sources/generator.rs @bruceg
133+
/src/sources/host_metrics.rs @bruceg
84134
/src/sources/journald.rs @bruceg
85135
/src/sources/stdin.rs @bruceg
86136
/src/sources/syslog.rs @lukesteensen
@@ -95,6 +145,7 @@
95145

96146
/src/transforms/add_tags.rs @lukesteensen
97147
/src/transforms/ansi_stripper.rs @JeanMertz
148+
/src/transforms/aws_cloudwatch_logs_subscription_parser.rs @jszwedko
98149
/src/transforms/coercer.rs @bruceg
99150
/src/transforms/filter.rs @bruceg
100151
/src/transforms/field_filter.rs @lukesteensen
@@ -103,6 +154,7 @@
103154
/src/transforms/log_to_metric.rs @lukesteensen
104155
/src/transforms/merge.rs @MOZGIII
105156
/src/transforms/regex_parser.rs @lukesteensen
157+
/src/transforms/remap.rs @JeanMertz @FungusHumungus
106158
/src/transforms/remove_tags.rs @lukesteensen
107159
/src/transforms/sampler.rs @lukesteensen
108160
/src/transforms/split.rs @lukesteensen
@@ -112,7 +164,6 @@
112164

113165
/tests/buffering.rs @MOZGIII
114166
/tests/data/wasm/ @hoverbear @JeanMertz
115-
/tests/kubernetes-e2e.rs @MOZGIII @JeanMertz
116167
/tests/shutdown.rs @ktff
117168
/tests/cli.rs @ktff
118169

.github/ISSUE_TEMPLATE/bug_report.md renamed to .github/ISSUE_TEMPLATE/bug.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Bug Report
2+
name: Bug
33
about: Let us know about an unexpected error, a crash, or an incorrect behavior.
44
labels: 'type: bug'
55
assignees: ''

.github/ISSUE_TEMPLATE/enhancement.md

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
---
2+
name: Enhancement
3+
about: Suggest an enhancement to an existing feature.
4+
labels: 'type: enhancement'
5+
assignees: ''
6+
title: ''
7+
8+
---
9+
10+
<!--
11+
Hi there,
12+
13+
Thank you for opening an issue. Please note that we try to keep the Vector issue tracker reserved for bug reports and feature requests. For general usage questions, please see: https://chat.vector.dev.
14+
-->
15+
16+
### Current Vector Version
17+
18+
<!---
19+
Run `vector --version` to show the version, and paste the result between the ``` marks below. This will record which version was current at the time of your feature request, to help manage the request backlog.
20+
21+
If you're not using the latest version, please check to see if something related to your request has already been implemented in a later version.
22+
-->
23+
24+
```
25+
...
26+
```
27+
28+
### Use-cases
29+
30+
<!---
31+
In order to properly evaluate a feature request, it is necessary to understand the use-cases for it.
32+
33+
Please describe below the _end goal_ you are trying to achieve that has led you to request this feature.
34+
35+
Please keep this section focused on the problem and not on the suggested solution. We'll get to that in a moment, below!
36+
-->
37+
38+
### Attempted Solutions
39+
40+
<!---
41+
If you've already tried to solve the problem within Vector's existing features and found a limitation that prevented you from succeeding, please describe it below in as much detail as possible.
42+
43+
Ideally, this would include real configuration snippets that you tried and what results you got in each case.
44+
45+
Please remove any sensitive information such as passwords before sharing configuration snippets and command lines.
46+
--->
47+
48+
### Proposal
49+
50+
<!---
51+
If you have an idea for a way to address the problem via a change to Vector features, please describe it below.
52+
53+
In this section, it's helpful to include specific examples of how what you are suggesting might look in configuration files, or on the command line, since that allows us to understand the full picture of what you are proposing.
54+
55+
If you're not sure of some details, don't worry! When we evaluate the feature request we may suggest modifications as necessary to work within the design constraints of Vector.
56+
-->
57+
58+
### References
59+
60+
<!--
61+
Are there any other GitHub issues, whether open or closed, that are related to the problem you've described above or to the suggested solution? If so, please create a list below that mentions each of them. For example:
62+
63+
- #7023
64+
65+
-->

.github/ISSUE_TEMPLATE/feature_request.md renamed to .github/ISSUE_TEMPLATE/feature.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
name: Feature Request
3-
about: Suggest a new feature or enhancement.
2+
name: Feature
3+
about: Suggest a new feature.
44
labels: 'type: feature'
55
assignees: ''
66
title: ''

.github/ISSUE_TEMPLATE/task.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
name: Task
3+
about: Record a general task that needs to be done.
4+
labels: 'type: task'
5+
assignees: ''
6+
title: ''
7+
8+
---

.github/bors.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
status = [
2+
"ci",
3+
]
4+
delete_merged_branches = true
5+
use_squash_merge = true
6+
cut_body_after = "---"
7+
timeout_sec = 43200

.github/semantic.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# WARNING! THIS FILE IS AUTOGENERATED! DO NOT EDIT!
2-
# Orginal file: https://github.com/timberio/vector-management/github/semantic_pull_requests.tf
2+
# Orginal file: https://github.com/timberio/resources/tree/master/vector/github/semantic_pull_requests.tf
33
# ------------------------------------------------------------------------------
44
#
55
# Configuration for probot/semantic-pull-requests GitHub check bot
@@ -38,13 +38,13 @@ scopes:
3838
- deps # Anything related to Vector's dependencies
3939
- dev # Anything related to Vector's development environment
4040
- enriching # Anything related to enriching Vector's events with context data
41+
- exceptions # Anything related to Vector's exception events.
4142
- extensions # Anything related to extending Vector (WASM, plugins, etc.)
4243
- external docs # Anything related to Vector's external, public documentation
4344
- filtering # Anything related to filtering within Vector
4445
- healthchecks # Anything related to Vector's healtchecks
4546
- internal docs # Anything related to Vector's internal documentation
4647
- logs # Anything related to Vector's log events
47-
- mapping # Anything related to mapping data within Vector
4848
- marketing # Anything related to marketing Vector
4949
- metrics # Anything related to Vector's metrics events
5050
- networking # Anything related to Vector's networking
@@ -57,6 +57,7 @@ scopes:
5757
- releasing # Anything related to releasing Vector
5858
- reliability # Anything related to Vector's reliability
5959
- reload # Anything related to reloading Vector (updating configuration)
60+
- remap # Anything related to the Timber Remap Language
6061
- rfcs # Anything related to Vector's internal RFCs
6162
- security # Anything related to security
6263
- setup # Anything related to setting up or installing Vector
@@ -165,6 +166,7 @@ scopes:
165166
- aws_kinesis_firehose sink # Anything `aws_kinesis_firehose` sink related
166167
- aws_kinesis_streams sink # Anything `aws_kinesis_streams` sink related
167168
- aws_s3 sink # Anything `aws_s3` sink related
169+
- azure_monitor_logs sink # Anything `azure_monitor_logs` sink related
168170
- blackhole sink # Anything `blackhole` sink related
169171
- clickhouse sink # Anything `clickhouse` sink related
170172
- console sink # Anything `console` sink related

.github/workflows/benches.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ on:
77

88
env:
99
VERBOSE: true
10-
ENVIRONMENT_UPSTREAM: docker.pkg.github.com/timberio/vector/environment:${{ github.sha }}
10+
ENVIRONMENT_UPSTREAM: timberio/ci_image:${{ github.sha }}
1111
AWS_ACCESS_KEY_ID: "dummy"
1212
AWS_SECRET_ACCESS_KEY: "dummy"
13+
CI: true
1314

1415
jobs:
1516
cancel-previous:
@@ -29,6 +30,7 @@ jobs:
2930
runs-on: ubuntu-20.04
3031
steps:
3132
- uses: actions/checkout@v2
33+
- run: make ci-sweep
3234
- run: sudo bash scripts/environment/bootstrap-ubuntu-20.04.sh
3335
- run: bash scripts/environment/prepare.sh
3436
- run: make bench

0 commit comments

Comments
 (0)