Live reload of probe history

clix-dev-llc · Jan 18, 2017 · fb3ef6f · fb3ef6f
1 parent dc307da
commit fb3ef6f
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 12 deletions.
diff --git a/cmd/kuard/main.go b/cmd/kuard/main.go
@@ -58,10 +58,10 @@ type pageContext struct {
 }
 
 type kuard struct {
-	tg htmlutils.TemplateGroup
+	tg *htmlutils.TemplateGroup
 
-	live  debugprobe.Probe
-	ready debugprobe.Probe
+	live  *debugprobe.Probe
+	ready *debugprobe.Probe
 }
 
 func (k *kuard) getPageContext(r *http.Request) *pageContext {
@@ -112,8 +112,17 @@ func (k *kuard) addRoutes(router *httprouter.Router) {
 	router.Handler("GET", "/static/*filepath", http.StripPrefix("/static/", http.FileServer(fs)))
 	router.Handler("GET", "/fs/*filepath", http.StripPrefix("/fs", http.FileServer(http.Dir("/"))))
 
-	k.live.AddRoutes("/healthy", router)
-	k.ready.AddRoutes("/ready", router)
+	k.live.AddRoutes(router)
+	k.ready.AddRoutes(router)
+}
+
+func NewApp() *kuard {
+	k := &kuard{
+		tg: &htmlutils.TemplateGroup{},
+	}
+	k.live = debugprobe.New("/healthy", k.tg)
+	k.ready = debugprobe.New("/ready", k.tg)
+	return k
 }
 
 func main() {
@@ -126,7 +135,7 @@ func main() {
 	log.Println("* and secret information. Be careful.")
 	log.Println(strings.Repeat("*", 70))
 
-	app := kuard{}
+	app := NewApp()
 	router := httprouter.New()
 	app.addRoutes(router)
 

diff --git a/pkg/debugprobe/probe.go b/pkg/debugprobe/probe.go
@@ -23,6 +23,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/jbeda/kuard/pkg/htmlutils"
 	"github.com/julienschmidt/httprouter"
 )
 
@@ -31,6 +32,8 @@ const maxHistory = 20
 type Probe struct {
 	mu sync.Mutex
 
+	tg *htmlutils.TemplateGroup
+
 	basePath string
 	// If failNext > 0, then fail next probe and decrement.  If failNext < 0, then
 	// fail forever.
@@ -50,10 +53,17 @@ type ProbeContext struct {
 	History  []ProbeHistory
 }
 
-func (p *Probe) AddRoutes(base string, r *httprouter.Router) {
-	p.basePath = base
-	r.GET(base, p.Handle)
-	r.POST(base+"/config", p.Config)
+func New(base string, tg *htmlutils.TemplateGroup) *Probe {
+	return &Probe{
+		basePath: base,
+		tg:       tg,
+	}
+}
+
+func (p *Probe) AddRoutes(r *httprouter.Router) {
+	r.GET(p.basePath, p.Handle)
+	r.POST(p.basePath+"/config", p.Config)
+	r.GET(p.basePath+"/render", p.Render)
 }
 
 func (p *Probe) Handle(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
@@ -93,6 +103,10 @@ func (p *Probe) Config(w http.ResponseWriter, r *http.Request, _ httprouter.Para
 	http.Redirect(w, r, "/", http.StatusFound)
 }
 
+func (p *Probe) Render(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+	p.tg.Render(w, "probe.html", p.GetContext())
+}
+
 func (p *Probe) recordRequest(_ *http.Request, code int) {
 	entry := &ProbeHistory{
 		When: time.Now(),

diff --git a/sitedata/static/js/jquery-3.1.1.min.js b/sitedata/static/js/jquery-3.1.1.min.js
diff --git a/sitedata/templates/index.html b/sitedata/templates/index.html
@@ -12,6 +12,8 @@
       color: {{ .VersionColor }};
     }
   </style>
+
+  <script src="/static/js/jquery-3.1.1.min.js"></script>
 </head>
 
 <body>
@@ -72,12 +74,12 @@ <h1>Kubernetes Up and Running</h1>
 
   <details open>
     <summary>Liveness Probe</summary>
-    {{template "probe" .Liveness}}
+    <div id=liveness></div>
   </details>
 
   <details open>
     <summary>Readiness Probe</summary>
-    {{template "probe" .Readiness }}
+    <div id=readiness></div>
   </details>
 
   <details>
@@ -86,5 +88,18 @@ <h1>Kubernetes Up and Running</h1>
       <a href="/fs/">Browse the root file system for this server.</a>
     </div>
   </details>
+  <script>
+    function renderLiveness() {
+      $("#liveness").load("{{.Liveness.BasePath}}/render")
+    }
+    renderLiveness()
+    setInterval(renderLiveness, 1000)
+
+    function renderReadiness() {
+      $("#readiness").load("{{.Readiness.BasePath}}/render")
+    }
+    renderReadiness()
+    setInterval(renderReadiness, 1000)
+  </script>
 </body>
 </html>
diff --git a/sitedata/templates/probe.html b/sitedata/templates/probe.html
@@ -0,0 +1,21 @@
+<div>
+  <p>Probe is being served on <a href="{{.BasePath}}">{{.BasePath}}</a></p>
+  <p>{{if eq .FailNext 0 }}Probe will permanently succeed
+     {{- else if gt .FailNext 0 }}Probe will fail for next {{.FailNext}} calls
+     {{- else}}Probe will permanently fail{{end}}
+  </p>
+  {{- if .History}}
+  <table>
+    <tr>
+      <th>When</th><th>&nbsp;</th><th>Status</th>
+    </tr>
+    {{- range .History }}
+    <tr>
+      <td>{{.When|friendlytime}}</td><td>{{.When|reltime}}</td><td>{{.Code}}</td>
+    </tr>
+    {{- end}}
+  </table>
+  {{- else}}
+  <p>No recorded probe history</p>
+  {{- end}}
+</div>