Forground monitoring for many daemons

(cherry picked from commit b906651c85a7bf45c715727b2099151f08762ec8)

33 files changed, 39 insertions, 1 deletions

diff --git a/templates/monitor/cluster/background/node.def b/templates/monitor/cluster/background/node.def
new file mode 100644
index 0000000..b57e636
--- /dev/null
+++ b/templates/monitor/cluster/background/node.def
@@ -0,0 +1 @@
+help: Monitor cluster service in the background
diff --git a/templates/monitor/cluster/background/start/node.def b/templates/monitor/cluster/background/start/node.def
new file mode 100644
index 0000000..3d6f577
--- /dev/null
+++ b/templates/monitor/cluster/background/start/node.def
@@ -0,0 +1,2 @@
+help: Start background monitoring for cluster service
+run: ${vyatta_bindir}/vyatta-monitor-background Cluster heartbeat cl_status mach_down ha_log
diff --git a/templates/monitor/cluster/background/stop/node.def b/templates/monitor/cluster/background/stop/node.def
new file mode 100644
index 0000000..07b16f4
--- /dev/null
+++ b/templates/monitor/cluster/background/stop/node.def
@@ -0,0 +1,2 @@
+help: Stop background monitoring for cluster service
+run: ${vyatta_bindir}/vyatta-monitor-background-stop Cluster
diff --git a/templates/monitor/cluster/node.def b/templates/monitor/cluster/node.def
new file mode 100644
index 0000000..c4703bc
--- /dev/null
+++ b/templates/monitor/cluster/node.def
@@ -0,0 +1,2 @@
+help: Monitor clustering service
+run: ${vyatta_bindir}/vyatta-monitor Cluster heartbeat cl_status mach_down ha_log
diff --git a/templates/monitor/content-inspection/background/node.def b/templates/monitor/content-inspection/background/node.def
new file mode 100644
index 0000000..7632343
--- /dev/null
+++ b/templates/monitor/content-inspection/background/node.def
@@ -0,0 +1 @@
+help: Monitor Content-Inspection in the background
diff --git a/templates/monitor/content-inspection/background/start/node.def b/templates/monitor/content-inspection/background/start/node.def
new file mode 100644
index 0000000..7f7c1e1
--- /dev/null
+++ b/templates/monitor/content-inspection/background/start/node.def
@@ -0,0 +1,2 @@
+help: Start background monitoring of Content-Inspection
+run: ${vyatta_bindir}/vyatta-monitor-background Content-Inspection snort
diff --git a/templates/monitor/content-inspection/background/stop/node.def b/templates/monitor/content-inspection/background/stop/node.def
new file mode 100644
index 0000000..d77a1fb
--- /dev/null
+++ b/templates/monitor/content-inspection/background/stop/node.def
@@ -0,0 +1,2 @@
+help: Stop background monitoring of Content-Inspection
+run: ${vyatta_bindir}/vyatta-monitor-background-stop Content-Inspection
diff --git a/templates/monitor/content-inspection/node.def b/templates/monitor/content-inspection/node.def
new file mode 100644
index 0000000..35c8e97
--- /dev/null
+++ b/templates/monitor/content-inspection/node.def
@@ -0,0 +1,2 @@
+help: Monitor Content-Inspection
+run: ${vyatta_bindir}/vyatta-monitor Content-Inspection snort
diff --git a/templates/monitor/firewall/node.def b/templates/monitor/firewall/node.def
new file mode 100644
index 0000000..8584ad4
--- /dev/null
+++ b/templates/monitor/firewall/node.def
@@ -0,0 +1 @@
+help: Monitor Firewall
diff --git a/templates/monitor/nat/type/destination/node.def b/templates/monitor/nat/destination/node.def
index b04248c..b04248c 100644
--- a/templates/monitor/nat/type/destination/node.def
+++ b/templates/monitor/nat/destination/node.def
diff --git a/templates/monitor/nat/type/destination/rule/node.def b/templates/monitor/nat/destination/rule/node.def
index f1243ee..f1243ee 100644
--- a/templates/monitor/nat/type/destination/rule/node.def
+++ b/templates/monitor/nat/destination/rule/node.def
diff --git a/templates/monitor/nat/type/destination/rule/node.tag/node.def b/templates/monitor/nat/destination/rule/node.tag/node.def
index 5a349c9..5a349c9 100644
--- a/templates/monitor/nat/type/destination/rule/node.tag/node.def
+++ b/templates/monitor/nat/destination/rule/node.tag/node.def
diff --git a/templates/monitor/nat/type/masquerade/node.def b/templates/monitor/nat/masquerade/node.def
index 80e942b..80e942b 100644
--- a/templates/monitor/nat/type/masquerade/node.def
+++ b/templates/monitor/nat/masquerade/node.def
diff --git a/templates/monitor/nat/type/masquerade/rule/node.def b/templates/monitor/nat/masquerade/rule/node.def
index 543074f..543074f 100644
--- a/templates/monitor/nat/type/masquerade/rule/node.def
+++ b/templates/monitor/nat/masquerade/rule/node.def
diff --git a/templates/monitor/nat/type/masquerade/rule/node.tag/node.def b/templates/monitor/nat/masquerade/rule/node.tag/node.def
index bc77a5b..bc77a5b 100644
--- a/templates/monitor/nat/type/masquerade/rule/node.tag/node.def
+++ b/templates/monitor/nat/masquerade/rule/node.tag/node.def
diff --git a/templates/monitor/nat/type/source/node.def b/templates/monitor/nat/source/node.def
index 2dd604f..2dd604f 100644
--- a/templates/monitor/nat/type/source/node.def
+++ b/templates/monitor/nat/source/node.def
diff --git a/templates/monitor/nat/type/source/rule/node.def b/templates/monitor/nat/source/rule/node.def
index b24d1bf..b24d1bf 100644
--- a/templates/monitor/nat/type/source/rule/node.def
+++ b/templates/monitor/nat/source/rule/node.def
diff --git a/templates/monitor/nat/type/source/rule/node.tag/node.def b/templates/monitor/nat/source/rule/node.tag/node.def
index 660eef9..660eef9 100644
--- a/templates/monitor/nat/type/source/rule/node.tag/node.def
+++ b/templates/monitor/nat/source/rule/node.tag/node.def
diff --git a/templates/monitor/nat/type/node.def b/templates/monitor/nat/type/node.def
deleted file mode 100644
index 9826866..0000000
--- a/templates/monitor/nat/type/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor NAT logs for a specified type of NAT
diff --git a/templates/monitor/service/conntrack-sync/node.def b/templates/monitor/service/conntrack-sync/node.def
new file mode 100644
index 0000000..00f53e0
--- /dev/null
+++ b/templates/monitor/service/conntrack-sync/node.def
@@ -0,0 +1 @@
+help: Monitor conntrack-sync
diff --git a/templates/monitor/service/dhcp/node.def b/templates/monitor/service/dhcp/node.def
new file mode 100644
index 0000000..28bf115
--- /dev/null
+++ b/templates/monitor/service/dhcp/node.def
@@ -0,0 +1,2 @@
+help: Monitor Dynamic Host Control Protocol (DHCP)
+run: ${vyatta_bindir}/vyatta-monitor DHCP dhcpd
diff --git a/templates/monitor/service/dns/dynamic/node.def b/templates/monitor/service/dns/dynamic/node.def
new file mode 100644
index 0000000..c17bae2
--- /dev/null
+++ b/templates/monitor/service/dns/dynamic/node.def
@@ -0,0 +1,2 @@
+help: Monitor Dynamic DNS
+run: ${vyatta_bindir}/vyatta-monitor Dynamic-DNS ddclient
diff --git a/templates/monitor/service/dns/forwarding/node.def b/templates/monitor/service/dns/forwarding/node.def
new file mode 100644
index 0000000..1deec08
--- /dev/null
+++ b/templates/monitor/service/dns/forwarding/node.def
@@ -0,0 +1,2 @@
+help: Monitor DNS forwarding
+run: ${vyatta_bindir}/vyatta-monitor DNS-Forward dnsmasq
diff --git a/templates/monitor/service/dns/node.def b/templates/monitor/service/dns/node.def
new file mode 100644
index 0000000..0584393
--- /dev/null
+++ b/templates/monitor/service/dns/node.def
@@ -0,0 +1 @@
+help: Monitor a Domain Name Service daemon
diff --git a/templates/monitor/service/https/node.def b/templates/monitor/service/https/node.def
new file mode 100644
index 0000000..e619b43
--- /dev/null
+++ b/templates/monitor/service/https/node.def
@@ -0,0 +1,2 @@
+help: Monitor the Secure Hypertext Transfer Protocol (HTTPS) service
+run: ${vyatta_bindir}/vyatta-monitor HTTPS lighttpd chunker webgui
diff --git a/templates/monitor/service/lldp/node.def b/templates/monitor/service/lldp/node.def
new file mode 100644
index 0000000..655b04c
--- /dev/null
+++ b/templates/monitor/service/lldp/node.def
@@ -0,0 +1,2 @@
+help: Monitor Link Layer Discovery Protocol (LLDP) daemon
+run: ${vyatta_bindir}/vyatta-monitor LLDP lldpd
diff --git a/templates/monitor/service/node.def b/templates/monitor/service/node.def
new file mode 100644
index 0000000..d9e3bcb
--- /dev/null
+++ b/templates/monitor/service/node.def
@@ -0,0 +1 @@
+help: Monitor a service
diff --git a/templates/monitor/service/snmp/node.def b/templates/monitor/service/snmp/node.def
new file mode 100644
index 0000000..d847eb8
--- /dev/null
+++ b/templates/monitor/service/snmp/node.def
@@ -0,0 +1,2 @@
+help: Monitor Simple Network Management Protocol (SNMP) daemon
+run: ${vyatta_bindir}/vyatta-monitor SNMP snmpd
diff --git a/templates/monitor/service/webproxy/node.def b/templates/monitor/service/webproxy/node.def
new file mode 100644
index 0000000..8966c38
--- /dev/null
+++ b/templates/monitor/service/webproxy/node.def
@@ -0,0 +1,2 @@
+help: Monitor Webproxy service
+run: ${vyatta_bindir}/vyatta-monitor Webproxy squid
diff --git a/templates/monitor/vrrp/background/node.def b/templates/monitor/vrrp/background/node.def
new file mode 100644
index 0000000..2ec6eff
--- /dev/null
+++ b/templates/monitor/vrrp/background/node.def
@@ -0,0 +1 @@
+help: Monitor VRRP in the background
diff --git a/templates/monitor/vrrp/background/start/node.def b/templates/monitor/vrrp/background/start/node.def
new file mode 100644
index 0000000..de6cfe5
--- /dev/null
+++ b/templates/monitor/vrrp/background/start/node.def
@@ -0,0 +1,2 @@
+help: Start background monitoring for VRRP
+run: ${vyatta_bindir}/vyatta-monitor-background VRRP Keepalived_vrrp
diff --git a/templates/monitor/vrrp/background/stop/node.def b/templates/monitor/vrrp/background/stop/node.def
new file mode 100644
index 0000000..714a05e
--- /dev/null
+++ b/templates/monitor/vrrp/background/stop/node.def
@@ -0,0 +1,2 @@
+help: Stop background monitoring for VRRP
+run: ${vyatta_bindir}/vyatta-monitor-background-stop VRRP
diff --git a/templates/monitor/vrrp/node.def b/templates/monitor/vrrp/node.def
new file mode 100644
index 0000000..a8e0900
--- /dev/null
+++ b/templates/monitor/vrrp/node.def
@@ -0,0 +1,2 @@
+help: Monitor Virtual Router Redundancy Protocol (VRRP)
+run: ${vyatta_bindir}/vyatta-monitor VRRP Keepalived_vrrp