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'}), From patchwork Mon Apr 7 18:43:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8606 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) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4ZWdQj1Zlpz3xq5 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 4ZWdQf3yccz5HZ 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 4ZWdQf3GdDz336P 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) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZWdQb3KzJz32pC 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 4ZWdQb1lswzyQ; Mon, 7 Apr 2025 18:43:51 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1744051431; 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: in-reply-to:in-reply-to:references:references; bh=sFh71zisyZ/5k2gDo1iPP8+sB6UezAPXvbHyq78gTM4=; b=Q1t35fzSQ7mESDJfYkhGZpYqwGGv+eScoL8i4KLfFl/tflwcqIu9x8ZMtKit542x1ETW1F lFIxu2Q/EKTJ/wCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1744051431; 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: in-reply-to:in-reply-to:references:references; bh=sFh71zisyZ/5k2gDo1iPP8+sB6UezAPXvbHyq78gTM4=; b=hXfYUb7OffpbJmRhPUTZS9tD4ZwWX/Gs75i6nECU5T8tXqbX9TkLFNmSAfmOj20/o1Fs3N 2tpy8vY/+TMMaID0ZnXqZYaSQYKjHYApNQkklOK/0pR0XmrPOwVkjnLnVeA2VXgeN6etjH 7+/f2OIy6Bnn+RiOCnebVuJs5WjmEH9Eu4rEZMRf11UdPiz8lX7hBlzUYCDOLPK8saU/bz vwfLThHA5h+0UvvOrmLC0iYmf3NTuBQhm+eGq8tOhtnSNCwmRiQNJpSJvvfJOM1WtmG5QZ HJ+H7fgaWv5JnzcZrVoOrFM4GTswhc0iYhHm7kjzUfI+OM7YyTva1xuzGxQcmg== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 2/3] netovpnrw.cgi: Fixes bug13838 - additional file name correction for collectd-5.x Date: Mon, 7 Apr 2025 20:43:44 +0200 Message-ID: <20250407184345.3242601-2-adolf.belka@ipfire.org> In-Reply-To: <20250407184345.3242601-1-adolf.belka@ipfire.org> References: <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 - One location in netovpnrw.cgi was missed with a filename change coming from the collectd update. - This resulted in missing graph content for the openvpn road warrior graphs. - Tested out on my production IPFire system. Making the change resulted in the grahs being visible again. Fixes: Bug13838 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- html/cgi-bin/netovpnrw.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi index 5014f9a55..fb81e9ffe 100644 --- a/html/cgi-bin/netovpnrw.cgi +++ b/html/cgi-bin/netovpnrw.cgi @@ -43,7 +43,7 @@ my @vpns=(); my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*/ -not -path *openvpn-UNDEF* -not -path *openvpn-*n2n* -name *.rrd 2>/dev/null|sort`; foreach (@vpngraphs){ - if($_ =~ /(.*)\/openvpn-(.*)\/if_octets_derive.rrd/){ + if($_ =~ /(.*)\/openvpn-(.*)\/if_octets.rrd/){ push(@vpns,$2); } } From patchwork Mon Apr 7 18:43:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8607 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) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4ZWdQj1zP4z3xqR 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 4ZWdQf5hgQz5Hq 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 4ZWdQf50J7z30sN 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) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZWdQb53q2z336V 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 4ZWdQb3DyyzRM; Mon, 7 Apr 2025 18:43:51 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1744051431; 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: in-reply-to:in-reply-to:references:references; bh=iV1TE7DGTvijtzYN9TJXgTn3lySPeEC2H/wBZt5bVWU=; b=jodBQV4IcuBnw5XTQvyrApDK/vSgjWNwnlYmpQ6X6cXGMoSYvwicyHD050jQWfja7XB5AF ez0K15JN2hyHRsDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1744051431; 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: in-reply-to:in-reply-to:references:references; bh=iV1TE7DGTvijtzYN9TJXgTn3lySPeEC2H/wBZt5bVWU=; b=T8Ct16IHTvDmYNd0GmIu+jmgPk0nbijgrH/3owmgrzrF4m4tiALwBDNQhFjT/CR5ZFsN63 z3zVwqAGGpX2uUTX36DyrByzT/z0jD11OJLFdqJqVfMr1LPmLqCSfd+yBnmSYsYEM5SVCC s2jzcdrZv8iiv5+jrQ3hTFtoE/qXEWfkFH60nErSBTLRUCFn6u5yxJ4j5oR0XyHBbic7PR 12imnmzD5OaGD1AwB4JT2TtWxSJ2vMIvQdm/Pj9p8cVyp1oVv3TRTbHeckufOrkiF2O66d s3dOLNI63262R92OPx0+dcgoOZhW47SVuH2SiX/0qVJiH7s4YL0a9ZhTNL+vPg== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 3/3] core194: Ship graphs.pl and netovpnrw.cgi for bug13838 fixes. Date: Mon, 7 Apr 2025 20:43:45 +0200 Message-ID: <20250407184345.3242601-3-adolf.belka@ipfire.org> In-Reply-To: <20250407184345.3242601-1-adolf.belka@ipfire.org> References: <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 Signed-off-by: Adolf Belka --- config/rootfiles/core/194/filelists/files | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/core/194/filelists/files b/config/rootfiles/core/194/filelists/files index 03dfa2929..91c017ed2 100644 --- a/config/rootfiles/core/194/filelists/files +++ b/config/rootfiles/core/194/filelists/files @@ -6,3 +6,5 @@ etc/ssl/openssl.cnf srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/backup/include var/ipfire/backup/bin/backup.pl +srv/web/ipfire/cgi-bin/netovpnrw.cgi +var/ipfire/graphs.pl