From patchwork Fri Apr 10 17:17:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 2926 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48zPpF5SG6z3yC3 for ; Fri, 10 Apr 2020 17:17:25 +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 ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48zPpD0LH8z2nT; Fri, 10 Apr 2020 17:17:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48zPpC3Qnfz30FG; Fri, 10 Apr 2020 17:17:23 +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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48zPp66fG2z2xFf for ; Fri, 10 Apr 2020 17:17:18 +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 ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48zPp62bjqz1XQ for ; Fri, 10 Apr 2020 17:17:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1586539038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=seGvfZanGV0PZAGcYQfV42qzqy63pi0/761bkmFVjAQ=; b=IH3Etv+agsZO8HxcMlKVYWhjhYOzb7YZK2XsGMHmODyhiNEzRskojK8hQXX+h4i164+eln CdYDuu1O0HArMyAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1586539038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=seGvfZanGV0PZAGcYQfV42qzqy63pi0/761bkmFVjAQ=; b=tOwlTipTCsKpwibtDS1HJD6mL66uIIQM3AuBF4ikRrNf4RzX8wIKoiENywOS4VYYAzre7V i5BH7gqrNkN1d3+0M1WDk+dvmJ/UrdPu9uK//F6azJjuaPenebedfwWG7rQjNnjaEiv7YR lZrjd+k/PyfNgNWTQUNiyADjlfsHQ35mhEoy8bwG64CgItqmIUFGmDI7kKI3chZBtbKagD cxQOKCvDcqyAZ7NvQRKYgtPCwsSoKiXI1SbjtsNoBSb40gisHcgow46EIJTkSXuTmMH6bs wcYYtPY7AnOKgSZVeOyIZ0664tGIMHck8m9idMjUodFmfE5YgcGyUU9Z7JtMFA== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 1/4] vnstat: Update to 2.6 Date: Fri, 10 Apr 2020 19:17:08 +0200 Message-Id: <20200410171711.3902-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" For details see: https://humdi[dot]net/vnstat/CHANGES Signed-off-by: Matthias Fischer --- config/rootfiles/common/vnstat | 13 +++++-------- lfs/vnstat | 5 ++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/config/rootfiles/common/vnstat b/config/rootfiles/common/vnstat index 42e00ed2a..963b64bf7 100644 --- a/config/rootfiles/common/vnstat +++ b/config/rootfiles/common/vnstat @@ -1,12 +1,9 @@ -#etc/cron.d -#etc/cron.d/vnstat etc/vnstat.conf usr/bin/vnstat usr/bin/vnstati -#usr/sbin/vnstatd -#usr/share/man/man5/vnstat.conf.5 -#usr/share/man/man1/vnstatd.1 -#usr/share/man/man1/vnstati.1 +usr/sbin/vnstatd #usr/share/man/man1/vnstat.1 -#var/lib/vnstat -var/log/vnstat +#usr/share/man/man1/vnstati.1 +#usr/share/man/man5/vnstat.conf.5 +#usr/share/man/man8/vnstatd.8 +#var/log/vnstat diff --git a/lfs/vnstat b/lfs/vnstat index 27189126b..904e5a256 100644 --- a/lfs/vnstat +++ b/lfs/vnstat @@ -24,7 +24,7 @@ include Config -VER = 1.18 +VER = 2.6 THISAPP = vnstat-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c9abaeb0ce758c16f6cdfa247bd8606c +$(DL_FILE)_MD5 = fe2928a81243cc8a532a357f97221736 install : $(TARGET) @@ -80,7 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make all $(MAKETUNING) LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes" cd $(DIR_APP) && make install - sed -i 's|eth0|green0|g' /etc/vnstat.conf sed -i 's|SaveInterval 5|SaveInterval 1|g' /etc/vnstat.conf sed -i 's|/var/lib/vnstat|/var/log/vnstat|g' /etc/vnstat.conf sed -i 's|/var/log/vnstat/vnstat.log|/var/log/vnstat.log|g' /etc/vnstat.conf From patchwork Fri Apr 10 17:17:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 2923 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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48zPpF3ZFBz3yC0 for ; Fri, 10 Apr 2020 17:17:25 +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 ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48zPpC2RkBz2mg; Fri, 10 Apr 2020 17:17:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48zPpC00Jkz2yK0; Fri, 10 Apr 2020 17:17:23 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48zPp66lPKz2xgV for ; Fri, 10 Apr 2020 17:17:18 +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 ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48zPp65Jbtz2jG for ; Fri, 10 Apr 2020 17:17:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1586539038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=mNgeAcaQFNCrnWutfJlR4iZuI2/PZyXm6nOGDBABNMM=; b=9a1yipWiWXAWHPsvvED44syScqUVV9+TTwoAPD5dNvZsN8HLio2TqcYu8trVOkqmBevGOP tYOwdt9bkI0/vFAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1586539038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=mNgeAcaQFNCrnWutfJlR4iZuI2/PZyXm6nOGDBABNMM=; b=LuFao15BcrzobNtGz0xN4gJ787x916CUbCFd8KOe4ESvCmLey1t4Z4G59W69VthUGjnDxs i2xzejeM6+IGZCRq3ELhurNlBalVcuky9K+k/M4bmVZgcLZdGAoOYhYW0odHEJGZhmwu+Z dNYcSNyLo6Jmo/7kf1cS7IVznbYjydfQtsYeEP+cTY02Vqrfpl8Y6IxigqjCWuMokueuLP 97cgONWtsisG4s/yxP1kW1FGPqqLdUq/8muEeInBEbCPMs+VozNHs4vCjZS3MCGJzA4pcz eGnAU3af2gc4hQpA7wT75tgB5XOOVWbE3JjeeN0Zqdntukdf5BxLxONW2T263g== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 2/4] traffic.cgi: Changed time interval for vnstat graphs from 5 to 1 minute Date: Fri, 10 Apr 2020 19:17:09 +0200 Message-Id: <20200410171711.3902-2-matthias.fischer@ipfire.org> In-Reply-To: <20200410171711.3902-1-matthias.fischer@ipfire.org> References: <20200410171711.3902-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This keeps the graphs a bit more "updated". From 'man vnstat': '-c (--cache-time) => Update output file only if at least *time* minutes have passed since the previous file update. Signed-off-by: Matthias Fischer --- html/cgi-bin/traffic.cgi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index fbffecb7c..e19bea20a 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -86,15 +86,15 @@ sub display_vnstat if ( $testdata =~ 'enough') { print"No data for $device !
"; } else { - system("/usr/bin/vnstati -c 5 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png"); + system("/usr/bin/vnstati -c 1 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png"); # Hour graph - system("/usr/bin/vnstati -c 5 -h -i $device -o /srv/web/ipfire/html/graphs/vnstat-h-$device.png"); + system("/usr/bin/vnstati -c 1 -h -i $device -o /srv/web/ipfire/html/graphs/vnstat-h-$device.png"); # Day graph - system("/usr/bin/vnstati -c 5 -d -i $device -o /srv/web/ipfire/html/graphs/vnstat-d-$device.png"); + system("/usr/bin/vnstati -c 1 -d -i $device -o /srv/web/ipfire/html/graphs/vnstat-d-$device.png"); # Month graph - system("/usr/bin/vnstati -c 5 -m -i $device -o /srv/web/ipfire/html/graphs/vnstat-m-$device.png"); + system("/usr/bin/vnstati -c 1 -m -i $device -o /srv/web/ipfire/html/graphs/vnstat-m-$device.png"); # Top10 graph - system("/usr/bin/vnstati -c 5 -t -i $device -o /srv/web/ipfire/html/graphs/vnstat-t-$device.png"); + system("/usr/bin/vnstati -c 1 -t -i $device -o /srv/web/ipfire/html/graphs/vnstat-t-$device.png"); # Generate HTML-Table with the graphs print < X-Patchwork-Id: 2924 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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48zPpF3GCPz3yBt for ; Fri, 10 Apr 2020 17:17:25 +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 ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48zPpB6rdLz1XQ; Fri, 10 Apr 2020 17:17:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48zPpB0Zgvz2xgV; Fri, 10 Apr 2020 17:17:22 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48zPp70Ygcz2xq9 for ; Fri, 10 Apr 2020 17:17:19 +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 ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48zPp669y9z2jl for ; Fri, 10 Apr 2020 17:17:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1586539038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=24FBiBVMzMfYXDS1LrzbQnW/RxFo2VBMhsd6OvtQNns=; b=I23praGKiZsFOzTC+n0D5Yh5S2sLZn9DxBjzWEfhqVqZNpXfDHaSWCZGVSK3l78Jg6KF4Z RFe/mfhE/dBROXDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1586539038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=24FBiBVMzMfYXDS1LrzbQnW/RxFo2VBMhsd6OvtQNns=; b=c/OWdDaydbyCOWW7b/8J/a+YO1bBiJcUNtNHP68OKXv/zKFyhTU3z33e1SX61g3jZGVGnO iU56vGMi6crAzt38Z/azpdPe9oEnPYeZSMVoSPMFAYcQO9UI2NQb0VMOPMPtxiE5NubgT6 pFmzPccFdjvuvhyaEafWLWJjghsMLzsPx5e3X5rkrLWALnPkbKdbCAvVTOhvi2QcfitksM sacI35UooxNZmzjdB1qvctCRCjzDtOmDSt3peDj/ycLNg4yJw+AXdAoqNNSXwat+K28z/Y 6yImmZ6ya4HikItMYmGOde5H7Qy7T2tLl2MwSmR/zzAV6pXEDHdePJowp8DlAw== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 3/4] vnstat 2.6: New initscript Date: Fri, 10 Apr 2020 19:17:10 +0200 Message-Id: <20200410171711.3902-3-matthias.fischer@ipfire.org> In-Reply-To: <20200410171711.3902-1-matthias.fischer@ipfire.org> References: <20200410171711.3902-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Added the new 'vnstatd' daemon to 'start' and 'stop' section. Signed-off-by: Matthias Fischer --- src/initscripts/system/vnstat | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/initscripts/system/vnstat b/src/initscripts/system/vnstat index 363307013..bcc19c3ab 100755 --- a/src/initscripts/system/vnstat +++ b/src/initscripts/system/vnstat @@ -17,15 +17,28 @@ case "$1" in mount_ramdisk "${VNSTATLOG}" evaluate_retval fi + + boot_mesg "Starting vnstatd..." + loadproc /usr/sbin/vnstatd -d --alwaysadd + sleep 2 + evaluate_retval ;; + stop) + boot_mesg "Stopping vnstatd..." + killproc /usr/sbin/vnstatd + sleep 2 + evaluate_retval + umount_ramdisk "${VNSTATLOG}" ;; + restart) ${0} stop sleep 1 ${0} start ;; + backup) # Backup all data if ramdisk is used if mountpoint "${RRDLOG}" &>/dev/null; then From patchwork Fri Apr 10 17:17:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 2925 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48zPpF4Ztpz3yC1 for ; Fri, 10 Apr 2020 17:17:25 +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 ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48zPpC50Dqz2nB; Fri, 10 Apr 2020 17:17:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48zPpC1r9yz30F3; Fri, 10 Apr 2020 17:17:23 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48zPp71Dzwz2yK0 for ; Fri, 10 Apr 2020 17:17:19 +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 ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48zPp671JBz2lB for ; Fri, 10 Apr 2020 17:17:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1586539039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=9RycQE9jJo1HWS+/+xCfgIIoKTk31U0huUEXviFBNkE=; b=moM5XgBDDhiUmgRvEdr7Wkrc3fDlQuz9yyWpBRgtFPGG+PwO4PBbg5kFGZkzBG2CLnD+xL /Q3J4s70z0pLNFCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1586539039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=9RycQE9jJo1HWS+/+xCfgIIoKTk31U0huUEXviFBNkE=; b=WxXGFlD0uj+XA2o6qhN4tGKOaFIfcQodSovrq3tKPv94Knrvui7nglaqV5El73EQ0wCke4 iMNl6GR+AREhi6mk5eoZO6Taa0AqlwWb1mDn25MdxF/2CO16rKIMTCnUh0qsrNuFi4/KFT nhY12K2E1mVCQHwNqXpKFXmhY7oO0N4BuppwtMR6EIkAYJVx/b2XnKlVywKuc8G1aYIT6u hhSi3ogDlNqFHg+yhQGXY2ERkBMtCcNZIqYIoGokBwEMCBXkshknxTkZvViGYKKkjbxksA 2KdnRX4rk8bB8WlwtycEGLP8sZFym9e4yVY/GQJv6QW4ZGrcO0BXa+T7vh6xWQ== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 4/4] makegraphs: 'vnstat -u' is no longer supported/needed Date: Fri, 10 Apr 2020 19:17:11 +0200 Message-Id: <20200410171711.3902-4-matthias.fischer@ipfire.org> In-Reply-To: <20200410171711.3902-1-matthias.fischer@ipfire.org> References: <20200410171711.3902-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Matthias Fischer --- src/scripts/makegraphs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs index b91a70e3a..1dc14b8a3 100644 --- a/src/scripts/makegraphs +++ b/src/scripts/makegraphs @@ -106,9 +106,6 @@ sub updatehdddata{ } } -## Update vnstat -system ('/usr/bin/vnstat -u'); - my @disks = `ls -1 /sys/block | grep -E '^sd|^nvme|^mmcblk|^xvd|^vd|^md' | sort | uniq`; system("unlink /var/run/hddstatus 2>/dev/null && touch /var/run/hddstatus"); foreach (@disks){