update documentation and bump beta version

diff --git a/CHANGES b/CHANGES
index bcfbb9e9d216e6b3daaae8ef56ea0ef9cc7fb423..8218d4f7f02ac67026ea37b244458b958f0727b2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@
  - New
    - Detection of 32-bit / 64-bit kernel interface counters for improving
      traffic calculations in rollover situations, cfg: 64bitInterfaceCounters
+   - Possibility for queries to merge data from multiple interfaces to one
+     output with interface1+interface2 syntax
 
 
 2.1 / 6-Dec-2018

diff --git a/configure b/configure
index 79536078b46277c979a905b9ac7d4e8167585e09..c912c3acf2930d6df020d28b7db01ab99e280d75 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for vnstat 2.2_beta1.
+# Generated by GNU Autoconf 2.69 for vnstat 2.2_beta2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='vnstat'
 PACKAGE_TARNAME='vnstat'
-PACKAGE_VERSION='2.2_beta1'
-PACKAGE_STRING='vnstat 2.2_beta1'
+PACKAGE_VERSION='2.2_beta2'
+PACKAGE_STRING='vnstat 2.2_beta2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1309,7 +1309,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures vnstat 2.2_beta1 to adapt to many kinds of systems.
+\`configure' configures vnstat 2.2_beta2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1380,7 +1380,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of vnstat 2.2_beta1:";;
+     short | recursive ) echo "Configuration of vnstat 2.2_beta2:";;
    esac
   cat <<\_ACEOF
 
@@ -1488,7 +1488,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-vnstat configure 2.2_beta1
+vnstat configure 2.2_beta2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2083,7 +2083,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by vnstat $as_me 2.2_beta1, which was
+It was created by vnstat $as_me 2.2_beta2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2949,7 +2949,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='vnstat'
- VERSION='2.2_beta1'
+ VERSION='2.2_beta2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6283,7 +6283,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by vnstat $as_me 2.2_beta1, which was
+This file was extended by vnstat $as_me 2.2_beta2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6349,7 +6349,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-vnstat config.status 2.2_beta1
+vnstat config.status 2.2_beta2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index a55aa19f7496aea0b5e3c91dea126043ac7f5e29..5f125fb78c8d65b971d97170d040a3f7feb96677 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([vnstat], [2.2_beta1])
+AC_INIT([vnstat], [2.2_beta2])
 AM_INIT_AUTOMAKE([foreign subdir-objects std-options -Wall -Werror])
 AM_MAINTAINER_MODE
 

diff --git a/man/vnstat.1 b/man/vnstat.1
index 576b905bd525e47dde202ec02bbb06cc69778bb0..0b1b1bc7785866704134211563cb0049dd9f51fe 100644 (file)
--- a/man/vnstat.1
+++ b/man/vnstat.1
@@ -185,7 +185,10 @@ followed by a table representing the numerical data.
 .BI "-i, --iface " interface
 Select one specific
 .I interface
-and apply actions to only it.
+and apply actions to only it. For queries, it is possible to merge the
+information of two or more interfaces using the
+.I interface1+interface2+...
+syntax.
 
 .TP
 .B "--iflist"
@@ -391,6 +394,10 @@ for more information.
 Display traffic summary for the default interface or multiple interfaces
 when more than one is monitored.
 
+.TP
+.B "vnstat -i eth0+eth1+eth3"
+Display traffic summary for a merge of interfaces eth0, eth1 and eth3.
+
 .TP
 .B "vnstat -i eth2 --xml"
 Output all information about interface eth2 in xml format.

diff --git a/man/vnstati.1 b/man/vnstati.1
index fb0ebdf8e9e6b4d4b6a4a7a23f686a93dd7f190d..a6e54332336c485dd69f3e53cb6e751021e3e097 100644 (file)
--- a/man/vnstati.1
+++ b/man/vnstati.1
@@ -185,7 +185,10 @@ Output traffic summary including hourly data bar graph using a horizontal layout
 .BI "-i, --iface " interface
 Use
 .I interface
-instead of default or configured interface.
+instead of default or configured interface. It is also possible to merge the
+information of two or more interfaces using the
+.I interface1+interface2+...
+syntax.
 
 .TP
 .BI "--locale " locale
@@ -307,6 +310,11 @@ for more information.
 .B "vnstati -s -i eth0 -o /tmp/vnstat.png"
 Output traffic summary for interface eth0 to file /tmp/vnstat.png.
 
+.TP
+.B "vnstati -vs -i eth0+eth1+eth2 -o /tmp/vnstat.png"
+Output traffic summary with hourly data under the normal summary for a merge of
+interfaces eth0, eth1 and eth2 to file /tmp/vnstat.png.
+
 .TP
 .B "vnstati -h -c 15 -o /tmp/vnstat_h.png"
 Output hourly traffic statistics for default interface to file /tmp/vnstat_h.png

diff --git a/src/dbsql.c b/src/dbsql.c
index bd0bfa75000ae0746e08aa4ed43a210858086316..1d4f4dc95d930f3251b00d65fd27d0bd317ce607 100644 (file)
--- a/src/dbsql.c
+++ b/src/dbsql.c
@@ -1068,7 +1068,7 @@ int db_getdata_range(dbdatalist **dbdata, dbdatalistinfo *listinfo, const char *
 
        listinfo->count = 0;
 
-       /* TODO: tests and documentation */
+       /* TODO: tests */
        ifaceidin = db_getinterfaceidin(iface);
        if (ifaceidin == NULL) {
                return 0;