diff --git a/CHANGELOG.md b/CHANGELOG.md index 58c6e2f61..367eba3e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ Changes by Version +## 0.14.2 + +### 🧰 Bug fixes 🧰 + +- `tempostack`: Use default Jaeger RED metrics namespace if field is unset (#1096) + Use the default Jaeger RED metrics namespace if `.spec.template.queryFrontend.jaegerQuery.monitorTab.redMetricsNamespace` is not set. + Before Jaeger 1.62 the default namespace was empty, since [Jaeger 1.62](https://github.com/jaegertracing/jaeger/releases/tag/v1.62.0) (shipped in Tempo Operator v0.14.0) the default namespace is "traces_span_metrics". + Before OpenTelemetry Collector v0.109.0 the default namespace of the spanmetrics connector was empty, since [OpenTelemetry Collector v0.109.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.109.0) the default namespace is "traces_span_metrics". + + +### Components +- Tempo: [v2.6.1](https://github.com/grafana/tempo/releases/tag/v2.6.1) + ## 0.14.1 ### 🧰 Bug fixes 🧰 diff --git a/Makefile b/Makefile index 7b27d72c3..ca753d187 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Current Operator version -OPERATOR_VERSION ?= 0.14.1 +OPERATOR_VERSION ?= 0.14.2 TEMPO_VERSION ?= 2.6.1 JAEGER_QUERY_VERSION ?= 1.62.0 TEMPO_QUERY_VERSION ?= 2.6.1 diff --git a/RELEASE.md b/RELEASE.md index 7097d40f8..04fadde42 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -15,8 +15,8 @@ A locally installed [CRC](https://github.com/crc-org/crc) cluster can be used fo Note: The e2e tests require [opentelemetry-operator](https://github.com/open-telemetry/opentelemetry-operator) and cluster monitoring operator (`crc config set enable-cluster-monitoring true`). ``` -kubectl create namespace tempo-operator-system -IMG_PREFIX=docker.io/your_username OPERATOR_VERSION=x.y.z BUNDLE_VARIANT=openshift make bundle docker-build docker-push bundle-build bundle-push olm-deploy +kubectl create namespace openshift-tempo-operator +IMG_PREFIX=docker.io/your_username OPERATOR_VERSION=x.y.z BUNDLE_VARIANT=openshift OPERATOR_NAMESPACE=openshift-tempo-operator make build docker-build docker-push bundle bundle-build bundle-push olm-deploy make e2e e2e-openshift ``` diff --git a/apis/tempo/v1alpha1/tempostack_types.go b/apis/tempo/v1alpha1/tempostack_types.go index 8a9103e12..c4ea725c0 100644 --- a/apis/tempo/v1alpha1/tempostack_types.go +++ b/apis/tempo/v1alpha1/tempostack_types.go @@ -690,12 +690,10 @@ type JaegerQueryMonitor struct { // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Prometheus endpoint" PrometheusEndpoint string `json:"prometheusEndpoint"` // REDMetricsNamespace defines the a prefix used retrieve span rate, error, and duration (RED) metrics. - // By default it is set to `traces.span.metrics` following the default namespace of the OpenTelemetry Collector since Version 0.109.0. // +optional // +kubebuilder:validation:Optional - // +kubebuilder:default:=traces.span.metrics // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="RED Metric Namespace" - REDMetricsNamespace string `json:"redMetricsNamespace"` + REDMetricsNamespace *string `json:"redMetricsNamespace,omitempty"` } // IngressSpec defines Jaeger Query Ingress options. diff --git a/apis/tempo/v1alpha1/zz_generated.deepcopy.go b/apis/tempo/v1alpha1/zz_generated.deepcopy.go index f5a9d2534..d9a80f782 100644 --- a/apis/tempo/v1alpha1/zz_generated.deepcopy.go +++ b/apis/tempo/v1alpha1/zz_generated.deepcopy.go @@ -304,6 +304,11 @@ func (in *JaegerQueryAuthenticationSpec) DeepCopy() *JaegerQueryAuthenticationSp // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *JaegerQueryMonitor) DeepCopyInto(out *JaegerQueryMonitor) { *out = *in + if in.REDMetricsNamespace != nil { + in, out := &in.REDMetricsNamespace, &out.REDMetricsNamespace + *out = new(string) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new JaegerQueryMonitor. @@ -320,7 +325,7 @@ func (in *JaegerQueryMonitor) DeepCopy() *JaegerQueryMonitor { func (in *JaegerQuerySpec) DeepCopyInto(out *JaegerQuerySpec) { *out = *in in.Ingress.DeepCopyInto(&out.Ingress) - out.MonitorTab = in.MonitorTab + in.MonitorTab.DeepCopyInto(&out.MonitorTab) if in.Resources != nil { in, out := &in.Resources, &out.Resources *out = new(v1.ResourceRequirements) diff --git a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml index 2c9f15a27..4f5908fb9 100644 --- a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml +++ b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml @@ -73,8 +73,8 @@ metadata: ] capabilities: Deep Insights categories: Logging & Tracing,Monitoring - containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 - createdAt: "2024-11-06T14:25:14Z" + containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.2 + createdAt: "2024-12-02T13:07:44Z" description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" @@ -83,7 +83,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/grafana/tempo-operator support: Grafana Tempo Operator SIG - name: tempo-operator.v0.14.1 + name: tempo-operator.v0.14.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -1071,9 +1071,7 @@ spec: displayName: Prometheus endpoint path: template.queryFrontend.jaegerQuery.monitorTab.prometheusEndpoint - description: REDMetricsNamespace defines the a prefix used retrieve span rate, - error, and duration (RED) metrics. By default it is set to `traces.span.metrics` - following the default namespace of the OpenTelemetry Collector since Version - 0.109.0. + error, and duration (RED) metrics. displayName: RED Metric Namespace path: template.queryFrontend.jaegerQuery.monitorTab.redMetricsNamespace - description: Resources defines resources for this component, this will override @@ -1475,7 +1473,7 @@ spec: value: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863 - name: RELATED_IMAGE_OAUTH_PROXY value: quay.io/openshift/origin-oauth-proxy:4.14 - image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 + image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.2 livenessProbe: httpGet: path: /healthz @@ -1625,7 +1623,7 @@ spec: name: tempo-gateway-opa - image: quay.io/openshift/origin-oauth-proxy:4.14 name: oauth-proxy - version: 0.14.1 + version: 0.14.2 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml b/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml index 68eb5046f..6c93b0307 100644 --- a/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml +++ b/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml @@ -2471,10 +2471,9 @@ spec: For instance on OpenShift this is set to https://thanos-querier.openshift-monitoring.svc.cluster.local:9091 type: string redMetricsNamespace: - default: traces.span.metrics - description: |- - REDMetricsNamespace defines the a prefix used retrieve span rate, error, and duration (RED) metrics. - By default it is set to `traces.span.metrics` following the default namespace of the OpenTelemetry Collector since Version 0.109.0. + description: REDMetricsNamespace defines the a prefix + used retrieve span rate, error, and duration (RED) + metrics. type: string type: object resources: diff --git a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml index b62e83a47..e0fb426d9 100644 --- a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml +++ b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml @@ -73,8 +73,8 @@ metadata: ] capabilities: Deep Insights categories: Logging & Tracing,Monitoring - containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 - createdAt: "2024-11-06T14:25:12Z" + containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.2 + createdAt: "2024-12-02T13:07:42Z" description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" @@ -83,7 +83,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/grafana/tempo-operator support: Grafana Tempo Operator SIG - name: tempo-operator.v0.14.1 + name: tempo-operator.v0.14.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -1071,9 +1071,7 @@ spec: displayName: Prometheus endpoint path: template.queryFrontend.jaegerQuery.monitorTab.prometheusEndpoint - description: REDMetricsNamespace defines the a prefix used retrieve span rate, - error, and duration (RED) metrics. By default it is set to `traces.span.metrics` - following the default namespace of the OpenTelemetry Collector since Version - 0.109.0. + error, and duration (RED) metrics. displayName: RED Metric Namespace path: template.queryFrontend.jaegerQuery.monitorTab.redMetricsNamespace - description: Resources defines resources for this component, this will override @@ -1485,7 +1483,7 @@ spec: value: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863 - name: RELATED_IMAGE_OAUTH_PROXY value: quay.io/openshift/origin-oauth-proxy:4.14 - image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 + image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.2 livenessProbe: httpGet: path: /healthz @@ -1646,7 +1644,7 @@ spec: name: tempo-gateway-opa - image: quay.io/openshift/origin-oauth-proxy:4.14 name: oauth-proxy - version: 0.14.1 + version: 0.14.2 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml b/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml index 68eb5046f..6c93b0307 100644 --- a/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml +++ b/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml @@ -2471,10 +2471,9 @@ spec: For instance on OpenShift this is set to https://thanos-querier.openshift-monitoring.svc.cluster.local:9091 type: string redMetricsNamespace: - default: traces.span.metrics - description: |- - REDMetricsNamespace defines the a prefix used retrieve span rate, error, and duration (RED) metrics. - By default it is set to `traces.span.metrics` following the default namespace of the OpenTelemetry Collector since Version 0.109.0. + description: REDMetricsNamespace defines the a prefix + used retrieve span rate, error, and duration (RED) + metrics. type: string type: object resources: diff --git a/config/crd/bases/tempo.grafana.com_tempostacks.yaml b/config/crd/bases/tempo.grafana.com_tempostacks.yaml index 61e06807a..f753af9c2 100644 --- a/config/crd/bases/tempo.grafana.com_tempostacks.yaml +++ b/config/crd/bases/tempo.grafana.com_tempostacks.yaml @@ -2467,10 +2467,9 @@ spec: For instance on OpenShift this is set to https://thanos-querier.openshift-monitoring.svc.cluster.local:9091 type: string redMetricsNamespace: - default: traces.span.metrics - description: |- - REDMetricsNamespace defines the a prefix used retrieve span rate, error, and duration (RED) metrics. - By default it is set to `traces.span.metrics` following the default namespace of the OpenTelemetry Collector since Version 0.109.0. + description: REDMetricsNamespace defines the a prefix + used retrieve span rate, error, and duration (RED) + metrics. type: string type: object resources: diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 8f2eef0fd..b067b0777 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -9,4 +9,4 @@ kind: Kustomization images: - name: controller newName: ghcr.io/grafana/tempo-operator/tempo-operator - newTag: v0.14.1 + newTag: v0.14.2 diff --git a/config/manifests/community/bases/tempo-operator.clusterserviceversion.yaml b/config/manifests/community/bases/tempo-operator.clusterserviceversion.yaml index c717d3c71..462d034bd 100644 --- a/config/manifests/community/bases/tempo-operator.clusterserviceversion.yaml +++ b/config/manifests/community/bases/tempo-operator.clusterserviceversion.yaml @@ -5,7 +5,7 @@ metadata: alm-examples: '[]' capabilities: Deep Insights categories: Logging & Tracing,Monitoring - containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 + containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.2 description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" @@ -1000,9 +1000,7 @@ spec: displayName: Prometheus endpoint path: template.queryFrontend.jaegerQuery.monitorTab.prometheusEndpoint - description: REDMetricsNamespace defines the a prefix used retrieve span rate, - error, and duration (RED) metrics. By default it is set to `traces.span.metrics` - following the default namespace of the OpenTelemetry Collector since Version - 0.109.0. + error, and duration (RED) metrics. displayName: RED Metric Namespace path: template.queryFrontend.jaegerQuery.monitorTab.redMetricsNamespace - description: Resources defines resources for this component, this will override diff --git a/config/manifests/openshift/bases/tempo-operator.clusterserviceversion.yaml b/config/manifests/openshift/bases/tempo-operator.clusterserviceversion.yaml index 244cef7a2..69faf5558 100644 --- a/config/manifests/openshift/bases/tempo-operator.clusterserviceversion.yaml +++ b/config/manifests/openshift/bases/tempo-operator.clusterserviceversion.yaml @@ -5,7 +5,7 @@ metadata: alm-examples: '[]' capabilities: Deep Insights categories: Logging & Tracing,Monitoring - containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 + containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.2 description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" @@ -1000,9 +1000,7 @@ spec: displayName: Prometheus endpoint path: template.queryFrontend.jaegerQuery.monitorTab.prometheusEndpoint - description: REDMetricsNamespace defines the a prefix used retrieve span rate, - error, and duration (RED) metrics. By default it is set to `traces.span.metrics` - following the default namespace of the OpenTelemetry Collector since Version - 0.109.0. + error, and duration (RED) metrics. displayName: RED Metric Namespace path: template.queryFrontend.jaegerQuery.monitorTab.redMetricsNamespace - description: Resources defines resources for this component, this will override diff --git a/docs/spec/tempo.grafana.com_tempostacks.yaml b/docs/spec/tempo.grafana.com_tempostacks.yaml index b946cb156..dee7ff186 100644 --- a/docs/spec/tempo.grafana.com_tempostacks.yaml +++ b/docs/spec/tempo.grafana.com_tempostacks.yaml @@ -342,7 +342,7 @@ spec: # TempoStackSpec defines the desired st monitorTab: # MonitorTab defines the monitor tab configuration. enabled: false # Enabled enables the monitor tab in the Jaeger console. The PrometheusEndpoint must be configured to enable this feature. prometheusEndpoint: "" # PrometheusEndpoint defines the endpoint to the Prometheus instance that contains the span rate, error, and duration (RED) metrics. For instance on OpenShift this is set to https://thanos-querier.openshift-monitoring.svc.cluster.local:9091 - redMetricsNamespace: "traces.span.metrics" # REDMetricsNamespace defines the a prefix used retrieve span rate, error, and duration (RED) metrics. By default it is set to `traces.span.metrics` following the default namespace of the OpenTelemetry Collector since Version 0.109.0. + redMetricsNamespace: "" # REDMetricsNamespace defines the a prefix used retrieve span rate, error, and duration (RED) metrics. servicesQueryDuration: "" # ServicesQueryDuration defines how long the services will be available in the services list tempoQuery: # TempoQuery defines options specific to the Tempoo Query component. resources: # Resources defines resources for this component, this will override the calculated resources derived from total diff --git a/internal/manifests/queryfrontend/query_frontend.go b/internal/manifests/queryfrontend/query_frontend.go index 55d1afe70..ffb17158b 100644 --- a/internal/manifests/queryfrontend/query_frontend.go +++ b/internal/manifests/queryfrontend/query_frontend.go @@ -398,11 +398,6 @@ func enableMonitoringTab(tempo v1alpha1.TempoStack, jaegerQueryContainer corev1. // However, we do not intend to support them. // --prometheus.query.normalize-calls // --prometheus.query.normalize-duration - // - // NOTE: Jaeger 1.62 default namespace changed to "traces_span_metrics". - // We fallback to no namespace. - // See https://github.com/jaegertracing/jaeger/pull/6007. - fmt.Sprintf("--prometheus.query.namespace=%s", tempo.Spec.Template.QueryFrontend.JaegerQuery.MonitorTab.REDMetricsNamespace), }, } // If the endpoint matches Prometheus on OpenShift, configure TLS and token based auth @@ -417,6 +412,15 @@ func enableMonitoringTab(tempo v1alpha1.TempoStack, jaegerQueryContainer corev1. "--prometheus.tls.ca=/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt") } + if tempo.Spec.Template.QueryFrontend.JaegerQuery.MonitorTab.REDMetricsNamespace != nil { + // NOTE: Jaeger 1.62 default namespace changed to "traces_span_metrics". + // Set .spec.template.queryFrontend.jaegerQuery.monitorTab.redMetricsNamespace explicitly to "" to disable the namespace. + // See https://github.com/jaegertracing/jaeger/pull/6007. + container.Args = append(container.Args, + fmt.Sprintf("--prometheus.query.namespace=%s", *tempo.Spec.Template.QueryFrontend.JaegerQuery.MonitorTab.REDMetricsNamespace), + ) + } + err := mergo.Merge(&jaegerQueryContainer, container, mergo.WithAppendSlice) if err != nil { return corev1.Container{}, err diff --git a/internal/manifests/queryfrontend/query_frontend_test.go b/internal/manifests/queryfrontend/query_frontend_test.go index 9ffb26b6a..fc726fc85 100644 --- a/internal/manifests/queryfrontend/query_frontend_test.go +++ b/internal/manifests/queryfrontend/query_frontend_test.go @@ -614,6 +614,26 @@ func TestBuildQueryFrontendWithJaegerMonitorTab(t *testing.T) { }, { name: "custom prometheus", + tempo: v1alpha1.TempoStack{ + Spec: v1alpha1.TempoStackSpec{ + Template: v1alpha1.TempoTemplateSpec{ + QueryFrontend: v1alpha1.TempoQueryFrontendSpec{ + JaegerQuery: v1alpha1.JaegerQuerySpec{ + Enabled: true, + MonitorTab: v1alpha1.JaegerQueryMonitor{ + Enabled: true, + PrometheusEndpoint: "http://prometheus:9091", + }, + }, + }, + }, + }, + }, + args: []string{"--query.base-path=/", "--span-storage.type=grpc", "--grpc-storage.server=localhost:7777", "--query.bearer-token-propagation=true"}, + env: []corev1.EnvVar{{Name: "METRICS_STORAGE_TYPE", Value: "prometheus"}, {Name: "PROMETHEUS_SERVER_URL", Value: "http://prometheus:9091"}}, + }, + { + name: "custom RED metrics namespace", tempo: v1alpha1.TempoStack{ Spec: v1alpha1.TempoStackSpec{ Template: v1alpha1.TempoTemplateSpec{ @@ -623,7 +643,7 @@ func TestBuildQueryFrontendWithJaegerMonitorTab(t *testing.T) { MonitorTab: v1alpha1.JaegerQueryMonitor{ Enabled: true, PrometheusEndpoint: "http://prometheus:9091", - REDMetricsNamespace: "test", + REDMetricsNamespace: ptr.To("test"), }, }, }, @@ -633,6 +653,27 @@ func TestBuildQueryFrontendWithJaegerMonitorTab(t *testing.T) { args: []string{"--query.base-path=/", "--span-storage.type=grpc", "--grpc-storage.server=localhost:7777", "--query.bearer-token-propagation=true", "--prometheus.query.namespace=test"}, env: []corev1.EnvVar{{Name: "METRICS_STORAGE_TYPE", Value: "prometheus"}, {Name: "PROMETHEUS_SERVER_URL", Value: "http://prometheus:9091"}}, }, + { + name: "disable default RED metrics namespace", + tempo: v1alpha1.TempoStack{ + Spec: v1alpha1.TempoStackSpec{ + Template: v1alpha1.TempoTemplateSpec{ + QueryFrontend: v1alpha1.TempoQueryFrontendSpec{ + JaegerQuery: v1alpha1.JaegerQuerySpec{ + Enabled: true, + MonitorTab: v1alpha1.JaegerQueryMonitor{ + Enabled: true, + PrometheusEndpoint: "http://prometheus:9091", + REDMetricsNamespace: ptr.To(""), + }, + }, + }, + }, + }, + }, + args: []string{"--query.base-path=/", "--span-storage.type=grpc", "--grpc-storage.server=localhost:7777", "--query.bearer-token-propagation=true", "--prometheus.query.namespace="}, + env: []corev1.EnvVar{{Name: "METRICS_STORAGE_TYPE", Value: "prometheus"}, {Name: "PROMETHEUS_SERVER_URL", Value: "http://prometheus:9091"}}, + }, { name: "OpenShift user-workload monitoring", tempo: v1alpha1.TempoStack{ @@ -658,7 +699,6 @@ func TestBuildQueryFrontendWithJaegerMonitorTab(t *testing.T) { "--span-storage.type=grpc", "--grpc-storage.server=localhost:7777", "--query.bearer-token-propagation=true", - "--prometheus.query.namespace=", "--prometheus.tls.enabled=true", "--prometheus.token-file=/var/run/secrets/kubernetes.io/serviceaccount/token", "--prometheus.token-override-from-context=false", diff --git a/tests/e2e-long-running/tempostack-retention-global/03-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e-long-running/tempostack-retention-global/03-assert.yaml +++ b/tests/e2e-long-running/tempostack-retention-global/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-long-running/tempostack-retention-global/04-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/04-assert.yaml index ab9e98db3..2000de515 100644 --- a/tests/e2e-long-running/tempostack-retention-global/04-assert.yaml +++ b/tests/e2e-long-running/tempostack-retention-global/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-jaeger status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-long-running/tempostack-retention-global/05-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/05-assert.yaml index 7eec01bfb..d4baf6efe 100644 --- a/tests/e2e-long-running/tempostack-retention-global/05-assert.yaml +++ b/tests/e2e-long-running/tempostack-retention-global/05-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-grafana status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-long-running/tempostack-retention-global/verify-traces-grafana-ret-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/verify-traces-grafana-ret-assert.yaml index f6d3a4998..4179326ae 100644 --- a/tests/e2e-long-running/tempostack-retention-global/verify-traces-grafana-ret-assert.yaml +++ b/tests/e2e-long-running/tempostack-retention-global/verify-traces-grafana-ret-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-grafana-ret status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-long-running/tempostack-retention-global/verify-traces-jaeger-ret-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/verify-traces-jaeger-ret-assert.yaml index 19895c419..a9642c166 100644 --- a/tests/e2e-long-running/tempostack-retention-global/verify-traces-jaeger-ret-assert.yaml +++ b/tests/e2e-long-running/tempostack-retention-global/verify-traces-jaeger-ret-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-jaeger-ret status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-otel-collector.yaml b/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-otel-collector.yaml index 30dcfe56f..ec42c4985 100644 --- a/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-otel-collector.yaml +++ b/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-otel-collector.yaml @@ -6,7 +6,7 @@ metadata: spec: config: | receivers: - zipkin: + zipkin: {} otlp: protocols: grpc: diff --git a/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-otel-collector.yaml b/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-otel-collector.yaml index 89bf7d061..e77119bcd 100644 --- a/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-otel-collector.yaml +++ b/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-otel-collector.yaml @@ -6,7 +6,7 @@ metadata: spec: config: | receivers: - zipkin: + zipkin: {} otlp: protocols: grpc: diff --git a/tests/e2e-openshift-serverless/otel-tempo-serverless/create-otel-collector.yaml b/tests/e2e-openshift-serverless/otel-tempo-serverless/create-otel-collector.yaml index cc1009c29..8736b7574 100644 --- a/tests/e2e-openshift-serverless/otel-tempo-serverless/create-otel-collector.yaml +++ b/tests/e2e-openshift-serverless/otel-tempo-serverless/create-otel-collector.yaml @@ -7,7 +7,7 @@ spec: mode: deployment config: | receivers: - zipkin: + zipkin: {} processors: exporters: otlp: diff --git a/tests/e2e-openshift-serverless/otel-tempo-serverless/verify-traces-assert.yaml b/tests/e2e-openshift-serverless/otel-tempo-serverless/verify-traces-assert.yaml index 7ced823e4..7640bf442 100644 --- a/tests/e2e-openshift-serverless/otel-tempo-serverless/verify-traces-assert.yaml +++ b/tests/e2e-openshift-serverless/otel-tempo-serverless/verify-traces-assert.yaml @@ -4,6 +4,4 @@ metadata: name: verify-traces namespace: chainsaw-otel-tempo-serverless status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift-serverless/tempo-serverless/verify-traces-assert.yaml b/tests/e2e-openshift-serverless/tempo-serverless/verify-traces-assert.yaml index 955ee90ee..57a357507 100644 --- a/tests/e2e-openshift-serverless/tempo-serverless/verify-traces-assert.yaml +++ b/tests/e2e-openshift-serverless/tempo-serverless/verify-traces-assert.yaml @@ -4,6 +4,4 @@ metadata: name: verify-traces namespace: chainsaw-tempo-serverless status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/component-replicas/generate-traces-assert.yaml b/tests/e2e-openshift/component-replicas/generate-traces-assert.yaml index 4e388748f..2692c8b16 100644 --- a/tests/e2e-openshift/component-replicas/generate-traces-assert.yaml +++ b/tests/e2e-openshift/component-replicas/generate-traces-assert.yaml @@ -4,9 +4,7 @@ metadata: name: generate-traces-grpc namespace: chainsaw-replicas status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,6 +12,4 @@ metadata: name: generate-traces-http namespace: chainsaw-replicas status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/component-replicas/verify-traces-assert.yaml b/tests/e2e-openshift/component-replicas/verify-traces-assert.yaml index 5a330ee66..22042f477 100644 --- a/tests/e2e-openshift/component-replicas/verify-traces-assert.yaml +++ b/tests/e2e-openshift/component-replicas/verify-traces-assert.yaml @@ -4,9 +4,7 @@ metadata: name: verify-traces-grpc namespace: chainsaw-replicas status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,9 +12,7 @@ metadata: name: verify-traces-traceql-grpc namespace: chainsaw-replicas status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -24,9 +20,7 @@ metadata: name: verify-traces-http namespace: chainsaw-replicas status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -34,6 +28,4 @@ metadata: name: verify-traces-traceql-http namespace: chainsaw-replicas status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monitoring-monolithic/chainsaw-test.yaml b/tests/e2e-openshift/monitoring-monolithic/chainsaw-test.yaml index 84b6d11f3..1aa629205 100644 --- a/tests/e2e-openshift/monitoring-monolithic/chainsaw-test.yaml +++ b/tests/e2e-openshift/monitoring-monolithic/chainsaw-test.yaml @@ -29,8 +29,8 @@ spec: try: - apply: file: verify-traces.yaml - - apply: - file: workload-monitoring-assert.yaml + - assert: + file: verify-traces-assert.yaml - name: Check Tempo Monolithc metrics scraped by user workload monitoring try: - script: diff --git a/tests/e2e-openshift/monitoring-monolithic/verify-traces-assert.yaml b/tests/e2e-openshift/monitoring-monolithic/verify-traces-assert.yaml new file mode 100644 index 000000000..30bbc7ee3 --- /dev/null +++ b/tests/e2e-openshift/monitoring-monolithic/verify-traces-assert.yaml @@ -0,0 +1,6 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: verify-traces +status: + succeeded: 1 diff --git a/tests/e2e-openshift/monitoring/04-assert.yaml b/tests/e2e-openshift/monitoring/04-assert.yaml index d7426be82..1e6909ccc 100644 --- a/tests/e2e-openshift/monitoring/04-assert.yaml +++ b/tests/e2e-openshift/monitoring/04-assert.yaml @@ -17,6 +17,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-multitenancy-openshift/03-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-openshift/03-assert.yaml index 55038b28c..1fafdf168 100644 --- a/tests/e2e-openshift/monolithic-multitenancy-openshift/03-assert.yaml +++ b/tests/e2e-openshift/monolithic-multitenancy-openshift/03-assert.yaml @@ -3,15 +3,11 @@ kind: Job metadata: name: generate-traces-grpc status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job metadata: name: generate-traces-http status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-multitenancy-openshift/04-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-openshift/04-assert.yaml index ddf7cd37d..ff19437cf 100644 --- a/tests/e2e-openshift/monolithic-multitenancy-openshift/04-assert.yaml +++ b/tests/e2e-openshift/monolithic-multitenancy-openshift/04-assert.yaml @@ -3,33 +3,25 @@ kind: Job metadata: name: verify-traces-jaegerui-grpc status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job metadata: name: verify-traces-traceql-grpc status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job metadata: name: verify-traces-jaegerui-http status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job metadata: name: verify-traces-traceql-http status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-multitenancy-static/01-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-static/01-assert.yaml index 581543714..e3202b406 100644 --- a/tests/e2e-openshift/monolithic-multitenancy-static/01-assert.yaml +++ b/tests/e2e-openshift/monolithic-multitenancy-static/01-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: setup-hydra status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-multitenancy-static/04-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-static/04-assert.yaml index d63e4dc65..a88d2a37b 100644 --- a/tests/e2e-openshift/monolithic-multitenancy-static/04-assert.yaml +++ b/tests/e2e-openshift/monolithic-multitenancy-static/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-multitenancy-static/05-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-static/05-assert.yaml index 1e01a9144..8195a9df6 100644 --- a/tests/e2e-openshift/monolithic-multitenancy-static/05-assert.yaml +++ b/tests/e2e-openshift/monolithic-multitenancy-static/05-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-traceql status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-route/check-must-gather.sh b/tests/e2e-openshift/monolithic-route/check-must-gather.sh index b573afcc3..5629d59d3 100755 --- a/tests/e2e-openshift/monolithic-route/check-must-gather.sh +++ b/tests/e2e-openshift/monolithic-route/check-must-gather.sh @@ -15,7 +15,7 @@ REQUIRED_ITEMS=( "*sha*/olm/clusterserviceversion-tempo-operator-*.yaml" "*sha*/olm/operator-opentelemetry-product-openshift-opentelemetry-operator.yaml" "*sha*/olm/operator-tempo-*-tempo-operator.yaml" - "*sha*/olm/subscription-tempo-operator-*-sub.yaml" + "*sha*/olm/subscription-tempo-*.yaml" "*sha*/namespaces/chainsaw-mono-route/tempomonolithic/mono-route/tempomonolithic-mono-route.yaml" "*sha*/namespaces/chainsaw-mono-route/tempomonolithic/mono-route/service-tempo-mono-route-jaegerui.yaml" "*sha*/namespaces/chainsaw-mono-route/tempomonolithic/mono-route/configmap-tempo-mono-route-serving-cabundle.yaml" @@ -38,4 +38,4 @@ for item in "${REQUIRED_ITEMS[@]}"; do done # Cleanup the must-gather directory -rm -rf $MUST_GATHER_DIR \ No newline at end of file +rm -rf $MUST_GATHER_DIR diff --git a/tests/e2e-openshift/monolithic-single-tenant-auth/generate-traces-assert.yaml b/tests/e2e-openshift/monolithic-single-tenant-auth/generate-traces-assert.yaml index ba5d63b60..63d3b592c 100644 --- a/tests/e2e-openshift/monolithic-single-tenant-auth/generate-traces-assert.yaml +++ b/tests/e2e-openshift/monolithic-single-tenant-auth/generate-traces-assert.yaml @@ -4,6 +4,4 @@ metadata: name: generate-traces namespace: chainsaw-mst status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-jaeger-assert.yaml b/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-jaeger-assert.yaml index 851cb4308..1de782d13 100644 --- a/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-jaeger-assert.yaml +++ b/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-jaeger-assert.yaml @@ -4,6 +4,4 @@ metadata: name: verify-traces-jaeger namespace: chainsaw-mst status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-traceql-assert.yaml b/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-traceql-assert.yaml index 9fe3d31c9..8d7b2ec87 100644 --- a/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-traceql-assert.yaml +++ b/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-traceql-assert.yaml @@ -4,6 +4,4 @@ metadata: name: verify-traces-traceql namespace: chainsaw-mst status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/multitenancy/03-assert.yaml b/tests/e2e-openshift/multitenancy/03-assert.yaml index 9c5a6a6d8..b851c155d 100644 --- a/tests/e2e-openshift/multitenancy/03-assert.yaml +++ b/tests/e2e-openshift/multitenancy/03-assert.yaml @@ -4,9 +4,7 @@ metadata: name: generate-traces-grpc namespace: chainsaw-multitenancy status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,6 +12,4 @@ metadata: name: generate-traces-http namespace: chainsaw-multitenancy status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/multitenancy/04-assert.yaml b/tests/e2e-openshift/multitenancy/04-assert.yaml index c849ba665..aaadeeb4b 100644 --- a/tests/e2e-openshift/multitenancy/04-assert.yaml +++ b/tests/e2e-openshift/multitenancy/04-assert.yaml @@ -4,9 +4,7 @@ metadata: name: verify-traces-grpc namespace: chainsaw-multitenancy status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,9 +12,7 @@ metadata: name: verify-traces-traceql-grpc namespace: chainsaw-multitenancy status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -24,9 +20,7 @@ metadata: name: verify-traces-http namespace: chainsaw-multitenancy status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -34,6 +28,4 @@ metadata: name: verify-traces-traceql-http namespace: chainsaw-multitenancy status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/red-metrics/02-assert.yaml b/tests/e2e-openshift/red-metrics/02-assert.yaml index df932449d..7e6d8f4e5 100644 --- a/tests/e2e-openshift/red-metrics/02-assert.yaml +++ b/tests/e2e-openshift/red-metrics/02-assert.yaml @@ -20,7 +20,7 @@ spec: description: '{{$labels.instance}} has 95th request latency above 2s (current value: {{$value}}s)' summary: High request latency on {{$labels.service_name}} and {{$labels.span_name}} - expr: histogram_quantile(0.95, sum(rate(duration_bucket{service_name="frontend", + expr: histogram_quantile(0.95, sum(rate(traces_span_metrics_duration_bucket{service_name="frontend", span_kind="SPAN_KIND_SERVER"}[1m])) by (le, service_name, span_name)) > 1000 labels: severity: Warning diff --git a/tests/e2e-openshift/red-metrics/02-install-otel-collector.yaml b/tests/e2e-openshift/red-metrics/02-install-otel-collector.yaml index ce6005912..495ad67f9 100644 --- a/tests/e2e-openshift/red-metrics/02-install-otel-collector.yaml +++ b/tests/e2e-openshift/red-metrics/02-install-otel-collector.yaml @@ -34,7 +34,7 @@ spec: resource_to_telemetry_conversion: enabled: true # by default resource attributes are dropped - logging: + debug: otlp: endpoint: tempo-redmetrics-distributor:4317 @@ -53,7 +53,7 @@ spec: exporters: [otlp, spanmetrics] metrics: receivers: [spanmetrics] - exporters: [prometheus, logging] + exporters: [prometheus, debug] --- apiVersion: monitoring.coreos.com/v1 @@ -65,7 +65,7 @@ spec: - name: server-side-latency rules: - alert: SpanREDFrontendAPIRequestLatency - expr: histogram_quantile(0.95, sum(rate(duration_bucket{service_name="frontend", span_kind="SPAN_KIND_SERVER"}[1m])) by (le, service_name, span_name)) > 1000 + expr: histogram_quantile(0.95, sum(rate(traces_span_metrics_duration_bucket{service_name="frontend", span_kind="SPAN_KIND_SERVER"}[1m])) by (le, service_name, span_name)) > 1000 labels: severity: Warning annotations: diff --git a/tests/e2e-openshift/red-metrics/03-install-tempo.yaml b/tests/e2e-openshift/red-metrics/03-install-tempo.yaml index 6d8653f9f..dd8121223 100644 --- a/tests/e2e-openshift/red-metrics/03-install-tempo.yaml +++ b/tests/e2e-openshift/red-metrics/03-install-tempo.yaml @@ -28,6 +28,5 @@ spec: monitorTab: enabled: true prometheusEndpoint: https://thanos-querier.openshift-monitoring.svc.cluster.local:9091 - redMetricsNamespace: "" ingress: type: route diff --git a/tests/e2e-openshift/red-metrics/06-assert.yaml b/tests/e2e-openshift/red-metrics/06-assert.yaml index 6e63c0afb..886fd9e7a 100755 --- a/tests/e2e-openshift/red-metrics/06-assert.yaml +++ b/tests/e2e-openshift/red-metrics/06-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-metrics status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/red-metrics/check_metrics.sh b/tests/e2e-openshift/red-metrics/check_metrics.sh index c0c40523a..6dd9d00ee 100755 --- a/tests/e2e-openshift/red-metrics/check_metrics.sh +++ b/tests/e2e-openshift/red-metrics/check_metrics.sh @@ -4,7 +4,7 @@ TOKEN=$(oc create token tempo-redmetrics-query-frontend -n $NAMESPACE) THANOS_QUERIER_HOST=$(oc get route thanos-querier -n openshift-monitoring -o json | jq -r '.spec.host') #Check metrics used in the prometheus rules created for TempoStack. Refer issue https://issues.redhat.com/browse/TRACING-3399 for skipped metrics. -metrics="duration_bucket duration_count duration_sum calls" +metrics="traces_span_metrics_duration_bucket traces_span_metrics_duration_count traces_span_metrics_duration_sum traces_span_metrics_calls" for metric in $metrics; do query="$metric" diff --git a/tests/e2e-openshift/route/check-must-gather.sh b/tests/e2e-openshift/route/check-must-gather.sh index 0a1185b72..e8b570fc5 100755 --- a/tests/e2e-openshift/route/check-must-gather.sh +++ b/tests/e2e-openshift/route/check-must-gather.sh @@ -15,7 +15,7 @@ REQUIRED_ITEMS=( "*sha*/olm/clusterserviceversion-tempo-operator-*.yaml" "*sha*/olm/operator-opentelemetry-product-openshift-opentelemetry-operator.yaml" "*sha*/olm/operator-*-tempo-operator.yaml" - "*sha*/olm/subscription-tempo-operator-*-sub.yaml" + "*sha*/olm/subscription-tempo-*.yaml" "*sha*/namespaces/chainsaw-route/tempostack/simplest/service-tempo-simplest-distributor.yaml" "*sha*/namespaces/chainsaw-route/tempostack/simplest/service-tempo-simplest-ingester.yaml" "*sha*/namespaces/chainsaw-route/tempostack/simplest/deployment-tempo-simplest-distributor.yaml" @@ -48,4 +48,4 @@ for item in "${REQUIRED_ITEMS[@]}"; do done # Cleanup the must-gather directory -rm -rf $MUST_GATHER_DIR \ No newline at end of file +rm -rf $MUST_GATHER_DIR diff --git a/tests/e2e-openshift/tempo-single-tenant-auth/generate-traces-assert.yaml b/tests/e2e-openshift/tempo-single-tenant-auth/generate-traces-assert.yaml index 1ee1b1348..06ad58162 100644 --- a/tests/e2e-openshift/tempo-single-tenant-auth/generate-traces-assert.yaml +++ b/tests/e2e-openshift/tempo-single-tenant-auth/generate-traces-assert.yaml @@ -4,6 +4,4 @@ metadata: name: generate-traces namespace: chainsaw-tst status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-jaeger-assert.yaml b/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-jaeger-assert.yaml index 67092c16d..925cd0046 100644 --- a/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-jaeger-assert.yaml +++ b/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-jaeger-assert.yaml @@ -4,6 +4,4 @@ metadata: name: verify-traces-jaeger namespace: chainsaw-tst status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-traceql-assert.yaml b/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-traceql-assert.yaml index 3a58e4455..80da88669 100644 --- a/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-traceql-assert.yaml +++ b/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-traceql-assert.yaml @@ -4,6 +4,4 @@ metadata: name: verify-traces-traceql namespace: chainsaw-tst status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/tls-monolithic-singletenant/03-assert.yaml b/tests/e2e-openshift/tls-monolithic-singletenant/03-assert.yaml index e9ebd41bc..f1b64779a 100644 --- a/tests/e2e-openshift/tls-monolithic-singletenant/03-assert.yaml +++ b/tests/e2e-openshift/tls-monolithic-singletenant/03-assert.yaml @@ -4,9 +4,7 @@ metadata: name: generate-traces-grpc namespace: chainsaw-tls-mono-st status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,6 +12,4 @@ metadata: name: generate-traces-http namespace: chainsaw-tls-mono-st status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/tls-monolithic-singletenant/04-assert.yaml b/tests/e2e-openshift/tls-monolithic-singletenant/04-assert.yaml index d61e19490..d15c0f136 100644 --- a/tests/e2e-openshift/tls-monolithic-singletenant/04-assert.yaml +++ b/tests/e2e-openshift/tls-monolithic-singletenant/04-assert.yaml @@ -4,9 +4,7 @@ metadata: name: verify-traces-grpc namespace: chainsaw-tls-mono-st status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,6 +12,4 @@ metadata: name: verify-traces-http namespace: chainsaw-tls-mono-st status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/tls-singletenant/03-assert.yaml b/tests/e2e-openshift/tls-singletenant/03-assert.yaml index b142f282a..82fc40647 100644 --- a/tests/e2e-openshift/tls-singletenant/03-assert.yaml +++ b/tests/e2e-openshift/tls-singletenant/03-assert.yaml @@ -4,9 +4,7 @@ metadata: name: generate-traces-grpc namespace: chainsaw-tls-singletenant status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,6 +12,4 @@ metadata: name: generate-traces-http namespace: chainsaw-tls-singletenant status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/tls-singletenant/04-assert.yaml b/tests/e2e-openshift/tls-singletenant/04-assert.yaml index 2ac298b8c..0cf42999a 100644 --- a/tests/e2e-openshift/tls-singletenant/04-assert.yaml +++ b/tests/e2e-openshift/tls-singletenant/04-assert.yaml @@ -4,9 +4,7 @@ metadata: name: verify-traces-grpc namespace: chainsaw-tls-singletenant status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,6 +12,4 @@ metadata: name: verify-traces-http namespace: chainsaw-tls-singletenant status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-upgrade/upgrade/40-assert.yaml b/tests/e2e-upgrade/upgrade/40-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e-upgrade/upgrade/40-assert.yaml +++ b/tests/e2e-upgrade/upgrade/40-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-upgrade/upgrade/50-assert.yaml b/tests/e2e-upgrade/upgrade/50-assert.yaml index d9aef19d9..d9ebd7fc4 100644 --- a/tests/e2e-upgrade/upgrade/50-assert.yaml +++ b/tests/e2e-upgrade/upgrade/50-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-upgrade/upgrade/70-assert.yaml b/tests/e2e-upgrade/upgrade/70-assert.yaml index 9603fe12d..fcdb498a9 100644 --- a/tests/e2e-upgrade/upgrade/70-assert.yaml +++ b/tests/e2e-upgrade/upgrade/70-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-after-upgrade status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/compatibility/03-assert.yaml b/tests/e2e/compatibility/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/compatibility/03-assert.yaml +++ b/tests/e2e/compatibility/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/compatibility/04-assert.yaml b/tests/e2e/compatibility/04-assert.yaml index ab9e98db3..2000de515 100644 --- a/tests/e2e/compatibility/04-assert.yaml +++ b/tests/e2e/compatibility/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-jaeger status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/compatibility/05-assert.yaml b/tests/e2e/compatibility/05-assert.yaml index 7eec01bfb..d4baf6efe 100644 --- a/tests/e2e/compatibility/05-assert.yaml +++ b/tests/e2e/compatibility/05-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-grafana status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/custom-ca/02-assert.yaml b/tests/e2e/custom-ca/02-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/custom-ca/02-assert.yaml +++ b/tests/e2e/custom-ca/02-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/custom-ca/03-assert.yaml b/tests/e2e/custom-ca/03-assert.yaml index d9aef19d9..d9ebd7fc4 100644 --- a/tests/e2e/custom-ca/03-assert.yaml +++ b/tests/e2e/custom-ca/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/generate/chainsaw-test.yaml b/tests/e2e/generate/chainsaw-test.yaml index 0b5e7b383..1944f87ca 100755 --- a/tests/e2e/generate/chainsaw-test.yaml +++ b/tests/e2e/generate/chainsaw-test.yaml @@ -19,8 +19,7 @@ spec: - RELATED_IMAGE_TEMPO=docker.io/grafana/tempo:2.2.1 RELATED_IMAGE_TEMPO_QUERY=docker.io/grafana/tempo-query:2.2.1 RELATED_IMAGE_TEMPO_GATEWAY=quay.io/observatorium/api:main-2023-09-13-14e06c6 RELATED_IMAGE_TEMPO_GATEWAY_OPA=quay.io/observatorium/opa-openshift:main-2023-05-24-8e91537 - ../../../bin/manager generate --config config.yaml --cr cr.yaml --output - generated.yaml + ../../../bin/manager generate --config config.yaml --cr cr.yaml --output generated.yaml entrypoint: /bin/sh - command: timeout: 60s diff --git a/tests/e2e/monolithic-ingestion-mtls/03-assert.yaml b/tests/e2e/monolithic-ingestion-mtls/03-assert.yaml index d63e4dc65..5b558c510 100644 --- a/tests/e2e/monolithic-ingestion-mtls/03-assert.yaml +++ b/tests/e2e/monolithic-ingestion-mtls/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 diff --git a/tests/e2e/monolithic-ingestion-mtls/04-assert.yaml b/tests/e2e/monolithic-ingestion-mtls/04-assert.yaml index 055af76dc..9ae4ae7ad 100644 --- a/tests/e2e/monolithic-ingestion-mtls/04-assert.yaml +++ b/tests/e2e/monolithic-ingestion-mtls/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 diff --git a/tests/e2e/monolithic-memory/03-assert.yaml b/tests/e2e/monolithic-memory/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/monolithic-memory/03-assert.yaml +++ b/tests/e2e/monolithic-memory/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-memory/04-assert.yaml b/tests/e2e/monolithic-memory/04-assert.yaml index ab9e98db3..2000de515 100644 --- a/tests/e2e/monolithic-memory/04-assert.yaml +++ b/tests/e2e/monolithic-memory/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-jaeger status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-memory/05-assert.yaml b/tests/e2e/monolithic-memory/05-assert.yaml index 7eec01bfb..d4baf6efe 100644 --- a/tests/e2e/monolithic-memory/05-assert.yaml +++ b/tests/e2e/monolithic-memory/05-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-grafana status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-pv/03-assert.yaml b/tests/e2e/monolithic-pv/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/monolithic-pv/03-assert.yaml +++ b/tests/e2e/monolithic-pv/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-pv/04-assert.yaml b/tests/e2e/monolithic-pv/04-assert.yaml index 055af76dc..d9ebd7fc4 100644 --- a/tests/e2e/monolithic-pv/04-assert.yaml +++ b/tests/e2e/monolithic-pv/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-receivers-tls/03-assert.yaml b/tests/e2e/monolithic-receivers-tls/03-assert.yaml index 02d0f1afb..b9f26e679 100644 --- a/tests/e2e/monolithic-receivers-tls/03-assert.yaml +++ b/tests/e2e/monolithic-receivers-tls/03-assert.yaml @@ -3,15 +3,11 @@ kind: Job metadata: name: generate-traces-http status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job metadata: name: generate-traces-grpc status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-receivers-tls/04-assert.yaml b/tests/e2e/monolithic-receivers-tls/04-assert.yaml index 1178bc292..d05a64d9a 100644 --- a/tests/e2e/monolithic-receivers-tls/04-assert.yaml +++ b/tests/e2e/monolithic-receivers-tls/04-assert.yaml @@ -3,15 +3,11 @@ kind: Job metadata: name: verify-traces-http status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job metadata: name: verify-traces-grpc status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-s3-tls/03-assert.yaml b/tests/e2e/monolithic-s3-tls/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/monolithic-s3-tls/03-assert.yaml +++ b/tests/e2e/monolithic-s3-tls/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-s3-tls/04-assert.yaml b/tests/e2e/monolithic-s3-tls/04-assert.yaml index 055af76dc..d9ebd7fc4 100644 --- a/tests/e2e/monolithic-s3-tls/04-assert.yaml +++ b/tests/e2e/monolithic-s3-tls/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/receivers-mtls/03-assert.yaml b/tests/e2e/receivers-mtls/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/receivers-mtls/03-assert.yaml +++ b/tests/e2e/receivers-mtls/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/receivers-mtls/04-assert.yaml b/tests/e2e/receivers-mtls/04-assert.yaml index d9aef19d9..d9ebd7fc4 100644 --- a/tests/e2e/receivers-mtls/04-assert.yaml +++ b/tests/e2e/receivers-mtls/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/receivers-tls/03-assert.yaml b/tests/e2e/receivers-tls/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/receivers-tls/03-assert.yaml +++ b/tests/e2e/receivers-tls/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/receivers-tls/04-assert.yaml b/tests/e2e/receivers-tls/04-assert.yaml index d9aef19d9..d9ebd7fc4 100644 --- a/tests/e2e/receivers-tls/04-assert.yaml +++ b/tests/e2e/receivers-tls/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/operator-metrics/max-loops/01-assert-job.yaml b/tests/operator-metrics/max-loops/01-assert-job.yaml index 9fbedde5d..4c7297892 100644 --- a/tests/operator-metrics/max-loops/01-assert-job.yaml +++ b/tests/operator-metrics/max-loops/01-assert-job.yaml @@ -4,6 +4,4 @@ metadata: name: verify-metrics namespace: ($TEMPO_NAMESPACE) status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file