From patchwork Wed Dec 25 13:48:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8368 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 "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4YJClg43gjz3wxg for ; Wed, 25 Dec 2024 13:48:47 +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 "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YJClc4wzdz2WH; Wed, 25 Dec 2024 13:48:44 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YJClc4QSCz34Kv; Wed, 25 Dec 2024 13:48:44 +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 "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4YJClT5pzkz2xfY for ; Wed, 25 Dec 2024 13:48:37 +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 4YJClT4MTtz1qt; Wed, 25 Dec 2024 13:48:37 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1735134517; 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=AHqiHL9p8NlHcwcFYq65VvLzQhrvOPSwa6FFXruhUno=; b=BLiLQEaC1IGS0Dz2PgIA5dQRLegb5omUskpsCN/1tMS0YpS3ULM9Rg93Irm4n9Fe/oJeOy 6rkHs0tUc4UZoVAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1735134517; 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=AHqiHL9p8NlHcwcFYq65VvLzQhrvOPSwa6FFXruhUno=; b=dyshhnJKypGQaCArk+QYbA7gxPH+IZN51ihLNujzby65Gbw9N0L39fS96QxFVmUgTSP3+F sG00h+XsjBa3j+JwYXA0GQ/0nEOZOgt2VhbJ2oLEJz9T9RnIxXa1iLv2obNAiM2t59uFz5 7LmzlS4j/qKMU/jd6oJ4DxS8GUrbpMsNURwFt8WsrRnTPOMwv/hmdBVP92V1bJvqEsY7FZ D62zr005H3bhPeyL0G+tFQuzHbhQQmSGeyhlS6c7Ittaw25NK3C8MhfOVjAl9N02CdJShx EKtljSfvAsAJJqZAImhi+YyFilmf0y7DFSgRgZ3+wQG9z1m6G/1/pdFb/c+cbA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 3/7] graphs.pl: Update to names used by collectd-5.x Date: Wed, 25 Dec 2024 14:48:24 +0100 Message-ID: <20241225134828.6231-3-adolf.belka@ipfire.org> In-Reply-To: <20241225134828.6231-1-adolf.belka@ipfire.org> References: <20241225134828.6231-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 7WK2UOKC63FKVMR2U4RCX5EB4YMNX7ZP X-Message-ID-Hash: 7WK2UOKC63FKVMR2U4RCX5EB4YMNX7ZP X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/cfgroot/graphs.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index f07214cf8..51292540e 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -457,8 +457,8 @@ sub updateifgraph { "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, - "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface/if_octets-".$interface.".rrd:rx:AVERAGE", - "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface/if_octets-".$interface.".rrd:tx:AVERAGE", + "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface-".$interface."/if_octets.rrd:rx:AVERAGE", + "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/interface-".$interface."/if_octets.rrd:tx:AVERAGE", "CDEF:outgoingn=outgoing,-1,*", "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), @@ -757,7 +757,7 @@ sub updatepinggraph { "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, - "DEF:roundtrip=".$mainsettings{'RRDLOG'}."/collectd/localhost/ping/ping-".$host.".rrd:ping:AVERAGE", + "DEF:roundtrip=".$mainsettings{'RRDLOG'}."/collectd/localhost/ping/ping-".$host.".rrd:value:AVERAGE", "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'})."\\j", "CDEF:roundavg=roundtrip,PREV(roundtrip),+,2,/", "CDEF:r0=roundtrip,30,MIN", @@ -1173,7 +1173,7 @@ sub updateconntrackgraph { "-r", "--lower-limit","0", "-v $Lang::tr{'open connections'}", - "DEF:conntrack=$mainsettings{'RRDLOG'}/collectd/localhost/conntrack/conntrack.rrd:entropy:AVERAGE", + "DEF:conntrack=$mainsettings{'RRDLOG'}/collectd/localhost/conntrack/conntrack.rrd:value:AVERAGE", "LINE3:conntrack#ff0000:" . sprintf("%-15s", $Lang::tr{'open connections'}), "VDEF:ctmin=conntrack,MINIMUM", "VDEF:ctmax=conntrack,MAXIMUM",