From a04d085faa6baf3a021b8d795e1a8487f4317d1c Mon Sep 17 00:00:00 2001 From: Ewald van Geffen Date: Sun, 26 Jun 2016 20:40:13 +0200 Subject: T58 "monitor firewall name " does not monitor any firewall-log-entry related to set firewall name enable-default-log --- templates/monitor/firewall/name/node.tag/node.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/monitor') diff --git a/templates/monitor/firewall/name/node.tag/node.def b/templates/monitor/firewall/name/node.tag/node.def index 16b9244..9593cb8 100644 --- a/templates/monitor/firewall/name/node.tag/node.def +++ b/templates/monitor/firewall/name/node.tag/node.def @@ -3,4 +3,4 @@ allowed: local -a ARR eval "ARR=($(cli-shell-api -- listEffectiveNodes firewall name))" echo ${ARR[@]} run: echo "Notice: monitoring information is displayed only for rules with enabled logging"; \ - ${vyatta_bindir}/vyatta-monitor Firewall-$4 "\[$4-[0-9]*-[A,D,R]\]" + ${vyatta_bindir}/vyatta-monitor Firewall-$4 "\[$4-([0-9]*|default)-[A,D,R]\]" -- cgit v1.2.3 From e08a8546936fe6801d718c85e3723d2ea6d33cc9 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Tue, 15 May 2018 03:14:12 +0200 Subject: T638: remove the old handwritten templates for bmon commands. Turns out they were there, just overwriten by the gen-monitor-* so no one noticed. --- templates/monitor/interfaces/bonding/node.def | 2 -- templates/monitor/interfaces/bonding/node.tag/vif/node.def | 2 -- templates/monitor/interfaces/bridge/node.def | 2 -- templates/monitor/interfaces/ethernet/node.def | 2 -- templates/monitor/interfaces/ethernet/node.tag/vif/node.def | 2 -- templates/monitor/interfaces/loopback/node.def | 2 -- templates/monitor/interfaces/node.def | 2 -- templates/monitor/interfaces/pseudo-ethernet/node.def | 2 -- templates/monitor/interfaces/tunnel/node.def | 2 -- templates/monitor/interfaces/vrrp/node.def | 2 -- templates/monitor/interfaces/vti/node.def | 2 -- 11 files changed, 22 deletions(-) delete mode 100644 templates/monitor/interfaces/bonding/node.def delete mode 100644 templates/monitor/interfaces/bonding/node.tag/vif/node.def delete mode 100644 templates/monitor/interfaces/bridge/node.def delete mode 100644 templates/monitor/interfaces/ethernet/node.def delete mode 100644 templates/monitor/interfaces/ethernet/node.tag/vif/node.def delete mode 100644 templates/monitor/interfaces/loopback/node.def delete mode 100644 templates/monitor/interfaces/node.def delete mode 100644 templates/monitor/interfaces/pseudo-ethernet/node.def delete mode 100644 templates/monitor/interfaces/tunnel/node.def delete mode 100644 templates/monitor/interfaces/vrrp/node.def delete mode 100644 templates/monitor/interfaces/vti/node.def (limited to 'templates/monitor') diff --git a/templates/monitor/interfaces/bonding/node.def b/templates/monitor/interfaces/bonding/node.def deleted file mode 100644 index b7e8bce..0000000 --- a/templates/monitor/interfaces/bonding/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor a bonding interface -run: bmon -p bond*,!bond*v*,!bond*.* diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.def deleted file mode 100644 index 4241bc8..0000000 --- a/templates/monitor/interfaces/bonding/node.tag/vif/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor a vif -run: bmon -p $4.* diff --git a/templates/monitor/interfaces/bridge/node.def b/templates/monitor/interfaces/bridge/node.def deleted file mode 100644 index 5b2a395..0000000 --- a/templates/monitor/interfaces/bridge/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor a bridge interface -run: bmon -p br* diff --git a/templates/monitor/interfaces/ethernet/node.def b/templates/monitor/interfaces/ethernet/node.def deleted file mode 100644 index 60c4970..0000000 --- a/templates/monitor/interfaces/ethernet/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor a ethernet interface -run: bmon -p eth*,!eth*v*,!eth*.* diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.def deleted file mode 100644 index 4241bc8..0000000 --- a/templates/monitor/interfaces/ethernet/node.tag/vif/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor a vif -run: bmon -p $4.* diff --git a/templates/monitor/interfaces/loopback/node.def b/templates/monitor/interfaces/loopback/node.def deleted file mode 100644 index 9d3a8a5..0000000 --- a/templates/monitor/interfaces/loopback/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor a loopback interface -run: bmon -p lo diff --git a/templates/monitor/interfaces/node.def b/templates/monitor/interfaces/node.def deleted file mode 100644 index ef09ad0..0000000 --- a/templates/monitor/interfaces/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor interfaces -run: bmon -p !gre0,!sit0,!tunl0,!ip6tnl0; diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.def deleted file mode 100644 index 8cd18c9..0000000 --- a/templates/monitor/interfaces/pseudo-ethernet/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor a pseudo-ethernet interface -run: bmon -p peth* diff --git a/templates/monitor/interfaces/tunnel/node.def b/templates/monitor/interfaces/tunnel/node.def deleted file mode 100644 index a41faa2..0000000 --- a/templates/monitor/interfaces/tunnel/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor a tunnel interface -run: bmon -p tun* diff --git a/templates/monitor/interfaces/vrrp/node.def b/templates/monitor/interfaces/vrrp/node.def deleted file mode 100644 index 64c6684..0000000 --- a/templates/monitor/interfaces/vrrp/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor a vrrp interface -run: bmon -p eth*v*,bond*v* diff --git a/templates/monitor/interfaces/vti/node.def b/templates/monitor/interfaces/vti/node.def deleted file mode 100644 index b7429bd..0000000 --- a/templates/monitor/interfaces/vti/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor a vti interface -run: bmon -p vti* -- cgit v1.2.3