Skip to content
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

Jump to bottom

test/extended/prometheus: Re-enable telemetry test #24439

Merged
merged 1 commit into from
Jan 29, 2020
Merged

test/extended/prometheus: Re-enable telemetry test #24439

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 3 additions & 12 deletions test/extended/prometheus/prometheus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,6 @@ var _ = g.Describe("[Feature:Prometheus][Conformance] Prometheus", func() {

g.Describe("when installed on the cluster", func() {
g.It("should report telemetry if a cloud.openshift.com token is present", func() {
// https://github.com/openshift/cluster-monitoring-operator/pull/434
// changes the behavior from using the extra telemeter-client to
// the Prometheus native remote-write protocol. This causes the
// telemeter-client metrics to not be available anymore, causing
// this test to fail on that PR, but we can't merge modifying this
// test yet because the new metrics are not there yet. Skipping
// this test intermediately to merge the PR.
e2e.Skipf("skipping in order to merge https://github.com/openshift/cluster-monitoring-operator/pull/434")

if !hasPullSecret(oc.AdminKubeClient(), "cloud.openshift.com") {
e2e.Skipf("Telemetry is disabled")
}
Expand All @@ -70,9 +61,9 @@ var _ = g.Describe("[Feature:Prometheus][Conformance] Prometheus", func() {
defer func() { oc.AdminKubeClient().CoreV1().Pods(ns).Delete(execPod.Name, metav1.NewDeleteOptions(1)) }()

tests := map[string]bool{
// Should have successfully sent at least some metrics to remote write endpoint
// uncomment this once https://github.com/openshift/cluster-monitoring-operator/pull/434
// is merged, and remove the other two checks.
// Should have successfully sent at least some metrics to
// remote write endpoint uncomment this once sending telemetry
// via remote write is merged, and remove the other two checks.
// `prometheus_remote_storage_succeeded_samples_total{job="prometheus-k8s"} >= 1`: true,

// should have successfully sent at least once to remote
Expand Down