| Message ID | 20210308115751.1987-1-adolf.belka@ipfire.org |
|---|---|
| State | Superseded |
| Headers |
Return-Path: <development-bounces@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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4DvH3764tJz3wwp for <patchwork@web04.haj.ipfire.org>; Mon, 8 Mar 2021 12:00:19 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4DvH371mhCzwl; Mon, 8 Mar 2021 12:00:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DvH3716g1z2y66; Mon, 8 Mar 2021 12:00:19 +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 "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4DvH360PdNz2xB7 for <development@lists.ipfire.org>; Mon, 8 Mar 2021 12:00: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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4DvH344MMZzgB; Mon, 8 Mar 2021 12:00:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1615204816; 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=iECO+8VD0hd3bUpPbeGO+KPvEEuCFXU3d4/H2PiCsUI=; b=i/psNJpYDijN4HGfWIlM6C1VsLnMAU+OAj732gmN4qywapE+YCAarsi/MrrQR6+y37A1gE NxVd/t3g150ZiICQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1615204816; 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=iECO+8VD0hd3bUpPbeGO+KPvEEuCFXU3d4/H2PiCsUI=; b=lMD58M611DALn88tENE/ZuomQdBjGUdt05XpCmIlx9Vi7LQAg9Te8vX0sSbJjs5pSNqnzQ ffhRvlaulghP3nnPcaji+Mn/aEownAwe5cRi0d3cQdMOaVNIauldPgfX2nEv58zrPXn7Pp S1iklgJZnSCBCoNChzH1KcA3cynfgLbpUi5BD7HSx8PPZquJ947MLSnC9rlT8E1K9yhIkN ohfXVx95PWfCDzQIfatkJ8KwU8v+yiCK4H3IubRYLmWkT6xIVjlBIpv2Q/41BwTKc4UXIA 4xwsI7bOR6ZnYV60yhY1MyqeaSEY4tI1A2jC5+5UzDA9IRjLbhM9wuvy81RjTg== From: "Adolf Belka (ipfire)" <adolf.belka@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 1/2] pmacct: New addon Date: Mon, 8 Mar 2021 12:57:51 +0100 Message-Id: <20210308115751.1987-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
| Series |
[1/2] pmacct: New addon
|
|
Commit Message
Adolf Belka
March 8, 2021, 11:57 a.m. UTC
From: Adolf Belka <adolf.belka@ipfire.org> - What is it? pmacct is a monitoring tool for network management tasks. Data collected can be used for analysis and troubleshooting purposes to maintain the health of the network. pmacct can collect, replicate and export network information. It can cache in memory tables, store persistently to SQLite3 and output to flat-files like CSV, formatted, and JSON. - Why is it needed? To monitor data usage (IP-based or MAC-based data accounting) down to the client level. Net-Traffic will monitor traffic for the entire RED, GREEN, etc. networks, but it cannot pinpoint which client is using lots of data. Connections will take a snapshot but not show day by day sums. pmacct can help admins keep tabs on users that use too much data. - What are the use cases? An ISP may implement data caps and if the limit is over-run then you have to pay for every additional xxGB of data used. Typical charges can be around $10 per 50GB. With pmacct you can identify the high users and take action, hopefully before the limit is breached. - This is being introduced as a command line only tool. However, at a later date, if it is useful to enough additional users a WUI page could be developed as discussed in the development mailing list https://lists.ipfire.org/pipermail/development/2021-January/009174.html Co-authored-by: Jon Murphy Co-authored-by: Erik Kapfer <ummeegge@ipfire.org> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> --- config/backup/includes/pmacct | 2 + config/pmacct/pmacct.conf | 24 +++++ config/pmacct/pmacct.init | 57 +++++++++++ config/pmacct/pmacct_memory_example.conf | 24 +++++ config/pmacct/pmacct_sqlite3_example.conf | 25 +++++ config/rootfiles/packages/pmacct | 111 ++++++++++++++++++++++ lfs/pmacct | 107 +++++++++++++++++++++ make.sh | 2 + src/paks/pmacct/install.sh | 36 +++++++ src/paks/pmacct/uninstall.sh | 33 +++++++ src/paks/pmacct/update.sh | 26 +++++ 11 files changed, 447 insertions(+) create mode 100644 config/backup/includes/pmacct create mode 100644 config/pmacct/pmacct.conf create mode 100644 config/pmacct/pmacct.init create mode 100644 config/pmacct/pmacct_memory_example.conf create mode 100644 config/pmacct/pmacct_sqlite3_example.conf create mode 100644 config/rootfiles/packages/pmacct create mode 100644 lfs/pmacct create mode 100644 src/paks/pmacct/install.sh create mode 100644 src/paks/pmacct/uninstall.sh create mode 100644 src/paks/pmacct/update.sh
Comments
Hello, I will split this email into two parts: The technical part: * The initscript isn’t based on our template and uses sleep to check if starting a daemon has been successful. That should not be necessary and will potentially slow down the boot process. * I am not very sure if the example configuration files are helpful. Maybe someone can clear this up a little bit for me what is the rationale is behind them. * There are loads of daemons being shipped and only one is being used. * How much load does this generate? How large is the captured data? Then there is the other part: > On 8 Mar 2021, at 11:57, Adolf Belka (ipfire) <adolf.belka@ipfire.org> wrote: > > From: Adolf Belka <adolf.belka@ipfire.org> > > - What is it? > pmacct is a monitoring tool for network management tasks. Data collected > can be used for analysis and troubleshooting purposes to maintain the > health of the network. pmacct can collect, replicate and export network > information. It can cache in memory tables, store persistently to SQLite3 > and output to flat-files like CSV, formatted, and JSON. Okay. > - Why is it needed? > To monitor data usage (IP-based or MAC-based data accounting) down to the > client level. Net-Traffic will monitor traffic for the entire RED, GREEN, > etc. networks, but it cannot pinpoint which client is using lots of data. > Connections will take a snapshot but not show day by day sums. pmacct can > help admins keep tabs on users that use too much data. I agree with the goal of it. But how does this add-on achieve that? The data is being written to a (usually binary) file which cannot be visualised in the web UI. Does this not want a CGI script that allows people to see what is happening? Sending manual SQL queries probably isn’t much fun :) > - What are the use cases? > An ISP may implement data caps and if the limit is over-run then you have > to pay for every additional xxGB of data used. Typical charges can be > around $10 per 50GB. With pmacct you can identify the high users and take > action, hopefully before the limit is breached. > - This is being introduced as a command line only tool. However, at a later > date, if it is useful to enough additional users a WUI page could be > developed as discussed in the development mailing list > https://lists.ipfire.org/pipermail/development/2021-January/009174.html I have been thinking about this for a while now and would say that I can approve merging this as a CLI tool. But it would not really enhance IPFire’s functionality because it is only usable for people who spend a lot of time writing their own scripts or SQL queries to get information that can be used to make decisions. Adding another alternative to vnstat will result in us having to maintain two things that roughly do the same - or where one’s features are a subset of the other one. I would like to avoid merging this and then see it abandoned because it is too complicated to use. We already have a lot of virtually unmaintained stuff around and I would really like to drop a lot of it, although I know that there are a few people actually using it. Thoughts? Best, -Michael > Co-authored-by: Jon Murphy > Co-authored-by: Erik Kapfer <ummeegge@ipfire.org> > > Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> > --- > config/backup/includes/pmacct | 2 + > config/pmacct/pmacct.conf | 24 +++++ > config/pmacct/pmacct.init | 57 +++++++++++ > config/pmacct/pmacct_memory_example.conf | 24 +++++ > config/pmacct/pmacct_sqlite3_example.conf | 25 +++++ > config/rootfiles/packages/pmacct | 111 ++++++++++++++++++++++ > lfs/pmacct | 107 +++++++++++++++++++++ > make.sh | 2 + > src/paks/pmacct/install.sh | 36 +++++++ > src/paks/pmacct/uninstall.sh | 33 +++++++ > src/paks/pmacct/update.sh | 26 +++++ > 11 files changed, 447 insertions(+) > create mode 100644 config/backup/includes/pmacct > create mode 100644 config/pmacct/pmacct.conf > create mode 100644 config/pmacct/pmacct.init > create mode 100644 config/pmacct/pmacct_memory_example.conf > create mode 100644 config/pmacct/pmacct_sqlite3_example.conf > create mode 100644 config/rootfiles/packages/pmacct > create mode 100644 lfs/pmacct > create mode 100644 src/paks/pmacct/install.sh > create mode 100644 src/paks/pmacct/uninstall.sh > create mode 100644 src/paks/pmacct/update.sh > > diff --git a/config/backup/includes/pmacct b/config/backup/includes/pmacct > new file mode 100644 > index 000000000..4359067ad > --- /dev/null > +++ b/config/backup/includes/pmacct > @@ -0,0 +1,2 @@ > +/etc/pmacct/ > +/var/spool/pmacct/ > diff --git a/config/pmacct/pmacct.conf b/config/pmacct/pmacct.conf > new file mode 100644 > index 000000000..3c1d47efa > --- /dev/null > +++ b/config/pmacct/pmacct.conf > @@ -0,0 +1,24 @@ > +! > +! Pmacctd configuration file for IPFire environment > +! > + > +syslog: daemon > +daemonize: true > +debug: false > +promisc: true > +interface: green0 > + > + > +! > +! "plugin1" plugin configuration > +! > +plugins: memory[plugin1] > + > +plugin_buffer_size[plugin1]: 102400 > +plugin_pipe_size[plugin1]: 10240000 > + > +imt_mem_pools_number: 256 > +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe > + > +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto > +aggregate_filter[plugin1]: ip > \ No newline at end of file > diff --git a/config/pmacct/pmacct.init b/config/pmacct/pmacct.init > new file mode 100644 > index 000000000..31f9ce49b > --- /dev/null > +++ b/config/pmacct/pmacct.init > @@ -0,0 +1,57 @@ > +#!/bin/bash > + > +# Begin $rc_base/init.d/pmacct > + > +# Starts and stops pmacct daemon > +# Date: 2021-02-25 12:25:30 (Thu, 25 Feb 2021) > + > +# Locations > +CONF="/etc/pmacct/pmacct.conf" > +CONTENT="/var/pmacct" > +# Pmacctd binary > +PMACCT="/usr/sbin/pmacctd" > +# Pmacctd start options '-f' for the configuration file > +OPT="-f ${CONF}" > +DESC="pmacct daemon" > +# Pmacctd syslog facilitiy > +#SYSLOG="local1" > + > + > +. /etc/sysconfig/rc > +. $rc_functions > + > +case "$1" in > + start) > + boot_mesg "Starting the ${DESC}... " > + loadproc ${PMACCT} ${OPT} > + sleep 2 > + if P=$(pgrep -fl pmacctd); then > + echo -e "\n${P}" > + else > + echo -e "\n${PMACCT} is not running... " > + fi > + ;; > + > + stop) > + boot_mesg "Stopping the ${DESC}... " > + killproc ${PMACCT} > + ;; > + > + restart) > + $0 stop > + sleep 1 > + $0 start > + ;; > + > + status) > + statusproc ${PMACCT} > + ;; > + > + *) > + echo "Usage: $0 {start|stop|restart|status}" > + exit 1 > + ;; > +esac > + > +# End $rc_base/init.d/pmacct > + > diff --git a/config/pmacct/pmacct_memory_example.conf b/config/pmacct/pmacct_memory_example.conf > new file mode 100644 > index 000000000..0babdaaf7 > --- /dev/null > +++ b/config/pmacct/pmacct_memory_example.conf > @@ -0,0 +1,24 @@ > +! > +! Pmacctd configuration file for IPFire environment > +! > + > +syslog: daemon > +daemonize: true > +debug: false > +promisc: true > +interface: green0 > + > + > +! > +! "plugin1" plugin configuration > +! > +plugins: memory[plugin1] > + > +plugin_buffer_size[plugin1]: 102400 > +plugin_pipe_size[plugin1]: 10240000 > + > +imt_mem_pools_number: 256 > +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe > + > +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto > +aggregate_filter[plugin1]: ip > diff --git a/config/pmacct/pmacct_sqlite3_example.conf b/config/pmacct/pmacct_sqlite3_example.conf > new file mode 100644 > index 000000000..7fb996408 > --- /dev/null > +++ b/config/pmacct/pmacct_sqlite3_example.conf > @@ -0,0 +1,25 @@ > +! > +! Pmacctd configuration file for IPFire environment > +! > + > +syslog: daemon > +daemonize: true > +debug: false > +promisc: true > +interface: green0 > + > + > +! > +! "plugin2" plugin configuration > +! > +plugins: sqlite3[plugin2] > + > +sql_db[plugin2]: /var/spool/pmacct/pmacct_sqlitev1.db > +sql_table_version[plugin2]: 1 > +sql_history[plugin2]: 5m > +sql_refresh_time[plugin2]: 300 > +sql_history_roundoff[plugin2]: m > +sql_dont_try_update: true > + > +aggregate[plugin2]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto > +aggregate_filter[plugin2]: ip > diff --git a/config/rootfiles/packages/pmacct b/config/rootfiles/packages/pmacct > new file mode 100644 > index 000000000..fed83ee67 > --- /dev/null > +++ b/config/rootfiles/packages/pmacct > @@ -0,0 +1,111 @@ > +etc/pmacct > +etc/pmacct/pmacct.conf > +etc/pmacct/pmacct_memory_example.conf > +etc/pmacct/pmacct_sqlite3_example.conf > +etc/rc.d/init.d/pmacct > +usr/bin/pmacct > +#usr/lib/pmacct > +#usr/lib/pmacct/examples > +#usr/lib/pmacct/examples/custom > +#usr/lib/pmacct/examples/custom/libcustom.la > +#usr/lib/pmacct/examples/lg > +#usr/lib/pmacct/examples/lg/pmbgp > +usr/sbin/nfacctd > +usr/sbin/pmacctd > +usr/sbin/pmbgpd > +usr/sbin/pmbmpd > +usr/sbin/pmtelemetryd > +usr/sbin/sfacctd > +usr/share/pmacct > +#usr/share/pmacct/CONFIG-KEYS > +#usr/share/pmacct/FAQS > +#usr/share/pmacct/QUICKSTART > +#usr/share/pmacct/UPGRADE > +#usr/share/pmacct/docs > +#usr/share/pmacct/docs/IPFIX > +#usr/share/pmacct/docs/LOOKING_GLASS_FORMAT > +#usr/share/pmacct/docs/MSGLOG_DUMP_FORMATS > +#usr/share/pmacct/docs/SIGNALS > +#usr/share/pmacct/docs/TRIGGER_VARS > +#usr/share/pmacct/examples > +usr/share/pmacct/examples/allow.lst.example > +#usr/share/pmacct/examples/amqp > +usr/share/pmacct/examples/amqp/amqp_receiver.py > +#usr/share/pmacct/examples/avro > +usr/share/pmacct/examples/avro/avro_file_decoder.py > +usr/share/pmacct/examples/bgp_agent.map.example > +usr/share/pmacct/examples/bgp_md5.lst.example > +usr/share/pmacct/examples/bgp_xconnects.map.example > +usr/share/pmacct/examples/flow_to_rd.map.example > +#usr/share/pmacct/examples/kafka > +usr/share/pmacct/examples/kafka/kafka_consumer.py > +#usr/share/pmacct/examples/lg > +usr/share/pmacct/examples/lg/pmbgp.py > +usr/share/pmacct/examples/networks.lst.example > +usr/share/pmacct/examples/nfacctd-sql.conf.example > +usr/share/pmacct/examples/pcap_interfaces.map.example > +usr/share/pmacct/examples/peers.map.example > +usr/share/pmacct/examples/pmacctd-imt.conf.example > +usr/share/pmacct/examples/pmacctd-multiple-plugins.conf.example > +usr/share/pmacct/examples/pmacctd-sql.conf.example > +usr/share/pmacct/examples/pmacctd-sqlite3.conf.example > +usr/share/pmacct/examples/ports.lst.example > +usr/share/pmacct/examples/pretag.map.example > +usr/share/pmacct/examples/primitives.lst.example > +usr/share/pmacct/examples/probe_netflow.conf.example > +usr/share/pmacct/examples/probe_sflow.conf.example > +usr/share/pmacct/examples/sampling.map.example > +usr/share/pmacct/examples/tee_receivers.lst.example > +#usr/share/pmacct/sql > +#usr/share/pmacct/sql/README.64bit > +#usr/share/pmacct/sql/README.GeoIP > +#usr/share/pmacct/sql/README.IPv6 > +#usr/share/pmacct/sql/README.cos > +#usr/share/pmacct/sql/README.custom_primitives > +#usr/share/pmacct/sql/README.etype > +#usr/share/pmacct/sql/README.export_proto > +#usr/share/pmacct/sql/README.iface > +#usr/share/pmacct/sql/README.label > +#usr/share/pmacct/sql/README.mask > +#usr/share/pmacct/sql/README.mpls > +#usr/share/pmacct/sql/README.mysql > +#usr/share/pmacct/sql/README.nat > +#usr/share/pmacct/sql/README.pgsql > +#usr/share/pmacct/sql/README.sampling > +usr/share/pmacct/sql/README.sqlite3 > +#usr/share/pmacct/sql/README.tag2 > +#usr/share/pmacct/sql/README.timestamp > +#usr/share/pmacct/sql/README.tunnel > +#usr/share/pmacct/sql/pmacct-create-db.pgsql > +#usr/share/pmacct/sql/pmacct-create-db_bgp_v1.mysql > +#usr/share/pmacct/sql/pmacct-create-db_v1.mysql > +#usr/share/pmacct/sql/pmacct-create-db_v2.mysql > +#usr/share/pmacct/sql/pmacct-create-db_v3.mysql > +#usr/share/pmacct/sql/pmacct-create-db_v4.mysql > +#usr/share/pmacct/sql/pmacct-create-db_v5.mysql > +#usr/share/pmacct/sql/pmacct-create-db_v6.mysql > +#usr/share/pmacct/sql/pmacct-create-db_v7.mysql > +#usr/share/pmacct/sql/pmacct-create-db_v8.mysql > +#usr/share/pmacct/sql/pmacct-create-db_v9.mysql > +#usr/share/pmacct/sql/pmacct-create-table_bgp_v1.pgsql > +usr/share/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3 > +#usr/share/pmacct/sql/pmacct-create-table_v1.pgsql > +usr/share/pmacct/sql/pmacct-create-table_v1.sqlite3 > +#usr/share/pmacct/sql/pmacct-create-table_v2.pgsql > +usr/share/pmacct/sql/pmacct-create-table_v2.sqlite3 > +#usr/share/pmacct/sql/pmacct-create-table_v3.pgsql > +usr/share/pmacct/sql/pmacct-create-table_v3.sqlite3 > +#usr/share/pmacct/sql/pmacct-create-table_v4.pgsql > +usr/share/pmacct/sql/pmacct-create-table_v4.sqlite3 > +#usr/share/pmacct/sql/pmacct-create-table_v5.pgsql > +usr/share/pmacct/sql/pmacct-create-table_v5.sqlite3 > +#usr/share/pmacct/sql/pmacct-create-table_v6.pgsql > +usr/share/pmacct/sql/pmacct-create-table_v6.sqlite3 > +usr/share/pmacct/sql/pmacct-create-table_v7.sqlite3 > +#usr/share/pmacct/sql/pmacct-create-table_v7_v8.pgsql > +usr/share/pmacct/sql/pmacct-create-table_v8.sqlite3 > +#usr/share/pmacct/sql/pmacct-create-table_v9.pgsql > +usr/share/pmacct/sql/pmacct-create-table_v9.sqlite3 > +#usr/share/pmacct/sql/pmacct-grant-db.mysql > +var/ipfire/backup/addons/includes/pmacct > +var/spool/pmacct > diff --git a/lfs/pmacct b/lfs/pmacct > new file mode 100644 > index 000000000..c6cc5270e > --- /dev/null > +++ b/lfs/pmacct > @@ -0,0 +1,107 @@ > +############################################################################### > +# # > +# IPFire.org - A linux based firewall # > +# Copyright (C) 2019 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 = 1.7.6 > + > +THISAPP = pmacct-$(VER) > +DL_FILE = $(THISAPP).tar.gz > +DL_FROM = $(URL_IPFIRE) > +DIR_APP = $(DIR_SRC)/$(THISAPP) > +TARGET = $(DIR_INFO)/$(THISAPP) > +PROG = pmacct > +PAK_VER = 1 > + > +DEPS = libcdada > + > +############################################################################### > +# Top-level Rules > +############################################################################### > + > +objects = $(DL_FILE) > + > +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) > + > +$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b > + > +install : $(TARGET) > + > +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) > + > +download :$(patsubst %,$(DIR_DL)/%,$(objects)) > + > +md5 : $(subst %,%_MD5,$(objects)) > + > +dist: > + @$(PAK) > + > +############################################################################### > +# Downloading, checking, md5sum > +############################################################################### > + > +$(patsubst %,$(DIR_CHK)/%,$(objects)) : > + @$(CHECK) > + > +$(patsubst %,$(DIR_DL)/%,$(objects)) : > + @$(LOAD) > + > +$(subst %,%_MD5,$(objects)) : > + @$(MD5) > + > +############################################################################### > +# Installation Details > +############################################################################### > + > +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > + @$(PREBUILD) > + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) > + cd $(DIR_APP) && ./autogen.sh > + cd $(DIR_APP) && ./configure \ > + --prefix=/usr \ > + --sysconfdir=/etc/pmacct \ > + --enable-sqlite3 \ > + --enable-l2 \ > + --enable-jansson > + > + # Add directory for plugins and pipes > + -mkdir -v /var/spool/pmacct > + > + # Add configuration folder and copy conf files to it > + -mkdir -v /etc/pmacct > + cp -vf $(DIR_CONF)/pmacct/*.conf /etc/pmacct > + > + # Copy initscript to dir > + cp -vf $(DIR_CONF)/pmacct/pmacct.init /etc/rc.d/init.d/pmacct > + chmod 754 /etc/rc.d/init.d/pmacct > + chown root:root /etc/rc.d/init.d/pmacct > + > + cd $(DIR_APP) && make $(MAKETUNING) > + cd $(DIR_APP) && make install > + > + # Install backup definition > + install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \ > + /var/ipfire/backup/addons/includes/pmacct > + @rm -rf $(DIR_APP) > + @$(POSTBUILD) > diff --git a/make.sh b/make.sh > index 43cccaca0..d42c9b1e2 100755 > --- a/make.sh > +++ b/make.sh > @@ -1646,6 +1646,8 @@ buildipfire() { > lfsmake2 ncdu > lfsmake2 lshw > lfsmake2 socat > + lfsmake2 libcdada > + lfsmake2 pmacct > } > > buildinstaller() { > diff --git a/src/paks/pmacct/install.sh b/src/paks/pmacct/install.sh > new file mode 100644 > index 000000000..8178cc7bc > --- /dev/null > +++ b/src/paks/pmacct/install.sh > @@ -0,0 +1,36 @@ > +#!/bin/bash > +############################################################################ > +# # > +# This file is part of the IPFire Firewall. # > +# # > +# IPFire 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 2 of the License, or # > +# (at your option) any later version. # > +# # > +# IPFire 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 IPFire; if not, write to the Free Software # > +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # > +# # > +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # > +# # > +############################################################################ > +# > +. /opt/pakfire/lib/functions.sh > + > +extract_files > +restore_backup ${NAME} > + > +# Add symlinks for runlevels > +ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME} > +ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME} > +ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME} > +start_service --background ${NAME} > + > + > +# EOF > diff --git a/src/paks/pmacct/uninstall.sh b/src/paks/pmacct/uninstall.sh > new file mode 100644 > index 000000000..51631e8c1 > --- /dev/null > +++ b/src/paks/pmacct/uninstall.sh > @@ -0,0 +1,33 @@ > +#!/bin/bash > +############################################################################ > +# # > +# This file is part of the IPFire Firewall. # > +# # > +# IPFire 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 2 of the License, or # > +# (at your option) any later version. # > +# # > +# IPFire 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 IPFire; if not, write to the Free Software # > +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # > +# # > +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # > +# # > +############################################################################ > +# > +. /opt/pakfire/lib/functions.sh > + > +stop_service ${NAME} > +make_backup ${NAME} > +remove_files > + > +# Delete symlinks > +rm -rfv /etc/rc.d/rc?.d/???${NAME} > + > +# EOF > diff --git a/src/paks/pmacct/update.sh b/src/paks/pmacct/update.sh > new file mode 100644 > index 000000000..89c40d0d7 > --- /dev/null > +++ b/src/paks/pmacct/update.sh > @@ -0,0 +1,26 @@ > +#!/bin/bash > +############################################################################ > +# # > +# This file is part of the IPFire Firewall. # > +# # > +# IPFire 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 2 of the License, or # > +# (at your option) any later version. # > +# # > +# IPFire 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 IPFire; if not, write to the Free Software # > +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # > +# # > +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # > +# # > +############################################################################ > +# > +. /opt/pakfire/lib/functions.sh > +./uninstall.sh > +./install.sh > -- > 2.30.1 >
Hi Michael, On 18/03/2021 14:07, Michael Tremer wrote: > Hello, > > I will split this email into two parts: > > The technical part: > > * The initscript isn’t based on our template and uses sleep to check if starting a daemon has been successful. That should not be necessary and will potentially slow down the boot process. I will have another look at the initscript and see if it can use the standard IPFire template. > > * I am not very sure if the example configuration files are helpful. Maybe someone can clear this up a little bit for me what is the rationale is behind them. The idea was that the two simplest config example scripts were provided that give a user the ability to get data into memory or into a sqlite file. The actual conf file provided is a copy of the memory version. These give a basic starting point that people can then add additional info to be recorded etc. > > * There are loads of daemons being shipped and only one is being used. I think Jon or Erik need to comment on this question. > > * How much load does this generate? How large is the captured data? Jon needs to provide this feedback. > > Then there is the other part: > >> On 8 Mar 2021, at 11:57, Adolf Belka (ipfire) <adolf.belka@ipfire.org> wrote: >> >> From: Adolf Belka <adolf.belka@ipfire.org> >> >> - What is it? >> pmacct is a monitoring tool for network management tasks. Data collected >> can be used for analysis and troubleshooting purposes to maintain the >> health of the network. pmacct can collect, replicate and export network >> information. It can cache in memory tables, store persistently to SQLite3 >> and output to flat-files like CSV, formatted, and JSON. > > Okay. > >> - Why is it needed? >> To monitor data usage (IP-based or MAC-based data accounting) down to the >> client level. Net-Traffic will monitor traffic for the entire RED, GREEN, >> etc. networks, but it cannot pinpoint which client is using lots of data. >> Connections will take a snapshot but not show day by day sums. pmacct can >> help admins keep tabs on users that use too much data. > > I agree with the goal of it. But how does this add-on achieve that? Jon should comment on this as he had this use case and can give feedback how the data has helped him in his investigations. > > The data is being written to a (usually binary) file which cannot be visualised in the web UI. Does this not want a CGI script that allows people to see what is happening? We all thought that this would ultimately need a CGI script to set up and visualise the data. We believed it was worth getting this running in actual use as a CLI tool to start with and then get more feedback on the best items that would need to be captured in the CGI script. The tool has a lot of capabilities and I think it will not be possible to do everything that it can do in a WUI page. So some form of file or db offload will need to be available anyway but the items identified as being commonly required would be the ones to be developed into a CGI WUI page. > > Sending manual SQL queries probably isn’t much fun :) > >> - What are the use cases? >> An ISP may implement data caps and if the limit is over-run then you have >> to pay for every additional xxGB of data used. Typical charges can be >> around $10 per 50GB. With pmacct you can identify the high users and take >> action, hopefully before the limit is breached. >> - This is being introduced as a command line only tool. However, at a later >> date, if it is useful to enough additional users a WUI page could be >> developed as discussed in the development mailing list >> https://lists.ipfire.org/pipermail/development/2021-January/009174.html > > I have been thinking about this for a while now and would say that I can approve merging this as a CLI tool. But it would not really enhance IPFire’s functionality because it is only usable for people who spend a lot of time writing their own scripts or SQL queries to get information that can be used to make decisions. We recognise that and had discussed the CGI WUI page as mentioned above. > > Adding another alternative to vnstat will result in us having to maintain two things that roughly do the same - or where one’s features are a subset of the other one. I think Jon or Erik need to comment on any comparison with vnstat. > > I would like to avoid merging this and then see it abandoned because it is too complicated to use. We already have a lot of virtually unmaintained stuff around and I would really like to drop a lot of it, although I know that there are a few people actually using it. Jon and Erik should comment on the complication of use or not. Jon especially has done quite a bit of work with it, installing the .ipfire package versions that I have created. I intend to also have a play around with it but for me it is more some playful fun as I just have a home network with only myself as the user and admin. > > Thoughts? > > Best, > -Michael > >> Co-authored-by: Jon Murphy >> Co-authored-by: Erik Kapfer <ummeegge@ipfire.org> >> >> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> >> --- >> config/backup/includes/pmacct | 2 + >> config/pmacct/pmacct.conf | 24 +++++ >> config/pmacct/pmacct.init | 57 +++++++++++ >> config/pmacct/pmacct_memory_example.conf | 24 +++++ >> config/pmacct/pmacct_sqlite3_example.conf | 25 +++++ >> config/rootfiles/packages/pmacct | 111 ++++++++++++++++++++++ >> lfs/pmacct | 107 +++++++++++++++++++++ >> make.sh | 2 + >> src/paks/pmacct/install.sh | 36 +++++++ >> src/paks/pmacct/uninstall.sh | 33 +++++++ >> src/paks/pmacct/update.sh | 26 +++++ >> 11 files changed, 447 insertions(+) >> create mode 100644 config/backup/includes/pmacct >> create mode 100644 config/pmacct/pmacct.conf >> create mode 100644 config/pmacct/pmacct.init >> create mode 100644 config/pmacct/pmacct_memory_example.conf >> create mode 100644 config/pmacct/pmacct_sqlite3_example.conf >> create mode 100644 config/rootfiles/packages/pmacct >> create mode 100644 lfs/pmacct >> create mode 100644 src/paks/pmacct/install.sh >> create mode 100644 src/paks/pmacct/uninstall.sh >> create mode 100644 src/paks/pmacct/update.sh >> >> diff --git a/config/backup/includes/pmacct b/config/backup/includes/pmacct >> new file mode 100644 >> index 000000000..4359067ad >> --- /dev/null >> +++ b/config/backup/includes/pmacct >> @@ -0,0 +1,2 @@ >> +/etc/pmacct/ >> +/var/spool/pmacct/ >> diff --git a/config/pmacct/pmacct.conf b/config/pmacct/pmacct.conf >> new file mode 100644 >> index 000000000..3c1d47efa >> --- /dev/null >> +++ b/config/pmacct/pmacct.conf >> @@ -0,0 +1,24 @@ >> +! >> +! Pmacctd configuration file for IPFire environment >> +! >> + >> +syslog: daemon >> +daemonize: true >> +debug: false >> +promisc: true >> +interface: green0 >> + >> + >> +! >> +! "plugin1" plugin configuration >> +! >> +plugins: memory[plugin1] >> + >> +plugin_buffer_size[plugin1]: 102400 >> +plugin_pipe_size[plugin1]: 10240000 >> + >> +imt_mem_pools_number: 256 >> +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe >> + >> +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >> +aggregate_filter[plugin1]: ip >> \ No newline at end of file >> diff --git a/config/pmacct/pmacct.init b/config/pmacct/pmacct.init >> new file mode 100644 >> index 000000000..31f9ce49b >> --- /dev/null >> +++ b/config/pmacct/pmacct.init >> @@ -0,0 +1,57 @@ >> +#!/bin/bash >> + >> +# Begin $rc_base/init.d/pmacct >> + >> +# Starts and stops pmacct daemon >> +# Date: 2021-02-25 12:25:30 (Thu, 25 Feb 2021) >> + >> +# Locations >> +CONF="/etc/pmacct/pmacct.conf" >> +CONTENT="/var/pmacct" >> +# Pmacctd binary >> +PMACCT="/usr/sbin/pmacctd" >> +# Pmacctd start options '-f' for the configuration file >> +OPT="-f ${CONF}" >> +DESC="pmacct daemon" >> +# Pmacctd syslog facilitiy >> +#SYSLOG="local1" >> + >> + >> +. /etc/sysconfig/rc >> +. $rc_functions >> + >> +case "$1" in >> + start) >> + boot_mesg "Starting the ${DESC}... " >> + loadproc ${PMACCT} ${OPT} >> + sleep 2 >> + if P=$(pgrep -fl pmacctd); then >> + echo -e "\n${P}" >> + else >> + echo -e "\n${PMACCT} is not running... " >> + fi >> + ;; >> + >> + stop) >> + boot_mesg "Stopping the ${DESC}... " >> + killproc ${PMACCT} >> + ;; >> + >> + restart) >> + $0 stop >> + sleep 1 >> + $0 start >> + ;; >> + >> + status) >> + statusproc ${PMACCT} >> + ;; >> + >> + *) >> + echo "Usage: $0 {start|stop|restart|status}" >> + exit 1 >> + ;; >> +esac >> + >> +# End $rc_base/init.d/pmacct >> + >> diff --git a/config/pmacct/pmacct_memory_example.conf b/config/pmacct/pmacct_memory_example.conf >> new file mode 100644 >> index 000000000..0babdaaf7 >> --- /dev/null >> +++ b/config/pmacct/pmacct_memory_example.conf >> @@ -0,0 +1,24 @@ >> +! >> +! Pmacctd configuration file for IPFire environment >> +! >> + >> +syslog: daemon >> +daemonize: true >> +debug: false >> +promisc: true >> +interface: green0 >> + >> + >> +! >> +! "plugin1" plugin configuration >> +! >> +plugins: memory[plugin1] >> + >> +plugin_buffer_size[plugin1]: 102400 >> +plugin_pipe_size[plugin1]: 10240000 >> + >> +imt_mem_pools_number: 256 >> +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe >> + >> +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >> +aggregate_filter[plugin1]: ip >> diff --git a/config/pmacct/pmacct_sqlite3_example.conf b/config/pmacct/pmacct_sqlite3_example.conf >> new file mode 100644 >> index 000000000..7fb996408 >> --- /dev/null >> +++ b/config/pmacct/pmacct_sqlite3_example.conf >> @@ -0,0 +1,25 @@ >> +! >> +! Pmacctd configuration file for IPFire environment >> +! >> + >> +syslog: daemon >> +daemonize: true >> +debug: false >> +promisc: true >> +interface: green0 >> + >> + >> +! >> +! "plugin2" plugin configuration >> +! >> +plugins: sqlite3[plugin2] >> + >> +sql_db[plugin2]: /var/spool/pmacct/pmacct_sqlitev1.db >> +sql_table_version[plugin2]: 1 >> +sql_history[plugin2]: 5m >> +sql_refresh_time[plugin2]: 300 >> +sql_history_roundoff[plugin2]: m >> +sql_dont_try_update: true >> + >> +aggregate[plugin2]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >> +aggregate_filter[plugin2]: ip >> diff --git a/config/rootfiles/packages/pmacct b/config/rootfiles/packages/pmacct >> new file mode 100644 >> index 000000000..fed83ee67 >> --- /dev/null >> +++ b/config/rootfiles/packages/pmacct >> @@ -0,0 +1,111 @@ >> +etc/pmacct >> +etc/pmacct/pmacct.conf >> +etc/pmacct/pmacct_memory_example.conf >> +etc/pmacct/pmacct_sqlite3_example.conf >> +etc/rc.d/init.d/pmacct >> +usr/bin/pmacct >> +#usr/lib/pmacct >> +#usr/lib/pmacct/examples >> +#usr/lib/pmacct/examples/custom >> +#usr/lib/pmacct/examples/custom/libcustom.la >> +#usr/lib/pmacct/examples/lg >> +#usr/lib/pmacct/examples/lg/pmbgp >> +usr/sbin/nfacctd >> +usr/sbin/pmacctd >> +usr/sbin/pmbgpd >> +usr/sbin/pmbmpd >> +usr/sbin/pmtelemetryd >> +usr/sbin/sfacctd >> +usr/share/pmacct >> +#usr/share/pmacct/CONFIG-KEYS >> +#usr/share/pmacct/FAQS >> +#usr/share/pmacct/QUICKSTART >> +#usr/share/pmacct/UPGRADE >> +#usr/share/pmacct/docs >> +#usr/share/pmacct/docs/IPFIX >> +#usr/share/pmacct/docs/LOOKING_GLASS_FORMAT >> +#usr/share/pmacct/docs/MSGLOG_DUMP_FORMATS >> +#usr/share/pmacct/docs/SIGNALS >> +#usr/share/pmacct/docs/TRIGGER_VARS >> +#usr/share/pmacct/examples >> +usr/share/pmacct/examples/allow.lst.example >> +#usr/share/pmacct/examples/amqp >> +usr/share/pmacct/examples/amqp/amqp_receiver.py >> +#usr/share/pmacct/examples/avro >> +usr/share/pmacct/examples/avro/avro_file_decoder.py >> +usr/share/pmacct/examples/bgp_agent.map.example >> +usr/share/pmacct/examples/bgp_md5.lst.example >> +usr/share/pmacct/examples/bgp_xconnects.map.example >> +usr/share/pmacct/examples/flow_to_rd.map.example >> +#usr/share/pmacct/examples/kafka >> +usr/share/pmacct/examples/kafka/kafka_consumer.py >> +#usr/share/pmacct/examples/lg >> +usr/share/pmacct/examples/lg/pmbgp.py >> +usr/share/pmacct/examples/networks.lst.example >> +usr/share/pmacct/examples/nfacctd-sql.conf.example >> +usr/share/pmacct/examples/pcap_interfaces.map.example >> +usr/share/pmacct/examples/peers.map.example >> +usr/share/pmacct/examples/pmacctd-imt.conf.example >> +usr/share/pmacct/examples/pmacctd-multiple-plugins.conf.example >> +usr/share/pmacct/examples/pmacctd-sql.conf.example >> +usr/share/pmacct/examples/pmacctd-sqlite3.conf.example >> +usr/share/pmacct/examples/ports.lst.example >> +usr/share/pmacct/examples/pretag.map.example >> +usr/share/pmacct/examples/primitives.lst.example >> +usr/share/pmacct/examples/probe_netflow.conf.example >> +usr/share/pmacct/examples/probe_sflow.conf.example >> +usr/share/pmacct/examples/sampling.map.example >> +usr/share/pmacct/examples/tee_receivers.lst.example >> +#usr/share/pmacct/sql >> +#usr/share/pmacct/sql/README.64bit >> +#usr/share/pmacct/sql/README.GeoIP >> +#usr/share/pmacct/sql/README.IPv6 >> +#usr/share/pmacct/sql/README.cos >> +#usr/share/pmacct/sql/README.custom_primitives >> +#usr/share/pmacct/sql/README.etype >> +#usr/share/pmacct/sql/README.export_proto >> +#usr/share/pmacct/sql/README.iface >> +#usr/share/pmacct/sql/README.label >> +#usr/share/pmacct/sql/README.mask >> +#usr/share/pmacct/sql/README.mpls >> +#usr/share/pmacct/sql/README.mysql >> +#usr/share/pmacct/sql/README.nat >> +#usr/share/pmacct/sql/README.pgsql >> +#usr/share/pmacct/sql/README.sampling >> +usr/share/pmacct/sql/README.sqlite3 >> +#usr/share/pmacct/sql/README.tag2 >> +#usr/share/pmacct/sql/README.timestamp >> +#usr/share/pmacct/sql/README.tunnel >> +#usr/share/pmacct/sql/pmacct-create-db.pgsql >> +#usr/share/pmacct/sql/pmacct-create-db_bgp_v1.mysql >> +#usr/share/pmacct/sql/pmacct-create-db_v1.mysql >> +#usr/share/pmacct/sql/pmacct-create-db_v2.mysql >> +#usr/share/pmacct/sql/pmacct-create-db_v3.mysql >> +#usr/share/pmacct/sql/pmacct-create-db_v4.mysql >> +#usr/share/pmacct/sql/pmacct-create-db_v5.mysql >> +#usr/share/pmacct/sql/pmacct-create-db_v6.mysql >> +#usr/share/pmacct/sql/pmacct-create-db_v7.mysql >> +#usr/share/pmacct/sql/pmacct-create-db_v8.mysql >> +#usr/share/pmacct/sql/pmacct-create-db_v9.mysql >> +#usr/share/pmacct/sql/pmacct-create-table_bgp_v1.pgsql >> +usr/share/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3 >> +#usr/share/pmacct/sql/pmacct-create-table_v1.pgsql >> +usr/share/pmacct/sql/pmacct-create-table_v1.sqlite3 >> +#usr/share/pmacct/sql/pmacct-create-table_v2.pgsql >> +usr/share/pmacct/sql/pmacct-create-table_v2.sqlite3 >> +#usr/share/pmacct/sql/pmacct-create-table_v3.pgsql >> +usr/share/pmacct/sql/pmacct-create-table_v3.sqlite3 >> +#usr/share/pmacct/sql/pmacct-create-table_v4.pgsql >> +usr/share/pmacct/sql/pmacct-create-table_v4.sqlite3 >> +#usr/share/pmacct/sql/pmacct-create-table_v5.pgsql >> +usr/share/pmacct/sql/pmacct-create-table_v5.sqlite3 >> +#usr/share/pmacct/sql/pmacct-create-table_v6.pgsql >> +usr/share/pmacct/sql/pmacct-create-table_v6.sqlite3 >> +usr/share/pmacct/sql/pmacct-create-table_v7.sqlite3 >> +#usr/share/pmacct/sql/pmacct-create-table_v7_v8.pgsql >> +usr/share/pmacct/sql/pmacct-create-table_v8.sqlite3 >> +#usr/share/pmacct/sql/pmacct-create-table_v9.pgsql >> +usr/share/pmacct/sql/pmacct-create-table_v9.sqlite3 >> +#usr/share/pmacct/sql/pmacct-grant-db.mysql >> +var/ipfire/backup/addons/includes/pmacct >> +var/spool/pmacct >> diff --git a/lfs/pmacct b/lfs/pmacct >> new file mode 100644 >> index 000000000..c6cc5270e >> --- /dev/null >> +++ b/lfs/pmacct >> @@ -0,0 +1,107 @@ >> +############################################################################### >> +# # >> +# IPFire.org - A linux based firewall # >> +# Copyright (C) 2019 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 = 1.7.6 >> + >> +THISAPP = pmacct-$(VER) >> +DL_FILE = $(THISAPP).tar.gz >> +DL_FROM = $(URL_IPFIRE) >> +DIR_APP = $(DIR_SRC)/$(THISAPP) >> +TARGET = $(DIR_INFO)/$(THISAPP) >> +PROG = pmacct >> +PAK_VER = 1 >> + >> +DEPS = libcdada >> + >> +############################################################################### >> +# Top-level Rules >> +############################################################################### >> + >> +objects = $(DL_FILE) >> + >> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) >> + >> +$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b >> + >> +install : $(TARGET) >> + >> +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >> + >> +download :$(patsubst %,$(DIR_DL)/%,$(objects)) >> + >> +md5 : $(subst %,%_MD5,$(objects)) >> + >> +dist: >> + @$(PAK) >> + >> +############################################################################### >> +# Downloading, checking, md5sum >> +############################################################################### >> + >> +$(patsubst %,$(DIR_CHK)/%,$(objects)) : >> + @$(CHECK) >> + >> +$(patsubst %,$(DIR_DL)/%,$(objects)) : >> + @$(LOAD) >> + >> +$(subst %,%_MD5,$(objects)) : >> + @$(MD5) >> + >> +############################################################################### >> +# Installation Details >> +############################################################################### >> + >> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> + @$(PREBUILD) >> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) >> + cd $(DIR_APP) && ./autogen.sh >> + cd $(DIR_APP) && ./configure \ >> + --prefix=/usr \ >> + --sysconfdir=/etc/pmacct \ >> + --enable-sqlite3 \ >> + --enable-l2 \ >> + --enable-jansson >> + >> + # Add directory for plugins and pipes >> + -mkdir -v /var/spool/pmacct >> + >> + # Add configuration folder and copy conf files to it >> + -mkdir -v /etc/pmacct >> + cp -vf $(DIR_CONF)/pmacct/*.conf /etc/pmacct >> + >> + # Copy initscript to dir >> + cp -vf $(DIR_CONF)/pmacct/pmacct.init /etc/rc.d/init.d/pmacct >> + chmod 754 /etc/rc.d/init.d/pmacct >> + chown root:root /etc/rc.d/init.d/pmacct >> + >> + cd $(DIR_APP) && make $(MAKETUNING) >> + cd $(DIR_APP) && make install >> + >> + # Install backup definition >> + install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \ >> + /var/ipfire/backup/addons/includes/pmacct >> + @rm -rf $(DIR_APP) >> + @$(POSTBUILD) >> diff --git a/make.sh b/make.sh >> index 43cccaca0..d42c9b1e2 100755 >> --- a/make.sh >> +++ b/make.sh >> @@ -1646,6 +1646,8 @@ buildipfire() { >> lfsmake2 ncdu >> lfsmake2 lshw >> lfsmake2 socat >> + lfsmake2 libcdada >> + lfsmake2 pmacct >> } >> >> buildinstaller() { >> diff --git a/src/paks/pmacct/install.sh b/src/paks/pmacct/install.sh >> new file mode 100644 >> index 000000000..8178cc7bc >> --- /dev/null >> +++ b/src/paks/pmacct/install.sh >> @@ -0,0 +1,36 @@ >> +#!/bin/bash >> +############################################################################ >> +# # >> +# This file is part of the IPFire Firewall. # >> +# # >> +# IPFire 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 2 of the License, or # >> +# (at your option) any later version. # >> +# # >> +# IPFire 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 IPFire; if not, write to the Free Software # >> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # >> +# # >> +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # >> +# # >> +############################################################################ >> +# >> +. /opt/pakfire/lib/functions.sh >> + >> +extract_files >> +restore_backup ${NAME} >> + >> +# Add symlinks for runlevels >> +ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME} >> +ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME} >> +ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME} >> +start_service --background ${NAME} >> + >> + >> +# EOF >> diff --git a/src/paks/pmacct/uninstall.sh b/src/paks/pmacct/uninstall.sh >> new file mode 100644 >> index 000000000..51631e8c1 >> --- /dev/null >> +++ b/src/paks/pmacct/uninstall.sh >> @@ -0,0 +1,33 @@ >> +#!/bin/bash >> +############################################################################ >> +# # >> +# This file is part of the IPFire Firewall. # >> +# # >> +# IPFire 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 2 of the License, or # >> +# (at your option) any later version. # >> +# # >> +# IPFire 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 IPFire; if not, write to the Free Software # >> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # >> +# # >> +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # >> +# # >> +############################################################################ >> +# >> +. /opt/pakfire/lib/functions.sh >> + >> +stop_service ${NAME} >> +make_backup ${NAME} >> +remove_files >> + >> +# Delete symlinks >> +rm -rfv /etc/rc.d/rc?.d/???${NAME} >> + >> +# EOF >> diff --git a/src/paks/pmacct/update.sh b/src/paks/pmacct/update.sh >> new file mode 100644 >> index 000000000..89c40d0d7 >> --- /dev/null >> +++ b/src/paks/pmacct/update.sh >> @@ -0,0 +1,26 @@ >> +#!/bin/bash >> +############################################################################ >> +# # >> +# This file is part of the IPFire Firewall. # >> +# # >> +# IPFire 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 2 of the License, or # >> +# (at your option) any later version. # >> +# # >> +# IPFire 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 IPFire; if not, write to the Free Software # >> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # >> +# # >> +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # >> +# # >> +############################################################################ >> +# >> +. /opt/pakfire/lib/functions.sh >> +./uninstall.sh >> +./install.sh >> -- >> 2.30.1 >> >
Hey, > On 18 Mar 2021, at 13:34, Adolf Belka <adolf.belka@ipfire.org> wrote: > > Hi Michael, > > On 18/03/2021 14:07, Michael Tremer wrote: >> Hello, >> I will split this email into two parts: >> The technical part: >> * The initscript isn’t based on our template and uses sleep to check if starting a daemon has been successful. That should not be necessary and will potentially slow down the boot process. > I will have another look at the initscript and see if it can use the standard IPFire template. Yes, it is not too different from your version: https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/initscripts/system/template;h=69dc2a6a2202fb30da61a7fff6625aea531802e9;hb=HEAD There isn’t much documentation around it but there are loads of other scripts that will be helpful to figure out any convention or boilerplate code to copy. >> * I am not very sure if the example configuration files are helpful. Maybe someone can clear this up a little bit for me what is the rationale is behind them. > The idea was that the two simplest config example scripts were provided that give a user the ability to get data into memory or into a sqlite file. The actual conf file provided is a copy of the memory version. These give a basic starting point that people can then add additional info to be recorded etc. Does anybody want to use anything else than SQLite in the context of IPFire? >> * There are loads of daemons being shipped and only one is being used. > I think Jon or Erik need to comment on this question. >> * How much load does this generate? How large is the captured data? > Jon needs to provide this feedback. >> Then there is the other part: >>> On 8 Mar 2021, at 11:57, Adolf Belka (ipfire) <adolf.belka@ipfire.org> wrote: >>> >>> From: Adolf Belka <adolf.belka@ipfire.org> >>> >>> - What is it? >>> pmacct is a monitoring tool for network management tasks. Data collected >>> can be used for analysis and troubleshooting purposes to maintain the >>> health of the network. pmacct can collect, replicate and export network >>> information. It can cache in memory tables, store persistently to SQLite3 >>> and output to flat-files like CSV, formatted, and JSON. >> Okay. >>> - Why is it needed? >>> To monitor data usage (IP-based or MAC-based data accounting) down to the >>> client level. Net-Traffic will monitor traffic for the entire RED, GREEN, >>> etc. networks, but it cannot pinpoint which client is using lots of data. >>> Connections will take a snapshot but not show day by day sums. pmacct can >>> help admins keep tabs on users that use too much data. >> I agree with the goal of it. But how does this add-on achieve that? > Jon should comment on this as he had this use case and can give feedback how the data has helped him in his investigations. >> The data is being written to a (usually binary) file which cannot be visualised in the web UI. Does this not want a CGI script that allows people to see what is happening? > We all thought that this would ultimately need a CGI script to set up and visualise the data. We believed it was worth getting this running in actual use as a CLI tool to start with and then get more feedback on the best items that would need to be captured in the CGI script. The tool has a lot of capabilities and I think it will not be possible to do everything that it can do in a WUI page. So some form of file or db offload will need to be available anyway but the items identified as being commonly required would be the ones to be developed into a CGI WUI page. >> Sending manual SQL queries probably isn’t much fun :) >>> - What are the use cases? >>> An ISP may implement data caps and if the limit is over-run then you have >>> to pay for every additional xxGB of data used. Typical charges can be >>> around $10 per 50GB. With pmacct you can identify the high users and take >>> action, hopefully before the limit is breached. >>> - This is being introduced as a command line only tool. However, at a later >>> date, if it is useful to enough additional users a WUI page could be >>> developed as discussed in the development mailing list >>> https://lists.ipfire.org/pipermail/development/2021-January/009174.html >> I have been thinking about this for a while now and would say that I can approve merging this as a CLI tool. But it would not really enhance IPFire’s functionality because it is only usable for people who spend a lot of time writing their own scripts or SQL queries to get information that can be used to make decisions. > We recognise that and had discussed the CGI WUI page as mentioned above. Was this here on the list or elsewhere? >> Adding another alternative to vnstat will result in us having to maintain two things that roughly do the same - or where one’s features are a subset of the other one. > I think Jon or Erik need to comment on any comparison with vnstat. >> I would like to avoid merging this and then see it abandoned because it is too complicated to use. We already have a lot of virtually unmaintained stuff around and I would really like to drop a lot of it, although I know that there are a few people actually using it. > Jon and Erik should comment on the complication of use or not. Jon especially has done quite a bit of work with it, installing the .ipfire package versions that I have created. > I intend to also have a play around with it but for me it is more some playful fun as I just have a home network with only myself as the user and admin. >> Thoughts? >> Best, >> -Michael >>> Co-authored-by: Jon Murphy >>> Co-authored-by: Erik Kapfer <ummeegge@ipfire.org> >>> >>> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> >>> --- >>> config/backup/includes/pmacct | 2 + >>> config/pmacct/pmacct.conf | 24 +++++ >>> config/pmacct/pmacct.init | 57 +++++++++++ >>> config/pmacct/pmacct_memory_example.conf | 24 +++++ >>> config/pmacct/pmacct_sqlite3_example.conf | 25 +++++ >>> config/rootfiles/packages/pmacct | 111 ++++++++++++++++++++++ >>> lfs/pmacct | 107 +++++++++++++++++++++ >>> make.sh | 2 + >>> src/paks/pmacct/install.sh | 36 +++++++ >>> src/paks/pmacct/uninstall.sh | 33 +++++++ >>> src/paks/pmacct/update.sh | 26 +++++ >>> 11 files changed, 447 insertions(+) >>> create mode 100644 config/backup/includes/pmacct >>> create mode 100644 config/pmacct/pmacct.conf >>> create mode 100644 config/pmacct/pmacct.init >>> create mode 100644 config/pmacct/pmacct_memory_example.conf >>> create mode 100644 config/pmacct/pmacct_sqlite3_example.conf >>> create mode 100644 config/rootfiles/packages/pmacct >>> create mode 100644 lfs/pmacct >>> create mode 100644 src/paks/pmacct/install.sh >>> create mode 100644 src/paks/pmacct/uninstall.sh >>> create mode 100644 src/paks/pmacct/update.sh >>> >>> diff --git a/config/backup/includes/pmacct b/config/backup/includes/pmacct >>> new file mode 100644 >>> index 000000000..4359067ad >>> --- /dev/null >>> +++ b/config/backup/includes/pmacct >>> @@ -0,0 +1,2 @@ >>> +/etc/pmacct/ >>> +/var/spool/pmacct/ >>> diff --git a/config/pmacct/pmacct.conf b/config/pmacct/pmacct.conf >>> new file mode 100644 >>> index 000000000..3c1d47efa >>> --- /dev/null >>> +++ b/config/pmacct/pmacct.conf >>> @@ -0,0 +1,24 @@ >>> +! >>> +! Pmacctd configuration file for IPFire environment >>> +! >>> + >>> +syslog: daemon >>> +daemonize: true >>> +debug: false >>> +promisc: true >>> +interface: green0 >>> + >>> + >>> +! >>> +! "plugin1" plugin configuration >>> +! >>> +plugins: memory[plugin1] >>> + >>> +plugin_buffer_size[plugin1]: 102400 >>> +plugin_pipe_size[plugin1]: 10240000 >>> + >>> +imt_mem_pools_number: 256 >>> +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe >>> + >>> +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >>> +aggregate_filter[plugin1]: ip >>> \ No newline at end of file >>> diff --git a/config/pmacct/pmacct.init b/config/pmacct/pmacct.init >>> new file mode 100644 >>> index 000000000..31f9ce49b >>> --- /dev/null >>> +++ b/config/pmacct/pmacct.init >>> @@ -0,0 +1,57 @@ >>> +#!/bin/bash >>> + >>> +# Begin $rc_base/init.d/pmacct >>> + >>> +# Starts and stops pmacct daemon >>> +# Date: 2021-02-25 12:25:30 (Thu, 25 Feb 2021) >>> + >>> +# Locations >>> +CONF="/etc/pmacct/pmacct.conf" >>> +CONTENT="/var/pmacct" >>> +# Pmacctd binary >>> +PMACCT="/usr/sbin/pmacctd" >>> +# Pmacctd start options '-f' for the configuration file >>> +OPT="-f ${CONF}" >>> +DESC="pmacct daemon" >>> +# Pmacctd syslog facilitiy >>> +#SYSLOG="local1" >>> + >>> + >>> +. /etc/sysconfig/rc >>> +. $rc_functions >>> + >>> +case "$1" in >>> + start) >>> + boot_mesg "Starting the ${DESC}... " >>> + loadproc ${PMACCT} ${OPT} >>> + sleep 2 >>> + if P=$(pgrep -fl pmacctd); then >>> + echo -e "\n${P}" >>> + else >>> + echo -e "\n${PMACCT} is not running... " >>> + fi >>> + ;; >>> + >>> + stop) >>> + boot_mesg "Stopping the ${DESC}... " >>> + killproc ${PMACCT} >>> + ;; >>> + >>> + restart) >>> + $0 stop >>> + sleep 1 >>> + $0 start >>> + ;; >>> + >>> + status) >>> + statusproc ${PMACCT} >>> + ;; >>> + >>> + *) >>> + echo "Usage: $0 {start|stop|restart|status}" >>> + exit 1 >>> + ;; >>> +esac >>> + >>> +# End $rc_base/init.d/pmacct >>> + >>> diff --git a/config/pmacct/pmacct_memory_example.conf b/config/pmacct/pmacct_memory_example.conf >>> new file mode 100644 >>> index 000000000..0babdaaf7 >>> --- /dev/null >>> +++ b/config/pmacct/pmacct_memory_example.conf >>> @@ -0,0 +1,24 @@ >>> +! >>> +! Pmacctd configuration file for IPFire environment >>> +! >>> + >>> +syslog: daemon >>> +daemonize: true >>> +debug: false >>> +promisc: true >>> +interface: green0 >>> + >>> + >>> +! >>> +! "plugin1" plugin configuration >>> +! >>> +plugins: memory[plugin1] >>> + >>> +plugin_buffer_size[plugin1]: 102400 >>> +plugin_pipe_size[plugin1]: 10240000 >>> + >>> +imt_mem_pools_number: 256 >>> +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe >>> + >>> +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >>> +aggregate_filter[plugin1]: ip >>> diff --git a/config/pmacct/pmacct_sqlite3_example.conf b/config/pmacct/pmacct_sqlite3_example.conf >>> new file mode 100644 >>> index 000000000..7fb996408 >>> --- /dev/null >>> +++ b/config/pmacct/pmacct_sqlite3_example.conf >>> @@ -0,0 +1,25 @@ >>> +! >>> +! Pmacctd configuration file for IPFire environment >>> +! >>> + >>> +syslog: daemon >>> +daemonize: true >>> +debug: false >>> +promisc: true >>> +interface: green0 >>> + >>> + >>> +! >>> +! "plugin2" plugin configuration >>> +! >>> +plugins: sqlite3[plugin2] >>> + >>> +sql_db[plugin2]: /var/spool/pmacct/pmacct_sqlitev1.db >>> +sql_table_version[plugin2]: 1 >>> +sql_history[plugin2]: 5m >>> +sql_refresh_time[plugin2]: 300 >>> +sql_history_roundoff[plugin2]: m >>> +sql_dont_try_update: true >>> + >>> +aggregate[plugin2]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >>> +aggregate_filter[plugin2]: ip >>> diff --git a/config/rootfiles/packages/pmacct b/config/rootfiles/packages/pmacct >>> new file mode 100644 >>> index 000000000..fed83ee67 >>> --- /dev/null >>> +++ b/config/rootfiles/packages/pmacct >>> @@ -0,0 +1,111 @@ >>> +etc/pmacct >>> +etc/pmacct/pmacct.conf >>> +etc/pmacct/pmacct_memory_example.conf >>> +etc/pmacct/pmacct_sqlite3_example.conf >>> +etc/rc.d/init.d/pmacct >>> +usr/bin/pmacct >>> +#usr/lib/pmacct >>> +#usr/lib/pmacct/examples >>> +#usr/lib/pmacct/examples/custom >>> +#usr/lib/pmacct/examples/custom/libcustom.la >>> +#usr/lib/pmacct/examples/lg >>> +#usr/lib/pmacct/examples/lg/pmbgp >>> +usr/sbin/nfacctd >>> +usr/sbin/pmacctd >>> +usr/sbin/pmbgpd >>> +usr/sbin/pmbmpd >>> +usr/sbin/pmtelemetryd >>> +usr/sbin/sfacctd >>> +usr/share/pmacct >>> +#usr/share/pmacct/CONFIG-KEYS >>> +#usr/share/pmacct/FAQS >>> +#usr/share/pmacct/QUICKSTART >>> +#usr/share/pmacct/UPGRADE >>> +#usr/share/pmacct/docs >>> +#usr/share/pmacct/docs/IPFIX >>> +#usr/share/pmacct/docs/LOOKING_GLASS_FORMAT >>> +#usr/share/pmacct/docs/MSGLOG_DUMP_FORMATS >>> +#usr/share/pmacct/docs/SIGNALS >>> +#usr/share/pmacct/docs/TRIGGER_VARS >>> +#usr/share/pmacct/examples >>> +usr/share/pmacct/examples/allow.lst.example >>> +#usr/share/pmacct/examples/amqp >>> +usr/share/pmacct/examples/amqp/amqp_receiver.py >>> +#usr/share/pmacct/examples/avro >>> +usr/share/pmacct/examples/avro/avro_file_decoder.py >>> +usr/share/pmacct/examples/bgp_agent.map.example >>> +usr/share/pmacct/examples/bgp_md5.lst.example >>> +usr/share/pmacct/examples/bgp_xconnects.map.example >>> +usr/share/pmacct/examples/flow_to_rd.map.example >>> +#usr/share/pmacct/examples/kafka >>> +usr/share/pmacct/examples/kafka/kafka_consumer.py >>> +#usr/share/pmacct/examples/lg >>> +usr/share/pmacct/examples/lg/pmbgp.py >>> +usr/share/pmacct/examples/networks.lst.example >>> +usr/share/pmacct/examples/nfacctd-sql.conf.example >>> +usr/share/pmacct/examples/pcap_interfaces.map.example >>> +usr/share/pmacct/examples/peers.map.example >>> +usr/share/pmacct/examples/pmacctd-imt.conf.example >>> +usr/share/pmacct/examples/pmacctd-multiple-plugins.conf.example >>> +usr/share/pmacct/examples/pmacctd-sql.conf.example >>> +usr/share/pmacct/examples/pmacctd-sqlite3.conf.example >>> +usr/share/pmacct/examples/ports.lst.example >>> +usr/share/pmacct/examples/pretag.map.example >>> +usr/share/pmacct/examples/primitives.lst.example >>> +usr/share/pmacct/examples/probe_netflow.conf.example >>> +usr/share/pmacct/examples/probe_sflow.conf.example >>> +usr/share/pmacct/examples/sampling.map.example >>> +usr/share/pmacct/examples/tee_receivers.lst.example >>> +#usr/share/pmacct/sql >>> +#usr/share/pmacct/sql/README.64bit >>> +#usr/share/pmacct/sql/README.GeoIP >>> +#usr/share/pmacct/sql/README.IPv6 >>> +#usr/share/pmacct/sql/README.cos >>> +#usr/share/pmacct/sql/README.custom_primitives >>> +#usr/share/pmacct/sql/README.etype >>> +#usr/share/pmacct/sql/README.export_proto >>> +#usr/share/pmacct/sql/README.iface >>> +#usr/share/pmacct/sql/README.label >>> +#usr/share/pmacct/sql/README.mask >>> +#usr/share/pmacct/sql/README.mpls >>> +#usr/share/pmacct/sql/README.mysql >>> +#usr/share/pmacct/sql/README.nat >>> +#usr/share/pmacct/sql/README.pgsql >>> +#usr/share/pmacct/sql/README.sampling >>> +usr/share/pmacct/sql/README.sqlite3 >>> +#usr/share/pmacct/sql/README.tag2 >>> +#usr/share/pmacct/sql/README.timestamp >>> +#usr/share/pmacct/sql/README.tunnel >>> +#usr/share/pmacct/sql/pmacct-create-db.pgsql >>> +#usr/share/pmacct/sql/pmacct-create-db_bgp_v1.mysql >>> +#usr/share/pmacct/sql/pmacct-create-db_v1.mysql >>> +#usr/share/pmacct/sql/pmacct-create-db_v2.mysql >>> +#usr/share/pmacct/sql/pmacct-create-db_v3.mysql >>> +#usr/share/pmacct/sql/pmacct-create-db_v4.mysql >>> +#usr/share/pmacct/sql/pmacct-create-db_v5.mysql >>> +#usr/share/pmacct/sql/pmacct-create-db_v6.mysql >>> +#usr/share/pmacct/sql/pmacct-create-db_v7.mysql >>> +#usr/share/pmacct/sql/pmacct-create-db_v8.mysql >>> +#usr/share/pmacct/sql/pmacct-create-db_v9.mysql >>> +#usr/share/pmacct/sql/pmacct-create-table_bgp_v1.pgsql >>> +usr/share/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3 >>> +#usr/share/pmacct/sql/pmacct-create-table_v1.pgsql >>> +usr/share/pmacct/sql/pmacct-create-table_v1.sqlite3 >>> +#usr/share/pmacct/sql/pmacct-create-table_v2.pgsql >>> +usr/share/pmacct/sql/pmacct-create-table_v2.sqlite3 >>> +#usr/share/pmacct/sql/pmacct-create-table_v3.pgsql >>> +usr/share/pmacct/sql/pmacct-create-table_v3.sqlite3 >>> +#usr/share/pmacct/sql/pmacct-create-table_v4.pgsql >>> +usr/share/pmacct/sql/pmacct-create-table_v4.sqlite3 >>> +#usr/share/pmacct/sql/pmacct-create-table_v5.pgsql >>> +usr/share/pmacct/sql/pmacct-create-table_v5.sqlite3 >>> +#usr/share/pmacct/sql/pmacct-create-table_v6.pgsql >>> +usr/share/pmacct/sql/pmacct-create-table_v6.sqlite3 >>> +usr/share/pmacct/sql/pmacct-create-table_v7.sqlite3 >>> +#usr/share/pmacct/sql/pmacct-create-table_v7_v8.pgsql >>> +usr/share/pmacct/sql/pmacct-create-table_v8.sqlite3 >>> +#usr/share/pmacct/sql/pmacct-create-table_v9.pgsql >>> +usr/share/pmacct/sql/pmacct-create-table_v9.sqlite3 >>> +#usr/share/pmacct/sql/pmacct-grant-db.mysql >>> +var/ipfire/backup/addons/includes/pmacct >>> +var/spool/pmacct >>> diff --git a/lfs/pmacct b/lfs/pmacct >>> new file mode 100644 >>> index 000000000..c6cc5270e >>> --- /dev/null >>> +++ b/lfs/pmacct >>> @@ -0,0 +1,107 @@ >>> +############################################################################### >>> +# # >>> +# IPFire.org - A linux based firewall # >>> +# Copyright (C) 2019 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 = 1.7.6 >>> + >>> +THISAPP = pmacct-$(VER) >>> +DL_FILE = $(THISAPP).tar.gz >>> +DL_FROM = $(URL_IPFIRE) >>> +DIR_APP = $(DIR_SRC)/$(THISAPP) >>> +TARGET = $(DIR_INFO)/$(THISAPP) >>> +PROG = pmacct >>> +PAK_VER = 1 >>> + >>> +DEPS = libcdada >>> + >>> +############################################################################### >>> +# Top-level Rules >>> +############################################################################### >>> + >>> +objects = $(DL_FILE) >>> + >>> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) >>> + >>> +$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b >>> + >>> +install : $(TARGET) >>> + >>> +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >>> + >>> +download :$(patsubst %,$(DIR_DL)/%,$(objects)) >>> + >>> +md5 : $(subst %,%_MD5,$(objects)) >>> + >>> +dist: >>> + @$(PAK) >>> + >>> +############################################################################### >>> +# Downloading, checking, md5sum >>> +############################################################################### >>> + >>> +$(patsubst %,$(DIR_CHK)/%,$(objects)) : >>> + @$(CHECK) >>> + >>> +$(patsubst %,$(DIR_DL)/%,$(objects)) : >>> + @$(LOAD) >>> + >>> +$(subst %,%_MD5,$(objects)) : >>> + @$(MD5) >>> + >>> +############################################################################### >>> +# Installation Details >>> +############################################################################### >>> + >>> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>> + @$(PREBUILD) >>> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) >>> + cd $(DIR_APP) && ./autogen.sh >>> + cd $(DIR_APP) && ./configure \ >>> + --prefix=/usr \ >>> + --sysconfdir=/etc/pmacct \ >>> + --enable-sqlite3 \ >>> + --enable-l2 \ >>> + --enable-jansson >>> + >>> + # Add directory for plugins and pipes >>> + -mkdir -v /var/spool/pmacct >>> + >>> + # Add configuration folder and copy conf files to it >>> + -mkdir -v /etc/pmacct >>> + cp -vf $(DIR_CONF)/pmacct/*.conf /etc/pmacct >>> + >>> + # Copy initscript to dir >>> + cp -vf $(DIR_CONF)/pmacct/pmacct.init /etc/rc.d/init.d/pmacct >>> + chmod 754 /etc/rc.d/init.d/pmacct >>> + chown root:root /etc/rc.d/init.d/pmacct >>> + >>> + cd $(DIR_APP) && make $(MAKETUNING) >>> + cd $(DIR_APP) && make install >>> + >>> + # Install backup definition >>> + install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \ >>> + /var/ipfire/backup/addons/includes/pmacct >>> + @rm -rf $(DIR_APP) >>> + @$(POSTBUILD) >>> diff --git a/make.sh b/make.sh >>> index 43cccaca0..d42c9b1e2 100755 >>> --- a/make.sh >>> +++ b/make.sh >>> @@ -1646,6 +1646,8 @@ buildipfire() { >>> lfsmake2 ncdu >>> lfsmake2 lshw >>> lfsmake2 socat >>> + lfsmake2 libcdada >>> + lfsmake2 pmacct >>> } >>> >>> buildinstaller() { >>> diff --git a/src/paks/pmacct/install.sh b/src/paks/pmacct/install.sh >>> new file mode 100644 >>> index 000000000..8178cc7bc >>> --- /dev/null >>> +++ b/src/paks/pmacct/install.sh >>> @@ -0,0 +1,36 @@ >>> +#!/bin/bash >>> +############################################################################ >>> +# # >>> +# This file is part of the IPFire Firewall. # >>> +# # >>> +# IPFire 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 2 of the License, or # >>> +# (at your option) any later version. # >>> +# # >>> +# IPFire 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 IPFire; if not, write to the Free Software # >>> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # >>> +# # >>> +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # >>> +# # >>> +############################################################################ >>> +# >>> +. /opt/pakfire/lib/functions.sh >>> + >>> +extract_files >>> +restore_backup ${NAME} >>> + >>> +# Add symlinks for runlevels >>> +ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME} >>> +ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME} >>> +ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME} >>> +start_service --background ${NAME} >>> + >>> + >>> +# EOF >>> diff --git a/src/paks/pmacct/uninstall.sh b/src/paks/pmacct/uninstall.sh >>> new file mode 100644 >>> index 000000000..51631e8c1 >>> --- /dev/null >>> +++ b/src/paks/pmacct/uninstall.sh >>> @@ -0,0 +1,33 @@ >>> +#!/bin/bash >>> +############################################################################ >>> +# # >>> +# This file is part of the IPFire Firewall. # >>> +# # >>> +# IPFire 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 2 of the License, or # >>> +# (at your option) any later version. # >>> +# # >>> +# IPFire 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 IPFire; if not, write to the Free Software # >>> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # >>> +# # >>> +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # >>> +# # >>> +############################################################################ >>> +# >>> +. /opt/pakfire/lib/functions.sh >>> + >>> +stop_service ${NAME} >>> +make_backup ${NAME} >>> +remove_files >>> + >>> +# Delete symlinks >>> +rm -rfv /etc/rc.d/rc?.d/???${NAME} >>> + >>> +# EOF >>> diff --git a/src/paks/pmacct/update.sh b/src/paks/pmacct/update.sh >>> new file mode 100644 >>> index 000000000..89c40d0d7 >>> --- /dev/null >>> +++ b/src/paks/pmacct/update.sh >>> @@ -0,0 +1,26 @@ >>> +#!/bin/bash >>> +############################################################################ >>> +# # >>> +# This file is part of the IPFire Firewall. # >>> +# # >>> +# IPFire 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 2 of the License, or # >>> +# (at your option) any later version. # >>> +# # >>> +# IPFire 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 IPFire; if not, write to the Free Software # >>> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # >>> +# # >>> +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # >>> +# # >>> +############################################################################ >>> +# >>> +. /opt/pakfire/lib/functions.sh >>> +./uninstall.sh >>> +./install.sh >>> -- >>> 2.30.1
Hi Michael, On 18/03/2021 19:25, Michael Tremer wrote: > Hey, > >> On 18 Mar 2021, at 13:34, Adolf Belka <adolf.belka@ipfire.org> wrote: >> >> Hi Michael, >> >> On 18/03/2021 14:07, Michael Tremer wrote: >>> Hello, >>> I will split this email into two parts: >>> The technical part: >>> * The initscript isn’t based on our template and uses sleep to check if starting a daemon has been successful. That should not be necessary and will potentially slow down the boot process. >> I will have another look at the initscript and see if it can use the standard IPFire template. > > Yes, it is not too different from your version: > > https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/initscripts/system/template;h=69dc2a6a2202fb30da61a7fff6625aea531802e9;hb=HEAD > > There isn’t much documentation around it but there are loads of other scripts that will be helpful to figure out any convention or boilerplate code to copy. > >>> * I am not very sure if the example configuration files are helpful. Maybe someone can clear this up a little bit for me what is the rationale is behind them. >> The idea was that the two simplest config example scripts were provided that give a user the ability to get data into memory or into a sqlite file. The actual conf file provided is a copy of the memory version. These give a basic starting point that people can then add additional info to be recorded etc. > > Does anybody want to use anything else than SQLite in the context of IPFire? I think we weren't sure and the memory and sqlite options were the easiest to get going and give real data. There are also mysql and postgresql options but I think we need to see what the interest is. > >>> * There are loads of daemons being shipped and only one is being used. >> I think Jon or Erik need to comment on this question. >>> * How much load does this generate? How large is the captured data? >> Jon needs to provide this feedback. >>> Then there is the other part: >>>> On 8 Mar 2021, at 11:57, Adolf Belka (ipfire) <adolf.belka@ipfire.org> wrote: >>>> >>>> From: Adolf Belka <adolf.belka@ipfire.org> >>>> >>>> - What is it? >>>> pmacct is a monitoring tool for network management tasks. Data collected >>>> can be used for analysis and troubleshooting purposes to maintain the >>>> health of the network. pmacct can collect, replicate and export network >>>> information. It can cache in memory tables, store persistently to SQLite3 >>>> and output to flat-files like CSV, formatted, and JSON. >>> Okay. >>>> - Why is it needed? >>>> To monitor data usage (IP-based or MAC-based data accounting) down to the >>>> client level. Net-Traffic will monitor traffic for the entire RED, GREEN, >>>> etc. networks, but it cannot pinpoint which client is using lots of data. >>>> Connections will take a snapshot but not show day by day sums. pmacct can >>>> help admins keep tabs on users that use too much data. >>> I agree with the goal of it. But how does this add-on achieve that? >> Jon should comment on this as he had this use case and can give feedback how the data has helped him in his investigations. >>> The data is being written to a (usually binary) file which cannot be visualised in the web UI. Does this not want a CGI script that allows people to see what is happening? >> We all thought that this would ultimately need a CGI script to set up and visualise the data. We believed it was worth getting this running in actual use as a CLI tool to start with and then get more feedback on the best items that would need to be captured in the CGI script. The tool has a lot of capabilities and I think it will not be possible to do everything that it can do in a WUI page. So some form of file or db offload will need to be available anyway but the items identified as being commonly required would be the ones to be developed into a CGI WUI page. >>> Sending manual SQL queries probably isn’t much fun :) >>>> - What are the use cases? >>>> An ISP may implement data caps and if the limit is over-run then you have >>>> to pay for every additional xxGB of data used. Typical charges can be >>>> around $10 per 50GB. With pmacct you can identify the high users and take >>>> action, hopefully before the limit is breached. >>>> - This is being introduced as a command line only tool. However, at a later >>>> date, if it is useful to enough additional users a WUI page could be >>>> developed as discussed in the development mailing list >>>> https://lists.ipfire.org/pipermail/development/2021-January/009174.html >>> I have been thinking about this for a while now and would say that I can approve merging this as a CLI tool. But it would not really enhance IPFire’s functionality because it is only usable for people who spend a lot of time writing their own scripts or SQL queries to get information that can be used to make decisions. >> We recognise that and had discussed the CGI WUI page as mentioned above. > > Was this here on the list or elsewhere? This was in a private conversation on the IPFire Community forum. We thought it best to have all our back and forth discussions between ourselves to start with. We were all finding our feet with it as well and we thought it best not to swamp the development list with our musings and questions to each other. If you want to see all the discussion history, then we can add you to the members of that conversation. If the addon gets accepted then any future discussions would be done on the Development mailing list to get everyones input. > >>> Adding another alternative to vnstat will result in us having to maintain two things that roughly do the same - or where one’s features are a subset of the other one. >> I think Jon or Erik need to comment on any comparison with vnstat. >>> I would like to avoid merging this and then see it abandoned because it is too complicated to use. We already have a lot of virtually unmaintained stuff around and I would really like to drop a lot of it, although I know that there are a few people actually using it. >> Jon and Erik should comment on the complication of use or not. Jon especially has done quite a bit of work with it, installing the .ipfire package versions that I have created. >> I intend to also have a play around with it but for me it is more some playful fun as I just have a home network with only myself as the user and admin. >>> Thoughts? >>> Best, >>> -Michael >>>> Co-authored-by: Jon Murphy >>>> Co-authored-by: Erik Kapfer <ummeegge@ipfire.org> >>>> >>>> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> >>>> --- >>>> config/backup/includes/pmacct | 2 + >>>> config/pmacct/pmacct.conf | 24 +++++ >>>> config/pmacct/pmacct.init | 57 +++++++++++ >>>> config/pmacct/pmacct_memory_example.conf | 24 +++++ >>>> config/pmacct/pmacct_sqlite3_example.conf | 25 +++++ >>>> config/rootfiles/packages/pmacct | 111 ++++++++++++++++++++++ >>>> lfs/pmacct | 107 +++++++++++++++++++++ >>>> make.sh | 2 + >>>> src/paks/pmacct/install.sh | 36 +++++++ >>>> src/paks/pmacct/uninstall.sh | 33 +++++++ >>>> src/paks/pmacct/update.sh | 26 +++++ >>>> 11 files changed, 447 insertions(+) >>>> create mode 100644 config/backup/includes/pmacct >>>> create mode 100644 config/pmacct/pmacct.conf >>>> create mode 100644 config/pmacct/pmacct.init >>>> create mode 100644 config/pmacct/pmacct_memory_example.conf >>>> create mode 100644 config/pmacct/pmacct_sqlite3_example.conf >>>> create mode 100644 config/rootfiles/packages/pmacct >>>> create mode 100644 lfs/pmacct >>>> create mode 100644 src/paks/pmacct/install.sh >>>> create mode 100644 src/paks/pmacct/uninstall.sh >>>> create mode 100644 src/paks/pmacct/update.sh >>>> >>>> diff --git a/config/backup/includes/pmacct b/config/backup/includes/pmacct >>>> new file mode 100644 >>>> index 000000000..4359067ad >>>> --- /dev/null >>>> +++ b/config/backup/includes/pmacct >>>> @@ -0,0 +1,2 @@ >>>> +/etc/pmacct/ >>>> +/var/spool/pmacct/ >>>> diff --git a/config/pmacct/pmacct.conf b/config/pmacct/pmacct.conf >>>> new file mode 100644 >>>> index 000000000..3c1d47efa >>>> --- /dev/null >>>> +++ b/config/pmacct/pmacct.conf >>>> @@ -0,0 +1,24 @@ >>>> +! >>>> +! Pmacctd configuration file for IPFire environment >>>> +! >>>> + >>>> +syslog: daemon >>>> +daemonize: true >>>> +debug: false >>>> +promisc: true >>>> +interface: green0 >>>> + >>>> + >>>> +! >>>> +! "plugin1" plugin configuration >>>> +! >>>> +plugins: memory[plugin1] >>>> + >>>> +plugin_buffer_size[plugin1]: 102400 >>>> +plugin_pipe_size[plugin1]: 10240000 >>>> + >>>> +imt_mem_pools_number: 256 >>>> +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe >>>> + >>>> +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >>>> +aggregate_filter[plugin1]: ip >>>> \ No newline at end of file >>>> diff --git a/config/pmacct/pmacct.init b/config/pmacct/pmacct.init >>>> new file mode 100644 >>>> index 000000000..31f9ce49b >>>> --- /dev/null >>>> +++ b/config/pmacct/pmacct.init >>>> @@ -0,0 +1,57 @@ >>>> +#!/bin/bash >>>> + >>>> +# Begin $rc_base/init.d/pmacct >>>> + >>>> +# Starts and stops pmacct daemon >>>> +# Date: 2021-02-25 12:25:30 (Thu, 25 Feb 2021) >>>> + >>>> +# Locations >>>> +CONF="/etc/pmacct/pmacct.conf" >>>> +CONTENT="/var/pmacct" >>>> +# Pmacctd binary >>>> +PMACCT="/usr/sbin/pmacctd" >>>> +# Pmacctd start options '-f' for the configuration file >>>> +OPT="-f ${CONF}" >>>> +DESC="pmacct daemon" >>>> +# Pmacctd syslog facilitiy >>>> +#SYSLOG="local1" >>>> + >>>> + >>>> +. /etc/sysconfig/rc >>>> +. $rc_functions >>>> + >>>> +case "$1" in >>>> + start) >>>> + boot_mesg "Starting the ${DESC}... " >>>> + loadproc ${PMACCT} ${OPT} >>>> + sleep 2 >>>> + if P=$(pgrep -fl pmacctd); then >>>> + echo -e "\n${P}" >>>> + else >>>> + echo -e "\n${PMACCT} is not running... " >>>> + fi >>>> + ;; >>>> + >>>> + stop) >>>> + boot_mesg "Stopping the ${DESC}... " >>>> + killproc ${PMACCT} >>>> + ;; >>>> + >>>> + restart) >>>> + $0 stop >>>> + sleep 1 >>>> + $0 start >>>> + ;; >>>> + >>>> + status) >>>> + statusproc ${PMACCT} >>>> + ;; >>>> + >>>> + *) >>>> + echo "Usage: $0 {start|stop|restart|status}" >>>> + exit 1 >>>> + ;; >>>> +esac >>>> + >>>> +# End $rc_base/init.d/pmacct >>>> + >>>> diff --git a/config/pmacct/pmacct_memory_example.conf b/config/pmacct/pmacct_memory_example.conf >>>> new file mode 100644 >>>> index 000000000..0babdaaf7 >>>> --- /dev/null >>>> +++ b/config/pmacct/pmacct_memory_example.conf >>>> @@ -0,0 +1,24 @@ >>>> +! >>>> +! Pmacctd configuration file for IPFire environment >>>> +! >>>> + >>>> +syslog: daemon >>>> +daemonize: true >>>> +debug: false >>>> +promisc: true >>>> +interface: green0 >>>> + >>>> + >>>> +! >>>> +! "plugin1" plugin configuration >>>> +! >>>> +plugins: memory[plugin1] >>>> + >>>> +plugin_buffer_size[plugin1]: 102400 >>>> +plugin_pipe_size[plugin1]: 10240000 >>>> + >>>> +imt_mem_pools_number: 256 >>>> +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe >>>> + >>>> +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >>>> +aggregate_filter[plugin1]: ip >>>> diff --git a/config/pmacct/pmacct_sqlite3_example.conf b/config/pmacct/pmacct_sqlite3_example.conf >>>> new file mode 100644 >>>> index 000000000..7fb996408 >>>> --- /dev/null >>>> +++ b/config/pmacct/pmacct_sqlite3_example.conf >>>> @@ -0,0 +1,25 @@ >>>> +! >>>> +! Pmacctd configuration file for IPFire environment >>>> +! >>>> + >>>> +syslog: daemon >>>> +daemonize: true >>>> +debug: false >>>> +promisc: true >>>> +interface: green0 >>>> + >>>> + >>>> +! >>>> +! "plugin2" plugin configuration >>>> +! >>>> +plugins: sqlite3[plugin2] >>>> + >>>> +sql_db[plugin2]: /var/spool/pmacct/pmacct_sqlitev1.db >>>> +sql_table_version[plugin2]: 1 >>>> +sql_history[plugin2]: 5m >>>> +sql_refresh_time[plugin2]: 300 >>>> +sql_history_roundoff[plugin2]: m >>>> +sql_dont_try_update: true >>>> + >>>> +aggregate[plugin2]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >>>> +aggregate_filter[plugin2]: ip >>>> diff --git a/config/rootfiles/packages/pmacct b/config/rootfiles/packages/pmacct >>>> new file mode 100644 >>>> index 000000000..fed83ee67 >>>> --- /dev/null >>>> +++ b/config/rootfiles/packages/pmacct >>>> @@ -0,0 +1,111 @@ >>>> +etc/pmacct >>>> +etc/pmacct/pmacct.conf >>>> +etc/pmacct/pmacct_memory_example.conf >>>> +etc/pmacct/pmacct_sqlite3_example.conf >>>> +etc/rc.d/init.d/pmacct >>>> +usr/bin/pmacct >>>> +#usr/lib/pmacct >>>> +#usr/lib/pmacct/examples >>>> +#usr/lib/pmacct/examples/custom >>>> +#usr/lib/pmacct/examples/custom/libcustom.la >>>> +#usr/lib/pmacct/examples/lg >>>> +#usr/lib/pmacct/examples/lg/pmbgp >>>> +usr/sbin/nfacctd >>>> +usr/sbin/pmacctd >>>> +usr/sbin/pmbgpd >>>> +usr/sbin/pmbmpd >>>> +usr/sbin/pmtelemetryd >>>> +usr/sbin/sfacctd >>>> +usr/share/pmacct >>>> +#usr/share/pmacct/CONFIG-KEYS >>>> +#usr/share/pmacct/FAQS >>>> +#usr/share/pmacct/QUICKSTART >>>> +#usr/share/pmacct/UPGRADE >>>> +#usr/share/pmacct/docs >>>> +#usr/share/pmacct/docs/IPFIX >>>> +#usr/share/pmacct/docs/LOOKING_GLASS_FORMAT >>>> +#usr/share/pmacct/docs/MSGLOG_DUMP_FORMATS >>>> +#usr/share/pmacct/docs/SIGNALS >>>> +#usr/share/pmacct/docs/TRIGGER_VARS >>>> +#usr/share/pmacct/examples >>>> +usr/share/pmacct/examples/allow.lst.example >>>> +#usr/share/pmacct/examples/amqp >>>> +usr/share/pmacct/examples/amqp/amqp_receiver.py >>>> +#usr/share/pmacct/examples/avro >>>> +usr/share/pmacct/examples/avro/avro_file_decoder.py >>>> +usr/share/pmacct/examples/bgp_agent.map.example >>>> +usr/share/pmacct/examples/bgp_md5.lst.example >>>> +usr/share/pmacct/examples/bgp_xconnects.map.example >>>> +usr/share/pmacct/examples/flow_to_rd.map.example >>>> +#usr/share/pmacct/examples/kafka >>>> +usr/share/pmacct/examples/kafka/kafka_consumer.py >>>> +#usr/share/pmacct/examples/lg >>>> +usr/share/pmacct/examples/lg/pmbgp.py >>>> +usr/share/pmacct/examples/networks.lst.example >>>> +usr/share/pmacct/examples/nfacctd-sql.conf.example >>>> +usr/share/pmacct/examples/pcap_interfaces.map.example >>>> +usr/share/pmacct/examples/peers.map.example >>>> +usr/share/pmacct/examples/pmacctd-imt.conf.example >>>> +usr/share/pmacct/examples/pmacctd-multiple-plugins.conf.example >>>> +usr/share/pmacct/examples/pmacctd-sql.conf.example >>>> +usr/share/pmacct/examples/pmacctd-sqlite3.conf.example >>>> +usr/share/pmacct/examples/ports.lst.example >>>> +usr/share/pmacct/examples/pretag.map.example >>>> +usr/share/pmacct/examples/primitives.lst.example >>>> +usr/share/pmacct/examples/probe_netflow.conf.example >>>> +usr/share/pmacct/examples/probe_sflow.conf.example >>>> +usr/share/pmacct/examples/sampling.map.example >>>> +usr/share/pmacct/examples/tee_receivers.lst.example >>>> +#usr/share/pmacct/sql >>>> +#usr/share/pmacct/sql/README.64bit >>>> +#usr/share/pmacct/sql/README.GeoIP >>>> +#usr/share/pmacct/sql/README.IPv6 >>>> +#usr/share/pmacct/sql/README.cos >>>> +#usr/share/pmacct/sql/README.custom_primitives >>>> +#usr/share/pmacct/sql/README.etype >>>> +#usr/share/pmacct/sql/README.export_proto >>>> +#usr/share/pmacct/sql/README.iface >>>> +#usr/share/pmacct/sql/README.label >>>> +#usr/share/pmacct/sql/README.mask >>>> +#usr/share/pmacct/sql/README.mpls >>>> +#usr/share/pmacct/sql/README.mysql >>>> +#usr/share/pmacct/sql/README.nat >>>> +#usr/share/pmacct/sql/README.pgsql >>>> +#usr/share/pmacct/sql/README.sampling >>>> +usr/share/pmacct/sql/README.sqlite3 >>>> +#usr/share/pmacct/sql/README.tag2 >>>> +#usr/share/pmacct/sql/README.timestamp >>>> +#usr/share/pmacct/sql/README.tunnel >>>> +#usr/share/pmacct/sql/pmacct-create-db.pgsql >>>> +#usr/share/pmacct/sql/pmacct-create-db_bgp_v1.mysql >>>> +#usr/share/pmacct/sql/pmacct-create-db_v1.mysql >>>> +#usr/share/pmacct/sql/pmacct-create-db_v2.mysql >>>> +#usr/share/pmacct/sql/pmacct-create-db_v3.mysql >>>> +#usr/share/pmacct/sql/pmacct-create-db_v4.mysql >>>> +#usr/share/pmacct/sql/pmacct-create-db_v5.mysql >>>> +#usr/share/pmacct/sql/pmacct-create-db_v6.mysql >>>> +#usr/share/pmacct/sql/pmacct-create-db_v7.mysql >>>> +#usr/share/pmacct/sql/pmacct-create-db_v8.mysql >>>> +#usr/share/pmacct/sql/pmacct-create-db_v9.mysql >>>> +#usr/share/pmacct/sql/pmacct-create-table_bgp_v1.pgsql >>>> +usr/share/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3 >>>> +#usr/share/pmacct/sql/pmacct-create-table_v1.pgsql >>>> +usr/share/pmacct/sql/pmacct-create-table_v1.sqlite3 >>>> +#usr/share/pmacct/sql/pmacct-create-table_v2.pgsql >>>> +usr/share/pmacct/sql/pmacct-create-table_v2.sqlite3 >>>> +#usr/share/pmacct/sql/pmacct-create-table_v3.pgsql >>>> +usr/share/pmacct/sql/pmacct-create-table_v3.sqlite3 >>>> +#usr/share/pmacct/sql/pmacct-create-table_v4.pgsql >>>> +usr/share/pmacct/sql/pmacct-create-table_v4.sqlite3 >>>> +#usr/share/pmacct/sql/pmacct-create-table_v5.pgsql >>>> +usr/share/pmacct/sql/pmacct-create-table_v5.sqlite3 >>>> +#usr/share/pmacct/sql/pmacct-create-table_v6.pgsql >>>> +usr/share/pmacct/sql/pmacct-create-table_v6.sqlite3 >>>> +usr/share/pmacct/sql/pmacct-create-table_v7.sqlite3 >>>> +#usr/share/pmacct/sql/pmacct-create-table_v7_v8.pgsql >>>> +usr/share/pmacct/sql/pmacct-create-table_v8.sqlite3 >>>> +#usr/share/pmacct/sql/pmacct-create-table_v9.pgsql >>>> +usr/share/pmacct/sql/pmacct-create-table_v9.sqlite3 >>>> +#usr/share/pmacct/sql/pmacct-grant-db.mysql >>>> +var/ipfire/backup/addons/includes/pmacct >>>> +var/spool/pmacct >>>> diff --git a/lfs/pmacct b/lfs/pmacct >>>> new file mode 100644 >>>> index 000000000..c6cc5270e >>>> --- /dev/null >>>> +++ b/lfs/pmacct >>>> @@ -0,0 +1,107 @@ >>>> +############################################################################### >>>> +# # >>>> +# IPFire.org - A linux based firewall # >>>> +# Copyright (C) 2019 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 = 1.7.6 >>>> + >>>> +THISAPP = pmacct-$(VER) >>>> +DL_FILE = $(THISAPP).tar.gz >>>> +DL_FROM = $(URL_IPFIRE) >>>> +DIR_APP = $(DIR_SRC)/$(THISAPP) >>>> +TARGET = $(DIR_INFO)/$(THISAPP) >>>> +PROG = pmacct >>>> +PAK_VER = 1 >>>> + >>>> +DEPS = libcdada >>>> + >>>> +############################################################################### >>>> +# Top-level Rules >>>> +############################################################################### >>>> + >>>> +objects = $(DL_FILE) >>>> + >>>> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) >>>> + >>>> +$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b >>>> + >>>> +install : $(TARGET) >>>> + >>>> +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >>>> + >>>> +download :$(patsubst %,$(DIR_DL)/%,$(objects)) >>>> + >>>> +md5 : $(subst %,%_MD5,$(objects)) >>>> + >>>> +dist: >>>> + @$(PAK) >>>> + >>>> +############################################################################### >>>> +# Downloading, checking, md5sum >>>> +############################################################################### >>>> + >>>> +$(patsubst %,$(DIR_CHK)/%,$(objects)) : >>>> + @$(CHECK) >>>> + >>>> +$(patsubst %,$(DIR_DL)/%,$(objects)) : >>>> + @$(LOAD) >>>> + >>>> +$(subst %,%_MD5,$(objects)) : >>>> + @$(MD5) >>>> + >>>> +############################################################################### >>>> +# Installation Details >>>> +############################################################################### >>>> + >>>> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>>> + @$(PREBUILD) >>>> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) >>>> + cd $(DIR_APP) && ./autogen.sh >>>> + cd $(DIR_APP) && ./configure \ >>>> + --prefix=/usr \ >>>> + --sysconfdir=/etc/pmacct \ >>>> + --enable-sqlite3 \ >>>> + --enable-l2 \ >>>> + --enable-jansson >>>> + >>>> + # Add directory for plugins and pipes >>>> + -mkdir -v /var/spool/pmacct >>>> + >>>> + # Add configuration folder and copy conf files to it >>>> + -mkdir -v /etc/pmacct >>>> + cp -vf $(DIR_CONF)/pmacct/*.conf /etc/pmacct >>>> + >>>> + # Copy initscript to dir >>>> + cp -vf $(DIR_CONF)/pmacct/pmacct.init /etc/rc.d/init.d/pmacct >>>> + chmod 754 /etc/rc.d/init.d/pmacct >>>> + chown root:root /etc/rc.d/init.d/pmacct >>>> + >>>> + cd $(DIR_APP) && make $(MAKETUNING) >>>> + cd $(DIR_APP) && make install >>>> + >>>> + # Install backup definition >>>> + install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \ >>>> + /var/ipfire/backup/addons/includes/pmacct >>>> + @rm -rf $(DIR_APP) >>>> + @$(POSTBUILD) >>>> diff --git a/make.sh b/make.sh >>>> index 43cccaca0..d42c9b1e2 100755 >>>> --- a/make.sh >>>> +++ b/make.sh >>>> @@ -1646,6 +1646,8 @@ buildipfire() { >>>> lfsmake2 ncdu >>>> lfsmake2 lshw >>>> lfsmake2 socat >>>> + lfsmake2 libcdada >>>> + lfsmake2 pmacct >>>> } >>>> >>>> buildinstaller() { >>>> diff --git a/src/paks/pmacct/install.sh b/src/paks/pmacct/install.sh >>>> new file mode 100644 >>>> index 000000000..8178cc7bc >>>> --- /dev/null >>>> +++ b/src/paks/pmacct/install.sh >>>> @@ -0,0 +1,36 @@ >>>> +#!/bin/bash >>>> +############################################################################ >>>> +# # >>>> +# This file is part of the IPFire Firewall. # >>>> +# # >>>> +# IPFire 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 2 of the License, or # >>>> +# (at your option) any later version. # >>>> +# # >>>> +# IPFire 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 IPFire; if not, write to the Free Software # >>>> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # >>>> +# # >>>> +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # >>>> +# # >>>> +############################################################################ >>>> +# >>>> +. /opt/pakfire/lib/functions.sh >>>> + >>>> +extract_files >>>> +restore_backup ${NAME} >>>> + >>>> +# Add symlinks for runlevels >>>> +ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME} >>>> +ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME} >>>> +ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME} >>>> +start_service --background ${NAME} >>>> + >>>> + >>>> +# EOF >>>> diff --git a/src/paks/pmacct/uninstall.sh b/src/paks/pmacct/uninstall.sh >>>> new file mode 100644 >>>> index 000000000..51631e8c1 >>>> --- /dev/null >>>> +++ b/src/paks/pmacct/uninstall.sh >>>> @@ -0,0 +1,33 @@ >>>> +#!/bin/bash >>>> +############################################################################ >>>> +# # >>>> +# This file is part of the IPFire Firewall. # >>>> +# # >>>> +# IPFire 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 2 of the License, or # >>>> +# (at your option) any later version. # >>>> +# # >>>> +# IPFire 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 IPFire; if not, write to the Free Software # >>>> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # >>>> +# # >>>> +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # >>>> +# # >>>> +############################################################################ >>>> +# >>>> +. /opt/pakfire/lib/functions.sh >>>> + >>>> +stop_service ${NAME} >>>> +make_backup ${NAME} >>>> +remove_files >>>> + >>>> +# Delete symlinks >>>> +rm -rfv /etc/rc.d/rc?.d/???${NAME} >>>> + >>>> +# EOF >>>> diff --git a/src/paks/pmacct/update.sh b/src/paks/pmacct/update.sh >>>> new file mode 100644 >>>> index 000000000..89c40d0d7 >>>> --- /dev/null >>>> +++ b/src/paks/pmacct/update.sh >>>> @@ -0,0 +1,26 @@ >>>> +#!/bin/bash >>>> +############################################################################ >>>> +# # >>>> +# This file is part of the IPFire Firewall. # >>>> +# # >>>> +# IPFire 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 2 of the License, or # >>>> +# (at your option) any later version. # >>>> +# # >>>> +# IPFire 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 IPFire; if not, write to the Free Software # >>>> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # >>>> +# # >>>> +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # >>>> +# # >>>> +############################################################################ >>>> +# >>>> +. /opt/pakfire/lib/functions.sh >>>> +./uninstall.sh >>>> +./install.sh >>>> -- >>>> 2.30.1 >
Try this agin... > On Mar 18, 2021, at 7:47 PM, murphy.jon@me.com wrote: > > > >> On Mar 18, 2021, at 1:43 PM, Adolf Belka <adolf.belka@ipfire.org <mailto:adolf.belka@ipfire.org>> wrote: >> >> Hi Michael, >> >> On 18/03/2021 19:25, Michael Tremer wrote: >>> Hey, >>>> On 18 Mar 2021, at 13:34, Adolf Belka <adolf.belka@ipfire.org <mailto:adolf.belka@ipfire.org>> wrote: >>>> >>>> Hi Michael, >>>> >>>> On 18/03/2021 14:07, Michael Tremer wrote: >>>>> Hello, >>>>> I will split this email into two parts: >>>>> The technical part: >>>>> * The initscript isn’t based on our template and uses sleep to check if starting a daemon has been successful. That should not be necessary and will potentially slow down the boot process. >>>> I will have another look at the initscript and see if it can use the standard IPFire template. >>> Yes, it is not too different from your version: >>> https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/initscripts/system/template;h=69dc2a6a2202fb30da61a7fff6625aea531802e9;hb=HEAD <https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/initscripts/system/template;h=69dc2a6a2202fb30da61a7fff6625aea531802e9;hb=HEAD> >>> There isn’t much documentation around it but there are loads of other scripts that will be helpful to figure out any convention or boilerplate code to copy. >>>>> * I am not very sure if the example configuration files are helpful. Maybe someone can clear this up a little bit for me what is the rationale is behind them. >>>> The idea was that the two simplest config example scripts were provided that give a user the ability to get data into memory or into a sqlite file. The actual conf file provided is a copy of the memory version. These give a basic starting point that people can then add additional info to be recorded etc. >>> Does anybody want to use anything else than SQLite in the context of IPFire? >> I think we weren't sure and the memory and sqlite options were the easiest to get going and give real data. There are also mysql and postgresql options but I think we need to see what the interest is. >>>>> * There are loads of daemons being shipped and only one is being used. >>>> I think Jon or Erik need to comment on this question. >>>>> * How much load does this generate? How large is the captured data? >>>> Jon needs to provide this feedback. > It depends (sorry for that!) > If someone runs the memory mode, then ~10,000 lines per day? (I’ll run more test to give you better info) > If someone runs in SQLite3 mode, AND runs at 1 min refresh, then ~230,000 lines per day. THIS IS NOT RECOMMENDED but is possible. > If someone runs in SQLite3 mode, AND runs at 60 min refresh, then ~100,000 lines per day. (I’m currently tracking too many items) > >>>>> Then there is the other part: >>>>>> On 8 Mar 2021, at 11:57, Adolf Belka (ipfire) <adolf.belka@ipfire.org <mailto:adolf.belka@ipfire.org>> wrote: >>>>>> >>>>>> From: Adolf Belka <adolf.belka@ipfire.org <mailto:adolf.belka@ipfire.org>> >>>>>> >>>>>> - What is it? >>>>>> pmacct is a monitoring tool for network management tasks. Data collected >>>>>> can be used for analysis and troubleshooting purposes to maintain the >>>>>> health of the network. pmacct can collect, replicate and export network >>>>>> information. It can cache in memory tables, store persistently to SQLite3 >>>>>> and output to flat-files like CSV, formatted, and JSON. >>>>> Okay. >>>>>> - Why is it needed? >>>>>> To monitor data usage (IP-based or MAC-based data accounting) down to the >>>>>> client level. Net-Traffic will monitor traffic for the entire RED, GREEN, >>>>>> etc. networks, but it cannot pinpoint which client is using lots of data. >>>>>> Connections will take a snapshot but not show day by day sums. pmacct can >>>>>> help admins keep tabs on users that use too much data. >>>>> I agree with the goal of it. But how does this add-on achieve that? >>>> Jon should comment on this as he had this use case and can give feedback how the data has helped him in his investigations. > Allows the admin to see which user (IP address or MAC address) is using too much of the data. Currently this is via a query. In the future it should be via a CGI. > >>>>> The data is being written to a (usually binary) file which cannot be visualised in the web UI. Does this not want a CGI script that allows people to see what is happening? >>>> We all thought that this would ultimately need a CGI script to set up and visualise the data. We believed it was worth getting this running in actual use as a CLI tool to start with and then get more feedback on the best items that would need to be captured in the CGI script. The tool has a lot of capabilities and I think it will not be possible to do everything that it can do in a WUI page. So some form of file or db offload will need to be available anyway but the items identified as being commonly required would be the ones to be developed into a CGI WUI page. >>>>> Sending manual SQL queries probably isn’t much fun :) >>>>>> - What are the use cases? >>>>>> An ISP may implement data caps and if the limit is over-run then you have >>>>>> to pay for every additional xxGB of data used. Typical charges can be >>>>>> around $10 per 50GB. With pmacct you can identify the high users and take >>>>>> action, hopefully before the limit is breached. >>>>>> - This is being introduced as a command line only tool. However, at a later >>>>>> date, if it is useful to enough additional users a WUI page could be >>>>>> developed as discussed in the development mailing list >>>>>> https://lists.ipfire.org/pipermail/development/2021-January/009174.html <https://lists.ipfire.org/pipermail/development/2021-January/009174.html> >>>>> I have been thinking about this for a while now and would say that I can approve merging this as a CLI tool. But it would not really enhance IPFire’s functionality because it is only usable for people who spend a lot of time writing their own scripts or SQL queries to get information that can be used to make decisions. >>>> We recognise that and had discussed the CGI WUI page as mentioned above. >>> Was this here on the list or elsewhere? >> This was in a private conversation on the IPFire Community forum. We thought it best to have all our back and forth discussions between ourselves to start with. We were all finding our feet with it as well and we thought it best not to swamp the development list with our musings and questions to each other. If you want to see all the discussion history, then we can add you to the members of that conversation. >> If the addon gets accepted then any future discussions would be done on the Development mailing list to get everyones input. >>>>> Adding another alternative to vnstat will result in us having to maintain two things that roughly do the same - or where one’s features are a subset of the other one. >>>> I think Jon or Erik need to comment on any comparison with vnstat. > I looked at Vnstat today. It doesn’t look like it gets down to the client level (specifically which IP / MAC address is the troublemaker). Does it output per IP address? > >>>>> I would like to avoid merging this and then see it abandoned because it is too complicated to use. We already have a lot of virtually unmaintained stuff around and I would really like to drop a lot of it, although I know that there are a few people actually using it. >>>> Jon and Erik should comment on the complication of use or not. Jon especially has done quite a bit of work with it, installing the .ipfire package versions that I have created. >>>> I intend to also have a play around with it but for me it is more some playful fun as I just have a home network with only myself as the user and admin. > > Hopefully we can get to the point of creating a CGI that will have IP address on the left side and Months across the top and bytes in the middle. > > Very rough draft (image enclosed). > > <PastedGraphic-1.tiff> > > Hopefully I answered all of the questions... > Jon > >>>>> Thoughts? >>>>> Best, >>>>> -Michael >>>>>> Co-authored-by: Jon Murphy >>>>>> Co-authored-by: Erik Kapfer <ummeegge@ipfire.org <mailto:ummeegge@ipfire.org>> >>>>>> >>>>>> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org <mailto:adolf.belka@ipfire.org>> >>>>>> --- >>>>>> config/backup/includes/pmacct | 2 + >>>>>> config/pmacct/pmacct.conf | 24 +++++ >>>>>> config/pmacct/pmacct.init | 57 +++++++++++ >>>>>> config/pmacct/pmacct_memory_example.conf | 24 +++++ >>>>>> config/pmacct/pmacct_sqlite3_example.conf | 25 +++++ >>>>>> config/rootfiles/packages/pmacct | 111 ++++++++++++++++++++++ >>>>>> lfs/pmacct | 107 +++++++++++++++++++++ >>>>>> make.sh | 2 + >>>>>> src/paks/pmacct/install.sh | 36 +++++++ >>>>>> src/paks/pmacct/uninstall.sh | 33 +++++++ >>>>>> src/paks/pmacct/update.sh | 26 +++++ >>>>>> 11 files changed, 447 insertions(+) >>>>>> create mode 100644 config/backup/includes/pmacct >>>>>> create mode 100644 config/pmacct/pmacct.conf >>>>>> create mode 100644 config/pmacct/pmacct.init >>>>>> create mode 100644 config/pmacct/pmacct_memory_example.conf >>>>>> create mode 100644 config/pmacct/pmacct_sqlite3_example.conf >>>>>> create mode 100644 config/rootfiles/packages/pmacct >>>>>> create mode 100644 lfs/pmacct >>>>>> create mode 100644 src/paks/pmacct/install.sh >>>>>> create mode 100644 src/paks/pmacct/uninstall.sh >>>>>> create mode 100644 src/paks/pmacct/update.sh >>>>>> >>>>>> diff --git a/config/backup/includes/pmacct b/config/backup/includes/pmacct >>>>>> new file mode 100644 >>>>>> index 000000000..4359067ad >>>>>> --- /dev/null >>>>>> +++ b/config/backup/includes/pmacct >>>>>> @@ -0,0 +1,2 @@ >>>>>> +/etc/pmacct/ >>>>>> +/var/spool/pmacct/ >>>>>> diff --git a/config/pmacct/pmacct.conf b/config/pmacct/pmacct.conf >>>>>> new file mode 100644 >>>>>> index 000000000..3c1d47efa >>>>>> --- /dev/null >>>>>> +++ b/config/pmacct/pmacct.conf >>>>>> @@ -0,0 +1,24 @@ >>>>>> +! >>>>>> +! Pmacctd configuration file for IPFire environment >>>>>> +! >>>>>> + >>>>>> +syslog: daemon >>>>>> +daemonize: true >>>>>> +debug: false >>>>>> +promisc: true >>>>>> +interface: green0 >>>>>> + >>>>>> + >>>>>> +! >>>>>> +! "plugin1" plugin configuration >>>>>> +! >>>>>> +plugins: memory[plugin1] >>>>>> + >>>>>> +plugin_buffer_size[plugin1]: 102400 >>>>>> +plugin_pipe_size[plugin1]: 10240000 >>>>>> + >>>>>> +imt_mem_pools_number: 256 >>>>>> +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe >>>>>> + >>>>>> +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >>>>>> +aggregate_filter[plugin1]: ip >>>>>> \ No newline at end of file >>>>>> diff --git a/config/pmacct/pmacct.init b/config/pmacct/pmacct.init >>>>>> new file mode 100644 >>>>>> index 000000000..31f9ce49b >>>>>> --- /dev/null >>>>>> +++ b/config/pmacct/pmacct.init >>>>>> @@ -0,0 +1,57 @@ >>>>>> +#!/bin/bash >>>>>> + >>>>>> +# Begin $rc_base/init.d/pmacct >>>>>> + >>>>>> +# Starts and stops pmacct daemon >>>>>> +# Date: 2021-02-25 12:25:30 (Thu, 25 Feb 2021) >>>>>> + >>>>>> +# Locations >>>>>> +CONF="/etc/pmacct/pmacct.conf" >>>>>> +CONTENT="/var/pmacct" >>>>>> +# Pmacctd binary >>>>>> +PMACCT="/usr/sbin/pmacctd" >>>>>> +# Pmacctd start options '-f' for the configuration file >>>>>> +OPT="-f ${CONF}" >>>>>> +DESC="pmacct daemon" >>>>>> +# Pmacctd syslog facilitiy >>>>>> +#SYSLOG="local1" >>>>>> + >>>>>> + >>>>>> +. /etc/sysconfig/rc >>>>>> +. $rc_functions >>>>>> + >>>>>> +case "$1" in >>>>>> + start) >>>>>> + boot_mesg "Starting the ${DESC}... " >>>>>> + loadproc ${PMACCT} ${OPT} >>>>>> + sleep 2 >>>>>> + if P=$(pgrep -fl pmacctd); then >>>>>> + echo -e "\n${P}" >>>>>> + else >>>>>> + echo -e "\n${PMACCT} is not running... " >>>>>> + fi >>>>>> + ;; >>>>>> + >>>>>> + stop) >>>>>> + boot_mesg "Stopping the ${DESC}... " >>>>>> + killproc ${PMACCT} >>>>>> + ;; >>>>>> + >>>>>> + restart) >>>>>> + $0 stop >>>>>> + sleep 1 >>>>>> + $0 start >>>>>> + ;; >>>>>> + >>>>>> + status) >>>>>> + statusproc ${PMACCT} >>>>>> + ;; >>>>>> + >>>>>> + *) >>>>>> + echo "Usage: $0 {start|stop|restart|status}" >>>>>> + exit 1 >>>>>> + ;; >>>>>> +esac >>>>>> + >>>>>> +# End $rc_base/init.d/pmacct >>>>>> + >>>>>> diff --git a/config/pmacct/pmacct_memory_example.conf b/config/pmacct/pmacct_memory_example.conf >>>>>> new file mode 100644 >>>>>> index 000000000..0babdaaf7 >>>>>> --- /dev/null >>>>>> +++ b/config/pmacct/pmacct_memory_example.conf >>>>>> @@ -0,0 +1,24 @@ >>>>>> +! >>>>>> +! Pmacctd configuration file for IPFire environment >>>>>> +! >>>>>> + >>>>>> +syslog: daemon >>>>>> +daemonize: true >>>>>> +debug: false >>>>>> +promisc: true >>>>>> +interface: green0 >>>>>> + >>>>>> + >>>>>> +! >>>>>> +! "plugin1" plugin configuration >>>>>> +! >>>>>> +plugins: memory[plugin1] >>>>>> + >>>>>> +plugin_buffer_size[plugin1]: 102400 >>>>>> +plugin_pipe_size[plugin1]: 10240000 >>>>>> + >>>>>> +imt_mem_pools_number: 256 >>>>>> +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe >>>>>> + >>>>>> +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >>>>>> +aggregate_filter[plugin1]: ip >>>>>> diff --git a/config/pmacct/pmacct_sqlite3_example.conf b/config/pmacct/pmacct_sqlite3_example.conf >>>>>> new file mode 100644 >>>>>> index 000000000..7fb996408 >>>>>> --- /dev/null >>>>>> +++ b/config/pmacct/pmacct_sqlite3_example.conf >>>>>> @@ -0,0 +1,25 @@ >>>>>> +! >>>>>> +! Pmacctd configuration file for IPFire environment >>>>>> +! >>>>>> + >>>>>> +syslog: daemon >>>>>> +daemonize: true >>>>>> +debug: false >>>>>> +promisc: true >>>>>> +interface: green0 >>>>>> + >>>>>> + >>>>>> +! >>>>>> +! "plugin2" plugin configuration >>>>>> +! >>>>>> +plugins: sqlite3[plugin2] >>>>>> + >>>>>> +sql_db[plugin2]: /var/spool/pmacct/pmacct_sqlitev1.db >>>>>> +sql_table_version[plugin2]: 1 >>>>>> +sql_history[plugin2]: 5m >>>>>> +sql_refresh_time[plugin2]: 300 >>>>>> +sql_history_roundoff[plugin2]: m >>>>>> +sql_dont_try_update: true >>>>>> + >>>>>> +aggregate[plugin2]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >>>>>> +aggregate_filter[plugin2]: ip >>>>>> diff --git a/config/rootfiles/packages/pmacct b/config/rootfiles/packages/pmacct >>>>>> new file mode 100644 >>>>>> index 000000000..fed83ee67 >>>>>> --- /dev/null >>>>>> +++ b/config/rootfiles/packages/pmacct >>>>>> @@ -0,0 +1,111 @@ >>>>>> +etc/pmacct >>>>>> +etc/pmacct/pmacct.conf >>>>>> +etc/pmacct/pmacct_memory_example.conf >>>>>> +etc/pmacct/pmacct_sqlite3_example.conf >>>>>> +etc/rc.d/init.d/pmacct >>>>>> +usr/bin/pmacct >>>>>> +#usr/lib/pmacct >>>>>> +#usr/lib/pmacct/examples >>>>>> +#usr/lib/pmacct/examples/custom >>>>>> +#usr/lib/pmacct/examples/custom/libcustom.la <http://libcustom.la/> >>>>>> +#usr/lib/pmacct/examples/lg >>>>>> +#usr/lib/pmacct/examples/lg/pmbgp >>>>>> +usr/sbin/nfacctd >>>>>> +usr/sbin/pmacctd >>>>>> +usr/sbin/pmbgpd >>>>>> +usr/sbin/pmbmpd >>>>>> +usr/sbin/pmtelemetryd >>>>>> +usr/sbin/sfacctd >>>>>> +usr/share/pmacct >>>>>> +#usr/share/pmacct/CONFIG-KEYS >>>>>> +#usr/share/pmacct/FAQS >>>>>> +#usr/share/pmacct/QUICKSTART >>>>>> +#usr/share/pmacct/UPGRADE >>>>>> +#usr/share/pmacct/docs >>>>>> +#usr/share/pmacct/docs/IPFIX >>>>>> +#usr/share/pmacct/docs/LOOKING_GLASS_FORMAT >>>>>> +#usr/share/pmacct/docs/MSGLOG_DUMP_FORMATS >>>>>> +#usr/share/pmacct/docs/SIGNALS >>>>>> +#usr/share/pmacct/docs/TRIGGER_VARS >>>>>> +#usr/share/pmacct/examples >>>>>> +usr/share/pmacct/examples/allow.lst.example >>>>>> +#usr/share/pmacct/examples/amqp >>>>>> +usr/share/pmacct/examples/amqp/amqp_receiver.py >>>>>> +#usr/share/pmacct/examples/avro >>>>>> +usr/share/pmacct/examples/avro/avro_file_decoder.py >>>>>> +usr/share/pmacct/examples/bgp_agent.map.example >>>>>> +usr/share/pmacct/examples/bgp_md5.lst.example >>>>>> +usr/share/pmacct/examples/bgp_xconnects.map.example >>>>>> +usr/share/pmacct/examples/flow_to_rd.map.example >>>>>> +#usr/share/pmacct/examples/kafka >>>>>> +usr/share/pmacct/examples/kafka/kafka_consumer.py >>>>>> +#usr/share/pmacct/examples/lg >>>>>> +usr/share/pmacct/examples/lg/pmbgp.py >>>>>> +usr/share/pmacct/examples/networks.lst.example >>>>>> +usr/share/pmacct/examples/nfacctd-sql.conf.example >>>>>> +usr/share/pmacct/examples/pcap_interfaces.map.example >>>>>> +usr/share/pmacct/examples/peers.map.example >>>>>> +usr/share/pmacct/examples/pmacctd-imt.conf.example >>>>>> +usr/share/pmacct/examples/pmacctd-multiple-plugins.conf.example >>>>>> +usr/share/pmacct/examples/pmacctd-sql.conf.example >>>>>> +usr/share/pmacct/examples/pmacctd-sqlite3.conf.example >>>>>> +usr/share/pmacct/examples/ports.lst.example >>>>>> +usr/share/pmacct/examples/pretag.map.example >>>>>> +usr/share/pmacct/examples/primitives.lst.example >>>>>> +usr/share/pmacct/examples/probe_netflow.conf.example >>>>>> +usr/share/pmacct/examples/probe_sflow.conf.example >>>>>> +usr/share/pmacct/examples/sampling.map.example >>>>>> +usr/share/pmacct/examples/tee_receivers.lst.example >>>>>> +#usr/share/pmacct/sql >>>>>> +#usr/share/pmacct/sql/README.64bit >>>>>> +#usr/share/pmacct/sql/README.GeoIP >>>>>> +#usr/share/pmacct/sql/README.IPv6 >>>>>> +#usr/share/pmacct/sql/README.cos >>>>>> +#usr/share/pmacct/sql/README.custom_primitives >>>>>> +#usr/share/pmacct/sql/README.etype >>>>>> +#usr/share/pmacct/sql/README.export_proto >>>>>> +#usr/share/pmacct/sql/README.iface >>>>>> +#usr/share/pmacct/sql/README.label >>>>>> +#usr/share/pmacct/sql/README.mask >>>>>> +#usr/share/pmacct/sql/README.mpls >>>>>> +#usr/share/pmacct/sql/README.mysql >>>>>> +#usr/share/pmacct/sql/README.nat >>>>>> +#usr/share/pmacct/sql/README.pgsql >>>>>> +#usr/share/pmacct/sql/README.sampling >>>>>> +usr/share/pmacct/sql/README.sqlite3 >>>>>> +#usr/share/pmacct/sql/README.tag2 >>>>>> +#usr/share/pmacct/sql/README.timestamp >>>>>> +#usr/share/pmacct/sql/README.tunnel >>>>>> +#usr/share/pmacct/sql/pmacct-create-db.pgsql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_bgp_v1.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v1.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v2.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v3.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v4.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v5.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v6.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v7.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v8.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v9.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_bgp_v1.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v1.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v1.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v2.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v2.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v3.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v3.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v4.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v4.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v5.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v5.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v6.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v6.sqlite3 >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v7.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v7_v8.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v8.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v9.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v9.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-grant-db.mysql >>>>>> +var/ipfire/backup/addons/includes/pmacct >>>>>> +var/spool/pmacct >>>>>> diff --git a/lfs/pmacct b/lfs/pmacct >>>>>> new file mode 100644 >>>>>> index 000000000..c6cc5270e >>>>>> --- /dev/null >>>>>> +++ b/lfs/pmacct >>>>>> @@ -0,0 +1,107 @@ >>>>>> +############################################################################### >>>>>> +# # >>>>>> +# IPFire.org <http://ipfire.org/> - A linux based firewall # >>>>>> +# Copyright (C) 2019 IPFire Team <info@ipfire.org <mailto: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/ <http://www.gnu.org/licenses/>>. # >>>>>> +# # >>>>>> +############################################################################### >>>>>> + >>>>>> +############################################################################### >>>>>> +# Definitions >>>>>> +############################################################################### >>>>>> + >>>>>> +include Config >>>>>> + >>>>>> +VER = 1.7.6 >>>>>> + >>>>>> +THISAPP = pmacct-$(VER) >>>>>> +DL_FILE = $(THISAPP).tar.gz >>>>>> +DL_FROM = $(URL_IPFIRE) >>>>>> +DIR_APP = $(DIR_SRC)/$(THISAPP) >>>>>> +TARGET = $(DIR_INFO)/$(THISAPP) >>>>>> +PROG = pmacct >>>>>> +PAK_VER = 1 >>>>>> + >>>>>> +DEPS = libcdada >>>>>> + >>>>>> +############################################################################### >>>>>> +# Top-level Rules >>>>>> +############################################################################### >>>>>> + >>>>>> +objects = $(DL_FILE) >>>>>> + >>>>>> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) >>>>>> + >>>>>> +$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b >>>>>> + >>>>>> +install : $(TARGET) >>>>>> + >>>>>> +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >>>>>> + >>>>>> +download :$(patsubst %,$(DIR_DL)/%,$(objects)) >>>>>> + >>>>>> +md5 : $(subst %,%_MD5,$(objects)) >>>>>> + >>>>>> +dist: >>>>>> + @$(PAK) >>>>>> + >>>>>> +############################################################################### >>>>>> +# Downloading, checking, md5sum >>>>>> +############################################################################### >>>>>> + >>>>>> +$(patsubst %,$(DIR_CHK)/%,$(objects)) : >>>>>> + @$(CHECK) >>>>>> + >>>>>> +$(patsubst %,$(DIR_DL)/%,$(objects)) : >>>>>> + @$(LOAD) >>>>>> + >>>>>> +$(subst %,%_MD5,$(objects)) : >>>>>> + @$(MD5) >>>>>> + >>>>>> +############################################################################### >>>>>> +# Installation Details >>>>>> +############################################################################### >>>>>> + >>>>>> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>>>>> + @$(PREBUILD) >>>>>> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) >>>>>> + cd $(DIR_APP) && ./autogen.sh >>>>>> + cd $(DIR_APP) && ./configure \ >>>>>> + --prefix=/usr \ >>>>>> + --sysconfdir=/etc/pmacct \ >>>>>> + --enable-sqlite3 \ >>>>>> + --enable-l2 \ >>>>>> + --enable-jansson >>>>>> + >>>>>> + # Add directory for plugins and pipes >>>>>> + -mkdir -v /var/spool/pmacct >>>>>> + >>>>>> + # Add configuration folder and copy conf files to it >>>>>> + -mkdir -v /etc/pmacct >>>>>> + cp -vf $(DIR_CONF)/pmacct/*.conf /etc/pmacct >>>>>> + >>>>>> + # Copy initscript to dir >>>>>> + cp -vf $(DIR_CONF)/pmacct/pmacct.init /etc/rc.d/init.d/pmacct >>>>>> + chmod 754 /etc/rc.d/init.d/pmacct >>>>>> + chown root:root /etc/rc.d/init.d/pmacct >>>>>> + >>>>>> + cd $(DIR_APP) && make $(MAKETUNING) >>>>>> + cd $(DIR_APP) && make install >>>>>> + >>>>>> + # Install backup definition >>>>>> + install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \ >>>>>> + /var/ipfire/backup/addons/includes/pmacct >>>>>> + @rm -rf $(DIR_APP) >>>>>> + @$(POSTBUILD) >>>>>> diff --git a/make.sh b/make.sh >>>>>> index 43cccaca0..d42c9b1e2 100755 >>>>>> --- a/make.sh >>>>>> +++ b/make.sh >>>>>> @@ -1646,6 +1646,8 @@ buildipfire() { >>>>>> lfsmake2 ncdu >>>>>> lfsmake2 lshw >>>>>> lfsmake2 socat >>>>>> + lfsmake2 libcdada >>>>>> + lfsmake2 pmacct >>>>>> } >>>>>> >>>>>> buildinstaller() { >>>>>> diff --git a/src/paks/pmacct/install.sh b/src/paks/pmacct/install.sh >>>>>> new file mode 100644 >>>>>> index 000000000..8178cc7bc >>>>>> --- /dev/null >>>>>> +++ b/src/paks/pmacct/install.sh >>>>>> @@ -0,0 +1,36 @@ >>>>>> +#!/bin/bash >>>>>> +############################################################################ >>>>>> +# # >>>>>> +# This file is part of the IPFire Firewall. # >>>>>> +# # >>>>>> +# IPFire 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 2 of the License, or # >>>>>> +# (at your option) any later version. # >>>>>> +# # >>>>>> +# IPFire 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 IPFire; if not, write to the Free Software # >>>>>> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # >>>>>> +# # >>>>>> +# Copyright (C) 2007 IPFire-Team <info@ipfire.org <mailto:info@ipfire.org>>. # >>>>>> +# # >>>>>> +############################################################################ >>>>>> +# >>>>>> +. /opt/pakfire/lib/functions.sh >>>>>> + >>>>>> +extract_files >>>>>> +restore_backup ${NAME} >>>>>> + >>>>>> +# Add symlinks for runlevels >>>>>> +ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME} >>>>>> +ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME} >>>>>> +ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME} >>>>>> +start_service --background ${NAME} >>>>>> + >>>>>> + >>>>>> +# EOF >>>>>> diff --git a/src/paks/pmacct/uninstall.sh b/src/paks/pmacct/uninstall.sh >>>>>> new file mode 100644 >>>>>> index 000000000..51631e8c1 >>>>>> --- /dev/null >>>>>> +++ b/src/paks/pmacct/uninstall.sh >>>>>> @@ -0,0 +1,33 @@ >>>>>> +#!/bin/bash >>>>>> +############################################################################ >>>>>> +# # >>>>>> +# This file is part of the IPFire Firewall. # >>>>>> +# # >>>>>> +# IPFire 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 2 of the License, or # >>>>>> +# (at your option) any later version. # >>>>>> +# # >>>>>> +# IPFire 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 IPFire; if not, write to the Free Software # >>>>>> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # >>>>>> +# # >>>>>> +# Copyright (C) 2007 IPFire-Team <info@ipfire.org <mailto:info@ipfire.org>>. # >>>>>> +# # >>>>>> +############################################################################ >>>>>> +# >>>>>> +. /opt/pakfire/lib/functions.sh >>>>>> + >>>>>> +stop_service ${NAME} >>>>>> +make_backup ${NAME} >>>>>> +remove_files >>>>>> + >>>>>> +# Delete symlinks >>>>>> +rm -rfv /etc/rc.d/rc?.d/???${NAME} >>>>>> + >>>>>> +# EOF >>>>>> diff --git a/src/paks/pmacct/update.sh b/src/paks/pmacct/update.sh >>>>>> new file mode 100644 >>>>>> index 000000000..89c40d0d7 >>>>>> --- /dev/null >>>>>> +++ b/src/paks/pmacct/update.sh >>>>>> @@ -0,0 +1,26 @@ >>>>>> +#!/bin/bash >>>>>> +############################################################################ >>>>>> +# # >>>>>> +# This file is part of the IPFire Firewall. # >>>>>> +# # >>>>>> +# IPFire 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 2 of the License, or # >>>>>> +# (at your option) any later version. # >>>>>> +# # >>>>>> +# IPFire 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 IPFire; if not, write to the Free Software # >>>>>> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # >>>>>> +# # >>>>>> +# Copyright (C) 2007 IPFire-Team <info@ipfire.org <mailto:info@ipfire.org>>. # >>>>>> +# # >>>>>> +############################################################################ >>>>>> +# >>>>>> +. /opt/pakfire/lib/functions.sh >>>>>> +./uninstall.sh >>>>>> +./install.sh >>>>>> -- >>>>>> 2.30.1 > <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">Try this agin...<br class=""><div><br class=""><blockquote type="cite" class=""><div class="">On Mar 18, 2021, at 7:47 PM, <a href="mailto:murphy.jon@me.com" class="">murphy.jon@me.com</a> wrote:</div><br class="Apple-interchange-newline"><div class=""><meta http-equiv="Content-Type" content="text/html; charset=utf-8" class=""><div style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><br class=""><div class=""><br class=""><blockquote type="cite" class=""><div class="">On Mar 18, 2021, at 1:43 PM, Adolf Belka <<a href="mailto:adolf.belka@ipfire.org" class="">adolf.belka@ipfire.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">Hi Michael,<br class=""><br class="">On 18/03/2021 19:25, Michael Tremer wrote:<br class=""><blockquote type="cite" class="">Hey,<br class=""><blockquote type="cite" class="">On 18 Mar 2021, at 13:34, Adolf Belka <<a href="mailto:adolf.belka@ipfire.org" class="">adolf.belka@ipfire.org</a>> wrote:<br class=""><br class="">Hi Michael,<br class=""><br class="">On 18/03/2021 14:07, Michael Tremer wrote:<br class=""><blockquote type="cite" class="">Hello,<br class="">I will split this email into two parts:<br class="">The technical part:<br class="">* The initscript isn’t based on our template and uses sleep to check if starting a daemon has been successful. That should not be necessary and will potentially slow down the boot process.<br class=""></blockquote>I will have another look at the initscript and see if it can use the standard IPFire template.<br class=""></blockquote>Yes, it is not too different from your version:<br class=""> <a href="https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/initscripts/system/template;h=69dc2a6a2202fb30da61a7fff6625aea531802e9;hb=HEAD" class="">https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/initscripts/system/template;h=69dc2a6a2202fb30da61a7fff6625aea531802e9;hb=HEAD</a><br class="">There isn’t much documentation around it but there are loads of other scripts that will be helpful to figure out any convention or boilerplate code to copy.<br class=""><blockquote type="cite" class=""><blockquote type="cite" class="">* I am not very sure if the example configuration files are helpful. Maybe someone can clear this up a little bit for me what is the rationale is behind them.<br class=""></blockquote>The idea was that the two simplest config example scripts were provided that give a user the ability to get data into memory or into a sqlite file. The actual conf file provided is a copy of the memory version. These give a basic starting point that people can then add additional info to be recorded etc.<br class=""></blockquote>Does anybody want to use anything else than SQLite in the context of IPFire?<br class=""></blockquote>I think we weren't sure and the memory and sqlite options were the easiest to get going and give real data. There are also mysql and postgresql options but I think we need to see what the interest is.<br class=""><blockquote type="cite" class=""><blockquote type="cite" class=""><blockquote type="cite" class="">* There are loads of daemons being shipped and only one is being used.<br class=""></blockquote>I think Jon or Erik need to comment on this question.<br class=""><blockquote type="cite" class="">* How much load does this generate? How large is the captured data?<br class=""></blockquote>Jon needs to provide this feedback.<br class=""></blockquote></blockquote></div></div></blockquote><div class="">It depends (sorry for that!) </div><div class="">If someone runs the memory mode, then ~10,000 lines per day? (I’ll run more test to give you better info)</div><div class="">If someone runs in SQLite3 mode, AND runs at 1 min refresh, then ~230,000 lines per day. THIS IS NOT RECOMMENDED but is possible.</div><div class="">If someone runs in SQLite3 mode, AND runs at 60 min refresh, then ~100,000 lines per day. (I’m currently tracking too many items)</div><div class=""><br class=""></div><blockquote type="cite" class=""><div class=""><div class=""><blockquote type="cite" class=""><blockquote type="cite" class=""><blockquote type="cite" class="">Then there is the other part:<br class=""><blockquote type="cite" class="">On 8 Mar 2021, at 11:57, Adolf Belka (ipfire) <<a href="mailto:adolf.belka@ipfire.org" class="">adolf.belka@ipfire.org</a>> wrote:<br class=""><br class="">From: Adolf Belka <<a href="mailto:adolf.belka@ipfire.org" class="">adolf.belka@ipfire.org</a>><br class=""><br class="">- What is it?<br class=""> pmacct is a monitoring tool for network management tasks. Data collected<br class=""> can be used for analysis and troubleshooting purposes to maintain the<br class=""> health of the network. pmacct can collect, replicate and export network<br class=""> information. It can cache in memory tables, store persistently to SQLite3<br class=""> and output to flat-files like CSV, formatted, and JSON.<br class=""></blockquote>Okay.<br class=""><blockquote type="cite" class="">- Why is it needed?<br class=""> To monitor data usage (IP-based or MAC-based data accounting) down to the<br class=""> client level. Net-Traffic will monitor traffic for the entire RED, GREEN,<br class=""> etc. networks, but it cannot pinpoint which client is using lots of data.<br class=""> Connections will take a snapshot but not show day by day sums. pmacct can<br class=""> help admins keep tabs on users that use too much data.<br class=""></blockquote>I agree with the goal of it. But how does this add-on achieve that?<br class=""></blockquote>Jon should comment on this as he had this use case and can give feedback how the data has helped him in his investigations.<br class=""></blockquote></blockquote></div></div></blockquote><div class="">Allows the admin to see which user (IP address or MAC address) is using too much of the data. Currently this is via a query. In the future it should be via a CGI. </div><br class=""><blockquote type="cite" class=""><div class=""><div class=""><blockquote type="cite" class=""><blockquote type="cite" class=""><blockquote type="cite" class="">The data is being written to a (usually binary) file which cannot be visualised in the web UI. Does this not want a CGI script that allows people to see what is happening?<br class=""></blockquote>We all thought that this would ultimately need a CGI script to set up and visualise the data. We believed it was worth getting this running in actual use as a CLI tool to start with and then get more feedback on the best items that would need to be captured in the CGI script. The tool has a lot of capabilities and I think it will not be possible to do everything that it can do in a WUI page. So some form of file or db offload will need to be available anyway but the items identified as being commonly required would be the ones to be developed into a CGI WUI page.<br class=""><blockquote type="cite" class="">Sending manual SQL queries probably isn’t much fun :)<br class=""><blockquote type="cite" class="">- What are the use cases?<br class=""> An ISP may implement data caps and if the limit is over-run then you have<br class=""> to pay for every additional xxGB of data used. Typical charges can be<br class=""> around $10 per 50GB. With pmacct you can identify the high users and take<br class=""> action, hopefully before the limit is breached.<br class="">- This is being introduced as a command line only tool. However, at a later<br class=""> date, if it is useful to enough additional users a WUI page could be<br class=""> developed as discussed in the development mailing list<br class=""> <a href="https://lists.ipfire.org/pipermail/development/2021-January/009174.html" class="">https://lists.ipfire.org/pipermail/development/2021-January/009174.html</a><br class=""></blockquote>I have been thinking about this for a while now and would say that I can approve merging this as a CLI tool. But it would not really enhance IPFire’s functionality because it is only usable for people who spend a lot of time writing their own scripts or SQL queries to get information that can be used to make decisions.<br class=""></blockquote>We recognise that and had discussed the CGI WUI page as mentioned above.<br class=""></blockquote>Was this here on the list or elsewhere?<br class=""></blockquote>This was in a private conversation on the IPFire Community forum. We thought it best to have all our back and forth discussions between ourselves to start with. We were all finding our feet with it as well and we thought it best not to swamp the development list with our musings and questions to each other. If you want to see all the discussion history, then we can add you to the members of that conversation.<br class="">If the addon gets accepted then any future discussions would be done on the Development mailing list to get everyones input.<br class=""><blockquote type="cite" class=""><blockquote type="cite" class=""><blockquote type="cite" class="">Adding another alternative to vnstat will result in us having to maintain two things that roughly do the same - or where one’s features are a subset of the other one.<br class=""></blockquote>I think Jon or Erik need to comment on any comparison with vnstat.<br class=""></blockquote></blockquote></div></div></blockquote>I looked at Vnstat today. It doesn’t look like it gets down to the client level (specifically which IP / MAC address is the troublemaker). Does it output per IP address?</div><div class=""><br class=""><blockquote type="cite" class=""><div class=""><div class=""><blockquote type="cite" class=""><blockquote type="cite" class=""><blockquote type="cite" class="">I would like to avoid merging this and then see it abandoned because it is too complicated to use. We already have a lot of virtually unmaintained stuff around and I would really like to drop a lot of it, although I know that there are a few people actually using it.<br class=""></blockquote>Jon and Erik should comment on the complication of use or not. Jon especially has done quite a bit of work with it, installing the .ipfire package versions that I have created.<br class="">I intend to also have a play around with it but for me it is more some playful fun as I just have a home network with only myself as the user and admin.<br class=""></blockquote></blockquote></div></div></blockquote><div class=""><br class=""></div>Hopefully we can get to the point of creating a CGI that will have IP address on the left side and Months across the top and bytes in the middle.</div><div class=""><br class=""></div><div class="">Very rough draft (image enclosed).</div><div class=""><div class=""><br class=""></div><div class=""><span id="cid:AB24B942-DFAB-4576-901F-0B4A5E7501CC@localdomain"><PastedGraphic-1.tiff></span></div><div class=""><br class=""></div><div class="">Hopefully I answered all of the questions...</div><div class="">Jon</div><br class=""><blockquote type="cite" class=""><div class=""><div class=""><blockquote type="cite" class=""><blockquote type="cite" class=""><blockquote type="cite" class="">Thoughts?<br class="">Best,<br class="">-Michael<br class=""><blockquote type="cite" class="">Co-authored-by: Jon Murphy<br class="">Co-authored-by: Erik Kapfer <<a href="mailto:ummeegge@ipfire.org" class="">ummeegge@ipfire.org</a>><br class=""><br class="">Signed-off-by: Adolf Belka <<a href="mailto:adolf.belka@ipfire.org" class="">adolf.belka@ipfire.org</a>><br class="">---<br class="">config/backup/includes/pmacct | 2 +<br class="">config/pmacct/pmacct.conf | 24 +++++<br class="">config/pmacct/pmacct.init | 57 +++++++++++<br class="">config/pmacct/pmacct_memory_example.conf | 24 +++++<br class="">config/pmacct/pmacct_sqlite3_example.conf | 25 +++++<br class="">config/rootfiles/packages/pmacct | 111 ++++++++++++++++++++++<br class="">lfs/pmacct | 107 +++++++++++++++++++++<br class="">make.sh | 2 +<br class="">src/paks/pmacct/install.sh | 36 +++++++<br class="">src/paks/pmacct/uninstall.sh | 33 +++++++<br class="">src/paks/pmacct/update.sh | 26 +++++<br class="">11 files changed, 447 insertions(+)<br class="">create mode 100644 config/backup/includes/pmacct<br class="">create mode 100644 config/pmacct/pmacct.conf<br class="">create mode 100644 config/pmacct/pmacct.init<br class="">create mode 100644 config/pmacct/pmacct_memory_example.conf<br class="">create mode 100644 config/pmacct/pmacct_sqlite3_example.conf<br class="">create mode 100644 config/rootfiles/packages/pmacct<br class="">create mode 100644 lfs/pmacct<br class="">create mode 100644 src/paks/pmacct/install.sh<br class="">create mode 100644 src/paks/pmacct/uninstall.sh<br class="">create mode 100644 src/paks/pmacct/update.sh<br class=""><br class="">diff --git a/config/backup/includes/pmacct b/config/backup/includes/pmacct<br class="">new file mode 100644<br class="">index 000000000..4359067ad<br class="">--- /dev/null<br class="">+++ b/config/backup/includes/pmacct<br class="">@@ -0,0 +1,2 @@<br class="">+/etc/pmacct/<br class="">+/var/spool/pmacct/<br class="">diff --git a/config/pmacct/pmacct.conf b/config/pmacct/pmacct.conf<br class="">new file mode 100644<br class="">index 000000000..3c1d47efa<br class="">--- /dev/null<br class="">+++ b/config/pmacct/pmacct.conf<br class="">@@ -0,0 +1,24 @@<br class="">+!<br class="">+! Pmacctd configuration file for IPFire environment<br class="">+!<br class="">+<br class="">+syslog: daemon<br class="">+daemonize: true<br class="">+debug: false<br class="">+promisc: true<br class="">+interface: green0<br class="">+<br class="">+<br class="">+!<br class="">+! "plugin1" plugin configuration<br class="">+!<br class="">+plugins: memory[plugin1]<br class="">+<br class="">+plugin_buffer_size[plugin1]: 102400<br class="">+plugin_pipe_size[plugin1]: 10240000<br class="">+<br class="">+imt_mem_pools_number: 256<br class="">+imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe<br class="">+<br class="">+aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto<br class="">+aggregate_filter[plugin1]: ip<br class="">\ No newline at end of file<br class="">diff --git a/config/pmacct/pmacct.init b/config/pmacct/pmacct.init<br class="">new file mode 100644<br class="">index 000000000..31f9ce49b<br class="">--- /dev/null<br class="">+++ b/config/pmacct/pmacct.init<br class="">@@ -0,0 +1,57 @@<br class="">+#!/bin/bash<br class="">+<br class="">+# Begin $rc_base/init.d/pmacct<br class="">+<br class="">+# Starts and stops pmacct daemon<br class="">+# Date: 2021-02-25 12:25:30 (Thu, 25 Feb 2021)<br class="">+<br class="">+# Locations<br class="">+CONF="/etc/pmacct/pmacct.conf"<br class="">+CONTENT="/var/pmacct"<br class="">+# Pmacctd binary<br class="">+PMACCT="/usr/sbin/pmacctd"<br class="">+# Pmacctd start options '-f' for the configuration file<br class="">+OPT="-f ${CONF}"<br class="">+DESC="pmacct daemon"<br class="">+# Pmacctd syslog facilitiy<br class="">+#SYSLOG="local1"<br class="">+<br class="">+<br class="">+. /etc/sysconfig/rc<br class="">+. $rc_functions<br class="">+<br class="">+case "$1" in<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>start)<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>boot_mesg "Starting the ${DESC}... "<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>loadproc ${PMACCT} ${OPT}<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>sleep 2<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>if P=$(pgrep -fl pmacctd); then<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>echo -e "\n${P}"<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>else<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>echo -e "\n${PMACCT} is not running... "<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>fi<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>;;<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>stop)<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>boot_mesg "Stopping the ${DESC}... "<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>killproc ${PMACCT}<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>;;<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>restart)<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>$0 stop<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>sleep 1<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>$0 start<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>;;<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>status)<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>statusproc ${PMACCT}<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>;;<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>*)<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>echo "Usage: $0 {start|stop|restart|status}"<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>exit 1<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>;;<br class="">+esac<br class="">+<br class="">+# End $rc_base/init.d/pmacct<br class="">+<br class="">diff --git a/config/pmacct/pmacct_memory_example.conf b/config/pmacct/pmacct_memory_example.conf<br class="">new file mode 100644<br class="">index 000000000..0babdaaf7<br class="">--- /dev/null<br class="">+++ b/config/pmacct/pmacct_memory_example.conf<br class="">@@ -0,0 +1,24 @@<br class="">+!<br class="">+! Pmacctd configuration file for IPFire environment<br class="">+!<br class="">+<br class="">+syslog: daemon<br class="">+daemonize: true<br class="">+debug: false<br class="">+promisc: true<br class="">+interface: green0<br class="">+<br class="">+<br class="">+!<br class="">+! "plugin1" plugin configuration<br class="">+!<br class="">+plugins: memory[plugin1]<br class="">+<br class="">+plugin_buffer_size[plugin1]: 102400<br class="">+plugin_pipe_size[plugin1]: 10240000<br class="">+<br class="">+imt_mem_pools_number: 256<br class="">+imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe<br class="">+<br class="">+aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto<br class="">+aggregate_filter[plugin1]: ip<br class="">diff --git a/config/pmacct/pmacct_sqlite3_example.conf b/config/pmacct/pmacct_sqlite3_example.conf<br class="">new file mode 100644<br class="">index 000000000..7fb996408<br class="">--- /dev/null<br class="">+++ b/config/pmacct/pmacct_sqlite3_example.conf<br class="">@@ -0,0 +1,25 @@<br class="">+!<br class="">+! Pmacctd configuration file for IPFire environment<br class="">+!<br class="">+<br class="">+syslog: daemon<br class="">+daemonize: true<br class="">+debug: false<br class="">+promisc: true<br class="">+interface: green0<br class="">+<br class="">+<br class="">+!<br class="">+! "plugin2" plugin configuration<br class="">+!<br class="">+plugins: sqlite3[plugin2]<br class="">+<br class="">+sql_db[plugin2]: /var/spool/pmacct/pmacct_sqlitev1.db<br class="">+sql_table_version[plugin2]: 1<br class="">+sql_history[plugin2]: 5m<br class="">+sql_refresh_time[plugin2]: 300<br class="">+sql_history_roundoff[plugin2]: m<br class="">+sql_dont_try_update: true<br class="">+<br class="">+aggregate[plugin2]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto<br class="">+aggregate_filter[plugin2]: ip<br class="">diff --git a/config/rootfiles/packages/pmacct b/config/rootfiles/packages/pmacct<br class="">new file mode 100644<br class="">index 000000000..fed83ee67<br class="">--- /dev/null<br class="">+++ b/config/rootfiles/packages/pmacct<br class="">@@ -0,0 +1,111 @@<br class="">+etc/pmacct<br class="">+etc/pmacct/pmacct.conf<br class="">+etc/pmacct/pmacct_memory_example.conf<br class="">+etc/pmacct/pmacct_sqlite3_example.conf<br class="">+etc/rc.d/init.d/pmacct<br class="">+usr/bin/pmacct<br class="">+#usr/lib/pmacct<br class="">+#usr/lib/pmacct/examples<br class="">+#usr/lib/pmacct/examples/custom<br class="">+#usr/lib/pmacct/examples/custom/<a href="http://libcustom.la/" class="">libcustom.la</a><br class="">+#usr/lib/pmacct/examples/lg<br class="">+#usr/lib/pmacct/examples/lg/pmbgp<br class="">+usr/sbin/nfacctd<br class="">+usr/sbin/pmacctd<br class="">+usr/sbin/pmbgpd<br class="">+usr/sbin/pmbmpd<br class="">+usr/sbin/pmtelemetryd<br class="">+usr/sbin/sfacctd<br class="">+usr/share/pmacct<br class="">+#usr/share/pmacct/CONFIG-KEYS<br class="">+#usr/share/pmacct/FAQS<br class="">+#usr/share/pmacct/QUICKSTART<br class="">+#usr/share/pmacct/UPGRADE<br class="">+#usr/share/pmacct/docs<br class="">+#usr/share/pmacct/docs/IPFIX<br class="">+#usr/share/pmacct/docs/LOOKING_GLASS_FORMAT<br class="">+#usr/share/pmacct/docs/MSGLOG_DUMP_FORMATS<br class="">+#usr/share/pmacct/docs/SIGNALS<br class="">+#usr/share/pmacct/docs/TRIGGER_VARS<br class="">+#usr/share/pmacct/examples<br class="">+usr/share/pmacct/examples/allow.lst.example<br class="">+#usr/share/pmacct/examples/amqp<br class="">+usr/share/pmacct/examples/amqp/amqp_receiver.py<br class="">+#usr/share/pmacct/examples/avro<br class="">+usr/share/pmacct/examples/avro/avro_file_decoder.py<br class="">+usr/share/pmacct/examples/bgp_agent.map.example<br class="">+usr/share/pmacct/examples/bgp_md5.lst.example<br class="">+usr/share/pmacct/examples/bgp_xconnects.map.example<br class="">+usr/share/pmacct/examples/flow_to_rd.map.example<br class="">+#usr/share/pmacct/examples/kafka<br class="">+usr/share/pmacct/examples/kafka/kafka_consumer.py<br class="">+#usr/share/pmacct/examples/lg<br class="">+usr/share/pmacct/examples/lg/pmbgp.py<br class="">+usr/share/pmacct/examples/networks.lst.example<br class="">+usr/share/pmacct/examples/nfacctd-sql.conf.example<br class="">+usr/share/pmacct/examples/pcap_interfaces.map.example<br class="">+usr/share/pmacct/examples/peers.map.example<br class="">+usr/share/pmacct/examples/pmacctd-imt.conf.example<br class="">+usr/share/pmacct/examples/pmacctd-multiple-plugins.conf.example<br class="">+usr/share/pmacct/examples/pmacctd-sql.conf.example<br class="">+usr/share/pmacct/examples/pmacctd-sqlite3.conf.example<br class="">+usr/share/pmacct/examples/ports.lst.example<br class="">+usr/share/pmacct/examples/pretag.map.example<br class="">+usr/share/pmacct/examples/primitives.lst.example<br class="">+usr/share/pmacct/examples/probe_netflow.conf.example<br class="">+usr/share/pmacct/examples/probe_sflow.conf.example<br class="">+usr/share/pmacct/examples/sampling.map.example<br class="">+usr/share/pmacct/examples/tee_receivers.lst.example<br class="">+#usr/share/pmacct/sql<br class="">+#usr/share/pmacct/sql/README.64bit<br class="">+#usr/share/pmacct/sql/README.GeoIP<br class="">+#usr/share/pmacct/sql/README.IPv6<br class="">+#usr/share/pmacct/sql/README.cos<br class="">+#usr/share/pmacct/sql/README.custom_primitives<br class="">+#usr/share/pmacct/sql/README.etype<br class="">+#usr/share/pmacct/sql/README.export_proto<br class="">+#usr/share/pmacct/sql/README.iface<br class="">+#usr/share/pmacct/sql/README.label<br class="">+#usr/share/pmacct/sql/README.mask<br class="">+#usr/share/pmacct/sql/README.mpls<br class="">+#usr/share/pmacct/sql/README.mysql<br class="">+#usr/share/pmacct/sql/README.nat<br class="">+#usr/share/pmacct/sql/README.pgsql<br class="">+#usr/share/pmacct/sql/README.sampling<br class="">+usr/share/pmacct/sql/README.sqlite3<br class="">+#usr/share/pmacct/sql/README.tag2<br class="">+#usr/share/pmacct/sql/README.timestamp<br class="">+#usr/share/pmacct/sql/README.tunnel<br class="">+#usr/share/pmacct/sql/pmacct-create-db.pgsql<br class="">+#usr/share/pmacct/sql/pmacct-create-db_bgp_v1.mysql<br class="">+#usr/share/pmacct/sql/pmacct-create-db_v1.mysql<br class="">+#usr/share/pmacct/sql/pmacct-create-db_v2.mysql<br class="">+#usr/share/pmacct/sql/pmacct-create-db_v3.mysql<br class="">+#usr/share/pmacct/sql/pmacct-create-db_v4.mysql<br class="">+#usr/share/pmacct/sql/pmacct-create-db_v5.mysql<br class="">+#usr/share/pmacct/sql/pmacct-create-db_v6.mysql<br class="">+#usr/share/pmacct/sql/pmacct-create-db_v7.mysql<br class="">+#usr/share/pmacct/sql/pmacct-create-db_v8.mysql<br class="">+#usr/share/pmacct/sql/pmacct-create-db_v9.mysql<br class="">+#usr/share/pmacct/sql/pmacct-create-table_bgp_v1.pgsql<br class="">+usr/share/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3<br class="">+#usr/share/pmacct/sql/pmacct-create-table_v1.pgsql<br class="">+usr/share/pmacct/sql/pmacct-create-table_v1.sqlite3<br class="">+#usr/share/pmacct/sql/pmacct-create-table_v2.pgsql<br class="">+usr/share/pmacct/sql/pmacct-create-table_v2.sqlite3<br class="">+#usr/share/pmacct/sql/pmacct-create-table_v3.pgsql<br class="">+usr/share/pmacct/sql/pmacct-create-table_v3.sqlite3<br class="">+#usr/share/pmacct/sql/pmacct-create-table_v4.pgsql<br class="">+usr/share/pmacct/sql/pmacct-create-table_v4.sqlite3<br class="">+#usr/share/pmacct/sql/pmacct-create-table_v5.pgsql<br class="">+usr/share/pmacct/sql/pmacct-create-table_v5.sqlite3<br class="">+#usr/share/pmacct/sql/pmacct-create-table_v6.pgsql<br class="">+usr/share/pmacct/sql/pmacct-create-table_v6.sqlite3<br class="">+usr/share/pmacct/sql/pmacct-create-table_v7.sqlite3<br class="">+#usr/share/pmacct/sql/pmacct-create-table_v7_v8.pgsql<br class="">+usr/share/pmacct/sql/pmacct-create-table_v8.sqlite3<br class="">+#usr/share/pmacct/sql/pmacct-create-table_v9.pgsql<br class="">+usr/share/pmacct/sql/pmacct-create-table_v9.sqlite3<br class="">+#usr/share/pmacct/sql/pmacct-grant-db.mysql<br class="">+var/ipfire/backup/addons/includes/pmacct<br class="">+var/spool/pmacct<br class="">diff --git a/lfs/pmacct b/lfs/pmacct<br class="">new file mode 100644<br class="">index 000000000..c6cc5270e<br class="">--- /dev/null<br class="">+++ b/lfs/pmacct<br class="">@@ -0,0 +1,107 @@<br class="">+###############################################################################<br class="">+# #<br class="">+# <a href="http://ipfire.org/" class="">IPFire.org</a> - A linux based firewall #<br class="">+# Copyright (C) 2019 IPFire Team <<a href="mailto:info@ipfire.org" class="">info@ipfire.org</a>> #<br class="">+# #<br class="">+# This program is free software: you can redistribute it and/or modify #<br class="">+# it under the terms of the GNU General Public License as published by #<br class="">+# the Free Software Foundation, either version 3 of the License, or #<br class="">+# (at your option) any later version. #<br class="">+# #<br class="">+# This program is distributed in the hope that it will be useful, #<br class="">+# but WITHOUT ANY WARRANTY; without even the implied warranty of #<br class="">+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #<br class="">+# GNU General Public License for more details. #<br class="">+# #<br class="">+# You should have received a copy of the GNU General Public License #<br class="">+# along with this program. If not, see <<a href="http://www.gnu.org/licenses/" class="">http://www.gnu.org/licenses/</a>>. #<br class="">+# #<br class="">+###############################################################################<br class="">+<br class="">+###############################################################################<br class="">+# Definitions<br class="">+###############################################################################<br class="">+<br class="">+include Config<br class="">+<br class="">+VER = 1.7.6<br class="">+<br class="">+THISAPP = pmacct-$(VER)<br class="">+DL_FILE = $(THISAPP).tar.gz<br class="">+DL_FROM = $(URL_IPFIRE)<br class="">+DIR_APP = $(DIR_SRC)/$(THISAPP)<br class="">+TARGET = $(DIR_INFO)/$(THISAPP)<br class="">+PROG = pmacct<br class="">+PAK_VER = 1<br class="">+<br class="">+DEPS = libcdada<br class="">+<br class="">+###############################################################################<br class="">+# Top-level Rules<br class="">+###############################################################################<br class="">+<br class="">+objects = $(DL_FILE)<br class="">+<br class="">+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)<br class="">+<br class="">+$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b<br class="">+<br class="">+install : $(TARGET)<br class="">+<br class="">+check : $(patsubst %,$(DIR_CHK)/%,$(objects))<br class="">+<br class="">+download :$(patsubst %,$(DIR_DL)/%,$(objects))<br class="">+<br class="">+md5 : $(subst %,%_MD5,$(objects))<br class="">+<br class="">+dist:<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>@$(PAK)<br class="">+<br class="">+###############################################################################<br class="">+# Downloading, checking, md5sum<br class="">+###############################################################################<br class="">+<br class="">+$(patsubst %,$(DIR_CHK)/%,$(objects)) :<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>@$(CHECK)<br class="">+<br class="">+$(patsubst %,$(DIR_DL)/%,$(objects)) :<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>@$(LOAD)<br class="">+<br class="">+$(subst %,%_MD5,$(objects)) :<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>@$(MD5)<br class="">+<br class="">+###############################################################################<br class="">+# Installation Details<br class="">+###############################################################################<br class="">+<br class="">+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>@$(PREBUILD)<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>cd $(DIR_APP) && ./autogen.sh<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>cd $(DIR_APP) && ./configure <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>\<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>--prefix=/usr <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>\<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>--sysconfdir=/etc/pmacct <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>\<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>--enable-sqlite3 <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>\<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>--enable-l2<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>\<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>--enable-jansson<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span># Add directory for plugins and pipes<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>-mkdir -v /var/spool/pmacct<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span># Add configuration folder and copy conf files to it<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>-mkdir -v /etc/pmacct<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>cp -vf $(DIR_CONF)/pmacct/*.conf /etc/pmacct<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span># Copy initscript to dir<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>cp -vf $(DIR_CONF)/pmacct/pmacct.init /etc/rc.d/init.d/pmacct<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>chmod 754 /etc/rc.d/init.d/pmacct<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>chown root:root /etc/rc.d/init.d/pmacct<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>cd $(DIR_APP) && make $(MAKETUNING)<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>cd $(DIR_APP) && make install<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span># Install backup definition<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>/var/ipfire/backup/addons/includes/pmacct<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>@rm -rf $(DIR_APP)<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>@$(POSTBUILD)<br class="">diff --git a/make.sh b/make.sh<br class="">index 43cccaca0..d42c9b1e2 100755<br class="">--- a/make.sh<br class="">+++ b/make.sh<br class="">@@ -1646,6 +1646,8 @@ buildipfire() {<br class=""> lfsmake2 ncdu<br class=""> lfsmake2 lshw<br class=""> lfsmake2 socat<br class="">+ lfsmake2 libcdada<br class="">+ lfsmake2 pmacct<br class="">}<br class=""><br class="">buildinstaller() {<br class="">diff --git a/src/paks/pmacct/install.sh b/src/paks/pmacct/install.sh<br class="">new file mode 100644<br class="">index 000000000..8178cc7bc<br class="">--- /dev/null<br class="">+++ b/src/paks/pmacct/install.sh<br class="">@@ -0,0 +1,36 @@<br class="">+#!/bin/bash<br class="">+############################################################################<br class="">+# #<br class="">+# This file is part of the IPFire Firewall. #<br class="">+# #<br class="">+# IPFire is free software; you can redistribute it and/or modify #<br class="">+# it under the terms of the GNU General Public License as published by #<br class="">+# the Free Software Foundation; either version 2 of the License, or #<br class="">+# (at your option) any later version. #<br class="">+# #<br class="">+# IPFire is distributed in the hope that it will be useful, #<br class="">+# but WITHOUT ANY WARRANTY; without even the implied warranty of #<br class="">+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #<br class="">+# GNU General Public License for more details. #<br class="">+# #<br class="">+# You should have received a copy of the GNU General Public License #<br class="">+# along with IPFire; if not, write to the Free Software #<br class="">+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #<br class="">+# #<br class="">+# Copyright (C) 2007 IPFire-Team <<a href="mailto:info@ipfire.org" class="">info@ipfire.org</a>>. #<br class="">+# #<br class="">+############################################################################<br class="">+#<br class="">+. /opt/pakfire/lib/functions.sh<br class="">+<br class="">+extract_files<br class="">+restore_backup ${NAME}<br class="">+<br class="">+# Add symlinks for runlevels<br class="">+ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME}<br class="">+ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME}<br class="">+ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME}<br class="">+start_service --background ${NAME}<br class="">+<br class="">+<br class="">+# EOF<br class="">diff --git a/src/paks/pmacct/uninstall.sh b/src/paks/pmacct/uninstall.sh<br class="">new file mode 100644<br class="">index 000000000..51631e8c1<br class="">--- /dev/null<br class="">+++ b/src/paks/pmacct/uninstall.sh<br class="">@@ -0,0 +1,33 @@<br class="">+#!/bin/bash<br class="">+############################################################################<br class="">+# #<br class="">+# This file is part of the IPFire Firewall. #<br class="">+# #<br class="">+# IPFire is free software; you can redistribute it and/or modify #<br class="">+# it under the terms of the GNU General Public License as published by #<br class="">+# the Free Software Foundation; either version 2 of the License, or #<br class="">+# (at your option) any later version. #<br class="">+# #<br class="">+# IPFire is distributed in the hope that it will be useful, #<br class="">+# but WITHOUT ANY WARRANTY; without even the implied warranty of #<br class="">+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #<br class="">+# GNU General Public License for more details. #<br class="">+# #<br class="">+# You should have received a copy of the GNU General Public License #<br class="">+# along with IPFire; if not, write to the Free Software #<br class="">+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #<br class="">+# #<br class="">+# Copyright (C) 2007 IPFire-Team <<a href="mailto:info@ipfire.org" class="">info@ipfire.org</a>>. #<br class="">+# #<br class="">+############################################################################<br class="">+#<br class="">+. /opt/pakfire/lib/functions.sh<br class="">+<br class="">+stop_service ${NAME}<br class="">+make_backup ${NAME}<br class="">+remove_files<br class="">+<br class="">+# Delete symlinks<br class="">+rm -rfv /etc/rc.d/rc?.d/???${NAME}<br class="">+<br class="">+# EOF<br class="">diff --git a/src/paks/pmacct/update.sh b/src/paks/pmacct/update.sh<br class="">new file mode 100644<br class="">index 000000000..89c40d0d7<br class="">--- /dev/null<br class="">+++ b/src/paks/pmacct/update.sh<br class="">@@ -0,0 +1,26 @@<br class="">+#!/bin/bash<br class="">+############################################################################<br class="">+# #<br class="">+# This file is part of the IPFire Firewall. #<br class="">+# #<br class="">+# IPFire is free software; you can redistribute it and/or modify #<br class="">+# it under the terms of the GNU General Public License as published by #<br class="">+# the Free Software Foundation; either version 2 of the License, or #<br class="">+# (at your option) any later version. #<br class="">+# #<br class="">+# IPFire is distributed in the hope that it will be useful, #<br class="">+# but WITHOUT ANY WARRANTY; without even the implied warranty of #<br class="">+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #<br class="">+# GNU General Public License for more details. #<br class="">+# #<br class="">+# You should have received a copy of the GNU General Public License #<br class="">+# along with IPFire; if not, write to the Free Software #<br class="">+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #<br class="">+# #<br class="">+# Copyright (C) 2007 IPFire-Team <<a href="mailto:info@ipfire.org" class="">info@ipfire.org</a>>. #<br class="">+# #<br class="">+############################################################################<br class="">+#<br class="">+. /opt/pakfire/lib/functions.sh<br class="">+./uninstall.sh<br class="">+./install.sh<br class="">-- <br class="">2.30.1<br class=""></blockquote></blockquote></blockquote></blockquote></div></div></blockquote></div><br class=""></div></div></blockquote></div><br class=""></body></html>
Hi Michael, On 18/03/2021 19:43, Adolf Belka wrote: > Hi Michael, > > On 18/03/2021 19:25, Michael Tremer wrote: >> Hey, >> >>> On 18 Mar 2021, at 13:34, Adolf Belka <adolf.belka@ipfire.org> wrote: >>> >>> Hi Michael, >>> >>> On 18/03/2021 14:07, Michael Tremer wrote: >>>> Hello, >>>> I will split this email into two parts: >>>> The technical part: >>>> * The initscript isn’t based on our template and uses sleep to >>>> check if starting a daemon has been successful. That should not be >>>> necessary and will potentially slow down the boot process. >>> I will have another look at the initscript and see if it can use the >>> standard IPFire template. >> >> Yes, it is not too different from your version: >> >> https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/initscripts/system/template;h=69dc2a6a2202fb30da61a7fff6625aea531802e9;hb=HEAD >> >> There isn’t much documentation around it but there are loads of other >> scripts that will be helpful to figure out any convention or >> boilerplate code to copy. >> >>>> * I am not very sure if the example configuration files are >>>> helpful. Maybe someone can clear this up a little bit for me what >>>> is the rationale is behind them. >>> The idea was that the two simplest config example scripts were >>> provided that give a user the ability to get data into memory or >>> into a sqlite file. The actual conf file provided is a copy of the >>> memory version. These give a basic starting point that people can >>> then add additional info to be recorded etc. >> >> Does anybody want to use anything else than SQLite in the context of >> IPFire? > I think we weren't sure and the memory and sqlite options were the > easiest to get going and give real data. There are also mysql and > postgresql options but I think we need to see what the interest is. >> >>>> * There are loads of daemons being shipped and only one is being used. >>>> >>>> I looked through our conversations and it looks like these were >>>> left there because we weren't sure if they would be used or not. >>>> >>>> pmacctd is the daemon being used by Jon. pmacct is the frontend to >>>> pmacctd when being used in memory mode. >>>> >>>> For the others I looked in the pmacct website and found the following:- >>>> I looked through our conversations and it looks like these were left there because we weren't sure if they would be used or not. pmacctd is the daemon being used by Jon. pmacct is the frontend to pmacctd when being used in memory mode. For the others I looked in the pmacct website and found the following:- 'pmacctd' is the libpcap-based IPv4/IPv6 accounting daemon 'nfacctd' is the NetFlow (versions supported NetFlow v1, v5 and v9) and IPFIX accounting daemon 'sfacctd' is the sFlow v2/v4 and v5 accounting daemon 'uacctd' is the Linux NFLOG-based accounting daemon (historically, it was using ULOG, hence its name) 'pmtelemetryd' is the Streaming Telemetry collector, where "Streaming telemetry [ .. ] data can be used for analysis and troubleshooting purposes to maintain the health of the network. This is achieved by leveraging the capabilities of machine-to-machine communication. [ .. ]" (quoting Cisco IOS-XR Telemetry Configuration Guide at the time of this writing) 'pmbgpd' is the pmacct BGP collector and 'pmbmpd'is the pmacct BMP collector. I don't know what most of that means but it looks to be quite different to what the addon was created for, so I would propose that I re-do the rootfiles and remove those daemons from the install. If in future there is demand for others we can add them back in with an update patch. I will do that together with the other changes already discussed. Regards, Adolf. >>> I think Jon or Erik need to comment on this question. >>>> * How much load does this generate? How large is the captured data? >>> Jon needs to provide this feedback. >>>> Then there is the other part: >>>>> On 8 Mar 2021, at 11:57, Adolf Belka (ipfire) >>>>> <adolf.belka@ipfire.org> wrote: >>>>> >>>>> From: Adolf Belka <adolf.belka@ipfire.org> >>>>> >>>>> - What is it? >>>>> pmacct is a monitoring tool for network management tasks. Data >>>>> collected >>>>> can be used for analysis and troubleshooting purposes to >>>>> maintain the >>>>> health of the network. pmacct can collect, replicate and export >>>>> network >>>>> information. It can cache in memory tables, store persistently >>>>> to SQLite3 >>>>> and output to flat-files like CSV, formatted, and JSON. >>>> Okay. >>>>> - Why is it needed? >>>>> To monitor data usage (IP-based or MAC-based data accounting) >>>>> down to the >>>>> client level. Net-Traffic will monitor traffic for the entire >>>>> RED, GREEN, >>>>> etc. networks, but it cannot pinpoint which client is using >>>>> lots of data. >>>>> Connections will take a snapshot but not show day by day sums. >>>>> pmacct can >>>>> help admins keep tabs on users that use too much data. >>>> I agree with the goal of it. But how does this add-on achieve that? >>> Jon should comment on this as he had this use case and can give >>> feedback how the data has helped him in his investigations. >>>> The data is being written to a (usually binary) file which cannot >>>> be visualised in the web UI. Does this not want a CGI script that >>>> allows people to see what is happening? >>> We all thought that this would ultimately need a CGI script to set >>> up and visualise the data. We believed it was worth getting this >>> running in actual use as a CLI tool to start with and then get more >>> feedback on the best items that would need to be captured in the CGI >>> script. The tool has a lot of capabilities and I think it will not >>> be possible to do everything that it can do in a WUI page. So some >>> form of file or db offload will need to be available anyway but the >>> items identified as being commonly required would be the ones to be >>> developed into a CGI WUI page. >>>> Sending manual SQL queries probably isn’t much fun :) >>>>> - What are the use cases? >>>>> An ISP may implement data caps and if the limit is over-run >>>>> then you have >>>>> to pay for every additional xxGB of data used. Typical charges >>>>> can be >>>>> around $10 per 50GB. With pmacct you can identify the high >>>>> users and take >>>>> action, hopefully before the limit is breached. >>>>> - This is being introduced as a command line only tool. However, >>>>> at a later >>>>> date, if it is useful to enough additional users a WUI page >>>>> could be >>>>> developed as discussed in the development mailing list >>>>> https://lists.ipfire.org/pipermail/development/2021-January/009174.html >>>>> >>>> I have been thinking about this for a while now and would say that >>>> I can approve merging this as a CLI tool. But it would not really >>>> enhance IPFire’s functionality because it is only usable for people >>>> who spend a lot of time writing their own scripts or SQL queries to >>>> get information that can be used to make decisions. >>> We recognise that and had discussed the CGI WUI page as mentioned >>> above. >> >> Was this here on the list or elsewhere? > This was in a private conversation on the IPFire Community forum. We > thought it best to have all our back and forth discussions between > ourselves to start with. We were all finding our feet with it as well > and we thought it best not to swamp the development list with our > musings and questions to each other. If you want to see all the > discussion history, then we can add you to the members of that > conversation. > If the addon gets accepted then any future discussions would be done > on the Development mailing list to get everyones input. >> >>>> Adding another alternative to vnstat will result in us having to >>>> maintain two things that roughly do the same - or where one’s >>>> features are a subset of the other one. >>> I think Jon or Erik need to comment on any comparison with vnstat. >>>> I would like to avoid merging this and then see it abandoned >>>> because it is too complicated to use. We already have a lot of >>>> virtually unmaintained stuff around and I would really like to drop >>>> a lot of it, although I know that there are a few people actually >>>> using it. >>> Jon and Erik should comment on the complication of use or not. Jon >>> especially has done quite a bit of work with it, installing the >>> .ipfire package versions that I have created. >>> I intend to also have a play around with it but for me it is more >>> some playful fun as I just have a home network with only myself as >>> the user and admin. >>>> Thoughts? >>>> Best, >>>> -Michael >>>>> Co-authored-by: Jon Murphy >>>>> Co-authored-by: Erik Kapfer <ummeegge@ipfire.org> >>>>> >>>>> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> >>>>> --- >>>>> config/backup/includes/pmacct | 2 + >>>>> config/pmacct/pmacct.conf | 24 +++++ >>>>> config/pmacct/pmacct.init | 57 +++++++++++ >>>>> config/pmacct/pmacct_memory_example.conf | 24 +++++ >>>>> config/pmacct/pmacct_sqlite3_example.conf | 25 +++++ >>>>> config/rootfiles/packages/pmacct | 111 >>>>> ++++++++++++++++++++++ >>>>> lfs/pmacct | 107 +++++++++++++++++++++ >>>>> make.sh | 2 + >>>>> src/paks/pmacct/install.sh | 36 +++++++ >>>>> src/paks/pmacct/uninstall.sh | 33 +++++++ >>>>> src/paks/pmacct/update.sh | 26 +++++ >>>>> 11 files changed, 447 insertions(+) >>>>> create mode 100644 config/backup/includes/pmacct >>>>> create mode 100644 config/pmacct/pmacct.conf >>>>> create mode 100644 config/pmacct/pmacct.init >>>>> create mode 100644 config/pmacct/pmacct_memory_example.conf >>>>> create mode 100644 config/pmacct/pmacct_sqlite3_example.conf >>>>> create mode 100644 config/rootfiles/packages/pmacct >>>>> create mode 100644 lfs/pmacct >>>>> create mode 100644 src/paks/pmacct/install.sh >>>>> create mode 100644 src/paks/pmacct/uninstall.sh >>>>> create mode 100644 src/paks/pmacct/update.sh >>>>> >>>>> diff --git a/config/backup/includes/pmacct >>>>> b/config/backup/includes/pmacct >>>>> new file mode 100644 >>>>> index 000000000..4359067ad >>>>> --- /dev/null >>>>> +++ b/config/backup/includes/pmacct >>>>> @@ -0,0 +1,2 @@ >>>>> +/etc/pmacct/ >>>>> +/var/spool/pmacct/ >>>>> diff --git a/config/pmacct/pmacct.conf b/config/pmacct/pmacct.conf >>>>> new file mode 100644 >>>>> index 000000000..3c1d47efa >>>>> --- /dev/null >>>>> +++ b/config/pmacct/pmacct.conf >>>>> @@ -0,0 +1,24 @@ >>>>> +! >>>>> +! Pmacctd configuration file for IPFire environment >>>>> +! >>>>> + >>>>> +syslog: daemon >>>>> +daemonize: true >>>>> +debug: false >>>>> +promisc: true >>>>> +interface: green0 >>>>> + >>>>> + >>>>> +! >>>>> +! "plugin1" plugin configuration >>>>> +! >>>>> +plugins: memory[plugin1] >>>>> + >>>>> +plugin_buffer_size[plugin1]: 102400 >>>>> +plugin_pipe_size[plugin1]: 10240000 >>>>> + >>>>> +imt_mem_pools_number: 256 >>>>> +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe >>>>> + >>>>> +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, >>>>> dst_port, dst_mac, proto >>>>> +aggregate_filter[plugin1]: ip >>>>> \ No newline at end of file >>>>> diff --git a/config/pmacct/pmacct.init b/config/pmacct/pmacct.init >>>>> new file mode 100644 >>>>> index 000000000..31f9ce49b >>>>> --- /dev/null >>>>> +++ b/config/pmacct/pmacct.init >>>>> @@ -0,0 +1,57 @@ >>>>> +#!/bin/bash >>>>> + >>>>> +# Begin $rc_base/init.d/pmacct >>>>> + >>>>> +# Starts and stops pmacct daemon >>>>> +# Date: 2021-02-25 12:25:30 (Thu, 25 Feb 2021) >>>>> + >>>>> +# Locations >>>>> +CONF="/etc/pmacct/pmacct.conf" >>>>> +CONTENT="/var/pmacct" >>>>> +# Pmacctd binary >>>>> +PMACCT="/usr/sbin/pmacctd" >>>>> +# Pmacctd start options '-f' for the configuration file >>>>> +OPT="-f ${CONF}" >>>>> +DESC="pmacct daemon" >>>>> +# Pmacctd syslog facilitiy >>>>> +#SYSLOG="local1" >>>>> + >>>>> + >>>>> +. /etc/sysconfig/rc >>>>> +. $rc_functions >>>>> + >>>>> +case "$1" in >>>>> + start) >>>>> + boot_mesg "Starting the ${DESC}... " >>>>> + loadproc ${PMACCT} ${OPT} >>>>> + sleep 2 >>>>> + if P=$(pgrep -fl pmacctd); then >>>>> + echo -e "\n${P}" >>>>> + else >>>>> + echo -e "\n${PMACCT} is not running... " >>>>> + fi >>>>> + ;; >>>>> + >>>>> + stop) >>>>> + boot_mesg "Stopping the ${DESC}... " >>>>> + killproc ${PMACCT} >>>>> + ;; >>>>> + >>>>> + restart) >>>>> + $0 stop >>>>> + sleep 1 >>>>> + $0 start >>>>> + ;; >>>>> + >>>>> + status) >>>>> + statusproc ${PMACCT} >>>>> + ;; >>>>> + >>>>> + *) >>>>> + echo "Usage: $0 {start|stop|restart|status}" >>>>> + exit 1 >>>>> + ;; >>>>> +esac >>>>> + >>>>> +# End $rc_base/init.d/pmacct >>>>> + >>>>> diff --git a/config/pmacct/pmacct_memory_example.conf >>>>> b/config/pmacct/pmacct_memory_example.conf >>>>> new file mode 100644 >>>>> index 000000000..0babdaaf7 >>>>> --- /dev/null >>>>> +++ b/config/pmacct/pmacct_memory_example.conf >>>>> @@ -0,0 +1,24 @@ >>>>> +! >>>>> +! Pmacctd configuration file for IPFire environment >>>>> +! >>>>> + >>>>> +syslog: daemon >>>>> +daemonize: true >>>>> +debug: false >>>>> +promisc: true >>>>> +interface: green0 >>>>> + >>>>> + >>>>> +! >>>>> +! "plugin1" plugin configuration >>>>> +! >>>>> +plugins: memory[plugin1] >>>>> + >>>>> +plugin_buffer_size[plugin1]: 102400 >>>>> +plugin_pipe_size[plugin1]: 10240000 >>>>> + >>>>> +imt_mem_pools_number: 256 >>>>> +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe >>>>> + >>>>> +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, >>>>> dst_port, dst_mac, proto >>>>> +aggregate_filter[plugin1]: ip >>>>> diff --git a/config/pmacct/pmacct_sqlite3_example.conf >>>>> b/config/pmacct/pmacct_sqlite3_example.conf >>>>> new file mode 100644 >>>>> index 000000000..7fb996408 >>>>> --- /dev/null >>>>> +++ b/config/pmacct/pmacct_sqlite3_example.conf >>>>> @@ -0,0 +1,25 @@ >>>>> +! >>>>> +! Pmacctd configuration file for IPFire environment >>>>> +! >>>>> + >>>>> +syslog: daemon >>>>> +daemonize: true >>>>> +debug: false >>>>> +promisc: true >>>>> +interface: green0 >>>>> + >>>>> + >>>>> +! >>>>> +! "plugin2" plugin configuration >>>>> +! >>>>> +plugins: sqlite3[plugin2] >>>>> + >>>>> +sql_db[plugin2]: /var/spool/pmacct/pmacct_sqlitev1.db >>>>> +sql_table_version[plugin2]: 1 >>>>> +sql_history[plugin2]: 5m >>>>> +sql_refresh_time[plugin2]: 300 >>>>> +sql_history_roundoff[plugin2]: m >>>>> +sql_dont_try_update: true >>>>> + >>>>> +aggregate[plugin2]: src_host, src_port, src_mac, dst_host, >>>>> dst_port, dst_mac, proto >>>>> +aggregate_filter[plugin2]: ip >>>>> diff --git a/config/rootfiles/packages/pmacct >>>>> b/config/rootfiles/packages/pmacct >>>>> new file mode 100644 >>>>> index 000000000..fed83ee67 >>>>> --- /dev/null >>>>> +++ b/config/rootfiles/packages/pmacct >>>>> @@ -0,0 +1,111 @@ >>>>> +etc/pmacct >>>>> +etc/pmacct/pmacct.conf >>>>> +etc/pmacct/pmacct_memory_example.conf >>>>> +etc/pmacct/pmacct_sqlite3_example.conf >>>>> +etc/rc.d/init.d/pmacct >>>>> +usr/bin/pmacct >>>>> +#usr/lib/pmacct >>>>> +#usr/lib/pmacct/examples >>>>> +#usr/lib/pmacct/examples/custom >>>>> +#usr/lib/pmacct/examples/custom/libcustom.la >>>>> +#usr/lib/pmacct/examples/lg >>>>> +#usr/lib/pmacct/examples/lg/pmbgp >>>>> +usr/sbin/nfacctd >>>>> +usr/sbin/pmacctd >>>>> +usr/sbin/pmbgpd >>>>> +usr/sbin/pmbmpd >>>>> +usr/sbin/pmtelemetryd >>>>> +usr/sbin/sfacctd >>>>> +usr/share/pmacct >>>>> +#usr/share/pmacct/CONFIG-KEYS >>>>> +#usr/share/pmacct/FAQS >>>>> +#usr/share/pmacct/QUICKSTART >>>>> +#usr/share/pmacct/UPGRADE >>>>> +#usr/share/pmacct/docs >>>>> +#usr/share/pmacct/docs/IPFIX >>>>> +#usr/share/pmacct/docs/LOOKING_GLASS_FORMAT >>>>> +#usr/share/pmacct/docs/MSGLOG_DUMP_FORMATS >>>>> +#usr/share/pmacct/docs/SIGNALS >>>>> +#usr/share/pmacct/docs/TRIGGER_VARS >>>>> +#usr/share/pmacct/examples >>>>> +usr/share/pmacct/examples/allow.lst.example >>>>> +#usr/share/pmacct/examples/amqp >>>>> +usr/share/pmacct/examples/amqp/amqp_receiver.py >>>>> +#usr/share/pmacct/examples/avro >>>>> +usr/share/pmacct/examples/avro/avro_file_decoder.py >>>>> +usr/share/pmacct/examples/bgp_agent.map.example >>>>> +usr/share/pmacct/examples/bgp_md5.lst.example >>>>> +usr/share/pmacct/examples/bgp_xconnects.map.example >>>>> +usr/share/pmacct/examples/flow_to_rd.map.example >>>>> +#usr/share/pmacct/examples/kafka >>>>> +usr/share/pmacct/examples/kafka/kafka_consumer.py >>>>> +#usr/share/pmacct/examples/lg >>>>> +usr/share/pmacct/examples/lg/pmbgp.py >>>>> +usr/share/pmacct/examples/networks.lst.example >>>>> +usr/share/pmacct/examples/nfacctd-sql.conf.example >>>>> +usr/share/pmacct/examples/pcap_interfaces.map.example >>>>> +usr/share/pmacct/examples/peers.map.example >>>>> +usr/share/pmacct/examples/pmacctd-imt.conf.example >>>>> +usr/share/pmacct/examples/pmacctd-multiple-plugins.conf.example >>>>> +usr/share/pmacct/examples/pmacctd-sql.conf.example >>>>> +usr/share/pmacct/examples/pmacctd-sqlite3.conf.example >>>>> +usr/share/pmacct/examples/ports.lst.example >>>>> +usr/share/pmacct/examples/pretag.map.example >>>>> +usr/share/pmacct/examples/primitives.lst.example >>>>> +usr/share/pmacct/examples/probe_netflow.conf.example >>>>> +usr/share/pmacct/examples/probe_sflow.conf.example >>>>> +usr/share/pmacct/examples/sampling.map.example >>>>> +usr/share/pmacct/examples/tee_receivers.lst.example >>>>> +#usr/share/pmacct/sql >>>>> +#usr/share/pmacct/sql/README.64bit >>>>> +#usr/share/pmacct/sql/README.GeoIP >>>>> +#usr/share/pmacct/sql/README.IPv6 >>>>> +#usr/share/pmacct/sql/README.cos >>>>> +#usr/share/pmacct/sql/README.custom_primitives >>>>> +#usr/share/pmacct/sql/README.etype >>>>> +#usr/share/pmacct/sql/README.export_proto >>>>> +#usr/share/pmacct/sql/README.iface >>>>> +#usr/share/pmacct/sql/README.label >>>>> +#usr/share/pmacct/sql/README.mask >>>>> +#usr/share/pmacct/sql/README.mpls >>>>> +#usr/share/pmacct/sql/README.mysql >>>>> +#usr/share/pmacct/sql/README.nat >>>>> +#usr/share/pmacct/sql/README.pgsql >>>>> +#usr/share/pmacct/sql/README.sampling >>>>> +usr/share/pmacct/sql/README.sqlite3 >>>>> +#usr/share/pmacct/sql/README.tag2 >>>>> +#usr/share/pmacct/sql/README.timestamp >>>>> +#usr/share/pmacct/sql/README.tunnel >>>>> +#usr/share/pmacct/sql/pmacct-create-db.pgsql >>>>> +#usr/share/pmacct/sql/pmacct-create-db_bgp_v1.mysql >>>>> +#usr/share/pmacct/sql/pmacct-create-db_v1.mysql >>>>> +#usr/share/pmacct/sql/pmacct-create-db_v2.mysql >>>>> +#usr/share/pmacct/sql/pmacct-create-db_v3.mysql >>>>> +#usr/share/pmacct/sql/pmacct-create-db_v4.mysql >>>>> +#usr/share/pmacct/sql/pmacct-create-db_v5.mysql >>>>> +#usr/share/pmacct/sql/pmacct-create-db_v6.mysql >>>>> +#usr/share/pmacct/sql/pmacct-create-db_v7.mysql >>>>> +#usr/share/pmacct/sql/pmacct-create-db_v8.mysql >>>>> +#usr/share/pmacct/sql/pmacct-create-db_v9.mysql >>>>> +#usr/share/pmacct/sql/pmacct-create-table_bgp_v1.pgsql >>>>> +usr/share/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3 >>>>> +#usr/share/pmacct/sql/pmacct-create-table_v1.pgsql >>>>> +usr/share/pmacct/sql/pmacct-create-table_v1.sqlite3 >>>>> +#usr/share/pmacct/sql/pmacct-create-table_v2.pgsql >>>>> +usr/share/pmacct/sql/pmacct-create-table_v2.sqlite3 >>>>> +#usr/share/pmacct/sql/pmacct-create-table_v3.pgsql >>>>> +usr/share/pmacct/sql/pmacct-create-table_v3.sqlite3 >>>>> +#usr/share/pmacct/sql/pmacct-create-table_v4.pgsql >>>>> +usr/share/pmacct/sql/pmacct-create-table_v4.sqlite3 >>>>> +#usr/share/pmacct/sql/pmacct-create-table_v5.pgsql >>>>> +usr/share/pmacct/sql/pmacct-create-table_v5.sqlite3 >>>>> +#usr/share/pmacct/sql/pmacct-create-table_v6.pgsql >>>>> +usr/share/pmacct/sql/pmacct-create-table_v6.sqlite3 >>>>> +usr/share/pmacct/sql/pmacct-create-table_v7.sqlite3 >>>>> +#usr/share/pmacct/sql/pmacct-create-table_v7_v8.pgsql >>>>> +usr/share/pmacct/sql/pmacct-create-table_v8.sqlite3 >>>>> +#usr/share/pmacct/sql/pmacct-create-table_v9.pgsql >>>>> +usr/share/pmacct/sql/pmacct-create-table_v9.sqlite3 >>>>> +#usr/share/pmacct/sql/pmacct-grant-db.mysql >>>>> +var/ipfire/backup/addons/includes/pmacct >>>>> +var/spool/pmacct >>>>> diff --git a/lfs/pmacct b/lfs/pmacct >>>>> new file mode 100644 >>>>> index 000000000..c6cc5270e >>>>> --- /dev/null >>>>> +++ b/lfs/pmacct >>>>> @@ -0,0 +1,107 @@ >>>>> +############################################################################### >>>>> >>>>> +# # >>>>> +# IPFire.org - A linux based >>>>> firewall # >>>>> +# Copyright (C) 2019 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 = 1.7.6 >>>>> + >>>>> +THISAPP = pmacct-$(VER) >>>>> +DL_FILE = $(THISAPP).tar.gz >>>>> +DL_FROM = $(URL_IPFIRE) >>>>> +DIR_APP = $(DIR_SRC)/$(THISAPP) >>>>> +TARGET = $(DIR_INFO)/$(THISAPP) >>>>> +PROG = pmacct >>>>> +PAK_VER = 1 >>>>> + >>>>> +DEPS = libcdada >>>>> + >>>>> +############################################################################### >>>>> >>>>> +# Top-level Rules >>>>> +############################################################################### >>>>> >>>>> + >>>>> +objects = $(DL_FILE) >>>>> + >>>>> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) >>>>> + >>>>> +$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b >>>>> + >>>>> +install : $(TARGET) >>>>> + >>>>> +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >>>>> + >>>>> +download :$(patsubst %,$(DIR_DL)/%,$(objects)) >>>>> + >>>>> +md5 : $(subst %,%_MD5,$(objects)) >>>>> + >>>>> +dist: >>>>> + @$(PAK) >>>>> + >>>>> +############################################################################### >>>>> >>>>> +# Downloading, checking, md5sum >>>>> +############################################################################### >>>>> >>>>> + >>>>> +$(patsubst %,$(DIR_CHK)/%,$(objects)) : >>>>> + @$(CHECK) >>>>> + >>>>> +$(patsubst %,$(DIR_DL)/%,$(objects)) : >>>>> + @$(LOAD) >>>>> + >>>>> +$(subst %,%_MD5,$(objects)) : >>>>> + @$(MD5) >>>>> + >>>>> +############################################################################### >>>>> >>>>> +# Installation Details >>>>> +############################################################################### >>>>> >>>>> + >>>>> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>>>> + @$(PREBUILD) >>>>> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf >>>>> $(DIR_DL)/$(DL_FILE) >>>>> + cd $(DIR_APP) && ./autogen.sh >>>>> + cd $(DIR_APP) && ./configure \ >>>>> + --prefix=/usr \ >>>>> + --sysconfdir=/etc/pmacct \ >>>>> + --enable-sqlite3 \ >>>>> + --enable-l2 \ >>>>> + --enable-jansson >>>>> + >>>>> + # Add directory for plugins and pipes >>>>> + -mkdir -v /var/spool/pmacct >>>>> + >>>>> + # Add configuration folder and copy conf files to it >>>>> + -mkdir -v /etc/pmacct >>>>> + cp -vf $(DIR_CONF)/pmacct/*.conf /etc/pmacct >>>>> + >>>>> + # Copy initscript to dir >>>>> + cp -vf $(DIR_CONF)/pmacct/pmacct.init /etc/rc.d/init.d/pmacct >>>>> + chmod 754 /etc/rc.d/init.d/pmacct >>>>> + chown root:root /etc/rc.d/init.d/pmacct >>>>> + >>>>> + cd $(DIR_APP) && make $(MAKETUNING) >>>>> + cd $(DIR_APP) && make install >>>>> + >>>>> + # Install backup definition >>>>> + install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \ >>>>> + /var/ipfire/backup/addons/includes/pmacct >>>>> + @rm -rf $(DIR_APP) >>>>> + @$(POSTBUILD) >>>>> diff --git a/make.sh b/make.sh >>>>> index 43cccaca0..d42c9b1e2 100755 >>>>> --- a/make.sh >>>>> +++ b/make.sh >>>>> @@ -1646,6 +1646,8 @@ buildipfire() { >>>>> lfsmake2 ncdu >>>>> lfsmake2 lshw >>>>> lfsmake2 socat >>>>> + lfsmake2 libcdada >>>>> + lfsmake2 pmacct >>>>> } >>>>> >>>>> buildinstaller() { >>>>> diff --git a/src/paks/pmacct/install.sh b/src/paks/pmacct/install.sh >>>>> new file mode 100644 >>>>> index 000000000..8178cc7bc >>>>> --- /dev/null >>>>> +++ b/src/paks/pmacct/install.sh >>>>> @@ -0,0 +1,36 @@ >>>>> +#!/bin/bash >>>>> +############################################################################ >>>>> >>>>> +# # >>>>> +# This file is part of the IPFire >>>>> Firewall. # >>>>> +# # >>>>> +# IPFire 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 2 of the License, >>>>> or # >>>>> +# (at your option) any later >>>>> version. # >>>>> +# # >>>>> +# IPFire 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 IPFire; if not, write to the Free >>>>> Software # >>>>> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA >>>>> 02111-1307 USA # >>>>> +# # >>>>> +# Copyright (C) 2007 IPFire-Team >>>>> <info@ipfire.org>. # >>>>> +# # >>>>> +############################################################################ >>>>> >>>>> +# >>>>> +. /opt/pakfire/lib/functions.sh >>>>> + >>>>> +extract_files >>>>> +restore_backup ${NAME} >>>>> + >>>>> +# Add symlinks for runlevels >>>>> +ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME} >>>>> +ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME} >>>>> +ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME} >>>>> +start_service --background ${NAME} >>>>> + >>>>> + >>>>> +# EOF >>>>> diff --git a/src/paks/pmacct/uninstall.sh >>>>> b/src/paks/pmacct/uninstall.sh >>>>> new file mode 100644 >>>>> index 000000000..51631e8c1 >>>>> --- /dev/null >>>>> +++ b/src/paks/pmacct/uninstall.sh >>>>> @@ -0,0 +1,33 @@ >>>>> +#!/bin/bash >>>>> +############################################################################ >>>>> >>>>> +# # >>>>> +# This file is part of the IPFire >>>>> Firewall. # >>>>> +# # >>>>> +# IPFire 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 2 of the License, >>>>> or # >>>>> +# (at your option) any later >>>>> version. # >>>>> +# # >>>>> +# IPFire 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 IPFire; if not, write to the Free >>>>> Software # >>>>> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA >>>>> 02111-1307 USA # >>>>> +# # >>>>> +# Copyright (C) 2007 IPFire-Team >>>>> <info@ipfire.org>. # >>>>> +# # >>>>> +############################################################################ >>>>> >>>>> +# >>>>> +. /opt/pakfire/lib/functions.sh >>>>> + >>>>> +stop_service ${NAME} >>>>> +make_backup ${NAME} >>>>> +remove_files >>>>> + >>>>> +# Delete symlinks >>>>> +rm -rfv /etc/rc.d/rc?.d/???${NAME} >>>>> + >>>>> +# EOF >>>>> diff --git a/src/paks/pmacct/update.sh b/src/paks/pmacct/update.sh >>>>> new file mode 100644 >>>>> index 000000000..89c40d0d7 >>>>> --- /dev/null >>>>> +++ b/src/paks/pmacct/update.sh >>>>> @@ -0,0 +1,26 @@ >>>>> +#!/bin/bash >>>>> +############################################################################ >>>>> >>>>> +# # >>>>> +# This file is part of the IPFire >>>>> Firewall. # >>>>> +# # >>>>> +# IPFire 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 2 of the License, >>>>> or # >>>>> +# (at your option) any later >>>>> version. # >>>>> +# # >>>>> +# IPFire 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 IPFire; if not, write to the Free >>>>> Software # >>>>> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA >>>>> 02111-1307 USA # >>>>> +# # >>>>> +# Copyright (C) 2007 IPFire-Team >>>>> <info@ipfire.org>. # >>>>> +# # >>>>> +############################################################################ >>>>> >>>>> +# >>>>> +. /opt/pakfire/lib/functions.sh >>>>> +./uninstall.sh >>>>> +./install.sh >>>>> -- >>>>> 2.30.1 >>
Hi all, Am Freitag, dem 19.03.2021 um 10:20 +0100 schrieb Adolf Belka: > Hi Michael, > > On 18/03/2021 19:43, Adolf Belka wrote: > > Hi Michael, > > > > On 18/03/2021 19:25, Michael Tremer wrote: > > > Hey, > > > > > > > On 18 Mar 2021, at 13:34, Adolf Belka <adolf.belka@ipfire.org> > > > > wrote: > > > > > > > > Hi Michael, > > > > > > > > On 18/03/2021 14:07, Michael Tremer wrote: > > > > > Hello, > > > > > I will split this email into two parts: > > > > > The technical part: > > > > > * The initscript isn’t based on our template and uses sleep > > > > > to > > > > > check if starting a daemon has been successful. That should > > > > > not be > > > > > necessary and will potentially slow down the boot process. > > > > I will have another look at the initscript and see if it can > > > > use the > > > > standard IPFire template. > > > > > > Yes, it is not too different from your version: > > > > > > https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/initscripts/system/template;h=69dc2a6a2202fb30da61a7fff6625aea531802e9;hb=HEAD > > > > > > There isn’t much documentation around it but there are loads of > > > other > > > scripts that will be helpful to figure out any convention or > > > boilerplate code to copy. > > > > > > > > * I am not very sure if the example configuration files are > > > > > helpful. Maybe someone can clear this up a little bit for me > > > > > what > > > > > is the rationale is behind them. > > > > The idea was that the two simplest config example scripts were > > > > provided that give a user the ability to get data into memory > > > > or > > > > into a sqlite file. The actual conf file provided is a copy of > > > > the > > > > memory version. These give a basic starting point that people > > > > can > > > > then add additional info to be recorded etc. > > > > > > Does anybody want to use anything else than SQLite in the context > > > of > > > IPFire? > > I think we weren't sure and the memory and sqlite options were the > > easiest to get going and give real data. There are also mysql and > > postgresql options but I think we need to see what the interest is. there would be needed the enable switch in configure to use pgsql or mysql which is not enabled in this LFS. The memory table is cheaper according to system resources and is able to feed also 3rd party solutions like e.g. RRD. > > > > > > > > * There are loads of daemons being shipped and only one is > > > > > being used. > > > > > > > > > > I looked through our conversations and it looks like these > > > > > were > > > > > left there because we weren't sure if they would be used or > > > > > not. > > > > > > > > > > pmacctd is the daemon being used by Jon. pmacct is the > > > > > frontend to > > > > > pmacctd when being used in memory mode. > > > > > > > > > > For the others I looked in the pmacct website and found the > > > > > following:- > > > > > > I looked through our conversations and it looks like these were left > there because we weren't sure if they would be used or not. > > pmacctd is the daemon being used by Jon. pmacct is the frontend to > pmacctd when being used in memory mode. Exactly > > For the others I looked in the pmacct website and found the > following:- > > 'pmacctd' is the libpcap-based IPv4/IPv6 accounting daemon > > 'nfacctd' is the NetFlow (versions supported NetFlow v1, v5 and v9) > and > IPFIX accounting daemon > > 'sfacctd' is the sFlow v2/v4 and v5 accounting daemon > > 'uacctd' is the Linux NFLOG-based accounting daemon (historically, it > was using ULOG, hence its name) > > 'pmtelemetryd' is the Streaming Telemetry collector, where "Streaming > telemetry [ .. ] data can be used for analysis and troubleshooting > purposes to maintain the health of the network. This is achieved by > leveraging the capabilities of machine-to-machine communication. [ .. > ]" > (quoting Cisco IOS-XR Telemetry Configuration Guide at the time of > this > writing) > > 'pmbgpd' is the pmacct BGP collector and 'pmbmpd'is the pmacct BMP > collector. Pmacct can also handle BGP data via nfacct and the *bgp* binaries. > > > I don't know what most of that means but it looks to be quite > different > to what the addon was created for, so I would propose that I re-do > the > rootfiles and remove those daemons from the install. If in future > there > is demand for others we can add them back in with an update patch. I > will do that together with the other changes already discussed. > As a beside info. Best, Erik > Regards, > > Adolf. > > > > > I think Jon or Erik need to comment on this question. > > > > > * How much load does this generate? How large is the captured > > > > > data? > > > > Jon needs to provide this feedback. > > > > > Then there is the other part: > > > > > > On 8 Mar 2021, at 11:57, Adolf Belka (ipfire) > > > > > > <adolf.belka@ipfire.org> wrote: > > > > > > > > > > > > From: Adolf Belka <adolf.belka@ipfire.org> > > > > > > > > > > > > - What is it? > > > > > > pmacct is a monitoring tool for network management > > > > > > tasks. Data > > > > > > collected > > > > > > can be used for analysis and troubleshooting purposes to > > > > > > maintain the > > > > > > health of the network. pmacct can collect, replicate and > > > > > > export > > > > > > network > > > > > > information. It can cache in memory tables, store > > > > > > persistently > > > > > > to SQLite3 > > > > > > and output to flat-files like CSV, formatted, and JSON. > > > > > Okay. > > > > > > - Why is it needed? > > > > > > To monitor data usage (IP-based or MAC-based data > > > > > > accounting) > > > > > > down to the > > > > > > client level. Net-Traffic will monitor traffic for the > > > > > > entire > > > > > > RED, GREEN, > > > > > > etc. networks, but it cannot pinpoint which client is > > > > > > using > > > > > > lots of data. > > > > > > Connections will take a snapshot but not show day by day > > > > > > sums. > > > > > > pmacct can > > > > > > help admins keep tabs on users that use too much data. > > > > > I agree with the goal of it. But how does this add-on achieve > > > > > that? > > > > Jon should comment on this as he had this use case and can give > > > > feedback how the data has helped him in his investigations. > > > > > The data is being written to a (usually binary) file which > > > > > cannot > > > > > be visualised in the web UI. Does this not want a CGI script > > > > > that > > > > > allows people to see what is happening? > > > > We all thought that this would ultimately need a CGI script to > > > > set > > > > up and visualise the data. We believed it was worth getting > > > > this > > > > running in actual use as a CLI tool to start with and then get > > > > more > > > > feedback on the best items that would need to be captured in > > > > the CGI > > > > script. The tool has a lot of capabilities and I think it will > > > > not > > > > be possible to do everything that it can do in a WUI page. So > > > > some > > > > form of file or db offload will need to be available anyway but > > > > the > > > > items identified as being commonly required would be the ones > > > > to be > > > > developed into a CGI WUI page. > > > > > Sending manual SQL queries probably isn’t much fun :) > > > > > > - What are the use cases? > > > > > > An ISP may implement data caps and if the limit is over- > > > > > > run > > > > > > then you have > > > > > > to pay for every additional xxGB of data used. Typical > > > > > > charges > > > > > > can be > > > > > > around $10 per 50GB. With pmacct you can identify the > > > > > > high > > > > > > users and take > > > > > > action, hopefully before the limit is breached. > > > > > > - This is being introduced as a command line only tool. > > > > > > However, > > > > > > at a later > > > > > > date, if it is useful to enough additional users a WUI > > > > > > page > > > > > > could be > > > > > > developed as discussed in the development mailing list > > > > > > > > > > > > https://lists.ipfire.org/pipermail/development/2021-January/009174.html > > > > > > > > > > > > > > > > > I have been thinking about this for a while now and would say > > > > > that > > > > > I can approve merging this as a CLI tool. But it would not > > > > > really > > > > > enhance IPFire’s functionality because it is only usable for > > > > > people > > > > > who spend a lot of time writing their own scripts or SQL > > > > > queries to > > > > > get information that can be used to make decisions. > > > > We recognise that and had discussed the CGI WUI page as > > > > mentioned > > > > above. > > > > > > Was this here on the list or elsewhere? > > This was in a private conversation on the IPFire Community forum. > > We > > thought it best to have all our back and forth discussions between > > ourselves to start with. We were all finding our feet with it as > > well > > and we thought it best not to swamp the development list with our > > musings and questions to each other. If you want to see all the > > discussion history, then we can add you to the members of that > > conversation. > > If the addon gets accepted then any future discussions would be > > done > > on the Development mailing list to get everyones input. > > > > > > > > Adding another alternative to vnstat will result in us having > > > > > to > > > > > maintain two things that roughly do the same - or where one’s > > > > > features are a subset of the other one. > > > > I think Jon or Erik need to comment on any comparison with > > > > vnstat. > > > > > I would like to avoid merging this and then see it abandoned > > > > > because it is too complicated to use. We already have a lot > > > > > of > > > > > virtually unmaintained stuff around and I would really like > > > > > to drop > > > > > a lot of it, although I know that there are a few people > > > > > actually > > > > > using it. > > > > Jon and Erik should comment on the complication of use or not. > > > > Jon > > > > especially has done quite a bit of work with it, installing the > > > > .ipfire package versions that I have created. > > > > I intend to also have a play around with it but for me it is > > > > more > > > > some playful fun as I just have a home network with only myself > > > > as > > > > the user and admin. > > > > > Thoughts? > > > > > Best, > > > > > -Michael > > > > > > Co-authored-by: Jon Murphy > > > > > > Co-authored-by: Erik Kapfer <ummeegge@ipfire.org> > > > > > > > > > > > > Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> > > > > > > --- > > > > > > config/backup/includes/pmacct | 2 + > > > > > > config/pmacct/pmacct.conf | 24 +++++ > > > > > > config/pmacct/pmacct.init | 57 +++++++++++ > > > > > > config/pmacct/pmacct_memory_example.conf | 24 +++++ > > > > > > config/pmacct/pmacct_sqlite3_example.conf | 25 +++++ > > > > > > config/rootfiles/packages/pmacct | 111 > > > > > > ++++++++++++++++++++++ > > > > > > lfs/pmacct | 107 > > > > > > +++++++++++++++++++++ > > > > > > make.sh | 2 + > > > > > > src/paks/pmacct/install.sh | 36 +++++++ > > > > > > src/paks/pmacct/uninstall.sh | 33 +++++++ > > > > > > src/paks/pmacct/update.sh | 26 +++++ > > > > > > 11 files changed, 447 insertions(+) > > > > > > create mode 100644 config/backup/includes/pmacct > > > > > > create mode 100644 config/pmacct/pmacct.conf > > > > > > create mode 100644 config/pmacct/pmacct.init > > > > > > create mode 100644 config/pmacct/pmacct_memory_example.conf > > > > > > create mode 100644 > > > > > > config/pmacct/pmacct_sqlite3_example.conf > > > > > > create mode 100644 config/rootfiles/packages/pmacct > > > > > > create mode 100644 lfs/pmacct > > > > > > create mode 100644 src/paks/pmacct/install.sh > > > > > > create mode 100644 src/paks/pmacct/uninstall.sh > > > > > > create mode 100644 src/paks/pmacct/update.sh > > > > > > > > > > > > diff --git a/config/backup/includes/pmacct > > > > > > b/config/backup/includes/pmacct > > > > > > new file mode 100644 > > > > > > index 000000000..4359067ad > > > > > > --- /dev/null > > > > > > +++ b/config/backup/includes/pmacct > > > > > > @@ -0,0 +1,2 @@ > > > > > > +/etc/pmacct/ > > > > > > +/var/spool/pmacct/ > > > > > > diff --git a/config/pmacct/pmacct.conf > > > > > > b/config/pmacct/pmacct.conf > > > > > > new file mode 100644 > > > > > > index 000000000..3c1d47efa > > > > > > --- /dev/null > > > > > > +++ b/config/pmacct/pmacct.conf > > > > > > @@ -0,0 +1,24 @@ > > > > > > +! > > > > > > +! Pmacctd configuration file for IPFire environment > > > > > > +! > > > > > > + > > > > > > +syslog: daemon > > > > > > +daemonize: true > > > > > > +debug: false > > > > > > +promisc: true > > > > > > +interface: green0 > > > > > > + > > > > > > + > > > > > > +! > > > > > > +! "plugin1" plugin configuration > > > > > > +! > > > > > > +plugins: memory[plugin1] > > > > > > + > > > > > > +plugin_buffer_size[plugin1]: 102400 > > > > > > +plugin_pipe_size[plugin1]: 10240000 > > > > > > + > > > > > > +imt_mem_pools_number: 256 > > > > > > +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe > > > > > > + > > > > > > +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, > > > > > > dst_port, dst_mac, proto > > > > > > +aggregate_filter[plugin1]: ip > > > > > > \ No newline at end of file > > > > > > diff --git a/config/pmacct/pmacct.init > > > > > > b/config/pmacct/pmacct.init > > > > > > new file mode 100644 > > > > > > index 000000000..31f9ce49b > > > > > > --- /dev/null > > > > > > +++ b/config/pmacct/pmacct.init > > > > > > @@ -0,0 +1,57 @@ > > > > > > +#!/bin/bash > > > > > > + > > > > > > +# Begin $rc_base/init.d/pmacct > > > > > > + > > > > > > +# Starts and stops pmacct daemon > > > > > > +# Date: 2021-02-25 12:25:30 (Thu, 25 Feb 2021) > > > > > > + > > > > > > +# Locations > > > > > > +CONF="/etc/pmacct/pmacct.conf" > > > > > > +CONTENT="/var/pmacct" > > > > > > +# Pmacctd binary > > > > > > +PMACCT="/usr/sbin/pmacctd" > > > > > > +# Pmacctd start options '-f' for the configuration file > > > > > > +OPT="-f ${CONF}" > > > > > > +DESC="pmacct daemon" > > > > > > +# Pmacctd syslog facilitiy > > > > > > +#SYSLOG="local1" > > > > > > + > > > > > > + > > > > > > +. /etc/sysconfig/rc > > > > > > +. $rc_functions > > > > > > + > > > > > > +case "$1" in > > > > > > + start) > > > > > > + boot_mesg "Starting the ${DESC}... " > > > > > > + loadproc ${PMACCT} ${OPT} > > > > > > + sleep 2 > > > > > > + if P=$(pgrep -fl pmacctd); then > > > > > > + echo -e "\n${P}" > > > > > > + else > > > > > > + echo -e "\n${PMACCT} is not running... " > > > > > > + fi > > > > > > + ;; > > > > > > + > > > > > > + stop) > > > > > > + boot_mesg "Stopping the ${DESC}... " > > > > > > + killproc ${PMACCT} > > > > > > + ;; > > > > > > + > > > > > > + restart) > > > > > > + $0 stop > > > > > > + sleep 1 > > > > > > + $0 start > > > > > > + ;; > > > > > > + > > > > > > + status) > > > > > > + statusproc ${PMACCT} > > > > > > + ;; > > > > > > + > > > > > > + *) > > > > > > + echo "Usage: $0 {start|stop|restart|status}" > > > > > > + exit 1 > > > > > > + ;; > > > > > > +esac > > > > > > + > > > > > > +# End $rc_base/init.d/pmacct > > > > > > + > > > > > > diff --git a/config/pmacct/pmacct_memory_example.conf > > > > > > b/config/pmacct/pmacct_memory_example.conf > > > > > > new file mode 100644 > > > > > > index 000000000..0babdaaf7 > > > > > > --- /dev/null > > > > > > +++ b/config/pmacct/pmacct_memory_example.conf > > > > > > @@ -0,0 +1,24 @@ > > > > > > +! > > > > > > +! Pmacctd configuration file for IPFire environment > > > > > > +! > > > > > > + > > > > > > +syslog: daemon > > > > > > +daemonize: true > > > > > > +debug: false > > > > > > +promisc: true > > > > > > +interface: green0 > > > > > > + > > > > > > + > > > > > > +! > > > > > > +! "plugin1" plugin configuration > > > > > > +! > > > > > > +plugins: memory[plugin1] > > > > > > + > > > > > > +plugin_buffer_size[plugin1]: 102400 > > > > > > +plugin_pipe_size[plugin1]: 10240000 > > > > > > + > > > > > > +imt_mem_pools_number: 256 > > > > > > +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe > > > > > > + > > > > > > +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, > > > > > > dst_port, dst_mac, proto > > > > > > +aggregate_filter[plugin1]: ip > > > > > > diff --git a/config/pmacct/pmacct_sqlite3_example.conf > > > > > > b/config/pmacct/pmacct_sqlite3_example.conf > > > > > > new file mode 100644 > > > > > > index 000000000..7fb996408 > > > > > > --- /dev/null > > > > > > +++ b/config/pmacct/pmacct_sqlite3_example.conf > > > > > > @@ -0,0 +1,25 @@ > > > > > > +! > > > > > > +! Pmacctd configuration file for IPFire environment > > > > > > +! > > > > > > + > > > > > > +syslog: daemon > > > > > > +daemonize: true > > > > > > +debug: false > > > > > > +promisc: true > > > > > > +interface: green0 > > > > > > + > > > > > > + > > > > > > +! > > > > > > +! "plugin2" plugin configuration > > > > > > +! > > > > > > +plugins: sqlite3[plugin2] > > > > > > + > > > > > > +sql_db[plugin2]: /var/spool/pmacct/pmacct_sqlitev1.db > > > > > > +sql_table_version[plugin2]: 1 > > > > > > +sql_history[plugin2]: 5m > > > > > > +sql_refresh_time[plugin2]: 300 > > > > > > +sql_history_roundoff[plugin2]: m > > > > > > +sql_dont_try_update: true > > > > > > + > > > > > > +aggregate[plugin2]: src_host, src_port, src_mac, dst_host, > > > > > > dst_port, dst_mac, proto > > > > > > +aggregate_filter[plugin2]: ip > > > > > > diff --git a/config/rootfiles/packages/pmacct > > > > > > b/config/rootfiles/packages/pmacct > > > > > > new file mode 100644 > > > > > > index 000000000..fed83ee67 > > > > > > --- /dev/null > > > > > > +++ b/config/rootfiles/packages/pmacct > > > > > > @@ -0,0 +1,111 @@ > > > > > > +etc/pmacct > > > > > > +etc/pmacct/pmacct.conf > > > > > > +etc/pmacct/pmacct_memory_example.conf > > > > > > +etc/pmacct/pmacct_sqlite3_example.conf > > > > > > +etc/rc.d/init.d/pmacct > > > > > > +usr/bin/pmacct > > > > > > +#usr/lib/pmacct > > > > > > +#usr/lib/pmacct/examples > > > > > > +#usr/lib/pmacct/examples/custom > > > > > > +#usr/lib/pmacct/examples/custom/libcustom.la > > > > > > +#usr/lib/pmacct/examples/lg > > > > > > +#usr/lib/pmacct/examples/lg/pmbgp > > > > > > +usr/sbin/nfacctd > > > > > > +usr/sbin/pmacctd > > > > > > +usr/sbin/pmbgpd > > > > > > +usr/sbin/pmbmpd > > > > > > +usr/sbin/pmtelemetryd > > > > > > +usr/sbin/sfacctd > > > > > > +usr/share/pmacct > > > > > > +#usr/share/pmacct/CONFIG-KEYS > > > > > > +#usr/share/pmacct/FAQS > > > > > > +#usr/share/pmacct/QUICKSTART > > > > > > +#usr/share/pmacct/UPGRADE > > > > > > +#usr/share/pmacct/docs > > > > > > +#usr/share/pmacct/docs/IPFIX > > > > > > +#usr/share/pmacct/docs/LOOKING_GLASS_FORMAT > > > > > > +#usr/share/pmacct/docs/MSGLOG_DUMP_FORMATS > > > > > > +#usr/share/pmacct/docs/SIGNALS > > > > > > +#usr/share/pmacct/docs/TRIGGER_VARS > > > > > > +#usr/share/pmacct/examples > > > > > > +usr/share/pmacct/examples/allow.lst.example > > > > > > +#usr/share/pmacct/examples/amqp > > > > > > +usr/share/pmacct/examples/amqp/amqp_receiver.py > > > > > > +#usr/share/pmacct/examples/avro > > > > > > +usr/share/pmacct/examples/avro/avro_file_decoder.py > > > > > > +usr/share/pmacct/examples/bgp_agent.map.example > > > > > > +usr/share/pmacct/examples/bgp_md5.lst.example > > > > > > +usr/share/pmacct/examples/bgp_xconnects.map.example > > > > > > +usr/share/pmacct/examples/flow_to_rd.map.example > > > > > > +#usr/share/pmacct/examples/kafka > > > > > > +usr/share/pmacct/examples/kafka/kafka_consumer.py > > > > > > +#usr/share/pmacct/examples/lg > > > > > > +usr/share/pmacct/examples/lg/pmbgp.py > > > > > > +usr/share/pmacct/examples/networks.lst.example > > > > > > +usr/share/pmacct/examples/nfacctd-sql.conf.example > > > > > > +usr/share/pmacct/examples/pcap_interfaces.map.example > > > > > > +usr/share/pmacct/examples/peers.map.example > > > > > > +usr/share/pmacct/examples/pmacctd-imt.conf.example > > > > > > +usr/share/pmacct/examples/pmacctd-multiple- > > > > > > plugins.conf.example > > > > > > +usr/share/pmacct/examples/pmacctd-sql.conf.example > > > > > > +usr/share/pmacct/examples/pmacctd-sqlite3.conf.example > > > > > > +usr/share/pmacct/examples/ports.lst.example > > > > > > +usr/share/pmacct/examples/pretag.map.example > > > > > > +usr/share/pmacct/examples/primitives.lst.example > > > > > > +usr/share/pmacct/examples/probe_netflow.conf.example > > > > > > +usr/share/pmacct/examples/probe_sflow.conf.example > > > > > > +usr/share/pmacct/examples/sampling.map.example > > > > > > +usr/share/pmacct/examples/tee_receivers.lst.example > > > > > > +#usr/share/pmacct/sql > > > > > > +#usr/share/pmacct/sql/README.64bit > > > > > > +#usr/share/pmacct/sql/README.GeoIP > > > > > > +#usr/share/pmacct/sql/README.IPv6 > > > > > > +#usr/share/pmacct/sql/README.cos > > > > > > +#usr/share/pmacct/sql/README.custom_primitives > > > > > > +#usr/share/pmacct/sql/README.etype > > > > > > +#usr/share/pmacct/sql/README.export_proto > > > > > > +#usr/share/pmacct/sql/README.iface > > > > > > +#usr/share/pmacct/sql/README.label > > > > > > +#usr/share/pmacct/sql/README.mask > > > > > > +#usr/share/pmacct/sql/README.mpls > > > > > > +#usr/share/pmacct/sql/README.mysql > > > > > > +#usr/share/pmacct/sql/README.nat > > > > > > +#usr/share/pmacct/sql/README.pgsql > > > > > > +#usr/share/pmacct/sql/README.sampling > > > > > > +usr/share/pmacct/sql/README.sqlite3 > > > > > > +#usr/share/pmacct/sql/README.tag2 > > > > > > +#usr/share/pmacct/sql/README.timestamp > > > > > > +#usr/share/pmacct/sql/README.tunnel > > > > > > +#usr/share/pmacct/sql/pmacct-create-db.pgsql > > > > > > +#usr/share/pmacct/sql/pmacct-create-db_bgp_v1.mysql > > > > > > +#usr/share/pmacct/sql/pmacct-create-db_v1.mysql > > > > > > +#usr/share/pmacct/sql/pmacct-create-db_v2.mysql > > > > > > +#usr/share/pmacct/sql/pmacct-create-db_v3.mysql > > > > > > +#usr/share/pmacct/sql/pmacct-create-db_v4.mysql > > > > > > +#usr/share/pmacct/sql/pmacct-create-db_v5.mysql > > > > > > +#usr/share/pmacct/sql/pmacct-create-db_v6.mysql > > > > > > +#usr/share/pmacct/sql/pmacct-create-db_v7.mysql > > > > > > +#usr/share/pmacct/sql/pmacct-create-db_v8.mysql > > > > > > +#usr/share/pmacct/sql/pmacct-create-db_v9.mysql > > > > > > +#usr/share/pmacct/sql/pmacct-create-table_bgp_v1.pgsql > > > > > > +usr/share/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3 > > > > > > +#usr/share/pmacct/sql/pmacct-create-table_v1.pgsql > > > > > > +usr/share/pmacct/sql/pmacct-create-table_v1.sqlite3 > > > > > > +#usr/share/pmacct/sql/pmacct-create-table_v2.pgsql > > > > > > +usr/share/pmacct/sql/pmacct-create-table_v2.sqlite3 > > > > > > +#usr/share/pmacct/sql/pmacct-create-table_v3.pgsql > > > > > > +usr/share/pmacct/sql/pmacct-create-table_v3.sqlite3 > > > > > > +#usr/share/pmacct/sql/pmacct-create-table_v4.pgsql > > > > > > +usr/share/pmacct/sql/pmacct-create-table_v4.sqlite3 > > > > > > +#usr/share/pmacct/sql/pmacct-create-table_v5.pgsql > > > > > > +usr/share/pmacct/sql/pmacct-create-table_v5.sqlite3 > > > > > > +#usr/share/pmacct/sql/pmacct-create-table_v6.pgsql > > > > > > +usr/share/pmacct/sql/pmacct-create-table_v6.sqlite3 > > > > > > +usr/share/pmacct/sql/pmacct-create-table_v7.sqlite3 > > > > > > +#usr/share/pmacct/sql/pmacct-create-table_v7_v8.pgsql > > > > > > +usr/share/pmacct/sql/pmacct-create-table_v8.sqlite3 > > > > > > +#usr/share/pmacct/sql/pmacct-create-table_v9.pgsql > > > > > > +usr/share/pmacct/sql/pmacct-create-table_v9.sqlite3 > > > > > > +#usr/share/pmacct/sql/pmacct-grant-db.mysql > > > > > > +var/ipfire/backup/addons/includes/pmacct > > > > > > +var/spool/pmacct > > > > > > diff --git a/lfs/pmacct b/lfs/pmacct > > > > > > new file mode 100644 > > > > > > index 000000000..c6cc5270e > > > > > > --- /dev/null > > > > > > +++ b/lfs/pmacct > > > > > > @@ -0,0 +1,107 @@ > > > > > > +########################################################## > > > > > > ##################### > > > > > > > > > > > > +# # > > > > > > +# IPFire.org - A linux based > > > > > > firewall # > > > > > > +# Copyright (C) 2019 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 = 1.7.6 > > > > > > + > > > > > > +THISAPP = pmacct-$(VER) > > > > > > +DL_FILE = $(THISAPP).tar.gz > > > > > > +DL_FROM = $(URL_IPFIRE) > > > > > > +DIR_APP = $(DIR_SRC)/$(THISAPP) > > > > > > +TARGET = $(DIR_INFO)/$(THISAPP) > > > > > > +PROG = pmacct > > > > > > +PAK_VER = 1 > > > > > > + > > > > > > +DEPS = libcdada > > > > > > + > > > > > > +########################################################## > > > > > > ##################### > > > > > > > > > > > > +# Top-level Rules > > > > > > +########################################################## > > > > > > ##################### > > > > > > > > > > > > + > > > > > > +objects = $(DL_FILE) > > > > > > + > > > > > > +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > > > > > + > > > > > > +$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b > > > > > > + > > > > > > +install : $(TARGET) > > > > > > + > > > > > > +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) > > > > > > + > > > > > > +download :$(patsubst %,$(DIR_DL)/%,$(objects)) > > > > > > + > > > > > > +md5 : $(subst %,%_MD5,$(objects)) > > > > > > + > > > > > > +dist: > > > > > > + @$(PAK) > > > > > > + > > > > > > +########################################################## > > > > > > ##################### > > > > > > > > > > > > +# Downloading, checking, md5sum > > > > > > +########################################################## > > > > > > ##################### > > > > > > > > > > > > + > > > > > > +$(patsubst %,$(DIR_CHK)/%,$(objects)) : > > > > > > + @$(CHECK) > > > > > > + > > > > > > +$(patsubst %,$(DIR_DL)/%,$(objects)) : > > > > > > + @$(LOAD) > > > > > > + > > > > > > +$(subst %,%_MD5,$(objects)) : > > > > > > + @$(MD5) > > > > > > + > > > > > > +########################################################## > > > > > > ##################### > > > > > > > > > > > > +# Installation Details > > > > > > +########################################################## > > > > > > ##################### > > > > > > > > > > > > + > > > > > > +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > > > > > > + @$(PREBUILD) > > > > > > + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf > > > > > > $(DIR_DL)/$(DL_FILE) > > > > > > + cd $(DIR_APP) && ./autogen.sh > > > > > > + cd $(DIR_APP) && ./configure \ > > > > > > + --prefix=/usr \ > > > > > > + --sysconfdir=/etc/pmacct \ > > > > > > + --enable-sqlite3 \ > > > > > > + --enable-l2 \ > > > > > > + --enable-jansson > > > > > > + > > > > > > + # Add directory for plugins and pipes > > > > > > + -mkdir -v /var/spool/pmacct > > > > > > + > > > > > > + # Add configuration folder and copy conf files to it > > > > > > + -mkdir -v /etc/pmacct > > > > > > + cp -vf $(DIR_CONF)/pmacct/*.conf /etc/pmacct > > > > > > + > > > > > > + # Copy initscript to dir > > > > > > + cp -vf $(DIR_CONF)/pmacct/pmacct.init > > > > > > /etc/rc.d/init.d/pmacct > > > > > > + chmod 754 /etc/rc.d/init.d/pmacct > > > > > > + chown root:root /etc/rc.d/init.d/pmacct > > > > > > + > > > > > > + cd $(DIR_APP) && make $(MAKETUNING) > > > > > > + cd $(DIR_APP) && make install > > > > > > + > > > > > > + # Install backup definition > > > > > > + install -v -m 644 > > > > > > ${DIR_SRC}/config/backup/includes/pmacct \ > > > > > > + /var/ipfire/backup/addons/includes/pmacct > > > > > > + @rm -rf $(DIR_APP) > > > > > > + @$(POSTBUILD) > > > > > > diff --git a/make.sh b/make.sh > > > > > > index 43cccaca0..d42c9b1e2 100755 > > > > > > --- a/make.sh > > > > > > +++ b/make.sh > > > > > > @@ -1646,6 +1646,8 @@ buildipfire() { > > > > > > lfsmake2 ncdu > > > > > > lfsmake2 lshw > > > > > > lfsmake2 socat > > > > > > + lfsmake2 libcdada > > > > > > + lfsmake2 pmacct > > > > > > } > > > > > > > > > > > > buildinstaller() { > > > > > > diff --git a/src/paks/pmacct/install.sh > > > > > > b/src/paks/pmacct/install.sh > > > > > > new file mode 100644 > > > > > > index 000000000..8178cc7bc > > > > > > --- /dev/null > > > > > > +++ b/src/paks/pmacct/install.sh > > > > > > @@ -0,0 +1,36 @@ > > > > > > +#!/bin/bash > > > > > > +########################################################## > > > > > > ################## > > > > > > > > > > > > +# # > > > > > > +# This file is part of the IPFire > > > > > > Firewall. # > > > > > > +# # > > > > > > +# IPFire 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 2 of the > > > > > > License, > > > > > > or # > > > > > > +# (at your option) any later > > > > > > version. # > > > > > > +# # > > > > > > +# IPFire 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 IPFire; if not, write to the Free > > > > > > Software # > > > > > > +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, > > > > > > MA > > > > > > 02111-1307 USA # > > > > > > +# # > > > > > > +# Copyright (C) 2007 IPFire-Team > > > > > > <info@ipfire.org>. # > > > > > > +# # > > > > > > +########################################################## > > > > > > ################## > > > > > > > > > > > > +# > > > > > > +. /opt/pakfire/lib/functions.sh > > > > > > + > > > > > > +extract_files > > > > > > +restore_backup ${NAME} > > > > > > + > > > > > > +# Add symlinks for runlevels > > > > > > +ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME} > > > > > > +ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME} > > > > > > +ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME} > > > > > > +start_service --background ${NAME} > > > > > > + > > > > > > + > > > > > > +# EOF > > > > > > diff --git a/src/paks/pmacct/uninstall.sh > > > > > > b/src/paks/pmacct/uninstall.sh > > > > > > new file mode 100644 > > > > > > index 000000000..51631e8c1 > > > > > > --- /dev/null > > > > > > +++ b/src/paks/pmacct/uninstall.sh > > > > > > @@ -0,0 +1,33 @@ > > > > > > +#!/bin/bash > > > > > > +########################################################## > > > > > > ################## > > > > > > > > > > > > +# # > > > > > > +# This file is part of the IPFire > > > > > > Firewall. # > > > > > > +# # > > > > > > +# IPFire 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 2 of the > > > > > > License, > > > > > > or # > > > > > > +# (at your option) any later > > > > > > version. # > > > > > > +# # > > > > > > +# IPFire 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 IPFire; if not, write to the Free > > > > > > Software # > > > > > > +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, > > > > > > MA > > > > > > 02111-1307 USA # > > > > > > +# # > > > > > > +# Copyright (C) 2007 IPFire-Team > > > > > > <info@ipfire.org>. # > > > > > > +# # > > > > > > +########################################################## > > > > > > ################## > > > > > > > > > > > > +# > > > > > > +. /opt/pakfire/lib/functions.sh > > > > > > + > > > > > > +stop_service ${NAME} > > > > > > +make_backup ${NAME} > > > > > > +remove_files > > > > > > + > > > > > > +# Delete symlinks > > > > > > +rm -rfv /etc/rc.d/rc?.d/???${NAME} > > > > > > + > > > > > > +# EOF > > > > > > diff --git a/src/paks/pmacct/update.sh > > > > > > b/src/paks/pmacct/update.sh > > > > > > new file mode 100644 > > > > > > index 000000000..89c40d0d7 > > > > > > --- /dev/null > > > > > > +++ b/src/paks/pmacct/update.sh > > > > > > @@ -0,0 +1,26 @@ > > > > > > +#!/bin/bash > > > > > > +########################################################## > > > > > > ################## > > > > > > > > > > > > +# # > > > > > > +# This file is part of the IPFire > > > > > > Firewall. # > > > > > > +# # > > > > > > +# IPFire 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 2 of the > > > > > > License, > > > > > > or # > > > > > > +# (at your option) any later > > > > > > version. # > > > > > > +# # > > > > > > +# IPFire 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 IPFire; if not, write to the Free > > > > > > Software # > > > > > > +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, > > > > > > MA > > > > > > 02111-1307 USA # > > > > > > +# # > > > > > > +# Copyright (C) 2007 IPFire-Team > > > > > > <info@ipfire.org>. # > > > > > > +# # > > > > > > +########################################################## > > > > > > ################## > > > > > > > > > > > > +# > > > > > > +. /opt/pakfire/lib/functions.sh > > > > > > +./uninstall.sh > > > > > > +./install.sh > > > > > > -- > > > > > > 2.30.1 > > >
diff --git a/config/backup/includes/pmacct b/config/backup/includes/pmacct new file mode 100644 index 000000000..4359067ad --- /dev/null +++ b/config/backup/includes/pmacct @@ -0,0 +1,2 @@ +/etc/pmacct/ +/var/spool/pmacct/ diff --git a/config/pmacct/pmacct.conf b/config/pmacct/pmacct.conf new file mode 100644 index 000000000..3c1d47efa --- /dev/null +++ b/config/pmacct/pmacct.conf @@ -0,0 +1,24 @@ +! +! Pmacctd configuration file for IPFire environment +! + +syslog: daemon +daemonize: true +debug: false +promisc: true +interface: green0 + + +! +! "plugin1" plugin configuration +! +plugins: memory[plugin1] + +plugin_buffer_size[plugin1]: 102400 +plugin_pipe_size[plugin1]: 10240000 + +imt_mem_pools_number: 256 +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe + +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto +aggregate_filter[plugin1]: ip \ No newline at end of file diff --git a/config/pmacct/pmacct.init b/config/pmacct/pmacct.init new file mode 100644 index 000000000..31f9ce49b --- /dev/null +++ b/config/pmacct/pmacct.init @@ -0,0 +1,57 @@ +#!/bin/bash + +# Begin $rc_base/init.d/pmacct + +# Starts and stops pmacct daemon +# Date: 2021-02-25 12:25:30 (Thu, 25 Feb 2021) + +# Locations +CONF="/etc/pmacct/pmacct.conf" +CONTENT="/var/pmacct" +# Pmacctd binary +PMACCT="/usr/sbin/pmacctd" +# Pmacctd start options '-f' for the configuration file +OPT="-f ${CONF}" +DESC="pmacct daemon" +# Pmacctd syslog facilitiy +#SYSLOG="local1" + + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + boot_mesg "Starting the ${DESC}... " + loadproc ${PMACCT} ${OPT} + sleep 2 + if P=$(pgrep -fl pmacctd); then + echo -e "\n${P}" + else + echo -e "\n${PMACCT} is not running... " + fi + ;; + + stop) + boot_mesg "Stopping the ${DESC}... " + killproc ${PMACCT} + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + statusproc ${PMACCT} + ;; + + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/pmacct + diff --git a/config/pmacct/pmacct_memory_example.conf b/config/pmacct/pmacct_memory_example.conf new file mode 100644 index 000000000..0babdaaf7 --- /dev/null +++ b/config/pmacct/pmacct_memory_example.conf @@ -0,0 +1,24 @@ +! +! Pmacctd configuration file for IPFire environment +! + +syslog: daemon +daemonize: true +debug: false +promisc: true +interface: green0 + + +! +! "plugin1" plugin configuration +! +plugins: memory[plugin1] + +plugin_buffer_size[plugin1]: 102400 +plugin_pipe_size[plugin1]: 10240000 + +imt_mem_pools_number: 256 +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe + +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto +aggregate_filter[plugin1]: ip diff --git a/config/pmacct/pmacct_sqlite3_example.conf b/config/pmacct/pmacct_sqlite3_example.conf new file mode 100644 index 000000000..7fb996408 --- /dev/null +++ b/config/pmacct/pmacct_sqlite3_example.conf @@ -0,0 +1,25 @@ +! +! Pmacctd configuration file for IPFire environment +! + +syslog: daemon +daemonize: true +debug: false +promisc: true +interface: green0 + + +! +! "plugin2" plugin configuration +! +plugins: sqlite3[plugin2] + +sql_db[plugin2]: /var/spool/pmacct/pmacct_sqlitev1.db +sql_table_version[plugin2]: 1 +sql_history[plugin2]: 5m +sql_refresh_time[plugin2]: 300 +sql_history_roundoff[plugin2]: m +sql_dont_try_update: true + +aggregate[plugin2]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto +aggregate_filter[plugin2]: ip diff --git a/config/rootfiles/packages/pmacct b/config/rootfiles/packages/pmacct new file mode 100644 index 000000000..fed83ee67 --- /dev/null +++ b/config/rootfiles/packages/pmacct @@ -0,0 +1,111 @@ +etc/pmacct +etc/pmacct/pmacct.conf +etc/pmacct/pmacct_memory_example.conf +etc/pmacct/pmacct_sqlite3_example.conf +etc/rc.d/init.d/pmacct +usr/bin/pmacct +#usr/lib/pmacct +#usr/lib/pmacct/examples +#usr/lib/pmacct/examples/custom +#usr/lib/pmacct/examples/custom/libcustom.la +#usr/lib/pmacct/examples/lg +#usr/lib/pmacct/examples/lg/pmbgp +usr/sbin/nfacctd +usr/sbin/pmacctd +usr/sbin/pmbgpd +usr/sbin/pmbmpd +usr/sbin/pmtelemetryd +usr/sbin/sfacctd +usr/share/pmacct +#usr/share/pmacct/CONFIG-KEYS +#usr/share/pmacct/FAQS +#usr/share/pmacct/QUICKSTART +#usr/share/pmacct/UPGRADE +#usr/share/pmacct/docs +#usr/share/pmacct/docs/IPFIX +#usr/share/pmacct/docs/LOOKING_GLASS_FORMAT +#usr/share/pmacct/docs/MSGLOG_DUMP_FORMATS +#usr/share/pmacct/docs/SIGNALS +#usr/share/pmacct/docs/TRIGGER_VARS +#usr/share/pmacct/examples +usr/share/pmacct/examples/allow.lst.example +#usr/share/pmacct/examples/amqp +usr/share/pmacct/examples/amqp/amqp_receiver.py +#usr/share/pmacct/examples/avro +usr/share/pmacct/examples/avro/avro_file_decoder.py +usr/share/pmacct/examples/bgp_agent.map.example +usr/share/pmacct/examples/bgp_md5.lst.example +usr/share/pmacct/examples/bgp_xconnects.map.example +usr/share/pmacct/examples/flow_to_rd.map.example +#usr/share/pmacct/examples/kafka +usr/share/pmacct/examples/kafka/kafka_consumer.py +#usr/share/pmacct/examples/lg +usr/share/pmacct/examples/lg/pmbgp.py +usr/share/pmacct/examples/networks.lst.example +usr/share/pmacct/examples/nfacctd-sql.conf.example +usr/share/pmacct/examples/pcap_interfaces.map.example +usr/share/pmacct/examples/peers.map.example +usr/share/pmacct/examples/pmacctd-imt.conf.example +usr/share/pmacct/examples/pmacctd-multiple-plugins.conf.example +usr/share/pmacct/examples/pmacctd-sql.conf.example +usr/share/pmacct/examples/pmacctd-sqlite3.conf.example +usr/share/pmacct/examples/ports.lst.example +usr/share/pmacct/examples/pretag.map.example +usr/share/pmacct/examples/primitives.lst.example +usr/share/pmacct/examples/probe_netflow.conf.example +usr/share/pmacct/examples/probe_sflow.conf.example +usr/share/pmacct/examples/sampling.map.example +usr/share/pmacct/examples/tee_receivers.lst.example +#usr/share/pmacct/sql +#usr/share/pmacct/sql/README.64bit +#usr/share/pmacct/sql/README.GeoIP +#usr/share/pmacct/sql/README.IPv6 +#usr/share/pmacct/sql/README.cos +#usr/share/pmacct/sql/README.custom_primitives +#usr/share/pmacct/sql/README.etype +#usr/share/pmacct/sql/README.export_proto +#usr/share/pmacct/sql/README.iface +#usr/share/pmacct/sql/README.label +#usr/share/pmacct/sql/README.mask +#usr/share/pmacct/sql/README.mpls +#usr/share/pmacct/sql/README.mysql +#usr/share/pmacct/sql/README.nat +#usr/share/pmacct/sql/README.pgsql +#usr/share/pmacct/sql/README.sampling +usr/share/pmacct/sql/README.sqlite3 +#usr/share/pmacct/sql/README.tag2 +#usr/share/pmacct/sql/README.timestamp +#usr/share/pmacct/sql/README.tunnel +#usr/share/pmacct/sql/pmacct-create-db.pgsql +#usr/share/pmacct/sql/pmacct-create-db_bgp_v1.mysql +#usr/share/pmacct/sql/pmacct-create-db_v1.mysql +#usr/share/pmacct/sql/pmacct-create-db_v2.mysql +#usr/share/pmacct/sql/pmacct-create-db_v3.mysql +#usr/share/pmacct/sql/pmacct-create-db_v4.mysql +#usr/share/pmacct/sql/pmacct-create-db_v5.mysql +#usr/share/pmacct/sql/pmacct-create-db_v6.mysql +#usr/share/pmacct/sql/pmacct-create-db_v7.mysql +#usr/share/pmacct/sql/pmacct-create-db_v8.mysql +#usr/share/pmacct/sql/pmacct-create-db_v9.mysql +#usr/share/pmacct/sql/pmacct-create-table_bgp_v1.pgsql +usr/share/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v1.pgsql +usr/share/pmacct/sql/pmacct-create-table_v1.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v2.pgsql +usr/share/pmacct/sql/pmacct-create-table_v2.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v3.pgsql +usr/share/pmacct/sql/pmacct-create-table_v3.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v4.pgsql +usr/share/pmacct/sql/pmacct-create-table_v4.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v5.pgsql +usr/share/pmacct/sql/pmacct-create-table_v5.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v6.pgsql +usr/share/pmacct/sql/pmacct-create-table_v6.sqlite3 +usr/share/pmacct/sql/pmacct-create-table_v7.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v7_v8.pgsql +usr/share/pmacct/sql/pmacct-create-table_v8.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v9.pgsql +usr/share/pmacct/sql/pmacct-create-table_v9.sqlite3 +#usr/share/pmacct/sql/pmacct-grant-db.mysql +var/ipfire/backup/addons/includes/pmacct +var/spool/pmacct diff --git a/lfs/pmacct b/lfs/pmacct new file mode 100644 index 000000000..c6cc5270e --- /dev/null +++ b/lfs/pmacct @@ -0,0 +1,107 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2019 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 = 1.7.6 + +THISAPP = pmacct-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = pmacct +PAK_VER = 1 + +DEPS = libcdada + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/pmacct \ + --enable-sqlite3 \ + --enable-l2 \ + --enable-jansson + + # Add directory for plugins and pipes + -mkdir -v /var/spool/pmacct + + # Add configuration folder and copy conf files to it + -mkdir -v /etc/pmacct + cp -vf $(DIR_CONF)/pmacct/*.conf /etc/pmacct + + # Copy initscript to dir + cp -vf $(DIR_CONF)/pmacct/pmacct.init /etc/rc.d/init.d/pmacct + chmod 754 /etc/rc.d/init.d/pmacct + chown root:root /etc/rc.d/init.d/pmacct + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + # Install backup definition + install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \ + /var/ipfire/backup/addons/includes/pmacct + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 43cccaca0..d42c9b1e2 100755 --- a/make.sh +++ b/make.sh @@ -1646,6 +1646,8 @@ buildipfire() { lfsmake2 ncdu lfsmake2 lshw lfsmake2 socat + lfsmake2 libcdada + lfsmake2 pmacct } buildinstaller() { diff --git a/src/paks/pmacct/install.sh b/src/paks/pmacct/install.sh new file mode 100644 index 000000000..8178cc7bc --- /dev/null +++ b/src/paks/pmacct/install.sh @@ -0,0 +1,36 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +extract_files +restore_backup ${NAME} + +# Add symlinks for runlevels +ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME} +ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME} +ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME} +start_service --background ${NAME} + + +# EOF diff --git a/src/paks/pmacct/uninstall.sh b/src/paks/pmacct/uninstall.sh new file mode 100644 index 000000000..51631e8c1 --- /dev/null +++ b/src/paks/pmacct/uninstall.sh @@ -0,0 +1,33 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +stop_service ${NAME} +make_backup ${NAME} +remove_files + +# Delete symlinks +rm -rfv /etc/rc.d/rc?.d/???${NAME} + +# EOF diff --git a/src/paks/pmacct/update.sh b/src/paks/pmacct/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/pmacct/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh