Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/actions/spelling/allow.txt
Original file line number Diff line number Diff line change
Expand Up @@ -560,3 +560,4 @@ Zync
sighup
CLAUDE
linting
lexers
1 change: 0 additions & 1 deletion .github/actions/spelling/patterns.txt
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,3 @@ uuid_from_friendly_id!\(".*"\)
# Release authors (embedded in releases/*.cue files)
# Allow "contributors:" lines with one or more GitHub usernames in a JSON-style array
(?i)^\s*contributors: \["[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}"(?:, "[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}")*\]$

19 changes: 17 additions & 2 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ vector-common-macros = { path = "lib/vector-common-macros" }
vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl"] }
vector-vrl-category = { path = "lib/vector-vrl/category" }
vector-vrl-functions = { path = "lib/vector-vrl/functions", default-features = false }
vrl = { git = "https://github.com/vectordotdev/vrl.git", branch = "main", default-features = false, features = ["arbitrary", "cli", "test", "test_framework", "stdlib-base"] }
vrl = { default-features = false, features = ["arbitrary", "cli", "test", "test_framework", "stdlib-base"] , version = "0.31.0" }
mock_instant = { version = "0.6" }
serial_test = { version = "3.2" }

Expand Down
1 change: 1 addition & 0 deletions LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,7 @@ serde_urlencoded,https://github.com/nox/serde_urlencoded,MIT OR Apache-2.0,Antho
serde_with,https://github.com/jonasbb/serde_with,MIT OR Apache-2.0,"Jonas Bushart, Marcin Kaźmierczak"
serde_with_macros,https://github.com/jonasbb/serde_with,MIT OR Apache-2.0,Jonas Bushart
serde_yaml,https://github.com/dtolnay/serde-yaml,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
serde_yaml_ng,https://github.com/acatton/serde-yaml-ng,MIT,Antoine Catton <devel@antoine.catton.fr>
sha-1,https://github.com/RustCrypto/hashes,MIT OR Apache-2.0,RustCrypto Developers
sha1,https://github.com/RustCrypto/hashes,MIT OR Apache-2.0,RustCrypto Developers
sha2,https://github.com/RustCrypto/hashes,MIT OR Apache-2.0,RustCrypto Developers
Expand Down
4 changes: 0 additions & 4 deletions changelog.d/#####_limited-buffer-close-race.fix.md

This file was deleted.

5 changes: 0 additions & 5 deletions changelog.d/22912_add_azure_logs_ingestion.feature.md

This file was deleted.

3 changes: 0 additions & 3 deletions changelog.d/23329_remove_patch_dependencies.fix.md

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions changelog.d/24355_vector_top_controls.feature.md

This file was deleted.

3 changes: 0 additions & 3 deletions changelog.d/24393_log_to_metric_histogram_summary.fix.md

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions changelog.d/24650_buffer-utilization-metrics.fix.md

This file was deleted.

3 changes: 0 additions & 3 deletions changelog.d/24667_clickhouse_arrow_default_columns.fix.md

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions changelog.d/24843_unit_test_escape_codes.fix.md

This file was deleted.

3 changes: 0 additions & 3 deletions changelog.d/7538_filesystem_inode_metrics.feature.md

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions changelog.d/azure_blob_connect_proxy.feature.md

This file was deleted.

5 changes: 0 additions & 5 deletions changelog.d/component_latency-metrics.enhancement.md

This file was deleted.

6 changes: 0 additions & 6 deletions changelog.d/datadog-logs-zstd.enhancement.md

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions changelog.d/opentelemetry_otlp_decoding_schema.fix.md

This file was deleted.

3 changes: 0 additions & 3 deletions changelog.d/optimize-websocket-source.enhancement.md

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions changelog.d/remove-no-vrl-cli-flag.breaking.md

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion distribution/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set -u
# If PACKAGE_ROOT is unset or empty, default it.
PACKAGE_ROOT="${PACKAGE_ROOT:-"https://packages.timber.io/vector"}"
# If VECTOR_VERSION is unset or empty, default it.
VECTOR_VERSION="${VECTOR_VERSION:-"0.53.0"}"
VECTOR_VERSION="${VECTOR_VERSION:-"0.54.0"}"
_divider="--------------------------------------------------------------------------------"
_prompt=">>>"
_indent=" "
Expand Down
38 changes: 20 additions & 18 deletions vdev/src/commands/build/vrl_docs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::{
path::{Path, PathBuf},
};

use anyhow::{Context, Result};
use anyhow::{Context, Result, bail};
use serde::{Deserialize, Serialize};
use serde_json::Value;

Expand Down Expand Up @@ -99,6 +99,7 @@ impl Cli {
#[derive(Deserialize)]
struct LockPackage {
name: String,
version: String,
source: Option<String>,
}

Expand All @@ -107,7 +108,10 @@ struct CargoLock {
package: Vec<LockPackage>,
}

/// Parse `Cargo.lock` to find the git commit SHA for the `vrl` package.
/// Parse `Cargo.lock` to find a git ref for the `vrl` package.
///
/// Returns the commit SHA for git-sourced dependencies, or a version tag (e.g. `v0.31.0`) for
/// registry-sourced dependencies.
fn get_vrl_commit_sha(repo_root: &Path) -> Result<String> {
let lock_path = repo_root.join("Cargo.lock");
let lock_text = fs::read_to_string(&lock_path)
Expand All @@ -119,22 +123,20 @@ fn get_vrl_commit_sha(repo_root: &Path) -> Result<String> {
let pkg = lock
.package
.iter()
.find(|p| {
p.name == VRL_PACKAGE_NAME
&& p.source
.as_deref()
.is_some_and(|s| s.contains("github.com/vectordotdev/vrl"))
})
.context("Could not find VRL package with git source in Cargo.lock")?;

// Source format: "git+https://github.com/vectordotdev/vrl.git?branch=doc-generation#5316c01b..."
let source = pkg.source.as_deref().unwrap();
let sha = source
.rsplit_once('#')
.map(|(_, sha)| sha)
.context("Could not extract commit SHA from VRL source string")?;

Ok(sha.to_string())
.find(|p| p.name == VRL_PACKAGE_NAME)
.context("Could not find VRL package in Cargo.lock")?;

match pkg.source.as_deref() {
// Git source: "git+https://github.com/vectordotdev/vrl.git?branch=main#5316c01b..."
Some(source) if source.starts_with("git+") => source
.rsplit_once('#')
.map(|(_, sha)| sha.to_string())
.context("Could not extract commit SHA from VRL git source string"),
// Registry source (crates.io): use the version as a tag
Some(source) if source.starts_with("registry+") => Ok(format!("v{}", pkg.version)),
Some(source) => bail!("Unrecognized VRL package source in Cargo.lock: {source}"),
None => bail!("VRL package in Cargo.lock has no source field"),
}
}

/// Read all `*.json` files from a directory into a name->value map.
Expand Down
2 changes: 1 addition & 1 deletion vdev/src/utils/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ pub fn sparse_checkout_docs(sha: &str, repo_url: &str, clone_dir: &Path) -> Resu
.context("Failed to write sparse-checkout config")?;

git(&["fetch", "--depth", "1", "origin", sha])?;
git(&["checkout", sha])?;
git(&["checkout", "FETCH_HEAD"])?;

Ok(())
}
Expand Down
4 changes: 4 additions & 0 deletions website/content/en/releases/0.54.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: Vector v0.54.0 release notes
weight: 33
---
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ administration: interfaces: kubectl: {
role_implementations: [Name=string]: {
commands: {
_deployment_variant: string
_vector_version: "0.53"
_vector_version: "0.54"
_namespace: string | *"vector"
_controller_resource_type: string
_controller_resource_name: string | *_deployment_variant
Expand Down
Loading
Loading