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 A633D74433 for ; Wed, 1 Jun 2022 10:13:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 591DE1A1A2 for ; Wed, 1 Jun 2022 10:13:05 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (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 id 0C5841A0F8 for ; Wed, 1 Jun 2022 10:13:02 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 523D634ADF; Wed, 1 Jun 2022 10:12:55 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 426E71766DC; Wed, 1 Jun 2022 10:12:55 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Cc: t.lamprecht@proxmox.com, Alexandre Derumier Date: Wed, 1 Jun 2022 10:12:47 +0200 Message-Id: <20220601081253.2542697-5-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601081253.2542697-1-aderumier@odiso.com> References: <20220601081253.2542697-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.125 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-manager 1/3] pvestatd: qemu/lxc/host : broadcast rrd pressure metrics X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2022 08:13:06 -0000 only "some" values for now, not sure we need full values Signed-off-by: Alexandre Derumier --- PVE/Service/pvestatd.pm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/PVE/Service/pvestatd.pm b/PVE/Service/pvestatd.pm index b1e71ec8..832d9dc5 100755 --- a/PVE/Service/pvestatd.pm +++ b/PVE/Service/pvestatd.pm @@ -132,6 +132,7 @@ sub update_node_status { my $stat = PVE::ProcFSTools::read_proc_stat(); my $cpuinfo = PVE::ProcFSTools::read_cpuinfo(); my $maxcpu = $cpuinfo->{cpus}; + my $pressure = PVE::ProcFSTools::read_pressure(); update_supported_cpuflags(); @@ -168,10 +169,13 @@ sub update_node_status { memory => $meminfo, blockstat => $dinfo, nics => $netdev, + pressure => $pressure, }; $node_metric->{cpustat}->@{qw(avg1 avg5 avg15)} = ($avg1, $avg5, $avg15); $node_metric->{cpustat}->{cpus} = $maxcpu; + broadcast_rrd_pressure($ctime, $node_metric, "pve2-metrics/nodes/$nodename"); + my $transactions = PVE::ExtMetric::transactions_start($status_cfg); PVE::ExtMetric::update_all($transactions, 'node', $nodename, $node_metric, $ctime); PVE::ExtMetric::transactions_finish($transactions); @@ -232,12 +236,41 @@ sub update_qemu_status { } PVE::Cluster::broadcast_rrd("pve2.3-vm/$vmid", $data); + broadcast_rrd_pressure($ctime, $d, "pve2-metrics/vms/$vmid"); + PVE::ExtMetric::update_all($transactions, 'qemu', $vmid, $d, $ctime, $nodename); } PVE::ExtMetric::transactions_finish($transactions); } +sub broadcast_rrd_pressure { + my ($ctime, $d, $path) = @_; + + return if !defined($d->{pressure}); + + my $pressure = $d->{pressure}; + + foreach my $type (keys %{$pressure}) { + my $pressuretype = $pressure->{$type}; + + foreach my $kind (keys %{$pressuretype}) { + next if $kind ne 'some'; + my $pressurekind = $pressuretype->{$kind}; + + foreach my $avg (keys %{$pressurekind}) { + next if $avg eq 'total'; + my $value = $pressurekind->{$avg}; + my $metric = "pressure_".$type."_".$kind."_".$avg; + my $data = $generate_rrd_string->([$ctime, $value]); + PVE::Cluster::broadcast_rrd("$path/$metric", $data); + $d->{$metric} = $value; + } + } + } + delete $d->{pressure}; +} + sub remove_stale_lxc_consoles { my $vmstatus = PVE::LXC::vmstatus(); @@ -441,6 +474,8 @@ sub update_lxc_status { } PVE::Cluster::broadcast_rrd("pve2.3-vm/$vmid", $data); + broadcast_rrd_pressure($ctime, $d, "pve2-metrics/vms/$vmid"); + PVE::ExtMetric::update_all($transactions, 'lxc', $vmid, $d, $ctime, $nodename); } PVE::ExtMetric::transactions_finish($transactions); -- 2.30.2