From 333fc369c2ad8918ad703c10f042af378cc97f4e Mon Sep 17 00:00:00 2001 From: John Southworth Date: Tue, 6 Sep 2011 17:43:33 -0500 Subject: Forground monitoring for many daemons (cherry picked from commit b906651c85a7bf45c715727b2099151f08762ec8) --- templates/monitor/cluster/background/node.def | 1 + templates/monitor/cluster/background/start/node.def | 2 ++ templates/monitor/cluster/background/stop/node.def | 2 ++ templates/monitor/cluster/node.def | 2 ++ templates/monitor/content-inspection/background/node.def | 1 + templates/monitor/content-inspection/background/start/node.def | 2 ++ templates/monitor/content-inspection/background/stop/node.def | 2 ++ templates/monitor/content-inspection/node.def | 2 ++ templates/monitor/firewall/node.def | 1 + templates/monitor/nat/destination/node.def | 2 ++ templates/monitor/nat/destination/rule/node.def | 1 + templates/monitor/nat/destination/rule/node.tag/node.def | 2 ++ templates/monitor/nat/masquerade/node.def | 2 ++ templates/monitor/nat/masquerade/rule/node.def | 1 + templates/monitor/nat/masquerade/rule/node.tag/node.def | 3 +++ templates/monitor/nat/source/node.def | 2 ++ templates/monitor/nat/source/rule/node.def | 1 + templates/monitor/nat/source/rule/node.tag/node.def | 2 ++ templates/monitor/nat/type/destination/node.def | 2 -- templates/monitor/nat/type/destination/rule/node.def | 1 - templates/monitor/nat/type/destination/rule/node.tag/node.def | 2 -- templates/monitor/nat/type/masquerade/node.def | 2 -- templates/monitor/nat/type/masquerade/rule/node.def | 1 - templates/monitor/nat/type/masquerade/rule/node.tag/node.def | 3 --- templates/monitor/nat/type/node.def | 1 - templates/monitor/nat/type/source/node.def | 2 -- templates/monitor/nat/type/source/rule/node.def | 1 - templates/monitor/nat/type/source/rule/node.tag/node.def | 2 -- templates/monitor/service/conntrack-sync/node.def | 1 + templates/monitor/service/dhcp/node.def | 2 ++ templates/monitor/service/dns/dynamic/node.def | 2 ++ templates/monitor/service/dns/forwarding/node.def | 2 ++ templates/monitor/service/dns/node.def | 1 + templates/monitor/service/https/node.def | 2 ++ templates/monitor/service/lldp/node.def | 2 ++ templates/monitor/service/node.def | 1 + templates/monitor/service/snmp/node.def | 2 ++ templates/monitor/service/webproxy/node.def | 2 ++ templates/monitor/vrrp/background/node.def | 1 + templates/monitor/vrrp/background/start/node.def | 2 ++ templates/monitor/vrrp/background/stop/node.def | 2 ++ templates/monitor/vrrp/node.def | 2 ++ 42 files changed, 55 insertions(+), 17 deletions(-) create mode 100644 templates/monitor/cluster/background/node.def create mode 100644 templates/monitor/cluster/background/start/node.def create mode 100644 templates/monitor/cluster/background/stop/node.def create mode 100644 templates/monitor/cluster/node.def create mode 100644 templates/monitor/content-inspection/background/node.def create mode 100644 templates/monitor/content-inspection/background/start/node.def create mode 100644 templates/monitor/content-inspection/background/stop/node.def create mode 100644 templates/monitor/content-inspection/node.def create mode 100644 templates/monitor/firewall/node.def create mode 100644 templates/monitor/nat/destination/node.def create mode 100644 templates/monitor/nat/destination/rule/node.def create mode 100644 templates/monitor/nat/destination/rule/node.tag/node.def create mode 100644 templates/monitor/nat/masquerade/node.def create mode 100644 templates/monitor/nat/masquerade/rule/node.def create mode 100644 templates/monitor/nat/masquerade/rule/node.tag/node.def create mode 100644 templates/monitor/nat/source/node.def create mode 100644 templates/monitor/nat/source/rule/node.def create mode 100644 templates/monitor/nat/source/rule/node.tag/node.def delete mode 100644 templates/monitor/nat/type/destination/node.def delete mode 100644 templates/monitor/nat/type/destination/rule/node.def delete mode 100644 templates/monitor/nat/type/destination/rule/node.tag/node.def delete mode 100644 templates/monitor/nat/type/masquerade/node.def delete mode 100644 templates/monitor/nat/type/masquerade/rule/node.def delete mode 100644 templates/monitor/nat/type/masquerade/rule/node.tag/node.def delete mode 100644 templates/monitor/nat/type/node.def delete mode 100644 templates/monitor/nat/type/source/node.def delete mode 100644 templates/monitor/nat/type/source/rule/node.def delete mode 100644 templates/monitor/nat/type/source/rule/node.tag/node.def create mode 100644 templates/monitor/service/conntrack-sync/node.def create mode 100644 templates/monitor/service/dhcp/node.def create mode 100644 templates/monitor/service/dns/dynamic/node.def create mode 100644 templates/monitor/service/dns/forwarding/node.def create mode 100644 templates/monitor/service/dns/node.def create mode 100644 templates/monitor/service/https/node.def create mode 100644 templates/monitor/service/lldp/node.def create mode 100644 templates/monitor/service/node.def create mode 100644 templates/monitor/service/snmp/node.def create mode 100644 templates/monitor/service/webproxy/node.def create mode 100644 templates/monitor/vrrp/background/node.def create mode 100644 templates/monitor/vrrp/background/start/node.def create mode 100644 templates/monitor/vrrp/background/stop/node.def create mode 100644 templates/monitor/vrrp/node.def (limited to 'templates') 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/destination/node.def b/templates/monitor/nat/destination/node.def new file mode 100644 index 0000000..b04248c --- /dev/null +++ b/templates/monitor/nat/destination/node.def @@ -0,0 +1,2 @@ +help: Monitor Destination NAT logs +run: "Monitor Destination nat diff --git a/templates/monitor/nat/destination/rule/node.def b/templates/monitor/nat/destination/rule/node.def new file mode 100644 index 0000000..f1243ee --- /dev/null +++ b/templates/monitor/nat/destination/rule/node.def @@ -0,0 +1 @@ +help: Monitor Destination NAT logs for a specified rule diff --git a/templates/monitor/nat/destination/rule/node.tag/node.def b/templates/monitor/nat/destination/rule/node.tag/node.def new file mode 100644 index 0000000..5a349c9 --- /dev/null +++ b/templates/monitor/nat/destination/rule/node.tag/node.def @@ -0,0 +1,2 @@ +help: Monitor Destination NAT logs for the specified rule +allowed: local -a ARR=$(cli-shell-api listEffectiveNodes service nat rule); echo "${ARR[@]}" diff --git a/templates/monitor/nat/masquerade/node.def b/templates/monitor/nat/masquerade/node.def new file mode 100644 index 0000000..80e942b --- /dev/null +++ b/templates/monitor/nat/masquerade/node.def @@ -0,0 +1,2 @@ +help: Monitor Masquerade NAT logs +run: "Monitor all Masquerade nat rules" diff --git a/templates/monitor/nat/masquerade/rule/node.def b/templates/monitor/nat/masquerade/rule/node.def new file mode 100644 index 0000000..543074f --- /dev/null +++ b/templates/monitor/nat/masquerade/rule/node.def @@ -0,0 +1 @@ +help: Monitor Masquerade NAT logs for a specified rule diff --git a/templates/monitor/nat/masquerade/rule/node.tag/node.def b/templates/monitor/nat/masquerade/rule/node.tag/node.def new file mode 100644 index 0000000..bc77a5b --- /dev/null +++ b/templates/monitor/nat/masquerade/rule/node.tag/node.def @@ -0,0 +1,3 @@ +help: Monitor Masquerade NAT logs for a specified rule +allowed: local -a ARR=$(cli-shell-api listEffectiveNodes service nat rule); echo "${ARR[@]}" +run: echo "Monitor [NAT-$4-$6]" diff --git a/templates/monitor/nat/source/node.def b/templates/monitor/nat/source/node.def new file mode 100644 index 0000000..2dd604f --- /dev/null +++ b/templates/monitor/nat/source/node.def @@ -0,0 +1,2 @@ +help: Monitor Source NAT logs +run: "Monitor all source nat rules" diff --git a/templates/monitor/nat/source/rule/node.def b/templates/monitor/nat/source/rule/node.def new file mode 100644 index 0000000..b24d1bf --- /dev/null +++ b/templates/monitor/nat/source/rule/node.def @@ -0,0 +1 @@ +help: Monitor Source NAT logs for a specified rule diff --git a/templates/monitor/nat/source/rule/node.tag/node.def b/templates/monitor/nat/source/rule/node.tag/node.def new file mode 100644 index 0000000..660eef9 --- /dev/null +++ b/templates/monitor/nat/source/rule/node.tag/node.def @@ -0,0 +1,2 @@ +help: Monitor Source NAT logs for a specified rule +allowed: local -a ARR=$(cli-shell-api listEffectiveNodes service nat rule); echo "${ARR[@]}" diff --git a/templates/monitor/nat/type/destination/node.def b/templates/monitor/nat/type/destination/node.def deleted file mode 100644 index b04248c..0000000 --- a/templates/monitor/nat/type/destination/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor Destination NAT logs -run: "Monitor Destination nat diff --git a/templates/monitor/nat/type/destination/rule/node.def b/templates/monitor/nat/type/destination/rule/node.def deleted file mode 100644 index f1243ee..0000000 --- a/templates/monitor/nat/type/destination/rule/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Monitor Destination NAT logs for a specified rule diff --git a/templates/monitor/nat/type/destination/rule/node.tag/node.def b/templates/monitor/nat/type/destination/rule/node.tag/node.def deleted file mode 100644 index 5a349c9..0000000 --- a/templates/monitor/nat/type/destination/rule/node.tag/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor Destination NAT logs for the specified rule -allowed: local -a ARR=$(cli-shell-api listEffectiveNodes service nat rule); echo "${ARR[@]}" diff --git a/templates/monitor/nat/type/masquerade/node.def b/templates/monitor/nat/type/masquerade/node.def deleted file mode 100644 index 80e942b..0000000 --- a/templates/monitor/nat/type/masquerade/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor Masquerade NAT logs -run: "Monitor all Masquerade nat rules" diff --git a/templates/monitor/nat/type/masquerade/rule/node.def b/templates/monitor/nat/type/masquerade/rule/node.def deleted file mode 100644 index 543074f..0000000 --- a/templates/monitor/nat/type/masquerade/rule/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Monitor Masquerade NAT logs for a specified rule diff --git a/templates/monitor/nat/type/masquerade/rule/node.tag/node.def b/templates/monitor/nat/type/masquerade/rule/node.tag/node.def deleted file mode 100644 index bc77a5b..0000000 --- a/templates/monitor/nat/type/masquerade/rule/node.tag/node.def +++ /dev/null @@ -1,3 +0,0 @@ -help: Monitor Masquerade NAT logs for a specified rule -allowed: local -a ARR=$(cli-shell-api listEffectiveNodes service nat rule); echo "${ARR[@]}" -run: echo "Monitor [NAT-$4-$6]" 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/nat/type/source/node.def b/templates/monitor/nat/type/source/node.def deleted file mode 100644 index 2dd604f..0000000 --- a/templates/monitor/nat/type/source/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor Source NAT logs -run: "Monitor all source nat rules" diff --git a/templates/monitor/nat/type/source/rule/node.def b/templates/monitor/nat/type/source/rule/node.def deleted file mode 100644 index b24d1bf..0000000 --- a/templates/monitor/nat/type/source/rule/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Monitor Source NAT logs for a specified rule diff --git a/templates/monitor/nat/type/source/rule/node.tag/node.def b/templates/monitor/nat/type/source/rule/node.tag/node.def deleted file mode 100644 index 660eef9..0000000 --- a/templates/monitor/nat/type/source/rule/node.tag/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Monitor Source NAT logs for a specified rule -allowed: local -a ARR=$(cli-shell-api listEffectiveNodes service nat rule); echo "${ARR[@]}" 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 -- cgit v1.2.3