From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox v2 1/3] proxmox-sys: make some structs serializable
Date: Wed, 15 Dec 2021 10:19:44 +0100 [thread overview]
Message-ID: <20211215091952.1490583-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20211215091952.1490583-1-d.csapak@proxmox.com>
we already depend on serde anyway, and this makes gathering structs a
bit more comfortable
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
proxmox-sys/Cargo.toml | 1 +
proxmox-sys/src/linux/procfs/mod.rs | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/proxmox-sys/Cargo.toml b/proxmox-sys/Cargo.toml
index 80d39eb..bfcd388 100644
--- a/proxmox-sys/Cargo.toml
+++ b/proxmox-sys/Cargo.toml
@@ -17,6 +17,7 @@ log = "0.4"
nix = "0.19.1"
regex = "1.2"
serde_json = "1.0"
+serde = { version = "1.0", features = [ "derive" ] }
zstd = { version = "0.6", features = [ "bindgen" ] }
# Macro crates:
diff --git a/proxmox-sys/src/linux/procfs/mod.rs b/proxmox-sys/src/linux/procfs/mod.rs
index 30b9978..3373dec 100644
--- a/proxmox-sys/src/linux/procfs/mod.rs
+++ b/proxmox-sys/src/linux/procfs/mod.rs
@@ -11,6 +11,7 @@ use std::time::Instant;
use anyhow::{bail, format_err, Error};
use lazy_static::lazy_static;
use nix::unistd::Pid;
+use serde::Serialize;
use crate::fs::file_read_firstline;
@@ -184,7 +185,7 @@ pub fn read_proc_uptime_ticks() -> Result<(u64, u64), Error> {
Ok((up as u64, idle as u64))
}
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Serialize)]
/// The CPU fields from `/proc/stat` with their native time value. Multiply
/// with CLOCK_TICKS to get the real value.
pub struct ProcFsStat {
@@ -407,7 +408,7 @@ fn test_read_proc_stat() {
assert_eq!(stat.iowait_percent, 0.0);
}
-#[derive(Debug)]
+#[derive(Debug, Serialize)]
pub struct ProcFsMemInfo {
pub memtotal: u64,
pub memfree: u64,
@@ -539,7 +540,7 @@ pub fn read_memory_usage() -> Result<ProcFsMemUsage, Error> {
}
}
-#[derive(Debug)]
+#[derive(Debug, Serialize)]
pub struct ProcFsNetDev {
pub device: String,
pub receive: u64,
--
2.30.2
next prev parent reply other threads:[~2021-12-15 9:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 9:19 [pbs-devel] [PATCH proxmox/proxmox-backup v2] add metrics server capability Dominik Csapak
2021-12-15 9:19 ` Dominik Csapak [this message]
2021-12-15 9:19 ` [pbs-devel] [PATCH proxmox v2 2/3] proxmox-sys: add DiskUsage struct and helper Dominik Csapak
2021-12-15 12:41 ` Thomas Lamprecht
2021-12-16 8:15 ` Dominik Csapak
2021-12-16 8:20 ` Thomas Lamprecht
2021-12-15 9:19 ` [pbs-devel] [PATCH proxmox v2 3/3] proxmox-metrics: implement metrics server client code Dominik Csapak
2021-12-15 9:19 ` [pbs-devel] [PATCH proxmox-backup v2 1/6] use 'disk_usage' from proxmox-sys Dominik Csapak
2021-12-15 9:19 ` [pbs-devel] [PATCH proxmox-backup v2 2/6] pbs-api-types: add metrics api types Dominik Csapak
2021-12-15 9:19 ` [pbs-devel] [PATCH proxmox-backup v2 3/6] pbs-config: add metrics config class Dominik Csapak
2021-12-15 9:19 ` [pbs-devel] [PATCH proxmox-backup v2 4/6] backup-proxy: decouple stats gathering from rrd update Dominik Csapak
2021-12-15 9:19 ` [pbs-devel] [PATCH proxmox-backup v2 5/6] proxmox-backup-proxy: send metrics to configured metrics server Dominik Csapak
2021-12-15 9:19 ` [pbs-devel] [PATCH proxmox-backup v2 6/6] api: add metricserver endpoints Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211215091952.1490583-2-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.