diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2012-02-22 10:49:07 -0800 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@vyatta.com> | 2012-02-22 10:49:07 -0800 |
| commit | 0af3058ba9f1bd5c770fa1aa9c48eb4724cef7b3 (patch) | |
| tree | f9c8b8e5ff2a251d0ffac4a16a43edcacec8c74f | |
| parent | 7bab6815704ce464a97ebbc29d12d400b443de33 (diff) | |
| parent | ad3177fc2fa442a55c6ac50b968c9dfbf060f481 (diff) | |
| download | vyatta-op-0af3058ba9f1bd5c770fa1aa9c48eb4724cef7b3.tar.gz vyatta-op-0af3058ba9f1bd5c770fa1aa9c48eb4724cef7b3.zip | |
Merge branch 'oxnard' of fiji.vyatta.com:/git/vyatta-op into oxnard
| -rw-r--r-- | debian/changelog | 20 | ||||
| -rwxr-xr-x | scripts/vyatta-op-dns-forwarding.pl | 24 | ||||
| -rw-r--r-- | templates/show/monitoring/node.def | 12 | ||||
| -rw-r--r-- | templates/show/ntp/node.tag/node.def | 4 |
4 files changed, 51 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 1421630..123efdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +vyatta-op (0.13.236) unstable; urgency=low + + * Add headers to show montioring command + + -- John Southworth <john.southworth@vyatta.com> Wed, 22 Feb 2012 10:11:37 -0800 + +vyatta-op (0.13.235) unstable; urgency=low + + * Bugfix 2581: show protocol debugging summary with 'show monitoring' + * Bugfix 5806: Don't show ntp.vyatta.com by default for show ntp + + -- John Southworth <john.southworth@vyatta.com> Wed, 22 Feb 2012 08:55:39 -0800 + +vyatta-op (0.13.234) unstable; urgency=low + + * Bug 4086:fixed order of display in show dns forwarding nameservers, + removed redundant information + + -- Gaurav <gaurav.sinha@vyatta.com> Tue, 21 Feb 2012 16:31:54 -0800 + vyatta-op (0.13.233) unstable; urgency=low * Add bridge info to show tech support diff --git a/scripts/vyatta-op-dns-forwarding.pl b/scripts/vyatta-op-dns-forwarding.pl index dc5fbf1..5f94c15 100755 --- a/scripts/vyatta-op-dns-forwarding.pl +++ b/scripts/vyatta-op-dns-forwarding.pl @@ -188,6 +188,9 @@ sub get_dns_nameservers { $show_nameservers_output .= "-----------------------------------------------\n"; $show_nameservers_output .= " Nameservers configured for DNS forwarding\n"; $show_nameservers_output .= "-----------------------------------------------\n"; + my $show_nameservers_output_dhcp; + my $show_nameservers_output_domain; + my $show_nameservers_output_nameserver; my $line_flag; ## server=/test.com/1.1.1.1 @@ -204,9 +207,9 @@ sub get_dns_nameservers { @domain_tokens = split(/\//, $nameserver); if (!defined($line_flag)) { $line_flag = 1; - $show_nameservers_output .= "\n"; - $show_nameservers_output .= "Domain Overrides\n"; - $show_nameservers_output .= "\n"; + $show_nameservers_output_domain .= "\n"; + $show_nameservers_output_domain .= "Domain Overrides:\n"; + $show_nameservers_output_domain .= "\n"; } } $active_nameservers[$active_nameserver_count] = $nameserver; @@ -214,13 +217,22 @@ sub get_dns_nameservers { my $nameserver_via = $nameserver_array[2]; if (@nameserver_array > 3){ my $dhcp_interface = $nameserver_array[3]; - $show_nameservers_output .= "$nameserver available via '$nameserver_via $dhcp_interface'\n"; + $show_nameservers_output_dhcp .= "$nameserver available via '$nameserver_via $dhcp_interface'\n"; } elsif (@domain_tokens) { - $show_nameservers_output .= "$domain_tokens[1] uses $domain_tokens[2] via '$nameserver_via'\n"; + $show_nameservers_output_domain .= "$domain_tokens[1] uses $domain_tokens[2]\n"; } else { - $show_nameservers_output .= "$nameserver available via '$nameserver_via'\n"; + $show_nameservers_output_nameserver .= "$nameserver available via '$nameserver_via'\n"; } } + if (defined ($show_nameservers_output_nameserver)) { + $show_nameservers_output .= $show_nameservers_output_nameserver; + } + if (defined ($show_nameservers_output_dhcp)) { + $show_nameservers_output .= $show_nameservers_output_dhcp; + } + if (defined ($show_nameservers_output_domain)) { + $show_nameservers_output .= $show_nameservers_output_domain ; + } # then you need to get nameservers from /etc/resolv.conf that are not in dnsmasq.conf to show them as inactive 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 |