Update status server to include mgs fs

The stats service should now retrieve the mgs filesystems from the
lustre collector library.

Signed-off-by: johnsonw <[email protected]>

Author: johnsonw

Cargo.lock

@@ -31,7 +31,7 @@ inotify = "0.8"
 lazy_static = "1.4.0"
 libc = "0.2"
 liblustreapi = {path = "../liblustreapi", version = "0.3"}
-lustre_collector = "=0.2.13"
+lustre_collector = "0.2.15"
 prettytable-rs = "0.8"
 reqwest = {version = "0.10", default-features = false, features = ["rustls-tls", "json", "stream"]}
 serde = {version = "1", features = ["derive"]}

iml-agent/Cargo.toml

@@ -9,7 +9,8 @@ use crate::{
 use futures::{future, Future, FutureExt, StreamExt, TryFutureExt, TryStreamExt};
 use iml_cmd::Command;
 use lustre_collector::{
-    parse_cpustats_output, parse_lctl_output, parse_lnetctl_output, parse_meminfo_output, parser,
+    mgs::mgs_fs_parser, parse_cpustats_output, parse_lctl_output, parse_lnetctl_output,
+    parse_meminfo_output, parse_mgs_fs_output, parser,
 };
 use std::{io, pin::Pin, str};
 
@@ -40,6 +41,14 @@ impl DaemonPlugin for Stats {
             let mut cmd1 = Command::new("lctl");
             let cmd1 = cmd1.arg("get_param").args(params()).output().err_into();
 
+            let mut cmd1a = Command::new("lctl");
+            let cmd1a = cmd1a
+                .arg("get_param")
+                .arg("-N")
+                .args(mgs_fs_parser::params())
+                .output()
+                .err_into();
+
             let mut cmd2 = Command::new("lnetctl");
             let cmd2 = cmd2.arg("export").output().err_into();
 
@@ -48,11 +57,14 @@ impl DaemonPlugin for Stats {
             let mut cmd4 = iml_fs::stream_file_lines("/proc/stat").boxed();
             let cmd4 = cmd4.try_next().err_into();
 
-            let result = future::try_join4(cmd1, cmd2, cmd3, cmd4).await;
+            let result = future::try_join5(cmd1, cmd1a, cmd2, cmd3, cmd4).await;
 
             match result {
-                Ok((lctl, lnetctl, meminfo, maybe_cpustats)) => {
+                Ok((lctl, mgs_fs, lnetctl, meminfo, maybe_cpustats)) => {
                     let mut lctl_output = parse_lctl_output(&lctl.stdout)?;
+                    let mut mgs_fs_output = parse_mgs_fs_output(&mgs_fs.stdout).unwrap_or_default();
+
+                    lctl_output.append(&mut mgs_fs_output);
 
                     let lnetctl_stats = str::from_utf8(&lnetctl.stdout)?;
 

iml-agent/src/daemon_plugins/stats.rs

@@ -15,10 +15,12 @@ iml-rabbit = {path = "../../iml-rabbit", version = "0.3"}
 iml-service-queue = {path = "../iml-service-queue", version = "0.3"}
 iml-tracing = {version = "0.2", path = "../../iml-tracing"}
 iml-wire-types = {path = "../../iml-wire-types", version = "0.3", features = ["postgres-interop"]}
+influx_db_client = {version = "0.4", default-features = false, features = ["rustls-tls"]}
 serde = {version = "1", features = ["derive"]}
 serde_json = "1.0"
 thiserror = "1.0"
 tokio = {version = "0.2", features = ["macros", "rt-threaded"]}
+url = "2.1.1"
 warp = "0.2"
 
 [dev-dependencies]

iml-services/iml-device/Cargo.toml

@@ -4,6 +4,7 @@
 
 use iml_postgres::sqlx;
 use iml_service_queue::service_queue::ImlServiceQueueError;
+use influx_db_client;
 use thiserror::Error;
 use warp::reject;
 
@@ -19,6 +20,8 @@ pub enum ImlDeviceError {
     SqlxCoreError(#[from] sqlx::Error),
     #[error(transparent)]
     SqlxMigrateError(#[from] sqlx::migrate::MigrateError),
+    #[error(transparent)]
+    InfluxDbError(#[from] influx_db_client::error::Error),
 }
 
 impl reject::Reject for ImlDeviceError {}