Skip to content

Commit

Permalink
Merge pull request #497 from mfojtik/improve-event-viewer
Browse files Browse the repository at this point in the history 
inspect: improve html event viewer
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot committed Jul 21, 2020
2 parents c33851e + 059a551 commit a3efb65
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 29 deletions.
62 changes: 43 additions & 19 deletions pkg/cli/admin/inspect/event_filter_html.go
View file
Expand Up @@ -9,59 +9,83 @@ const eventHTMLPage = `
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
<link href="https://unpkg.com/bootstrap-table@1.16.0/dist/bootstrap-table.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
<link href="https://unpkg.com/bootstrap-table@1.17.1/dist/bootstrap-table.min.css" rel="stylesheet">
<title>Events</title>
<style>
html {
font-size: 12px;
<style type="text/css">
body * {
font-size: 12px!important;
}
.text-overflow() {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.truncated {
display: inline-block;
max-width: 200px;
.text-overflow();
}
</style>
</head>
<body>
<table
id="events"
class="table table-bordered table-hover table-sm"
data-toggle="table"
data-search="true"
data-show-search-clear-button="true"
data-filter-control="true"
data-advanced-search="true"
data-id-table="advancedTable"
data-pagination="true"
data-page-size="100"
data-show-columns-toggle-all="true"
data-show-pagination-switch="true"
data-show-columns="true">
<thead>
<tr>
<th>Time</th>
<th data-sortable="true">Namespace</th>
<th data-sortable="true">Component</th>
<th>Reason</th>
<th data-escape="true">Message</th>
<th data-width="100" data-field="time" data-filter-control="input">Time</th>
<th data-width="200" data-field="namespace" data-filter-control="input" data-sortable="true">Namespace</th>
<th data-width="200" data-field="component" data-filter-control="input" data-sortable="true">Component</th>
<th data-field="reason" data-filter-control="input">Reason</th>
<th data-field="message" data-filter-control="input" data-escape="true">Message</th>
</tr>
</thead>
<tbody>
{{range .Items}}
<tr>
<td>{{formatTime .LastTimestamp}}</td>
<td>{{.Namespace}}</td>
<td>{{.Source.Component}}</td>
<td>{{formatTime .ObjectMeta.CreationTimestamp .FirstTimestamp .LastTimestamp .Count}}</td>
<td><p class="truncated">{{.Namespace}}</p></td>
<td><p class="truncated">{{.Source.Component}}</p></td>
<td>{{formatReason .Reason}}</td>
<td data-formatter="messageFormatter">{{.Message}}</td>
</tr>
{{end}}
</tbody>
</table>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<script src="https://unpkg.com/bootstrap-table@1.17.1/dist/bootstrap-table.min.js" crossorigin="anonymous"></script>
<script src="https://unpkg.com/bootstrap-table@1.17.1/dist/extensions/toolbar/bootstrap-table-toolbar.min.js" crossorigin="anonymous"></script>
<script src="https://unpkg.com/bootstrap-table@1.17.1/dist/extensions/filter-control/bootstrap-table-filter-control.min.js" crossorigin="anonymous"></script>
<script>
function messageFormatter(value, row) {
return '<code>'+value+'</code>'
}
$(function() {
$('#events').bootstrapTable()
})
</script>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
<script src="https://unpkg.com/bootstrap-table@1.16.0/dist/bootstrap-table.min.js"></script>
</body>
</html>
`
51 changes: 41 additions & 10 deletions pkg/cli/admin/inspect/util.go
View file
Expand Up @@ -2,10 +2,13 @@ package inspect

import (
"bytes"
"crypto/tls"
"encoding/json"
"fmt"
"html/template"
"io"
"io/ioutil"
"net/http"
"os"
"path"
"path/filepath"
Expand Down Expand Up @@ -178,10 +181,27 @@ func getAllEventsRecursive(rootDir string) (*corev1.EventList, error) {
}

func createEventFilterPageFromFile(eventFile string, rootDir string) error {
jsonStream, err := os.Open(eventFile)
if err != nil {
return err
var jsonStream io.Reader
var err error

if strings.HasPrefix(eventFile, "https://") || strings.HasPrefix(eventFile, "http://") {
tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
client := &http.Client{Transport: tr}
resp, err := client.Get(eventFile)
if err != nil {
return err
}
jsonStream = resp.Body
defer resp.Body.Close()
} else {
jsonStream, err = os.Open(eventFile)
if err != nil {
return err
}
}

decoder := json.NewDecoder(jsonStream)
var events corev1.EventList
if err := decoder.Decode(&events); err != nil {
Expand All @@ -196,18 +216,29 @@ func createEventFilterPage(events *corev1.EventList, rootDir string) error {
})

t := template.Must(template.New("events").Funcs(template.FuncMap{
"formatTime": func(t metav1.Time) template.HTML {
return template.HTML(t.Format("15:04:05"))
"formatTime": func(created, firstSeen, lastSeen metav1.Time, count int32) template.HTML {
countMsg := ""
if count > 1 {
countMsg = fmt.Sprintf(" <small>(x%d)</small>", count)
}
if lastSeen.IsZero() {
lastSeen = created
}
return template.HTML(fmt.Sprintf(`<time datetime="%s" title="First Seen: %s">%s</time>%s`, lastSeen.String(), firstSeen.Format("15:04:05"), lastSeen.Format("15:04:05"), countMsg))
},
"formatReason": func(r string) template.HTML {
switch {
case strings.Contains(strings.ToLower(r), "fail"),
strings.Contains(strings.ToLower(r), "error"):
return template.HTML(`<div class="alert alert-danger" role="alert">` + r + `</div>`)
case strings.Contains(strings.ToLower(r), "notready"):
return template.HTML(`<div class="alert alert-warning" role="alert">` + r + `</div>`)
strings.Contains(strings.ToLower(r), "error"),
strings.Contains(strings.ToLower(r), "kill"),
strings.Contains(strings.ToLower(r), "backoff"):
return template.HTML(`<p class="text-danger">` + r + `</p>`)
case strings.Contains(strings.ToLower(r), "notready"),
strings.Contains(strings.ToLower(r), "unhealthy"),
strings.Contains(strings.ToLower(r), "missing"):
return template.HTML(`<p class="text-warning">` + r + `</p>`)
}
return template.HTML(`<div class="alert alert-light" role="alert">` + r + `</div>`)
return template.HTML(`<p class="text-muted">` + r + `</p>`)
},
}).Parse(eventHTMLPage))

Expand Down

0 comments on commit a3efb65

Please sign in to comment.