From patchwork Thu May 15 11:49:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8747 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 4ZypR13wNbz3wwY for ; Thu, 15 May 2025 11:49:33 +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 4ZypQx3Xwbz6dT for ; Thu, 15 May 2025 11:49:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZypQw5v9qz340V for ; Thu, 15 May 2025 11:49:28 +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 4ZypQs6t6Lz2yHY for ; Thu, 15 May 2025 11:49:25 +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 4ZypQr089Mz2Z0; Thu, 15 May 2025 11:49:23 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1747309764; 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=irlDl+SzaaoWGxN+o1K6NR1qI21tRpvOzefYpLhwQUk=; b=gCTmvqk+BAiJVzgbpcM+owAXojxAQUBvm6hPmnZFnoZm0HEgFHHYQxZohZiPqyepDjOLwK mb7Q73pN5nhXS5Cw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1747309764; 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=irlDl+SzaaoWGxN+o1K6NR1qI21tRpvOzefYpLhwQUk=; b=itOk/m2OOq0sgnGKYvJUqbw/C/3CyYSGDDmsJycWBdysLNVd4XsWXdnx+KJWgJWmOgh5m3 NtfIhv5XqnBjFq5YyMxsBTQsxN77xs7nunNRo3FDdEL2y2JeKJq31YBZ5vRZcEBQzzGq4I ZmWh6pxDpXPZ3IpFByatBL4amkF8dJ0ENNPAoX3iUImCW/PUXT49n04jLXXhVegyJWGHkC VEALSWQ5vvKF7PsDaKOpBWMFgqpQuW1l+nnnAmO5UmuAC6/tUY/mv6S1uHxuHu+TXP7hba trOPG9vsYUOFckknD5b9AS79FVvUizm1q5B/wd1jEKemMirEu8gtoYYhgYps3g== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 1/4] netexternal.cgi: Fixed bug13834 - tun0 graph missing in external net traffic Date: Thu, 15 May 2025 13:49:17 +0200 Message-ID: <20250515114920.12919-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 - Some additional rrd directory and file name changes missed from collect-5 update. Fixes: bug13834 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- html/cgi-bin/netexternal.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi index fb1097d61..79ba1c0b8 100644 --- a/html/cgi-bin/netexternal.cgi +++ b/html/cgi-bin/netexternal.cgi @@ -55,11 +55,11 @@ if ($netsettings{'RED_TYPE'} ne 'PPPOE'){ push (@graphs, "ppp0"); } -if (-e "/var/log/rrd/collectd/localhost/interface/if_octets-ipsec0.rrd"){ +if (-e "/var/log/rrd/collectd/localhost/interface-ipsec0/if_octets.rrd"){ push (@graphs, ("ipsec0")); } -if (-e "/var/log/rrd/collectd/localhost/interface/if_octets-tun0.rrd"){ +if (-e "/var/log/rrd/collectd/localhost/interface-tun0/if_octets.rrd"){ push (@graphs, ("tun0")); } From patchwork Thu May 15 11:49:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8748 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 4ZypR14HMhz3xHn for ; Thu, 15 May 2025 11:49:33 +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 4ZypQx3SmGz6dP for ; Thu, 15 May 2025 11:49:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZypQw6Cwcz341y for ; Thu, 15 May 2025 11:49:28 +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 4ZypQs6v7dz30V0 for ; Thu, 15 May 2025 11:49:25 +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 4ZypQs3hcDz2r4; Thu, 15 May 2025 11:49:25 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1747309765; 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=oNaFVXj54rHlY/xt0yFzmsTVbwejolbq7qX/mAF22TU=; b=3xBqtEz1CzHCmF1KxbstLVAtP3S3ykEz39Fxlg7aHOdI+nFEJHQ/c5WZ3ohIzPssKMDnMe uSWO1pWjDaxMS/Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1747309765; 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=oNaFVXj54rHlY/xt0yFzmsTVbwejolbq7qX/mAF22TU=; b=G2syl9OKiae/0YcuxRD2+DGtR9/WUtR3sDWlmwl0g7k2hgVazDnU9itohFjvFGdEQL5ylA Xjb5EgjT/3L1PxoFNefDQdg0tPrudmOo7MJdjoBTNTQt0p6O2nqqpwguxX7lNTRu+Iatof 5PmRUrdj7H86gD/mAA1wZwpLG8S6ruHaw/yjf7fs4izfa/sCyyzoecvBRrh53c3+hZ/8ug s9pd5UCCE1nehxE5XctB5kvFKjD8JtWZNiRDUNw42utEyyQ/LZGDe0quM6JnW4U4IbVL1y Kzp0WqMT+VdeNVgvTuy9ROF0pDwG4pQJWEAu8plNQ4L/Yqb+UVp6yxMdfUS+SQ== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 2/4] netovpnsrv.cgi: Fixes rrd file names for n2n openvpn graphs Date: Thu, 15 May 2025 13:49:18 +0200 Message-ID: <20250515114920.12919-2-adolf.belka@ipfire.org> In-Reply-To: <20250515114920.12919-1-adolf.belka@ipfire.org> References: <20250515114920.12919-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 - An additional rrd file name change missed from collect-5 update. - This was identified as part of fixing bug13834 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- html/cgi-bin/netovpnsrv.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi index 1fb66e7a4..7bc5d8509 100644 --- a/html/cgi-bin/netovpnsrv.cgi +++ b/html/cgi-bin/netovpnsrv.cgi @@ -55,7 +55,7 @@ foreach my $key (sort {$vpnsettings{$a}[1] <=> $vpnsettings{$b}[1]} keys %vpnset my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*-n2n/ -not -path *openvpn-UNDEF* -name *traffic.rrd 2>/dev/null|sort`; foreach (@vpngraphs){ - if($_ =~ /(.*)\/openvpn-(.*)\/if_octets_derive-traffic.rrd/){ + if($_ =~ /(.*)\/openvpn-(.*)\/if_octets-traffic.rrd/){ push(@vpns,$2); } } From patchwork Thu May 15 11:49:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8749 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 4ZypR14SDXz3xNC for ; Thu, 15 May 2025 11:49:33 +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 4ZypQx3b8vz6dY for ; Thu, 15 May 2025 11:49:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZypQw6vZYz33gC for ; Thu, 15 May 2025 11:49:28 +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 4ZypQt0mLVz33d6 for ; Thu, 15 May 2025 11:49:26 +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 4ZypQs590sz2r9; Thu, 15 May 2025 11:49:25 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1747309765; 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=g5Qtdz7YSjD1frwZG8fvoHSqvlgylaeKatT5DT4GmAk=; b=ScoHJQIa5vShCsOr3E/rSDACNmfM3WWMU4v42HdWUsW6TcLRi3xJd54UBhsE3Qi3zims8t tuex1/6OBAOpTaBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1747309765; 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=g5Qtdz7YSjD1frwZG8fvoHSqvlgylaeKatT5DT4GmAk=; b=Dj4ZbSt6RwQgGu8jFSN450q9XgJxOMY+nG2j4eUBudUE1lg+7743ng3uCXsgeZRCKyyHBE TwT2oAQnyJ99RuvALJeW2y2mLLMFJyuzEqUPziJxXHO9mFbq52pI1eJCTEqgVp/XJYhj3k 6L4RXdUSu/gp5s1OoJWgjINcS+NMAKV51ipCBOvzUhLBe8hfAe0Xq/wnfA//wjhuSxkOG3 3kufxFCmdbNgIXwrHGYsazJCtBepU2fuKyeC+EJr/p4sKaldgdN8r/cKqoiV+239YV0VfS iQq3J3MEblN/qZ76PUZtPHwSzjhpY4UOmGOGSAMoD5GRJ+IxV5/+zz+d1o/OoA== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 3/4] red: Fixes rrd file name updates from collectd-5 update Date: Thu, 15 May 2025 13:49:19 +0200 Message-ID: <20250515114920.12919-3-adolf.belka@ipfire.org> In-Reply-To: <20250515114920.12919-1-adolf.belka@ipfire.org> References: <20250515114920.12919-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 - Some additional rrd file name changes missed from collect-5 update. - This was identified as part of fixing bug13834 - Couldn't test this as I don't have a ppp0 connection available but the chnage is inline with the other rrd changes which have been tested as working. Signed-off-by: Adolf Belka --- src/initscripts/networking/red | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index 2a5f06b4e..fddc70d92 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2025 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -483,7 +483,7 @@ case "${1}" in /etc/rc.d/init.d/connectd start # Add a NaN value to ppp0 rrd to supress spikes at reconnect - rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \ + rrdtool update $RRDLOG/collectd/localhost/interface-ppp0/if_octets.rrd \ $(date +%s):: > /dev/null 2>&1 exit 0 fi @@ -524,7 +524,7 @@ case "${1}" in killall -w -s TERM /usr/sbin/pppd 2>/dev/null evaluate_retval # Add a NaN value to ppp0 rrd to supress spikes at reconnect - rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \ + rrdtool update $RRDLOG/collectd/localhost/interface-ppp0/if_octets.rrd \ $(date +%s):: > /dev/null 2>&1 elif [ "$TYPE" == "DHCP" ]; then From patchwork Thu May 15 11:49:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8750 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 4ZypR14qLLz3xNH for ; Thu, 15 May 2025 11:49:33 +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 4ZypQx4kRzz6dv for ; Thu, 15 May 2025 11:49:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZypQx18zDz33jD for ; Thu, 15 May 2025 11:49:29 +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 4ZypQt27rBz33gn for ; Thu, 15 May 2025 11:49:26 +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 4ZypQt0c4vz2Z0; Thu, 15 May 2025 11:49:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1747309766; 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=ePn1JMfmyeBuMk6YA6I5LMtqidOZR0M3dHD4klEi4os=; b=JRNbaciLI6WU08/qOFW28MPqQaKgIKVbNvmWC0KO5rMfFG7maOkU+cnvLk1+coAGMnypYh 8AdIh0PZi4U/kJAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1747309766; 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=ePn1JMfmyeBuMk6YA6I5LMtqidOZR0M3dHD4klEi4os=; b=f9vqIPCLUYW06mpuv4RCdUTWra9JUI5ebaJSduenlEVdq9dNa7KWu3L9kLrc4tpqoqJcpY 1o1ZOWwh4xl0ix56J2Rja8grW8ex/NSUc+7VIIhLAL+uwAURYXf/t/79bXLdzlvwBzj3/O UxBNE9hUD9Z3JufA4nTy+tYH+aWyPAditisoWVKZJbEQuMvc6Z0Rc3yjhnmf8danW79RQv /Lxx+cw2LC/b5puavekTmxP9DgOMZL0r8Zi34Ku5VsEJ3L5wbdBUTxwgSfBSQV7Dhhk+uc L8MTIgc68bAnWU+61rclSIDUKlw38UOkPauh7XNR7mW9rFRa96kPDToyT4krQw== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 4/4] graphs.pl: Update of rrd file names from the collectd-5 update Date: Thu, 15 May 2025 13:49:20 +0200 Message-ID: <20250515114920.12919-4-adolf.belka@ipfire.org> In-Reply-To: <20250515114920.12919-1-adolf.belka@ipfire.org> References: <20250515114920.12919-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 - Some additional rrd file name changes missed from collect-5 update. - This was identified as part of fixing bug13834 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/cfgroot/graphs.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 8308d2443..a64958c75 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -529,12 +529,12 @@ sub updatevpnn2ngraph { "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, - "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-traffic.rrd:rx:AVERAGE", - "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-traffic.rrd:tx:AVERAGE", - "DEF:overhead_in=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-overhead.rrd:rx:AVERAGE", - "DEF:overhead_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive-overhead.rrd:tx:AVERAGE", - "DEF:compression_in=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression_derive-data_in.rrd:uncompressed:AVERAGE", - "DEF:compression_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression_derive-data_out.rrd:uncompressed:AVERAGE", + "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets-traffic.rrd:rx:AVERAGE", + "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets-traffic.rrd:tx:AVERAGE", + "DEF:overhead_in=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets-overhead.rrd:rx:AVERAGE", + "DEF:overhead_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets-overhead.rrd:tx:AVERAGE", + "DEF:compression_in=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression-data_in.rrd:uncompressed:AVERAGE", + "DEF:compression_out=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/compression-data_out.rrd:uncompressed:AVERAGE", "CDEF:outgoingn=outgoing,-1,*", "CDEF:overhead_outn=overhead_out,-1,*", "CDEF:compression_outn=compression_out,-1,*",