Skip to content

Commit

Permalink
chore(deps): Update VRL to 0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pront committed Sep 25, 2023
1 parent 6ced6ca commit 352eb16
Show file tree
Hide file tree
Showing 11 changed files with 268 additions and 219 deletions.
248 changes: 131 additions & 117 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ members = [
]

[workspace.dependencies]
vrl = { version = "0.6.0", default-features = false, features = ["cli", "test", "test_framework", "arbitrary", "compiler", "value", "diagnostic", "path", "parser", "stdlib", "datadog", "core"] }
vrl = { version = "0.7.0", default-features = false, features = ["cli", "test", "test_framework", "arbitrary", "compiler", "value", "diagnostic", "path", "parser", "stdlib", "datadog", "core"] }

pin-project = { version = "1.1.3", default-features = false }

Expand Down Expand Up @@ -336,7 +336,7 @@ arr_macro = { version = "0.2.1" }
heim = { git = "https://github.com/vectordotdev/heim.git", branch = "update-nix", default-features = false, features = ["disk"] }

# make sure to update the external docs when the Lua version changes
mlua = { version = "0.8.10", default-features = false, features = ["lua54", "send", "vendored"], optional = true }
mlua = { version = "0.9.1", default-features = false, features = ["lua54", "send", "vendored"], optional = true }

[target.'cfg(windows)'.dependencies]
windows-service = "0.6.0"
Expand Down Expand Up @@ -373,7 +373,7 @@ tokio = { version = "1.32.0", features = ["test-util"] }
tokio-test = "0.4.3"
tower-test = "0.4.0"
vector-core = { path = "lib/vector-core", default-features = false, features = ["vrl", "test"] }
vrl = { version = "0.6.0", features = ["cli", "test", "test_framework", "arbitrary"] }
vrl = { version = "0.7.0", features = ["cli", "test", "test_framework", "arbitrary"] }

