[ARVADOS] updated: 1.3.0-2836-g4d3b8b299

[Git user]

Summary of changes:
 lib/dispatchcloud/dispatcher_test.go | 4 ++++
 lib/dispatchcloud/worker/pool.go     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

       via  4d3b8b299deaa4fff45102a26768e26129b17f10 (commit)
      from  3757bbc7155d2a9c83d307925956fa2d524c92a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4d3b8b299deaa4fff45102a26768e26129b17f10
Author: Ward Vandewege <ward at curii.com>
Date:   Mon Aug 3 16:04:31 2020 -0400

    boot outcomes metric: fix labels and add some checks for the new metric
    in the tests.
    
    refs #16636
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go
index dd9d81181..aa5f22a50 100644
--- a/lib/dispatchcloud/dispatcher_test.go
+++ b/lib/dispatchcloud/dispatcher_test.go
@@ -207,6 +207,10 @@ func (s *DispatcherSuite) TestDispatchToStubDriver(c *check.C) {
 	c.Check(resp.Body.String(), check.Matches, `(?ms).*driver_operations{error="0",operation="Destroy"} [^0].*`)
 	c.Check(resp.Body.String(), check.Matches, `(?ms).*driver_operations{error="1",operation="Create"} [^0].*`)
 	c.Check(resp.Body.String(), check.Matches, `(?ms).*driver_operations{error="1",operation="List"} 0\n.*`)
+	c.Check(resp.Body.String(), check.Matches, `(?ms).*boot_outcomes{outcome="aborted"} 0.*`)
+	c.Check(resp.Body.String(), check.Matches, `(?ms).*boot_outcomes{outcome="disappeared"} [^0].*`)
+	c.Check(resp.Body.String(), check.Matches, `(?ms).*boot_outcomes{outcome="failure"} [^0].*`)
+	c.Check(resp.Body.String(), check.Matches, `(?ms).*boot_outcomes{outcome="success"} [^0].*`)
 	c.Check(resp.Body.String(), check.Matches, `(?ms).*instances_disappeared{state="shutdown"} [^0].*`)
 	c.Check(resp.Body.String(), check.Matches, `(?ms).*instances_disappeared{state="unknown"} 0\n.*`)
 }
diff --git a/lib/dispatchcloud/worker/pool.go b/lib/dispatchcloud/worker/pool.go
index efcc102e8..12bc1cdd7 100644
--- a/lib/dispatchcloud/worker/pool.go
+++ b/lib/dispatchcloud/worker/pool.go
@@ -600,7 +600,7 @@ func (wp *Pool) registerMetrics(reg *prometheus.Registry) {
 		Subsystem: "dispatchcloud",
 		Name:      "boot_outcomes",
 		Help:      "Boot outcomes by type.",
-	}, []string{"state"})
+	}, []string{"outcome"})
 	for k := range validBootOutcomes {
 		wp.mBootOutcomes.WithLabelValues(string(k)).Add(0)
 	}
@@ -610,7 +610,7 @@ func (wp *Pool) registerMetrics(reg *prometheus.Registry) {
 		Subsystem: "dispatchcloud",
 		Name:      "instances_disappeared",
 		Help:      "Number of occurrences of an instance disappearing from the cloud provider's list of instances.",
-	}, []string{"outcome"})
+	}, []string{"state"})
 	for _, v := range stateString {
 		wp.mDisappearances.WithLabelValues(v).Add(0)
 	}

-----------------------------------------------------------------------


hooks/post-receive
--