Skip to content

template: Gather the prometheus target metadata during teardown #6379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Dec 13, 2019
Merged

template: Gather the prometheus target metadata during teardown #6379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad29eda
template: Gather the prometheus target metadata during teardown
smarterclayton Dec 12, 2019
8810178
junitmerge: Support --exclude-skip to filter skip results during merge
smarterclayton Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,7 @@ objects:

echo "Snapshotting prometheus (may take 15s) ..."
queue /tmp/artifacts/metrics/prometheus.tar.gz oc --insecure-skip-tls-verify exec -n openshift-monitoring prometheus-k8s-0 -- tar cvzf - -C /prometheus .
FILTER=gzip queue /tmp/artifacts/metrics/prometheus-target-metadata.json.gz oc --insecure-skip-tls-verify exec -n openshift-monitoring prometheus-k8s-0 -- /bin/bash -c "curl -G http://localhost:9090/api/v1/targets/metadata --data-urlencode 'match_target={instance!=\"\"}'"

echo "Running must-gather..."
mkdir -p /tmp/artifacts/must-gather
Expand Down
6 changes: 6 additions & 0 deletions tools/junitmerge/junitmerge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ func main() {
log.SetFlags(0)
opt := struct {
JSONSummary bool
Skip bool
}{}
flag.BoolVar(&opt.Skip, "exclude-skip", false, "Exclude skipped tests when merging")
flag.BoolVar(&opt.JSONSummary, "json-summary", false, "Convert the result to a single JSON file that summarizes the output")
flag.Parse()

Expand Down Expand Up @@ -156,6 +158,9 @@ func main() {

for _, k := range keys {
testCase := suite.runs[k]
if opt.Skip && testCase.SkipMessage != nil {
continue
}
out.TestCases = append(out.TestCases, testCase)
switch {
case testCase.SkipMessage != nil:
Expand All @@ -165,6 +170,7 @@ func main() {
}
out.Duration += testCase.Duration
}
out.NumTests = uint(len(out.TestCases))
output.Suites = append(output.Suites, out)
}

Expand Down