wiremock = "0.5.19"
zstd = { version = "0.12.4", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion lib/codecs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ futures = { version = "0.3", default-features = false }
indoc = { version = "2", default-features = false }
tokio = { version = "1", features = ["test-util"] }
similar-asserts = "1.5.0"
vrl = { version = "0.6.0", features = ["cli", "test", "test_framework", "arbitrary"] }
vrl = { version = "0.7.0", features = ["cli", "test", "test_framework", "arbitrary"] }
vector-core = { path = "../vector-core", default-features = false, features = ["test"] }

[features]
Expand Down

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

4 changes: 2 additions & 2 deletions lib/vector-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ lookup = { package = "vector-lookup", path = "../vector-lookup" }
metrics = "0.21.1"
metrics-tracing-context = { version = "0.14.0", default-features = false }
metrics-util = { version = "0.15.1", default-features = false, features = ["registry"] }
mlua = { version = "0.8.10", default-features = false, features = ["lua54", "send", "vendored"], optional = true }
mlua = { version = "0.9.1", default-features = false, features = ["lua54", "send", "vendored"], optional = true }
no-proxy = { version = "0.3.4", default-features = false, features = ["serialize"] }
once_cell = { version = "1.18", default-features = false }
ordered-float = { version = "3.9.1", default-features = false }
Expand Down Expand Up @@ -95,7 +95,7 @@ rand = "0.8.5"
rand_distr = "0.4.3"
tracing-subscriber = { version = "0.3.17", default-features = false, features = ["env-filter", "fmt", "ansi", "registry"] }
vector-common = { path = "../vector-common", default-features = false, features = ["test"] }
vrl = { version = "0.6.0", features = ["cli", "test", "test_framework", "arbitrary"] }
vrl = { version = "0.7.0", features = ["cli", "test", "test_framework", "arbitrary"] }

[features]
api = ["dep:async-graphql"]
Expand Down
4 changes: 2 additions & 2 deletions lib/vrl/value/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tracing = { version = "0.1.34", default-features = false, features = ["attribute

# Optional
async-graphql = { version = "5.0.7", default-features = false, optional = true }
mlua = { version = "0.8.8", default-features = false, features = ["lua54", "send", "vendored"], optional = true}
mlua = { version = "0.9.1", default-features = false, features = ["lua54", "send", "vendored"], optional = true}
serde = { version = "1.0.158", default-features = false, features = ["derive", "rc"], optional = true }
serde_json = { version = "1.0.94", optional = true }
toml = { version = "0.7.3", default-features = false, optional = true }
Expand All @@ -39,4 +39,4 @@ lookup = { path = "../lookup", default-features = false, features = ["arbitrary"
serde = { version = "1.0.158", default-features = false, features = ["derive", "rc"]}
serde_json = { version = "1.0.94"}
toml = { version = "0.7.3", default-features = false }
mlua = { version = "0.8.8", default-features = false, features = ["lua54", "send", "vendored"]}
mlua = { version = "0.9.1", default-features = false, features = ["lua54", "send", "vendored"]}
80 changes: 80 additions & 0 deletions website/cue/reference/remap/functions/community_id.cue
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
package metadata

remap: functions: community_id: {
category: "String"
description: """
Used to generate an id based on the [Community ID Spec](\(urls.community_id_spec)).
"""

arguments: [
{
name: "source_ip"
description: "The source IP address."
required: true
type: ["string"]
},
{
name: "destination_ip"
description: "The destination IP address."
required: true
type: ["string"]
},
{
name: "protocol"
description: "The protocol number."
required: true
type: ["integer"]
},
{
name: "source_port"
description: "The source port."
required: false
type: ["integer"]
},
{
name: "destination_port"
description: "The destination port."
required: false
type: ["integer"]
},
{
name: "seed"
description: "The custom seed number."
required: false
type: ["integer"]
},
]
internal_failure_reasons: []
return: types: ["string"]

examples: [
{
title: "TCP"
source: #"""
community_id!(source_ip: "1.2.3.4", destination_ip: "5.6.7.8", source_port: 1122, destination_port: 3344, protocol: 6)
"""#
return: "1:wCb3OG7yAFWelaUydu0D+125CLM="
},
{
title: "UDP"
#"""
community_id!(source_ip: "1.2.3.4", destination_ip: "5.6.7.8", source_port: 1122, destination_port: 3344, protocol: 17)
"""#
return: "1:0Mu9InQx6z4ZiCZM/7HXi2WMhOg="
},
{
title: "ICMP"
#"""
community_id!(source_ip: "1.2.3.4", destination_ip: "5.6.7.8", source_port: 8, destination_port: 0, protocol: 1)
"""#
return: "1:crodRHL2FEsHjbv3UkRrfbs4bZ0="
},
{
title: "RSVP"
#"""
community_id!(source_ip: "1.2.3.4", destination_ip: "5.6.7.8", protocol: 46)
"""#
return: "1:ikv3kmf89luf73WPz1jOs49S768="
},
]
}
6 changes: 6 additions & 0 deletions website/cue/reference/remap/functions/encode_json.cue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ remap: functions: encode_json: {
required: true
type: ["any"]
},
{
name: "pretty"
description: "Whether to pretty print the JSON string or not."
required: false
type: ["boolean"]
},
]
internal_failure_reasons: []
return: types: ["string"]
Expand Down
40 changes: 39 additions & 1 deletion website/cue/reference/remap/functions/parse_aws_vpc_flow_log.cue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ remap: functions: parse_aws_vpc_flow_log: {
"""#
return: {
"version": 2
"account_id": 123456789010
"account_id": "123456789010"
"interface_id": "eni-1235b8ca123456789"
"srcaddr": null
"dstaddr": null
Expand Down Expand Up @@ -65,5 +65,43 @@ remap: functions: parse_aws_vpc_flow_log: {
"pkt_dstaddr": "203.0.113.5"
}
},
{
title: "Parse AWS VPC Flow including v5 fields"
source: #"""
parse_aws_vpc_flow_log!("5 52.95.128.179 10.0.0.71 80 34210 6 1616729292 1616729349 IPv4 14 15044 123456789012 vpc-abcdefab012345678 subnet-aaaaaaaa012345678 i-0c50d5961bcb2d47b eni-1235b8ca123456789 ap-southeast-2 apse2-az3 - - ACCEPT 19 52.95.128.179 10.0.0.71 S3 - - ingress OK",
format: "version srcaddr dstaddr srcport dstport protocol start end type packets bytes account_id vpc_id subnet_id instance_id interface_id region az_id sublocation_type sublocation_id action tcp_flags pkt_srcaddr pkt_dstaddr pkt_src_aws_service pkt_dst_aws_service traffic_path flow_direction log_status")

Check failure

Code scanning / check-spelling

Unrecognized Spelling Error

sublocation is not a recognized word. (unrecognized-spelling)

Check failure

Code scanning / check-spelling

Unrecognized Spelling Error

sublocation is not a recognized word. (unrecognized-spelling)
"""#
return: {
"account_id": "123456789012"
"action": "ACCEPT"
"az_id": "apse2-az3"
"bytes": 15044
"dstaddr": "10.0.0.71"
"dstport": 34210
"end": 1616729349
"flow_direction": "ingress"
"instance_id": "i-0c50d5961bcb2d47b"
"interface_id": "eni-1235b8ca123456789"
"log_status": "OK"
"packets": 14
"pkt_dst_aws_service": null
"pkt_dstaddr": "10.0.0.71"
"pkt_src_aws_service": "S3"
"pkt_srcaddr": "52.95.128.179"
"protocol": 6
"region": "ap-southeast-2"
"srcaddr": "52.95.128.179"
"srcport": 80
"start": 1616729292
"sublocation_id": null

Check failure

Code scanning / check-spelling

Unrecognized Spelling Error

sublocation is not a recognized word. (unrecognized-spelling)
"sublocation_type": null

Check failure

Code scanning / check-spelling

Unrecognized Spelling Error

sublocation is not a recognized word. (unrecognized-spelling)
"subnet_id": "subnet-aaaaaaaa012345678"
"tcp_flags": 19
"traffic_path": null
"type": "IPv4"
"version": 5
"vpc_id": "vpc-abcdefab012345678"
}
},
]
}
90 changes: 0 additions & 90 deletions website/cue/reference/remap/functions/to_timestamp.cue

This file was deleted.

3 changes: 2 additions & 1 deletion website/cue/reference/urls.cue
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,10 @@ urls: {
cloudsmith: "https://cloudsmith.io/~timber/repos/vector/packages/"
cloudsmith_apt: "https://cloudsmith.io/~timber/repos/vector/setup/#formats-deb"
cloudsmith_yum: "https://cloudsmith.io/~timber/repos/vector/setup/#formats-rpm"
community_id_spec: "https://github.com/corelight/community-id-spec"
console: "\(wikipedia)/wiki/System_console"
conventional_commits: "https://www.conventionalcommits.org"
contributing: "\(vector_repo)/blob/master/CONTRIBUTING.md#setup"
conventional_commits: "https://www.conventionalcommits.org"
crc: "\(wikipedia)/wiki/Cyclic_redundancy_check"
ctime: "https://www.cplusplus.com/reference/ctime"
cue: "https://cuelang.org/"
Expand Down

0 comments on commit 352eb16

Please sign in to comment.