From f7704af4f828c4fea83255bf212939f17ec2b5d7 Mon Sep 17 00:00:00 2001
From: "Matt T. Proud" <matt.proud@gmail.com>
Date: Mon, 15 Jul 2013 15:11:41 +0200
Subject: [PATCH] Code Review: Formatting comments.

---
 retrieval/target.go              |  7 +++
 storage/metric/operation_test.go | 18 ++++----
 web/templates/status.html        | 77 +++++++++++++++-----------------
 3 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/retrieval/target.go b/retrieval/target.go
index abd767136c..b2875f4e02 100644
--- a/retrieval/target.go
+++ b/retrieval/target.go
@@ -98,6 +98,9 @@ type Target interface {
 	//
 	// Right now, this is used as the sorting key in TargetPool.
 	ScheduledFor() time.Time
+	// EstimatedTimeToExecute emits the amount of time until the next prospective
+	// scheduling opportunity for this target.
+	EstimatedTimeToExecute() time.Duration
 	// Return the last encountered scrape error, if any.
 	LastError() error
 	// The address to which the Target corresponds.  Out of all of the available
@@ -257,6 +260,10 @@ func (t *target) ScheduledFor() time.Time {
 	return t.scheduler.ScheduledFor()
 }
 
+func (t *target) EstimatedTimeToExecute() time.Duration {
+	return t.scheduler.ScheduledFor().Sub(time.Now())
+}
+
 func (t *target) LastError() error {
 	return t.lastError
 }
diff --git a/storage/metric/operation_test.go b/storage/metric/operation_test.go
index e39cbdeb09..6a44fd4eeb 100644
--- a/storage/metric/operation_test.go
+++ b/storage/metric/operation_test.go
@@ -1838,13 +1838,13 @@ func TestGetValueRangeAtIntervalOp(t *testing.T) {
 
 	var scenarios = []struct {
 		op  getValueRangeAtIntervalOp
-		in  model.Values
-		out model.Values
+		in  Values
+		out Values
 	}{
 		// All values before the first range.
 		{
 			op: testOp,
-			in: model.Values{
+			in: Values{
 				{
 					Timestamp: testInstant.Add(-4 * time.Minute),
 					Value:     1,
@@ -1854,12 +1854,12 @@ func TestGetValueRangeAtIntervalOp(t *testing.T) {
 					Value:     2,
 				},
 			},
-			out: model.Values{},
+			out: Values{},
 		},
 		// Values starting before first range, ending after last.
 		{
 			op: testOp,
-			in: model.Values{
+			in: Values{
 				{
 					Timestamp: testInstant.Add(-4 * time.Minute),
 					Value:     1,
@@ -1917,7 +1917,7 @@ func TestGetValueRangeAtIntervalOp(t *testing.T) {
 					Value:     14,
 				},
 			},
-			out: model.Values{
+			out: Values{
 				{
 					Timestamp: testInstant.Add(-2 * time.Minute),
 					Value:     3,
@@ -1959,17 +1959,17 @@ func TestGetValueRangeAtIntervalOp(t *testing.T) {
 		// Values starting after last range.
 		{
 			op: testOp,
-			in: model.Values{
+			in: Values{
 				{
 					Timestamp: testInstant.Add(21 * time.Minute),
 					Value:     14,
 				},
 			},
-			out: model.Values{},
+			out: Values{},
 		},
 	}
 	for i, scenario := range scenarios {
-		actual := model.Values{}
+		actual := Values{}
 		for !scenario.op.Consumed() {
 			actual = append(actual, scenario.op.ExtractSamples(scenario.in)...)
 		}
diff --git a/web/templates/status.html b/web/templates/status.html
index 7a408db0df..25656923f3 100644
--- a/web/templates/status.html
+++ b/web/templates/status.html
@@ -40,46 +40,43 @@
 
     <h2>Targets</h2>
     <div class="grouping_box">
-      <ul>
-        {{range $job, $pool := .TargetPools}}
-        <li>{{$job}}
-          <table>
-            <thead>
-              <tr>
-                <th>Endpoint</th>
-                <th>State</th>
-                <th>Base Labels</th>
-                <th>Earliest Retrieval</th>
-                <th>Error</th>
-              </tr>
-            </thead>
-            <tbody>
-            {{range $pool.Targets}}
-              <tr>
-                <td>
-                  <a href="{{.GlobalAddress}}">{{.Address}}</a>
-                </td>
-                <td>
-                  {{.State}}
-                </td>
-                <td>
-                  {{.BaseLabels}}
-                </td>
-                <td>
-                  {{.ScheduledFor}}
-                </td>
-                <td>
-                  {{if .LastError}}
-                  <span class="error_text">{{.LastError}}</span>
-                  {{end}}
-                </td>
-              </tr>
-            {{end}}
-            </tbody>
-          </table>
-        </li>
-        {{end}}
-      </ul>
+      {{range $job, $pool := .TargetPools}}
+      <h3>{{$job}}</h3>
+        <table>
+          <thead>
+            <tr>
+              <th>Endpoint</th>
+              <th>State</th>
+              <th>Base Labels</th>
+              <th>Next Retrieval</th>
+              <th>Error</th>
+            </tr>
+          </thead>
+          <tbody>
+          {{range $pool.Targets}}
+            <tr>
+              <td>
+                <a href="{{.GlobalAddress}}">{{.Address}}</a>
+              </td>
+              <td>
+                {{.State}}
+              </td>
+              <td>
+                {{.BaseLabels}}
+              </td>
+              <td>
+                {{.EstimatedTimeToExecute}}
+              </td>
+              <td>
+                {{if .LastError}}
+                <span class="error_text">{{.LastError}}</span>
+                {{end}}
+              </td>
+            </tr>
+          {{end}}
+          </tbody>
+        </table>
+      {{end}}
     </div>
 
     <h2>Curation</h2>