3792. [func] Provide links to the alternate statistics views when

                        displaying in a browser.  [RT #35605]

Squashed commit of the following:

commit 7ac73b584aa6e026a1deb124257d3a2ed1fc64cc
Author: Evan Hunt <each@isc.org>
Date:   Mon Mar 24 21:47:28 2014 -0700

    [rt35605] tweak

commit b18bccc570803293f819c04f324f91b446a67756
Author: Mark Andrews <marka@isc.org>
Date:   Tue Mar 25 14:20:07 2014 +1100

    provide links to alternate statistic views

diff --git a/CHANGES b/CHANGES
index a82ce3ce27c4a59b28ffbd18700889612eed235a..c2cf25afe83a85b0a8d6e3c445885755ffe108b6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3792.  [func]          Provide links to the alternate statistics views when
+                       displaying in a browser.  [RT #35605]
+
 3791.  [placeholder]
 
 3790.  [bug]           Handle broken nameservers that send BADVERS in

diff --git a/bin/named/bind9.xsl b/bin/named/bind9.xsl
index b76d1acf6198fa9c9f03638a6c5c4f26ec20e4d3..8e92d9997b2ab381186db4bb041dd04f9b484174 100644 (file)
--- a/bin/named/bind9.xsl
+++ b/bin/named/bind9.xsl
@@ -271,6 +271,13 @@
         <div class="header">
           <h1>ISC Bind 9 Configuration and Statistics</h1>
         </div>
+       <p>Alternate statistics views: <a href="/">All</a>,
+       <a href="/xml/v3/status">Status</a>,
+       <a href="/xml/v3/server">Server</a>,
+       <a href="/xml/v3/zones">Zones</a>,
+       <a href="/xml/v3/net">Network</a>,
+       <a href="/xml/v3/tasks">Tasks</a> and
+       <a href="/xml/v3/mem">Memory</a></p>
         <hr/>
         <h2>Server Status</h2>
         <table class="info">

diff --git a/bin/named/bind9.xsl.h b/bin/named/bind9.xsl.h
index 602c78e975f10d1054f840d16c04cc3af5bab2d2..9d384e7ec63a790ebd9e2c8b712c13adbb7c00aa 100644 (file)
--- a/bin/named/bind9.xsl.h
+++ b/bin/named/bind9.xsl.h
@@ -276,6 +276,13 @@ static char xslmsg[] =
        " <div class=\"header\">\n"
        " <h1>ISC Bind 9 Configuration and Statistics</h1>\n"
        " </div>\n"
+       " <p>Alternate statistics views: <a href=\"/\">All</a>,\n"
+       " <a href=\"/xml/v3/status\">Status</a>,\n"
+       " <a href=\"/xml/v3/server\">Server</a>,\n"
+       " <a href=\"/xml/v3/zones\">Zones</a>,\n"
+       " <a href=\"/xml/v3/net\">Network</a>,\n"
+       " <a href=\"/xml/v3/tasks\">Tasks</a> and\n"
+       " <a href=\"/xml/v3/mem\">Memory</a></p>\n"
        " <hr/>\n"
        " <h2>Server Status</h2>\n"
        " <table class=\"info\">\n"