tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/bin/proxmox-backup-proxy.rs: simplify code

Browse Source 
and gather all stats for the root disk
This commit is contained in:
Dietmar Maurer 2020-05-28 12:30:54 +02:00
parent 547e3c2f6c
commit 91e5bb49f5
3 changed files with 92 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api2/node/rrd.rs
View File

@ -34,8 +34,10 @@ fn get_node_stats(
"memtotal", "memused",
"swaptotal", "swapused",
"netin", "netout",
"roottotal", "rootused",
"loadavg",
"total", "used",
"read_ios", "read_bytes", "read_ticks",
"write_ios", "write_bytes", "write_ticks",
],
timeframe,
cf,

66
src/bin/proxmox-backup-proxy.rs
View File

@ -1,5 +1,6 @@
use std::sync::Arc;
use std::ffi::OsString;
use std::path::Path;
use anyhow::{bail, format_err, Error};
use futures::*;
@ -16,6 +17,7 @@ use proxmox_backup::server;
use proxmox_backup::tools::daemon;
use proxmox_backup::server::{ApiConfig, rest::*};
use proxmox_backup::auth_helpers::*;
use proxmox_backup::tools::disks::{ DiskManage, zfs::zfs_pool_stats };
fn main() {
if let Err(err) = proxmox_backup::tools::runtime::main(run()) {
@ -620,7 +622,6 @@ async fn generate_host_stats() {
use proxmox::sys::linux::procfs::{
read_meminfo, read_proc_stat, read_proc_net_dev, read_loadavg};
use proxmox_backup::config::datastore;
use proxmox_backup::tools::disks::{ DiskManage, zfs::zfs_pool_stats };
proxmox_backup::tools::runtime::block_in_place(move || {
@ -674,37 +675,44 @@ async fn generate_host_stats() {
}
}
match disk_usage(std::path::Path::new("/")) {
Ok((total, used, _avail)) => {
rrd_update_gauge("host/roottotal", total as f64);
rrd_update_gauge("host/rootused", used as f64);
}
Err(err) => {
eprintln!("read root disk_usage failed - {}", err);
}
}
let disk_manager = DiskManage::new();
gather_disk_stats(disk_manager.clone(), Path::new("/"), "host");
match datastore::config() {
Ok((config, _)) => {
let datastore_list: Vec<datastore::DataStoreConfig> =
config.convert_to_typed_array("datastore").unwrap_or(Vec::new());
for config in datastore_list {
match disk_usage(std::path::Path::new(&config.path)) {
Ok((total, used, _avail)) => {
let rrd_key = format!("datastore/{}/total", config.name);
rrd_update_gauge(&rrd_key, total as f64);
let rrd_key = format!("datastore/{}/used", config.name);
rrd_update_gauge(&rrd_key, used as f64);
let rrd_prefix = format!("datastore/{}", config.name);
let path = std::path::Path::new(&config.path);
gather_disk_stats(disk_manager.clone(), path, &rrd_prefix);
}
}
Err(err) => {
eprintln!("read disk_usage on {:?} failed - {}", config.path, err);
eprintln!("read datastore config failed - {}", err);
}
}
let path = std::path::Path::new(&config.path);
});
}
fn gather_disk_stats(disk_manager: Arc<DiskManage>, path: &Path, rrd_prefix: &str) {
match disk_usage(path) {
Ok((total, used, _avail)) => {
let rrd_key = format!("{}/total", rrd_prefix);
rrd_update_gauge(&rrd_key, total as f64);
let rrd_key = format!("{}/used", rrd_prefix);
rrd_update_gauge(&rrd_key, used as f64);
}
Err(err) => {
eprintln!("read disk_usage on {:?} failed - {}", path, err);
}
}
match disk_manager.mount_info() {
Ok(mountinfo) => {
@ -729,18 +737,18 @@ async fn generate_host_stats() {
}
}
if let Some(stat) = device_stat {
let rrd_key = format!("datastore/{}/read_ios", config.name);
let rrd_key = format!("{}/read_ios", rrd_prefix);
rrd_update_derive(&rrd_key, stat.read_ios as f64);
let rrd_key = format!("datastore/{}/read_bytes", config.name);
let rrd_key = format!("{}/read_bytes", rrd_prefix);
rrd_update_derive(&rrd_key, (stat.read_sectors*512) as f64);
let rrd_key = format!("datastore/{}/read_ticks", config.name);
let rrd_key = format!("{}/read_ticks", rrd_prefix);
rrd_update_derive(&rrd_key, (stat.read_ticks as f64)/1000.0);
let rrd_key = format!("datastore/{}/write_ios", config.name);
let rrd_key = format!("{}/write_ios", rrd_prefix);
rrd_update_derive(&rrd_key, stat.write_ios as f64);
let rrd_key = format!("datastore/{}/write_bytes", config.name);
let rrd_key = format!("{}/write_bytes", rrd_prefix);
rrd_update_derive(&rrd_key, (stat.write_sectors*512) as f64);
let rrd_key = format!("datastore/{}/write_ticks", config.name);
let rrd_key = format!("{}/write_ticks", rrd_prefix);
rrd_update_derive(&rrd_key, (stat.write_ticks as f64)/1000.0);
}
}
@ -750,14 +758,6 @@ async fn generate_host_stats() {
}
}
}
}
Err(err) => {
eprintln!("read datastore config failed - {}", err);
}
}
});
}
// Returns (total, used, avail)
fn disk_usage(path: &std::path::Path) -> Result<(u64, u64, u64), Error> {

23
www/ServerStatus.js
View File

@ -125,10 +125,31 @@ Ext.define('PBS.ServerStatus', {
{
xtype: 'proxmoxRRDChart',
title: gettext('Root Disk usage'),
fields: ['roottotal','rootused'],
fields: ['total','used'],
fieldTitles: [gettext('Total'), gettext('Disk usage')],
store: rrdstore
},
{
xtype: 'proxmoxRRDChart',
title: gettext('Root Disk Transfer Rate (bytes/second)'),
fields: ['read_bytes','write_bytes'],
fieldTitles: [gettext('Read'), gettext('Write')],
store: rrdstore
},
{
xtype: 'proxmoxRRDChart',
title: gettext('Root Disk Input/Output Operations per Second (IOPS)'),
fields: ['read_ios','write_ios'],
fieldTitles: [gettext('Read'), gettext('Write')],
store: rrdstore
},
{
xtype: 'proxmoxRRDChart',
title: gettext('Root Disk IO Delay (ms)'),
fields: ['read_delay','write_delay'],
fieldTitles: [gettext('Read'), gettext('Write')],
store: rrdstore
},
]
};