summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2012-02-22 10:49:07 -0800
committerStephen Hemminger <shemminger@vyatta.com>2012-02-22 10:49:07 -0800
commit0af3058ba9f1bd5c770fa1aa9c48eb4724cef7b3 (patch)
treef9c8b8e5ff2a251d0ffac4a16a43edcacec8c74f /templates
parent7bab6815704ce464a97ebbc29d12d400b443de33 (diff)
parentad3177fc2fa442a55c6ac50b968c9dfbf060f481 (diff)
downloadvyatta-op-0af3058ba9f1bd5c770fa1aa9c48eb4724cef7b3.tar.gz
vyatta-op-0af3058ba9f1bd5c770fa1aa9c48eb4724cef7b3.zip
Merge branch 'oxnard' of fiji.vyatta.com:/git/vyatta-op into oxnard
Diffstat (limited to 'templates')
-rw-r--r--templates/show/monitoring/node.def12
-rw-r--r--templates/show/ntp/node.tag/node.def4
2 files changed, 13 insertions, 3 deletions
diff --git a/templates/show/monitoring/node.def b/templates/show/monitoring/node.def
index 9c16edc..2c6587a 100644
--- a/templates/show/monitoring/node.def
+++ b/templates/show/monitoring/node.def
@@ -1,2 +1,12 @@
help: Show currently monitored services
-run: ${vyatta_bindir}/vyatta-monitor-list
+run: echo "------------------------------"
+ echo "Background monitoring sessions"
+ echo "------------------------------"
+ ${vyatta_bindir}/vyatta-monitor-list
+ echo
+ echo "------------------------------"
+ echo " Protocol monitoring status"
+ echo "------------------------------"
+ for proto in bgp ospf rip ospfv3 ripng; do
+ show monitoring protocols $proto
+ done
diff --git a/templates/show/ntp/node.tag/node.def b/templates/show/ntp/node.tag/node.def
index 8eb5406..e7bdb6a 100644
--- a/templates/show/ntp/node.tag/node.def
+++ b/templates/show/ntp/node.tag/node.def
@@ -1,3 +1,3 @@
help: Show date and time of specified NTP server
-allowed: echo -e 'ntp.vyatta.com'; awk '/^server/ { print $2 }' /etc/ntp.conf
-run: /usr/sbin/ntpdate -q ${3:-ntp.vyatta.com}
+allowed: awk '/^server/ { print $2 }' /etc/ntp.conf
+run: /usr/sbin/ntpdate -q $3