Merge branch 'current' into lithiumlithium

Conflicts:
	Makefile.am
	debian/changelog
	templates/restart/dns/forwarding/node.def
	templates/show/version/added/node.def
	templates/show/version/all/node.def
	templates/show/version/deleted/node.def
	templates/show/version/downgraded/node.def
	templates/show/version/node.def
	templates/show/version/upgraded/node.def

12 files changed, 1 insertions, 23 deletions

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]\]"
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*