From d1071c1207973ee37bbdbc90047f2a7b63ebb4ef Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Wed, 22 Feb 2012 08:49:05 -0800
Subject: Bugfix 2581: show protocol debugging summary with 'show monitoring'

---
 templates/show/monitoring/node.def | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/show/monitoring/node.def b/templates/show/monitoring/node.def
index 9c16edc..2e38feb 100644
--- a/templates/show/monitoring/node.def
+++ b/templates/show/monitoring/node.def
@@ -1,2 +1,7 @@
 help: Show currently monitored services
-run: ${vyatta_bindir}/vyatta-monitor-list
+run: echo "Background monitoring sessions:"
+     ${vyatta_bindir}/vyatta-monitor-list
+     for proto in bgp ospf rip ospfv3 ripng; do 
+       show monitoring protocols $proto
+     done
+
-- 
cgit v1.2.3


From 6556eaf70db21e790aef323c32523fe0c439ec0b Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Wed, 22 Feb 2012 08:55:27 -0800
Subject: Bugfix 5806: Don't show ntp.vyatta.com by default for show ntp

---
 templates/show/ntp/node.tag/node.def | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

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
-- 
cgit v1.2.3


From 271020f565dcc7f5506b63a61222374fe44e9dde Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Wed, 22 Feb 2012 10:11:24 -0800
Subject: Add headers to show montioring command

---
 templates/show/monitoring/node.def | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/show/monitoring/node.def b/templates/show/monitoring/node.def
index 2e38feb..2c6587a 100644
--- a/templates/show/monitoring/node.def
+++ b/templates/show/monitoring/node.def
@@ -1,7 +1,12 @@
 help: Show currently monitored services
-run: echo "Background monitoring sessions:"
+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
-
-- 
cgit v1.2.3