Skip to content

Commit

Permalink
Merge branch 'master' into feature/fargate-stats
Browse files Browse the repository at this point in the history
  • Loading branch information
jamtur01 authored Nov 12, 2020
2 parents de006b2 + 63acc54 commit 1e27ce4
Show file tree
Hide file tree
Showing 16 changed files with 727 additions and 116 deletions.
17 changes: 10 additions & 7 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ async-graphql-warp = { version = "2.0.15", optional = true }
itertools = { version = "0.9.0", optional = true }

# API client
human_format = { version = "1.0.3", optional = true }
num-format = { version = "0.4.0", optional = true }
number_prefix = { version = "0.4", optional = true }
crossterm = { version = "0.18.0", optional = true }
tui = { version = "0.12.0", optional = true, default-features = false, features = ["crossterm"] }
bus = { version = "2.2.3", optional = true }
Expand Down Expand Up @@ -289,8 +289,8 @@ api = [
# API client
api-client = [
"vector-api-client",
"human_format",
"num-format",
"number_prefix",
"crossterm",
"tui",
]
Expand Down
17 changes: 17 additions & 0 deletions distribution/helm/vector-agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

# Global values can be consumed by both Parent and Child Helm Charts
# Each chart yml file can leverage each of these values where applicable
# global:
# vector:
# image:
# repository: <docker repo>
# # Overrides the image tag, the default is `{image.version}-{image.base}`
# tag: <tag>
# # Overrides the image version, the default is the Chart appVersion.
# version: <version>
# # Sets the image base OS
# base: <base>
# # Sets common environment variables for use globally
# commonEnvKV:
# - name: "CHIQUITA"
# value: "banana"

image:
repository: timberio/vector
pullPolicy: IfNotPresent
Expand Down
3 changes: 3 additions & 0 deletions lib/file-source/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ flate2 = "1.0.19"
winapi = { version = "0.3", features = ["winioctl"] }
libc = "0.2"
tokio = { version = "0.2.13", features = ["time"] }
serde = { version = "1.0.117", features = ["derive"] }
serde_json = "1.0.33"
chrono = { version = "0.4.19", features = ["serde"] }

[dev-dependencies]
quickcheck = "0.9"
Expand Down
Loading

0 comments on commit 1e27ce4

Please sign in to comment.