From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <t.lamprecht@proxmox.com>
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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 9E2EF69888
for <pve-devel@lists.proxmox.com>; Tue, 27 Jul 2021 15:29:52 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 8FA701A4B1
for <pve-devel@lists.proxmox.com>; Tue, 27 Jul 2021 15:29:52 +0200 (CEST)
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) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id EA6D01A4A0
for <pve-devel@lists.proxmox.com>; Tue, 27 Jul 2021 15:29:50 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BAEAD42984
for <pve-devel@lists.proxmox.com>; Tue, 27 Jul 2021 15:29:44 +0200 (CEST)
Message-ID: <6929f955-d79e-4e67-f87a-fdee770ecfdb@proxmox.com>
Date: Tue, 27 Jul 2021 15:29:43 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
Thunderbird/91.0
Content-Language: en-US
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>
References: <20210727071708.1405571-1-d.csapak@proxmox.com>
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
In-Reply-To: <20210727071708.1405571-1-d.csapak@proxmox.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.618 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
NICE_REPLY_A -0.438 Looks like a legit reply (A)
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [procfstools.pm, proxmox.com]
Subject: Re: [pve-devel] [PATCH common] ProcFSTools: read_proc_stat: add
more cpu stats from /proc/stat
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 27 Jul 2021 13:29:52 -0000
On 27.07.21 09:17, Dominik Csapak wrote:
> those fields might be interesting to users. At the moment, this is
> only used in the external metrics export.
>
> These fields exist in the kernel since:
> * irq - 2.6.0
> * softirq - 2.6.0
> * steal - 2.6.11
> * guest - 2.6.24
> * guest_nice - 2.6.33
>
> so they should all exist
Why the define check then? We're strictly 5.4+ kernel support requirement wise
in all stable supported releases.
But yeah, actually that was planned since a bit; IIRC I talked with wobu when I
added those to PBS[0], not sure what happened then though, probably just lost track
of that.
[0]: https://git.proxmox.com/?p=proxmox.git;a=blob;f=proxmox/src/sys/linux/procfs/mod.rs;h=5784e0e885d2c5b32d9acb6f63b7785cb8031995;hb=refs/heads/master#l1891
but def. makes sense, the `total` stat one should include some (adding the `guest*`
ones could be wrong in general) of those too though, the PBS one[1] can be used here too.
[1]: https://git.proxmox.com/?p=proxmox.git;a=blob;f=proxmox/src/sys/linux/procfs/mod.rs;h=5784e0e885d2c5b32d9acb6f63b7785cb8031995;hb=refs/heads/master#l337
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> src/PVE/ProcFSTools.pm | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/src/PVE/ProcFSTools.pm b/src/PVE/ProcFSTools.pm
> index ff30e4b..8309ced 100644
> --- a/src/PVE/ProcFSTools.pm
> +++ b/src/PVE/ProcFSTools.pm
> @@ -168,13 +168,18 @@ sub read_proc_stat {
>
> if (my $fh = IO::File->new ("/proc/stat", "r")) {
> while (defined (my $line = <$fh>)) {
> - if ($line =~ m|^cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s|) {
> + if ($line =~ m|^cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(?:(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+))?|) {
> $res->{user} = $1;
> $res->{nice} = $2;
> $res->{system} = $3;
> $res->{idle} = $4;
> $res->{used} = $1+$2+$3;
> $res->{iowait} = $5;
> + $res->{irq} = $6 if defined($6);
> + $res->{softirq} = $7 if defined($7);
> + $res->{steal} = $8 if defined($8);
> + $res->{guest} = $9 if defined($9);
> + $res->{guest_nice} = $10 if defined($10);
> } elsif ($line =~ m|^cpu\d+\s|) {
> $cpucount++;
> }
>