public inbox for pdm-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Erik Fastermann <e.fastermann@proxmox.com>
To: pdm-devel@lists.proxmox.com
Cc: Erik Fastermann <e.fastermann@proxmox.com>
Subject: [PATCH proxmox-datacenter-manager] fix #7187: report: add ethtool output for physical interfaces
Date: Fri,  8 May 2026 14:50:54 +0200	[thread overview]
Message-ID: <20260508125054.62224-1-e.fastermann@proxmox.com> (raw)

The implementation mirrors the change in proxmox-backup,
as the report functionality in pdm is adapted from there.

Signed-off-by: Erik Fastermann <e.fastermann@proxmox.com>
---

 NOTE: A similar patch was applied to all products:
 pmg, pve, pbs, pdm.

 server/src/report.rs | 63 ++++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/server/src/report.rs b/server/src/report.rs
index 371d8cf..e327051 100644
--- a/server/src/report.rs
+++ b/server/src/report.rs
@@ -2,6 +2,8 @@ use std::fmt::Write;
 use std::path::Path;
 use std::process::Command;
 
+use proxmox_network_api::NetworkInterfaceType;
+
 // TODO: This was copied from PBS. Might make sense to refactor these a little
 // bit and move them a `proxmox-system-report` crate or something.
 
@@ -46,42 +48,63 @@ fn files() -> Vec<(&'static str, Vec<&'static str>)> {
     ]
 }
 
-fn commands() -> Vec<(&'static str, Vec<&'static str>)> {
-    vec![
-        //  ("<command>", vec![<arg [, arg]>])
-        ("date", vec!["-R"]),
+fn commands() -> Vec<(&'static str, Vec<String>)> {
+    //  ("<command>", vec![<arg [, arg]>])
+    const BASE_COMMANDS: &[(&str, &[&str])] = &[
+        ("date", &["-R"]),
         (
             "proxmox-datacenter-manager-admin",
-            vec!["versions", "--verbose"],
+            &["versions", "--verbose"],
         ),
-        ("proxmox-datacenter-manager-admin", vec!["remote", "list"]),
+        ("proxmox-datacenter-manager-admin", &["remote", "list"]),
         (
             "proxmox-datacenter-manager-admin",
-            vec!["remote", "subscriptions"],
+            &["remote", "subscriptions"],
         ),
         (
             "proxmox-datacenter-manager-admin",
-            vec!["support-status", "get"],
+            &["support-status", "get"],
         ),
-        ("proxmox-boot-tool", vec!["status"]),
-        ("df", vec!["-h", "-T"]),
+        ("proxmox-boot-tool", &["status"]),
+        ("df", &["-h", "-T"]),
         (
             "lsblk",
-            vec![
+            &[
                 "--ascii",
                 "-M",
                 "-o",
                 "+HOTPLUG,ROTA,PHY-SEC,FSTYPE,MODEL,TRAN",
             ],
         ),
-        ("ls", vec!["-l", "/dev/disk/by-id", "/dev/disk/by-path"]),
-        ("zpool", vec!["status"]),
-        ("zfs", vec!["list"]),
-        ("zarcstat", vec![]),
-        ("ip", vec!["-details", "-statistics", "address"]),
-        ("ip", vec!["-4", "route", "show"]),
-        ("ip", vec!["-6", "route", "show"]),
-    ]
+        ("ls", &["-l", "/dev/disk/by-id", "/dev/disk/by-path"]),
+        ("zpool", &["status"]),
+        ("zfs", &["list"]),
+        ("zarcstat", &[]),
+        ("ip", &["-details", "-statistics", "address"]),
+        ("ip", &["-4", "route", "show"]),
+        ("ip", &["-6", "route", "show"]),
+    ];
+
+    let mut commands: Vec<_> = BASE_COMMANDS
+        .into_iter()
+        .map(|(cmd, args)| (*cmd, args.into_iter().map(|arg| arg.to_string()).collect()))
+        .collect();
+
+    match proxmox_network_api::config() {
+        Ok((config, _)) => {
+            let ethtool_commands = config
+                .interfaces
+                .into_iter()
+                .filter(|(_, iface)| iface.interface_type == NetworkInterfaceType::Eth)
+                .map(|(name, _)| ("ethtool", vec![name]));
+            commands.extend(ethtool_commands)
+        }
+        Err(err) => {
+            eprintln!("error while querying network interfaces: {err}")
+        }
+    };
+
+    commands
 }
 
 // (description, function())
@@ -137,7 +160,7 @@ fn get_directory_content(path: impl AsRef<Path>) -> String {
     out
 }
 
-fn get_command_output(exe: &str, args: &Vec<&str>) -> String {
+fn get_command_output(exe: &str, args: &[String]) -> String {
     let output = Command::new(exe)
         .env("PROXMOX_OUTPUT_NO_BORDER", "1")
         .args(args)
-- 
2.47.3




                 reply	other threads:[~2026-05-08 12:51 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20260508125054.62224-1-e.fastermann@proxmox.com \
    --to=e.fastermann@proxmox.com \
    --cc=pdm-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal