From patchwork Mon Apr 7 18:43:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8605 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4ZWdQj19nYz3xD7 for ; Mon, 7 Apr 2025 18:43:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZWdQf34yyz5HP for ; Mon, 7 Apr 2025 18:43:54 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZWdQf2MpYz3367 for ; Mon, 7 Apr 2025 18:43:54 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZWdQb2PBXz30Gr for ; Mon, 7 Apr 2025 18:43:51 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4ZWdQY5kGmzRM; Mon, 7 Apr 2025 18:43:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1744051429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=+47qAy1N+LGBdXks8Q+zNXBs8IB3h7UyR5rpGDir3ZQ=; b=R4nmamJQsFjC+8TI01gzC1NlDKEckD3F0PcEGHqtwk/sQ3dan2XVQgkfucAnSXoCQuA9LL XXRhvwQ5M4BlAPCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1744051429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=+47qAy1N+LGBdXks8Q+zNXBs8IB3h7UyR5rpGDir3ZQ=; b=RjFDFUkyXpTY6q7HWOdP/duvqaAZww9Bz8ZrTRRTeNFH6y9hKwNLMguvRqt7KtjgrEu07G sqwfvYrmhYqyE5rTFI2Hy5+UEZragm8q05+xlSgqxZAVwfalcBtKoYr4En5EftIko7jFq8 ndUxCFCWBHhbHboenrDpmyE5UBeO4MvX1/C42B9gXqm/uYFTxjiTQZ/YE2l9l8MzZjUPh7 gsV3P5cW0ZlFJqt8jgjOfMT1lH0U/yJlxgsOdzVjkBZIPkft9/pyvM8jQcvtOHA0ooLoDb u1fZXrr2WFsU0wFAMHMCII7D13x8LH+o38Vzg0qkToIq838x/daywFGJrN9v9g== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 1/3] graphs.pl: Fixes bug13838 - additional file name corrections for collectd-5.x Date: Mon, 7 Apr 2025 20:43:43 +0200 Message-ID: <20250407184345.3242601-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - Two locations in graphs.pl were missed with filename changes coming from the collectd update. - These result in missing graph content for the openvpn road warrior graphs. - Tested out on my production IPFire system. Making the changes resulted in the grahs being visible again. Fixes: bug13838 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/cfgroot/graphs.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index aba1ef0ef..8308d2443 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -493,8 +493,8 @@ sub updatevpngraph { "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, - "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive.rrd:rx:AVERAGE", - "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive.rrd:tx:AVERAGE", + "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets.rrd:rx:AVERAGE", + "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets.rrd:tx:AVERAGE", "CDEF:outgoingn=outgoing,-1,*", "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),