From cf7c945180e7e29fee7a194daca06197a867c495 Mon Sep 17 00:00:00 2001 From: Daniel Ehlers Date: Mon, 1 Oct 2018 23:59:55 +0200 Subject: [PATCH 1/2] Add filter for ddhcpd multicast --- contrib/filters/bcast-stats.rules.BCAST | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/filters/bcast-stats.rules.BCAST b/contrib/filters/bcast-stats.rules.BCAST index 72e6d97..9722c26 100644 --- a/contrib/filters/bcast-stats.rules.BCAST +++ b/contrib/filters/bcast-stats.rules.BCAST @@ -13,6 +13,7 @@ IPv6_fragment,ipv6.nxt == 44 IPv4_fragment,ip.flags.mf == 1 || ip.frag_offset > 0 DHCP,bootp DHCPv6,udp.dstport == 547 +DDHCPD,ipv6.addr eq ff02::1234 XID,llc.control == 0x00af BJNP,bjnp ws-discovery,udp.dstport == 3702 From a14fea4846fba240c3f92a546ffceac76a6958f4 Mon Sep 17 00:00:00 2001 From: Daniel Ehlers Date: Wed, 3 Oct 2018 03:46:49 +0200 Subject: [PATCH 2/2] Add systemd service and timer templates --- contrib/systemd/wirerrd-collect.service | 11 +++++++++++ contrib/systemd/wirerrd-export.service | 12 ++++++++++++ contrib/systemd/wirerrd-export.timer | 10 ++++++++++ 3 files changed, 33 insertions(+) create mode 100644 contrib/systemd/wirerrd-collect.service create mode 100644 contrib/systemd/wirerrd-export.service create mode 100644 contrib/systemd/wirerrd-export.timer diff --git a/contrib/systemd/wirerrd-collect.service b/contrib/systemd/wirerrd-collect.service new file mode 100644 index 0000000..8d5588f --- /dev/null +++ b/contrib/systemd/wirerrd-collect.service @@ -0,0 +1,11 @@ +[Unit] +Description=wirerrd collector + +[Service] +Type=simple +User=wirerrd +WorkingDirectory=/path/to/wirerrd +ExecStart=/path/to/wirerrd/wirerrd collect -i interface -o /path/to/rrd -f contrib/filters/bcast-stats.rules + +[Install] +WantedBy=multi-user.target diff --git a/contrib/systemd/wirerrd-export.service b/contrib/systemd/wirerrd-export.service new file mode 100644 index 0000000..ca83038 --- /dev/null +++ b/contrib/systemd/wirerrd-export.service @@ -0,0 +1,12 @@ +[Unit] +Description=wirerrd exporter + +[Service] +Type=oneshot +User=wirerrd +Group=wirerrd +WorkingDirectory=/path/to/wirerrd +ExecStart=/path/to/wirerrd/wirerrd export -i /path/to/rrd -o /path/to/public_html_symlink + +[Install] +WantedBy=multi-user.target diff --git a/contrib/systemd/wirerrd-export.timer b/contrib/systemd/wirerrd-export.timer new file mode 100644 index 0000000..1115a24 --- /dev/null +++ b/contrib/systemd/wirerrd-export.timer @@ -0,0 +1,10 @@ +[Unit] +Description=wirerrd export timer + +[Timer] +Unit=wirerrd-export +OnBootSec=5m +OnUnitActiveSec=5m + +[Install] +WantedBy=timers.target