diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-01-18 13:43:00 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-18 13:43:00 -0500 |
commit | f133c863a0ca657b7e0c87c117428e053ac74db0 (patch) | |
tree | 1da1042e294feaa382b6651c779d0602f31ac102 /roles/openshift_certificate_expiry/templates | |
parent | 7a0228f432a0d68bd63a68b940a7913d4a6a7e7c (diff) | |
parent | c8d7c7e2d512f94990ee461297876b10fbc73207 (diff) | |
download | openshift-f133c863a0ca657b7e0c87c117428e053ac74db0.tar.gz openshift-f133c863a0ca657b7e0c87c117428e053ac74db0.tar.bz2 openshift-f133c863a0ca657b7e0c87c117428e053ac74db0.tar.xz openshift-f133c863a0ca657b7e0c87c117428e053ac74db0.zip |
Merge pull request #3099 from tbielawa/expiry_serials
[Cert Expiry] Add serial numbers, include example PBs, docs
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 |