From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/6] api2/nodes/status: use NodeStatus struct
Date: Mon, 19 Apr 2021 13:02:02 +0200 [thread overview]
Message-ID: <20210419110206.28498-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210419110206.28498-1-d.csapak@proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/node/status.rs | 77 +++++++++--------------------------------
1 file changed, 17 insertions(+), 60 deletions(-)
diff --git a/src/api2/node/status.rs b/src/api2/node/status.rs
index 14d4b587..d5df05ff 100644
--- a/src/api2/node/status.rs
+++ b/src/api2/node/status.rs
@@ -2,7 +2,7 @@ use std::process::Command;
use std::path::Path;
use anyhow::{Error, format_err, bail};
-use serde_json::{json, Value};
+use serde_json::Value;
use proxmox::sys::linux::procfs;
@@ -21,43 +21,7 @@ use crate::tools::cert::CertInfo;
},
},
returns: {
- type: Object,
- description: "Returns node memory, CPU and (root) disk usage",
- properties: {
- memory: {
- type: Object,
- description: "node memory usage counters",
- properties: {
- total: {
- description: "total memory",
- type: Integer,
- },
- used: {
- description: "total memory",
- type: Integer,
- },
- free: {
- description: "free memory",
- type: Integer,
- },
- },
- },
- cpu: {
- type: Number,
- description: "Total CPU usage since last query.",
- optional: true,
- },
- info: {
- type: Object,
- description: "contains node information",
- properties: {
- fingerprint: {
- description: "The SSL Fingerprint",
- type: String,
- },
- },
- },
- },
+ type: NodeStatus,
},
access: {
permission: &Permission::Privilege(&["system", "status"], PRIV_SYS_AUDIT, false),
@@ -68,32 +32,25 @@ fn get_status(
_param: Value,
_info: &ApiMethod,
_rpcenv: &mut dyn RpcEnvironment,
-) -> Result<Value, Error> {
-
+) -> Result<NodeStatus, Error> {
let meminfo: procfs::ProcFsMemInfo = procfs::read_meminfo()?;
- let kstat: procfs::ProcFsStat = procfs::read_proc_stat()?;
- let disk_usage = crate::tools::disks::disk_usage(Path::new("/"))?;
+ let memory = NodeMemoryCounters {
+ total: meminfo.memtotal,
+ used: meminfo.memused,
+ free: meminfo.memfree,
+ };
- // get fingerprint
- let cert = CertInfo::new()?;
- let fp = cert.fingerprint()?;
+ let kstat: procfs::ProcFsStat = procfs::read_proc_stat()?;
+ let cpu = kstat.cpu;
- Ok(json!({
- "memory": {
- "total": meminfo.memtotal,
- "used": meminfo.memused,
- "free": meminfo.memfree,
- },
- "cpu": kstat.cpu,
- "root": {
- "total": disk_usage.total,
- "used": disk_usage.used,
- "free": disk_usage.avail,
- },
- "info": {
- "fingerprint": fp,
+ Ok(NodeStatus {
+ memory,
+ root: crate::tools::disks::disk_usage(Path::new("/"))?,
+ cpu,
+ info: NodeInformation {
+ fingerprint: CertInfo::new()?.fingerprint()?,
},
- }))
+ })
}
#[api(
--
2.20.1
next prev parent reply other threads:[~2021-04-19 11:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 11:02 [pbs-devel] [PATCH proxmox-backup 0/6] make node info panel similar to pve Dominik Csapak
2021-04-19 11:02 ` [pbs-devel] [PATCH proxmox-backup 1/6] api2/types: add necessary types for node status Dominik Csapak
2021-04-23 9:36 ` [pbs-devel] applied: " Thomas Lamprecht
2021-04-19 11:02 ` Dominik Csapak [this message]
2021-04-23 9:36 ` [pbs-devel] applied: [PATCH proxmox-backup 2/6] api2/nodes/status: use NodeStatus struct Thomas Lamprecht
2021-04-19 11:02 ` [pbs-devel] [PATCH proxmox-backup 3/6] api2/node/status: extend node status Dominik Csapak
2021-04-23 9:36 ` [pbs-devel] applied: " Thomas Lamprecht
2021-04-19 11:02 ` [pbs-devel] [PATCH proxmox-backup 4/6] ui: factor out NodeInfoPanel Dominik Csapak
2021-04-19 11:02 ` [pbs-devel] [PATCH proxmox-backup 5/6] ui: panel/NodeInfo: make it like in pve Dominik Csapak
2021-04-19 11:02 ` [pbs-devel] [PATCH proxmox-backup 6/6] ui: window/Settings: add summarycolumns settings Dominik Csapak
2021-04-23 9:39 ` [pbs-devel] [PATCH proxmox-backup 0/6] make node info panel similar to pve Thomas Lamprecht
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=20210419110206.28498-3-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox