Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dependabot/cargo/re…
Browse files Browse the repository at this point in the history
…qwest-0.11.19
  • Loading branch information
jszwedko committed Aug 22, 2023
2 parents bc0097d + b982a74 commit 3322547
Show file tree
Hide file tree
Showing 49 changed files with 695 additions and 679 deletions.
85 changes: 49 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,11 @@ opendal = {version = "0.38", default-features = false, features = ["native-tls",
tower = { version = "0.4.13", default-features = false, features = ["buffer", "limit", "retry", "timeout", "util", "balance", "discover"] }
tower-http = { version = "0.4.3", default-features = false, features = ["decompression-gzip"]}
# Serde
serde = { version = "1.0.183", default-features = false, features = ["derive"] }
serde = { version = "1.0.185", default-features = false, features = ["derive"] }
serde-toml-merge = { version = "0.3.0", default-features = false }
serde_bytes = { version = "0.11.12", default-features = false, features = ["std"], optional = true }
serde_json = { version = "1.0.105", default-features = false, features = ["raw_value"] }
serde_with = { version = "3.2.0", default-features = false, features = ["macros", "std"] }
serde_with = { version = "3.3.0", default-features = false, features = ["macros", "std"] }
serde_yaml = { version = "0.9.25", default-features = false }

# Messagepack
Expand Down Expand Up @@ -269,7 +269,7 @@ futures-util = { version = "0.3.28", default-features = false }
glob = { version = "0.3.1", default-features = false }
governor = { version = "0.6.0", default-features = false, features = ["dashmap", "jitter", "std"], optional = true }
grok = { version = "2.0.0", default-features = false, optional = true }
h2 = { version = "0.3.20", default-features = false, optional = true }
h2 = { version = "0.3.21", default-features = false, optional = true }
hash_hasher = { version = "2.0.0", default-features = false }
hashbrown = { version = "0.14.0", default-features = false, optional = true, features = ["ahash"] }
headers = { version = "0.3.8", default-features = false }
Expand All @@ -295,7 +295,7 @@ mongodb = { version = "2.6.1", default-features = false, features = ["tokio-runt
async-nats = { version = "0.31.0", default-features = false, optional = true }
nkeys = { version = "0.3.1", default-features = false, optional = true }
nom = { version = "7.1.3", default-features = false, optional = true }
notify = { version = "6.0.1", default-features = false, features = ["macos_fsevent"] }
notify = { version = "6.1.0", default-features = false, features = ["macos_fsevent"] }
once_cell = { version = "1.18", default-features = false }
openssl = { version = "0.10.56", default-features = false, features = ["vendored"] }
openssl-probe = { version = "0.1.5", default-features = false }
Expand All @@ -320,7 +320,7 @@ stream-cancel = { version = "0.8.1", default-features = false }
strip-ansi-escapes = { version = "0.2.0", default-features = false }
syslog = { version = "6.1.0", default-features = false, optional = true }
tikv-jemallocator = { version = "0.5.4", default-features = false, optional = true }
tokio-postgres = { version = "0.7.7", default-features = false, features = ["runtime", "with-chrono-0_4"], optional = true }
tokio-postgres = { version = "0.7.9", default-features = false, features = ["runtime", "with-chrono-0_4"], optional = true }
tokio-tungstenite = {version = "0.20.0", default-features = false, features = ["connect"], optional = true}
toml = { version = "0.7.6", default-features = false, features = ["parse", "display"] }
tonic = { version = "0.9", optional = true, default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] }
Expand Down Expand Up @@ -362,7 +362,7 @@ base64 = "0.21.2"
criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] }
itertools = { version = "0.11.0", default-features = false, features = ["use_alloc"] }
libc = "0.2.147"
similar-asserts = "1.4.2"
similar-asserts = "1.5.0"
proptest = "1.2"
quickcheck = "1.0.3"
lookup = { package = "vector-lookup", path = "lib/vector-lookup", features = ["test"] }
Expand Down Expand Up @@ -391,8 +391,9 @@ ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "24fc1e47677fc9f6e3
# The current `openssl-sys` crate will vendor the OpenSSL sources via
# `openssl-src` at version 1.1.1*, but we want version 3.1.*. Bring in forked
# version of that crate with the appropriate dependency patched in.
openssl-sys = { git = "https://github.com/vectordotdev/rust-openssl.git", tag = "openssl-sys-v0.9.91+3.0.0" }
openssl-src = { git = "https://github.com/vectordotdev/openssl-src-rs.git", tag = "release-300-force-engine+3.1.2"}
openssl-sys = { git = "https://github.com/vectordotdev/rust-openssl", tag = "openssl-sys-v0.9.91_3.0.0" }
openssl-src = { git = "https://github.com/vectordotdev/openssl-src-rs", tag = "release-300-force-engine_3.1.2" }


[features]
# Default features for *-unknown-linux-gnu and *-apple-darwin
Expand Down
4 changes: 2 additions & 2 deletions LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ no-proxy,https://github.com/jdrouet/no-proxy,MIT,Jérémie Drouet <jeremie.droue
no-std-compat,https://gitlab.com/jD91mZM2/no-std-compat,MIT,jD91mZM2 <[email protected]>
nom,https://github.com/Geal/nom,MIT,[email protected]
nonzero_ext,https://github.com/antifuchs/nonzero_ext,Apache-2.0,Andreas Fuchs <[email protected]>
notify,https://github.com/notify-rs/notify,CC0-1.0 OR Artistic-2.0,"Félix Saparelli <[email protected]>, Daniel Faust <[email protected]>"
notify,https://github.com/notify-rs/notify,CC0-1.0,"Félix Saparelli <[email protected]>, Daniel Faust <[email protected]>, Aron Heinecke <[email protected]>"
ntapi,https://github.com/MSxDOS/ntapi,Apache-2.0 OR MIT,MSxDOS <[email protected]>
nu-ansi-term,https://github.com/nushell/nu-ansi-term,MIT,"[email protected], Ryan Scheel (Havvy) <[email protected]>, Josh Triplett <[email protected]>, The Nushell Project Developers"
nuid,https://github.com/casualjim/rs-nuid,Apache-2.0,Ivan Porto Carrero <[email protected]>
Expand Down Expand Up @@ -483,7 +483,6 @@ serde,https://github.com/serde-rs/serde,MIT OR Apache-2.0,"Erick Tryzelaar <eric
serde-toml-merge,https://github.com/jdrouet/serde-toml-merge,MIT,Jeremie Drouet <[email protected]>
serde-value,https://github.com/arcnmx/serde-value,MIT,arcnmx
serde_bytes,https://github.com/serde-rs/bytes,MIT OR Apache-2.0,David Tolnay <[email protected]>
serde_derive,https://github.com/serde-rs/serde,MIT OR Apache-2.0,David Tolnay <[email protected]>
serde_json,https://github.com/serde-rs/json,MIT OR Apache-2.0,"Erick Tryzelaar <[email protected]>, David Tolnay <[email protected]>"
serde_nanos,https://github.com/caspervonb/serde_nanos,MIT OR Apache-2.0,Casper Beyer <[email protected]>
serde_path_to_error,https://github.com/dtolnay/path-to-error,MIT OR Apache-2.0,David Tolnay <[email protected]>
Expand Down Expand Up @@ -621,6 +620,7 @@ webpki,https://github.com/briansmith/webpki,ISC,Brian Smith <[email protected]
webpki-roots,https://github.com/rustls/webpki-roots,MPL-2.0,Joseph Birr-Pixton <[email protected]>
webpki-roots,https://github.com/rustls/webpki-roots,MPL-2.0,The webpki-roots Authors
wepoll-ffi,https://github.com/aclysma/wepoll-ffi,MIT OR Apache-2.0 OR BSD-2-Clause,Philip Degarmo <[email protected]>
whoami,https://github.com/ardaku/whoami,Apache-2.0 OR BSL-1.0 OR MIT,The whoami Authors
widestring,https://github.com/starkat99/widestring-rs,MIT OR Apache-2.0,Kathryn Long <[email protected]>
widestring,https://github.com/starkat99/widestring-rs,MIT OR Apache-2.0,The widestring Authors
winapi,https://github.com/retep998/winapi-rs,MIT OR Apache-2.0,Peter Atashian <[email protected]>
Expand Down
2 changes: 2 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@ license-files = [

[advisories]
ignore = [
# requires our dependencies to migrate to `rustls-webpki`
"RUSTSEC-2023-0052"
]
2 changes: 1 addition & 1 deletion distribution/kubernetes/vector-agent/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The kubernetes manifests found in this directory have been automatically generated
from the [helm chart `vector/vector`](https://github.com/vectordotdev/helm-charts/tree/master/charts/vector)
version 0.24.0 with the following `values.yaml`:
version 0.24.1 with the following `values.yaml`:

```yaml
role: Agent
Expand Down
2 changes: 1 addition & 1 deletion distribution/kubernetes/vector-agent/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/name: vector
app.kubernetes.io/instance: vector
app.kubernetes.io/component: Agent
app.kubernetes.io/version: "0.32.0-distroless-libc"
app.kubernetes.io/version: "0.32.1-distroless-libc"
data:
agent.yaml: |
data_dir: /vector-data-dir
Expand Down
4 changes: 2 additions & 2 deletions distribution/kubernetes/vector-agent/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/name: vector
app.kubernetes.io/instance: vector
app.kubernetes.io/component: Agent
app.kubernetes.io/version: "0.32.0-distroless-libc"
app.kubernetes.io/version: "0.32.1-distroless-libc"
annotations: {}
spec:
selector:
Expand All @@ -30,7 +30,7 @@ spec:
dnsPolicy: ClusterFirst
containers:
- name: vector
image: "timberio/vector:0.32.0-distroless-libc"
image: "timberio/vector:0.32.1-distroless-libc"
imagePullPolicy: IfNotPresent
args:
- --config-dir
Expand Down
4 changes: 2 additions & 2 deletions distribution/kubernetes/vector-agent/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/name: vector
app.kubernetes.io/instance: vector
app.kubernetes.io/component: Agent
app.kubernetes.io/version: "0.32.0-distroless-libc"
app.kubernetes.io/version: "0.32.1-distroless-libc"
rules:
- apiGroups:
- ""
Expand All @@ -31,7 +31,7 @@ metadata:
app.kubernetes.io/name: vector
app.kubernetes.io/instance: vector
app.kubernetes.io/component: Agent
app.kubernetes.io/version: "0.32.0-distroless-libc"
app.kubernetes.io/version: "0.32.1-distroless-libc"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down
Loading

0 comments on commit 3322547

Please sign in to comment.