From d7bf06b2c474120cb2e183d2c889662c1270bf04 Mon Sep 17 00:00:00 2001
From: Tim Bielawa <tbielawa@redhat.com>
Date: Fri, 13 Jan 2017 10:38:41 -0800
Subject: [Cert Expiry] Add serial numbers, include example PBs, docs

* Now includes cert serial numbers in JSON and HTML output
* Docs are updated with explicit usage instructions
* Each example playbook includes a link to the playbook and an example of how to run it
* A graphic and copy of an HTML report are now included
* Example JSON output has been updated
---
 .../templates/cert-expiry-table.html.j2            | 29 ++++++++++++++++------
 1 file changed, 22 insertions(+), 7 deletions(-)

(limited to 'roles/openshift_certificate_expiry/templates')

diff --git a/roles/openshift_certificate_expiry/templates/cert-expiry-table.html.j2 b/roles/openshift_certificate_expiry/templates/cert-expiry-table.html.j2
index b05110336..1d4bb24e9 100644
--- a/roles/openshift_certificate_expiry/templates/cert-expiry-table.html.j2
+++ b/roles/openshift_certificate_expiry/templates/cert-expiry-table.html.j2
@@ -45,11 +45,20 @@
         </div>
         <div class="collapse navbar-collapse">
           <p class="navbar-text navbar-right">
-	    <a href="https://docs.openshift.com/container-platform/latest/install_config/redeploying_certificates.html"
-	       target="_blank"
-	       class="navbar-link">
-	       <i class="glyphicon glyphicon-book"></i> Redeploying Certificates
-	    </a>
+	    <button>
+	      <a href="https://docs.openshift.com/container-platform/latest/install_config/redeploying_certificates.html"
+		 target="_blank"
+		 class="navbar-link">
+		 <i class="glyphicon glyphicon-book"></i> Redeploying Certificates
+	      </a>
+	    </button>
+	    <button>
+	      <a href="https://github.com/openshift/openshift-ansible/tree/master/roles/openshift_certificate_expiry"
+		 target="_blank"
+		 class="navbar-link">
+		 <i class="glyphicon glyphicon-book"></i> Expiry Role Documentation
+	      </a>
+	    </button>
 	  </p>
         </div>
       </div>
@@ -71,12 +80,13 @@
         {# These are hard-coded right now, but should be grabbed dynamically from the registered results #}
         {%- for kind in ['ocp_certs', 'etcd', 'kubeconfigs', 'router', 'registry'] -%}
           <tr>
-            <th colspan="6" style="text-align:center"><h2 class="cert-kind">{{ kind }}</h2></th>
+            <th colspan="7" style="text-align:center"><h2 class="cert-kind">{{ kind }}</h2></th>
           </tr>
 
           <tr>
             <th>&nbsp;</th>
             <th style="width:33%">Certificate Common/Alt Name(s)</th>
+	    <td>Serial</th>
             <th>Health</th>
             <th>Days Remaining</th>
             <th>Expiration Date</th>
@@ -98,6 +108,7 @@
             <tr class="{{ loop.cycle('odd', 'even') }}">
               <td style="text-align:center"><i class="{{ health_icon }}"></i></td>
               <td style="width:33%">{{ v.cert_cn }}</td>
+	      <td><code>int({{ v.serial }})/hex({{ v.serial_hex }})</code></td>
               <td>{{ v.health }}</td>
               <td>{{ v.days_remaining }}</td>
               <td>{{ v.expiry }}</td>
@@ -114,7 +125,11 @@
 
     <footer>
       <p>
-        Expiration report generated by <a href="https://github.com/openshift/openshift-ansible" target="_blank">openshift-ansible</a>
+        Expiration report generated by
+        the <a href="https://github.com/openshift/openshift-ansible"
+        target="_blank">openshift-ansible</a>
+	<a href="https://github.com/openshift/openshift-ansible/tree/master/roles/openshift_certificate_expiry"
+	   target="_blank">certificate expiry</a> role.
       </p>
       <p>
         Status icons from bootstrap/glyphicon
-- 
cgit v1.2.3