From 1e78b373728184016975f3468a2096b8537ee4a6 Mon Sep 17 00:00:00 2001
From: Kyle Brandt <kbrandt@glade.local>
Date: Wed, 28 Oct 2015 09:14:05 -0400
Subject: [PATCH] cmd/bosun: Support seconds when representing "now" on the
 expression page

In particular this is needed for the Grafana bosun backend since it uses this route and specifies the seconds. Using the Grafana Bosun backend on versions prior to this commit will not work.
---
 cmd/bosun/sched/template.go             |  4 ++--
 cmd/bosun/web/expr.go                   |  7 ++++--
 cmd/bosun/web/static.go                 | 30 ++++++++++++-------------
 cmd/bosun/web/static/partials/expr.html |  2 +-
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/cmd/bosun/sched/template.go b/cmd/bosun/sched/template.go
index 9d6808c3d4..e233241667 100644
--- a/cmd/bosun/sched/template.go
+++ b/cmd/bosun/sched/template.go
@@ -81,7 +81,7 @@ func (c *Context) HostView(host string) string {
 func (c *Context) Expr(v string) string {
 	p := url.Values{}
 	p.Add("date", c.runHistory.Start.Format(`2006-01-02`))
-	p.Add("time", c.runHistory.Start.Format(`15:04`))
+	p.Add("time", c.runHistory.Start.Format(`15:04:05`))
 	p.Add("expr", base64.StdEncoding.EncodeToString([]byte(opentsdb.ReplaceTags(v, c.Group))))
 	return c.schedule.Conf.MakeLink("/expr", &p)
 }
@@ -93,7 +93,7 @@ func (c *Context) GraphLink(v string) string {
 	p.Add("expr", base64.StdEncoding.EncodeToString([]byte(v)))
 	p.Add("tab", "graph")
 	p.Add("date", c.runHistory.Start.Format(`2006-01-02`))
-	p.Add("time", c.runHistory.Start.Format(`15:04`))
+	p.Add("time", c.runHistory.Start.Format(`15:04:05`))
 	return c.schedule.Conf.MakeLink("/expr", &p)
 }
 
diff --git a/cmd/bosun/web/expr.go b/cmd/bosun/web/expr.go
index 90493c337e..001ea9cc25 100644
--- a/cmd/bosun/web/expr.go
+++ b/cmd/bosun/web/expr.go
@@ -107,9 +107,12 @@ func getTime(r *http.Request) (now time.Time, err error) {
 		if ft := r.FormValue("time"); len(ft) > 0 {
 			fd += " " + ft
 		} else {
-			fd += " " + now.Format("15:04")
+			fd += " " + now.Format("15:04:05")
+		}
+		now, err = time.Parse("2006-01-02 15:04:05", fd)
+		if err != nil {
+			now, err = time.Parse("2006-01-02 15:04", fd)
 		}
-		now, err = time.Parse("2006-01-02 15:04", fd)
 	}
 	return
 }
diff --git a/cmd/bosun/web/static.go b/cmd/bosun/web/static.go
index b2166c2625..f307703dfe 100644
--- a/cmd/bosun/web/static.go
+++ b/cmd/bosun/web/static.go
@@ -13120,23 +13120,23 @@ XBuDNhAKbqRYQ2bmHwetEmvzBNIbKn0aOwutP4cHcTRy4PMe6BiYjBmx52okmuL0vewYmmZ7ntpdc1vz
 
 	"/partials/expr.html": {
 		local:   "web/static/partials/expr.html",
-		size:    2124,
+		size:    2127,
 		modtime: 0,
 		compressed: `
-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
+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
 `,
 	},
 
diff --git a/cmd/bosun/web/static/partials/expr.html b/cmd/bosun/web/static/partials/expr.html
index ec023b3910..1307dd1c32 100644
--- a/cmd/bosun/web/static/partials/expr.html
+++ b/cmd/bosun/web/static/partials/expr.html
@@ -52,7 +52,7 @@
 			</div>
 			<div class="form-group">
 				<label class="control-label">Time</label>
-				<input type="text" class="form-control" ng-model="time" placeholder="HH:MM">
+				<input type="text" class="form-control" ng-model="time" placeholder="HH:MM:SS">
 			</div>
 			<div class="form-group">
 				<button class="btn btn-primary" ng-click="set()">Test</button>