From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A8A65954F6 for ; Mon, 26 Feb 2024 18:30:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 85B391380C for ; Mon, 26 Feb 2024 18:29:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 26 Feb 2024 18:29:42 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A9A6946C9D for ; Mon, 26 Feb 2024 18:29:42 +0100 (CET) From: Thomas Lamprecht To: pmg-devel@lists.proxmox.com Date: Mon, 26 Feb 2024 16:15:45 +0100 Message-Id: <20240226151546.2490216-1-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.056 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pmg-devel] applied: [PATCH api 1/2] api: node status: return structured info about current kernel X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2024 17:30:13 -0000 Makes it easier to show selectively what's important, as the whole string got quite a bit unwieldy lately. Mirrors commit 20ad4e0e ("api: nodes: add full info about current kernel from uname call") from pve-manager. Signed-off-by: Thomas Lamprecht --- src/PMG/API2/Nodes.pm | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/src/PMG/API2/Nodes.pm b/src/PMG/API2/Nodes.pm index 873434b..c1a39e1 100644 --- a/src/PMG/API2/Nodes.pm +++ b/src/PMG/API2/Nodes.pm @@ -679,6 +679,19 @@ __PACKAGE__->register_method({ return undef; }}); +my sub get_current_kernel_info { + my ($sysname, $nodename, $release, $version, $machine) = POSIX::uname(); + + my $kernel_version_string = "$sysname $release $version"; # for legacy compat + my $current_kernel = { + sysname => $sysname, + release => $release, + version => $version, + machine => $machine, + }; + return ($current_kernel, $kernel_version_string); +} + __PACKAGE__->register_method({ name => 'status', path => 'status', @@ -711,6 +724,28 @@ __PACKAGE__->register_method({ description => "Database is synced with other nodes.", type => 'boolean', }, + 'current-kernel' => { + description => "Meta-information about the currently booted kernel.", + type => 'object', + properties => { + sysname => { + description => 'OS kernel name (e.g., "Linux")', + type => 'string', + }, + release => { + description => 'OS kernel release (e.g., "6.8.0")', + type => 'string', + }, + version => { + description => 'OS kernel version with build info', + type => 'string', + }, + machine => { + description => 'Hardware (architecture) type', + type => 'string', + }, + }, + }, }, }, code => sub { @@ -737,9 +772,9 @@ __PACKAGE__->register_method({ my ($avg1, $avg5, $avg15) = PVE::ProcFSTools::read_loadavg(); $res->{loadavg} = [ $avg1, $avg5, $avg15]; - my ($sysname, $nodename, $release, $version, $machine) = POSIX::uname(); - - $res->{kversion} = "$sysname $release $version"; + my ($current_kernel_info, $kversion_string) = get_current_kernel_info(); + $res->{kversion} = $kversion_string; + $res->{'current-kernel'} = $current_kernel_info; $res->{cpuinfo} = PVE::ProcFSTools::read_cpuinfo(); -- 2.39.2