Skip to content

Commit 34eb5bb

Browse files
committed
address Jesse's review points
1 parent 7f344c2 commit 34eb5bb

File tree

4 files changed

+33
-5
lines changed

4 files changed

+33
-5
lines changed

src/config/loading/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@ fn default_config_paths() -> Vec<ConfigPath> {
325325

326326
let yaml_path = default_path.with_extension("yaml");
327327
if default_path.exists() {
328-
warn!("Using the deprecated {:?} config path as the default config location. Vector is migrating to YAML as the \
329-
default config format. Future Vector versions will use {:?} as the default config location.",
328+
warn!("DEPRECATED Using the deprecated {:?} config path as the default config location. Vector is migrating \
329+
to YAML as the default config format. Future Vector versions will use {:?} as the default config location.",
330330
default_path,
331331
yaml_path);
332332

src/validate.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ pub struct Opts {
5353

5454
/// Any number of Vector config files to validate.
5555
/// Format is detected from the file name.
56-
/// If none are specified the default config path `/etc/vector/vector.yaml`
57-
/// will be targeted.
56+
/// If none are specified the default config path `/etc/vector/vector.toml`
57+
/// will be targeted. And if the aforementioned file does not exist,
58+
// then `/etc/vector/vector.yaml` will be used.
5859
#[arg(env = "VECTOR_CONFIG", value_delimiter(','))]
5960
pub paths: Vec<PathBuf>,
6061

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
date: "2023-09-06"
3+
title: "0.33 Upgrade Guide"
4+
description: "An upgrade guide that addresses breaking changes in 0.33.0"
5+
authors: ["pront"]
6+
release: "0.33.0"
7+
hide_on_release_notes: false
8+
badges:
9+
type: breaking change
10+
---
11+
12+
Vector's 0.33.0 release includes **deprecations**:
13+
14+
1. [Default config location change](#default-config-location-change)
15+
16+
We cover them below to help you upgrade quickly:
17+
18+
## Upgrade guide
19+
20+
### Deprecations
21+
22+
#### Default config location change {#default-config-location-change}
23+
24+
The default config location `/etc/vector/vector.toml` which is used by Vector `0.32.0` is now deprecated. This location will still be used in `0.33.0`. The new default path is `/etc/vector/vector.yaml`, please migrate to this new default path or specify the config path explicitly.
25+
26+
Vector `0.33.0` will attempt to load `/etc/vector/vector.toml` first, and if it is not present, it will fallback to `/etc/vector/vector.yaml`. However, Vector release `0.34.0` will automatically load `/etc/vector/vector.yaml` only.

website/cue/reference/configuration.cue

+2-1
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,8 @@ configuration: {
711711
title: "Location"
712712
body: """
713713
The location of your Vector configuration file depends on your installation method. For most Linux
714-
based systems, the file can be found at `/etc/vector/vector.yaml`.
714+
based systems, the file can be found at `/etc/vector/vector.toml`. And if the aforementioned file does
715+
not exist, then `/etc/vector/vector.yaml` will be used.
715716
716717
All files in `/etc/vector` are user configuration files and can be safely overridden to craft your
717718
desired Vector configuration.

0 commit comments

Comments
 (0)