Skip to content
Merged
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
40 changes: 20 additions & 20 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 @@ -32,7 +32,6 @@ prometheus-parse = "0.2.5"
reqwest = "0.11"
serde = "1"
serde_json = "1"
serde_yaml = "0.9"
serial_test = "3.2"
sysinfo = "0.29"
test-case = "3.3"
Expand All @@ -42,6 +41,7 @@ tower = "0.5"
tower-http = "0.6"
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
yaml_serde = "0.10"

[profile.release]
lto = true
Expand Down
2 changes: 1 addition & 1 deletion lustre-collector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ clap = { workspace = true, features = ["derive"] }
combine.workspace = true
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
serde_yaml.workspace = true
thiserror.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
yaml_serde.workspace = true

[dev-dependencies]
include_dir.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion lustre-collector/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub enum LustreCollectorError {
#[error(transparent)]
SerdeJsonError(#[from] serde_json::error::Error),
#[error(transparent)]
SerdeYamlError(#[from] serde_yaml::Error),
SerdeYamlError(#[from] yaml_serde::Error),
#[error(transparent)]
StringStreamError(#[from] StringStreamError),
#[error(transparent)]
Expand Down
4 changes: 2 additions & 2 deletions lustre-collector/src/lnetctl_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub fn parse(xs: &[u8]) -> Result<Vec<Record>, LustreCollectorError> {
return Ok(vec![]);
}

let y: LnetNetStats = serde_yaml::from_slice(xs)?;
let y: LnetNetStats = yaml_serde::from_slice(xs)?;

Ok(y.net
.map(|xs| {
Expand Down Expand Up @@ -89,7 +89,7 @@ pub fn parse_lnetctl_stats(xs: &[u8]) -> Result<Vec<Record>, LustreCollectorErro
return Ok(vec![]);
}

let y: LnetStats = serde_yaml::from_slice(xs)?;
let y: LnetStats = yaml_serde::from_slice(xs)?;

Ok(y.statistics
.map(|x| build_lnetctl_stats(&x))
Expand Down
2 changes: 1 addition & 1 deletion lustre-collector/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ fn run() -> Result<(), LustreCollectorError> {

let x = match format {
Format::Json => serde_json::to_string(&lctl_record)?,
Format::Yaml => serde_yaml::to_string(&lctl_record)?,
Format::Yaml => yaml_serde::to_string(&lctl_record)?,
};

println!("{x}");
Expand Down
Loading