DNSSEC sign metrics: CHANGES, doc, release note

Add some information about the new statistic-channel DNS sign
metrics. Also add a CHANGES and release note entry.

(cherry picked from commit 3a3f40e3729e1e3ab32f6c18eeecfd4749812ffb)

diff --git a/CHANGES b/CHANGES
index c63e4f0887e2b69ddfa29a34ce56be764d85d017..42a051f3f5370b502706a311bbd36e20b628a1eb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,11 @@
                        be left in an incompletely updated state rather than
                        reverted. [GL #1109]
 
+5254.  [func]          Collect metrics to report to the statistics-channel
+                       DNSSEC signing operations (dnssec-sign) and refresh
+                       operations (dnssec-refresh) per zone and per keytag.
+                       [GL #513]
+
 5253.  [port]          Support platforms that don't define ULLONG_MAX.
                        [GL #1098]
 

diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index dfb2f44d9df35a58c3e0245b1996a6f1b8228cb1..32e3deb0da19035639f9c1ccb0ef8ee3f31dc0ac 100644 (file)
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -1455,7 +1455,7 @@ dnssecsignstat_dump(dns_keytag_t tag, uint64_t val, void *arg) {
        xmlTextWriterPtr writer;
        int xmlrc;
 #endif
-#ifdef HAVE_JSON_C
+#ifdef HAVE_JSON
        json_object *zoneobj, *obj;
 #endif
 
@@ -1479,7 +1479,7 @@ dnssecsignstat_dump(dns_keytag_t tag, uint64_t val, void *arg) {
 #endif
                break;
        case isc_statsformat_json:
-#ifdef HAVE_JSON_C
+#ifdef HAVE_JSON
                zoneobj = (json_object *) dumparg->arg;
                obj = json_object_new_int64(val);
                if (obj == NULL) {

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index d2e672d431cbbacd6eaf80d671cc2167f18e96ee..f7eb80b1454facb0e56c43c34a7f1314549e46be 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -5427,6 +5427,8 @@ options {
                <command>zone-statistics terse</command> or
                <command>zone-statistics none</command>
                in the <command>zone</command> statement).
+               These include, for example, DNSSEC signing operations
+               and the number of authoritative answers per query type.
                The default is <userinput>terse</userinput>, providing
                minimal statistics on zones (including name and
                current serial number, but not query type

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index a7aaff1649da5cc1efe42ce42cda8fc8ecd8a001..924356ee92fc3c25b7a1ac65da37080b6b3755bb 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -97,6 +97,25 @@
     </itemizedlist>
   </section>
 
+  <section xml:id="relnotes_features"><info><title>New Features</title></info>
+    <itemizedlist>
+      <listitem>
+       <para>
+         Two new metrics have been added to the
+         <command>statistics-channel</command> to report DNSSEC
+         signing operations.  For each key in each zone, the
+         <command>dnssec-sign</command> counter indicates the total
+         number of signatures <command>named</command> has generated
+         using that key since server startup, and the
+         <command>dnssec-refresh</command> counter indicates how
+         many of those signatures were refreshed during zone
+         maintenance, as opposed to having been generated
+         as a result of a zone update.  [GL #513]
+       </para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
   <section xml:id="relnotes_bugs"><info><title>Bug Fixes</title></info>
     <itemizedlist>
       <listitem>

diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in
index 7ef89a23af815029587dee8d75af611815729948..1ba7995073bcc1fcd90da8f6a521ca18da64caec 100644 (file)
--- a/lib/dns/win32/libdns.def.in
+++ b/lib/dns/win32/libdns.def.in
@@ -334,7 +334,6 @@ dns_dnssec_verifymessage
 dns_dnsseckey_create
 dns_dnsseckey_destroy
 dns_dnssecsignstats_create
-dns_dnssecsignstats_decrement
 dns_dnssecsignstats_dump
 dns_dnssecsignstats_increment
 dns_ds_buildrdata