mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 10:35:53 +02:00
c7369b4bf1
For details see: https://humdi.net/vnstat/CHANGES "2.10 / 22-Oct-2022 - Fixed - BandwidthDetection in BSD wasn't correctly converting kernel reported bits per second values to Mbits per second resulting in a sanity check being triggered and detected values not being used expect for PPPoE interfaces which incorrectly were detected as 64000 Mbit - Image output of 5 minute graph wasn't possible if data retention of the 5 minute time period was configured as unlimited (pull request by Sebastian Lechte) - Estimates and average rates weren't calculated correctly for daily, monthly and yearly time periods when monitoring of the interface had been started during the ongoing time period - Estimates weren't being shown in summary output when OutputStyle or --style was configured with a value less than 2 (vnstat) - Alignment of column header in short output wasn't correct when OutputStyle or --style was configured with the value 0 (vnstat) - New - Support input of more than 31 characters in interface name when using interface1+interface2 syntax data merge queries - Support passing --config option multiple times, later files override earlier files if settings overlap (vnstat and vnstati) - Add configuration option EstimateVisible for controlling the visibility of the estimate line - Add configuration option EstimateText for modifying the default "estimated" text string when the estimate line is visible - Add --style support to -tr / --traffic output - Add summary option to --json and --xml outputs - Add timestamps to --json and --xml outputs - Add Prometheus compatible metrics endpoint cgi to examples (examples/vnstat-metrics.cgi)" Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
93 lines
3.6 KiB
Plaintext
93 lines
3.6 KiB
Plaintext
###############################################################################
|
|
# #
|
|
# IPFire.org - A linux based firewall #
|
|
# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
|
|
# #
|
|
# 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 #
|
|
# the Free Software Foundation, either version 3 of the License, or #
|
|
# (at your option) any later version. #
|
|
# #
|
|
# This program is distributed in the hope that it will be useful, #
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
|
# GNU General Public License for more details. #
|
|
# #
|
|
# You should have received a copy of the GNU General Public License #
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
|
|
# #
|
|
###############################################################################
|
|
|
|
###############################################################################
|
|
# Definitions
|
|
###############################################################################
|
|
|
|
include Config
|
|
|
|
VER = 2.10
|
|
|
|
THISAPP = vnstat-$(VER)
|
|
DL_FILE = $(THISAPP).tar.gz
|
|
DL_FROM = $(URL_IPFIRE)
|
|
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
|
TARGET = $(DIR_INFO)/$(THISAPP)
|
|
|
|
###############################################################################
|
|
# Top-level Rules
|
|
###############################################################################
|
|
|
|
objects = $(DL_FILE)
|
|
|
|
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
|
|
|
$(DL_FILE)_BLAKE2 = 82fcb54cf00a8122f31dc27f41f830ef68b92452bf7ae22bf2f1be13a1526bd12e8365002edef7766156f2df15472b189b3f219074532cb00a81156775b08997
|
|
|
|
install : $(TARGET)
|
|
|
|
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
|
|
|
|
download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
|
|
|
b2 : $(subst %,%_BLAKE2,$(objects))
|
|
|
|
dist:
|
|
@$(PAK)
|
|
|
|
###############################################################################
|
|
# Downloading, checking, b2sum
|
|
###############################################################################
|
|
|
|
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
|
|
@$(CHECK)
|
|
|
|
$(patsubst %,$(DIR_DL)/%,$(objects)) :
|
|
@$(LOAD)
|
|
|
|
$(subst %,%_BLAKE2,$(objects)) :
|
|
@$(B2SUM)
|
|
|
|
###############################################################################
|
|
# Installation Details
|
|
###############################################################################
|
|
|
|
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
|
@$(PREBUILD)
|
|
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
|
$(UPDATE_AUTOMAKE)
|
|
cd $(DIR_APP) && ./configure \
|
|
--prefix=/usr \
|
|
--sysconfdir=/etc
|
|
|
|
cd $(DIR_APP) && make all $(MAKETUNING) LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
|
|
cd $(DIR_APP) && make install
|
|
sed -i 's|^;||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
|
|
sed -i 's|/var/run/vnstat/vnstat.pid|/var/run/vnstat.pid|g' /etc/vnstat.conf
|
|
|
|
mkdir -p /var/log/vnstat
|
|
|
|
@rm -rf $(DIR_APP)
|
|
@$(POSTBUILD)
|