Add support for monitor tab in Jaeger console #470
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
Codecov Report
@@ Coverage Diff @@
## main #470 +/- ##
==========================================
+ Coverage 78.11% 78.22% +0.10%
==========================================
Files 64 64
Lines 4707 4758 +51
==========================================
+ Hits 3677 3722 +45
- Misses 857 861 +4
- Partials 173 175 +2
Flags with carried forward coverage won't be shown. Click here to find out more.
|
pavolloffay
commented
Jul 6, 2023
| Value: tempo.Spec.Template.QueryFrontend.JaegerQuery.MonitorTab.PrometheusEndpoint, | ||
| }, | ||
| }, | ||
| Args: []string{ |
There was a problem hiding this comment.
I need to add a condition here to set the TLS/token file only when deployed on OCP
| @@ -0,0 +1,13 @@ | |||
| #!/bin/bash | |||
There was a problem hiding this comment.
Could you move this shellscript to a container? This will give us more deterministic results (e.g. curl might not be installed on every test host, may have a different version, etc.)
Something like here: https://github.com/grafana/tempo-operator/blob/3b402384c9e78b4cd0ae075548f4c6cebab82505/tests/e2e/smoketest-with-jaeger/03-verify-traces.yaml
There was a problem hiding this comment.
+1 I will change it
pavolloffay
force-pushed
the
span-metrics
branch
2 times, most recently
from
f39c775
to
9057fc5
Compare
|
I am seeing the following error even when a bundle is provisioned from annotation: |
pavolloffay
force-pushed
the
span-metrics
branch
from
423a3cf
to
e1313c9
Compare
|
The e2e test is passing now locally fine (I did 4 runs). However the solution does not work with OTEL collector 0.80.0 and above. Once Tempo 2.2 is released I will be able to support it via jaegertracing/jaeger#4555 |
| } | ||
| // If the endpoint matches Prometheus on OpenShift, configure TLS and token based auth | ||
| prometheusEndpoint := strings.TrimSpace(tempo.Spec.Template.QueryFrontend.JaegerQuery.MonitorTab.PrometheusEndpoint) | ||
| if prometheusEndpoint == "https://thanos-querier.openshift-monitoring.svc.cluster.local:9091" { |
There was a problem hiding this comment.
imho these settings (prometheus.tls.enabled, prometheus.token-file, prometheus.tls.ca) should be part of the monitorTab field in the CR, otherwise this feature will only work on non-tls prometheus and the monitoring stack on OpenShift.
There was a problem hiding this comment.
and to keep it simple for users, set these new fields of the CR in the defaulter webhook to the values here, if the endpoint matches the thanos endpoint
andreasgerstmayr
approved these changes
Aug 2, 2023
Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
pavolloffay
force-pushed
the
span-metrics
branch
from
e1313c9
to
9762bee
Compare
|
@andreasgerstmayr the PR is ready to be reviewed e2e test is passing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #466
Based on https://docs.google.com/document/d/17TC4VPaRgK1SeP9JNFlYk17gGjJ1dtQh1ENa9wO9rVw/edit#heading=h.rqzf9iedmg7o
Blocked by #525
Depends on:
flag: --prometheus.token-fileTodos