github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the Metrics test to only require the presense of a list of needed

Browse Source 
metrics, and not fail if any new metrics are added.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
This commit is contained in:
Vishnu kannan
2016-01-20 14:33:05 -08:00
parent 7866ffa71c
commit c7de580623
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/e2e/metrics_grabber_test.go
View File

@@ -47,7 +47,7 @@ func validateLabelSet(labelSet map[string][]string, data metrics.Metrics, invali
invalidLabel = false
}
}
if invalidLabel {
if invalidLabel && invalidLabels != nil {
if _, ok := invalidLabels[metric]; !ok {
invalidLabels[metric] = sets.NewString()
}
@@ -59,13 +59,21 @@ func validateLabelSet(labelSet map[string][]string, data metrics.Metrics, invali
}
}
func checkNecessaryMetrics(response metrics.Metrics, necessaryMetrics map[string][]string) {
missingLabels := make(map[string]sets.String)
validateLabelSet(metrics.CommonMetrics, response, nil, missingLabels)
validateLabelSet(necessaryMetrics, response, nil, missingLabels)
Expect(missingLabels).To(BeEmpty())
}
func checkMetrics(response metrics.Metrics, assumedMetrics map[string][]string) {
invalidLabels := make(map[string]sets.String)
unknownLabels := make(map[string]sets.String)
validateLabelSet(metrics.CommonMetrics, response, invalidLabels, unknownLabels)
validateLabelSet(assumedMetrics, response, invalidLabels, unknownLabels)
missingLabels := make(map[string]sets.String)
validateLabelSet(metrics.CommonMetrics, response, invalidLabels, missingLabels)
validateLabelSet(assumedMetrics, response, invalidLabels, missingLabels)
Expect(unknownLabels).To(BeEmpty())
Expect(missingLabels).To(BeEmpty())
Expect(invalidLabels).To(BeEmpty())
}
@@ -97,12 +105,9 @@ var _ = Describe("MetricsGrabber", func() {
By("Connecting proxying to Node through the API server")
nodes := ListSchedulableNodesOrDie(c)
Expect(nodes.Items).NotTo(BeEmpty())
unknownMetrics := sets.NewString()
response, err := grabber.GrabFromKubelet(nodes.Items[0].Name, unknownMetrics)
response, err := grabber.GrabFromKubelet(nodes.Items[0].Name)
expectNoError(err)
Expect(unknownMetrics).To(BeEmpty())
checkMetrics(metrics.Metrics(response), metrics.KnownKubeletMetrics)
checkNecessaryMetrics(metrics.Metrics(response), metrics.NecessaryKubeletMetrics)
}
})