From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZWdQg0GY9z3362 for ; Mon, 7 Apr 2025 18:43:55 +0000 (UTC) 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 Content-Transfer-Encoding: 8bit - 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); } } -- 2.49.0