diff options
| author | Tim Bielawa <tbielawa@redhat.com> | 2016-10-06 10:01:48 -0700 |
|---|---|---|
| committer | Tim Bielawa <tbielawa@redhat.com> | 2016-10-20 07:49:40 -0700 |
| commit | 4273b21105dd11f52de354b4777d33e4296ba7e0 (patch) | |
| tree | bc8cdda1e6147e2b0020feb3544217ab5422a464 /playbooks | |
| parent | 5f7f6a6023c470337f0d879f55eb619fd63e2dbe (diff) | |
| download | openshift-4273b21105dd11f52de354b4777d33e4296ba7e0.tar.gz openshift-4273b21105dd11f52de354b4777d33e4296ba7e0.tar.bz2 openshift-4273b21105dd11f52de354b4777d33e4296ba7e0.tar.xz openshift-4273b21105dd11f52de354b4777d33e4296ba7e0.zip | |
Get router/registry certs. Collect common names and subjectAltNames
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/templates/cert-expiry-table.html.j2 | 66 |
1 files changed, 40 insertions, 26 deletions
diff --git a/playbooks/common/openshift-cluster/templates/cert-expiry-table.html.j2 b/playbooks/common/openshift-cluster/templates/cert-expiry-table.html.j2 index da7844c37..f74d7f1ce 100644 --- a/playbooks/common/openshift-cluster/templates/cert-expiry-table.html.j2 +++ b/playbooks/common/openshift-cluster/templates/cert-expiry-table.html.j2 @@ -3,7 +3,7 @@ <head> <meta charset="UTF-8" /> <title>OCP Certificate Expiry Report</title> - {# For fancy icons #} + {# For fancy icons and a pleasing font #} <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" /> <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700" rel="stylesheet" /> <style type="text/css"> @@ -12,6 +12,7 @@ margin-left: 50px; margin-right: 50px; margin-bottom: 20px; + padding-top: 70px; } table { border-collapse: collapse; @@ -37,62 +38,75 @@ </style> </head> <body> - <center><h1>OCP Certificate Expiry Report</h1></center> - - <hr /> + <nav class="navbar navbar-default navbar-fixed-top"> + <div class="container-fluid"> + <div class="navbar-header"> + <a class="navbar-brand" href="#">OCP Certificate Expiry Report</a> + </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> + </p> + </div> + </div> + </nav> {# Each host has a header and table to itself #} {% for host in play_hosts %} <h1>{{ host }}</h1> <p> - {{ hostvars[host].check_results.msg }} + {{ hostvars[host].check_results.msg }} </p> <ul> - <li><b>Expirations checked at:</b> {{ hostvars[host].check_results.check_results.meta.checked_at_time }}</li> - <li><b>Warn after date:</b> {{ hostvars[host].check_results.check_results.meta.warn_after_date }}</li> + <li><b>Expirations checked at:</b> {{ hostvars[host].check_results.check_results.meta.checked_at_time }}</li> + <li><b>Warn after date:</b> {{ hostvars[host].check_results.check_results.meta.warn_after_date }}</li> </ul> <table border="1" width="100%"> {# These are hard-coded right now, but should be grabbed dynamically from the registered results #} - {%- for kind in ['ocp_certs', 'etcd', 'kubeconfigs'] -%} + {%- for kind in ['ocp_certs', 'etcd', 'kubeconfigs', 'router', 'registry'] -%} <tr> <th colspan="6" style="text-align:center"><h2 class="cert-kind">{{ kind }}</h2></th> </tr> <tr> - <th> </th> - <th>Certificate Common Name</th> + <th> </th> + <th style="width:33%">Certificate Common/Alt Name(s)</th> <th>Health</th> <th>Days Remaining</th> <th>Expiration Date</th> <th>Path</th> </tr> - {# A row for each certificate examined #} + {# A row for each certificate examined #} {%- for v in hostvars[host].check_results.check_results[kind] -%} - {# Let's add some flair and show status visually with fancy icons #} - {% if v.health == 'ok' %} - {% set health_icon = 'glyphicon glyphicon-ok' %} - {% elif v.health == 'warning' %} - {% set health_icon = 'glyphicon glyphicon-alert' %} - {% else %} - {% set health_icon = 'glyphicon glyphicon-remove' %} - {% endif %} + {# Let's add some flair and show status visually with fancy icons #} + {% if v.health == 'ok' %} + {% set health_icon = 'glyphicon glyphicon-ok' %} + {% elif v.health == 'warning' %} + {% set health_icon = 'glyphicon glyphicon-alert' %} + {% else %} + {% set health_icon = 'glyphicon glyphicon-remove' %} + {% endif %} - <tr class="{{ loop.cycle('odd', 'even') }}"> - <td style="text-align:center"><i class="{{ health_icon }}"></i></td> - <td>{{ v.cert_cn }}</td> + <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>{{ v.health }}</td> <td>{{ v.days_remaining }}</td> <td>{{ v.expiry }}</td> <td>{{ v.path }}</td> </tr> {% endfor %} - {# end row generation per cert of this type #} + {# end row generation per cert of this type #} {% endfor %} - {# end generation for each kind of cert block #} + {# end generation for each kind of cert block #} </table> <hr /> {% endfor %} @@ -100,10 +114,10 @@ <footer> <p> - Expiration report generated by <a href="https://github.com/openshift/openshift-ansible" target="_blank">openshift-ansible</a> + Expiration report generated by <a href="https://github.com/openshift/openshift-ansible" target="_blank">openshift-ansible</a> </p> <p> - Status icons from bootstrap/glyphicon + Status icons from bootstrap/glyphicon </p> </footer> </body> |