diff options
| author | Tim Bielawa <tbielawa@redhat.com> | 2017-01-13 10:38:41 -0800 |
|---|---|---|
| committer | Tim Bielawa <tbielawa@redhat.com> | 2017-01-17 08:58:56 -0800 |
| commit | d7bf06b2c474120cb2e183d2c889662c1270bf04 (patch) | |
| tree | 40520acf2adbd88fa1fe959f8de04676ffe2a0d3 /roles/openshift_certificate_expiry/templates | |
| parent | 1236604d2ddd835ab8559cbf632481a8a21e9bea (diff) | |
| download | openshift-d7bf06b2c474120cb2e183d2c889662c1270bf04.tar.gz openshift-d7bf06b2c474120cb2e183d2c889662c1270bf04.tar.bz2 openshift-d7bf06b2c474120cb2e183d2c889662c1270bf04.tar.xz openshift-d7bf06b2c474120cb2e183d2c889662c1270bf04.zip | |
[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
Diffstat (limited to 'roles/openshift_certificate_expiry/templates')
| -rw-r--r-- | roles/openshift_certificate_expiry/templates/cert-expiry-table.html.j2 | 29 |
1 files changed, 22 insertions, 7 deletions
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> </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 |