-
Notifications
You must be signed in to change notification settings - Fork 115
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.
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
Added Tempo Integration #1168
Merged
petewall
merged 14 commits into
grafana:main
from
Imshelledin21:feature-integration-tempo
Feb 6, 2025
Merged
Added Tempo Integration #1168
petewall
merged 14 commits into
grafana:main
from
Imshelledin21:feature-integration-tempo
Feb 6, 2025
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
Don't have the default allow list currently, so blanking it out while I compile it.
Working on compiling the default metrics allow list, then I think we'll be ready to go with this integration. |
petewall
approved these changes
Feb 6, 2025
lgTm! |
bentonam
pushed a commit
that referenced
this pull request
Feb 11, 2025
* Initial commit for tempo integration. * Adding in tempo integration tests * Update to default allow list for metrics Don't have the default allow list currently, so blanking it out while I compile it. * Adding default metric allow list * Fix to tempo integration test * Add in tempo single binary deployment for tests * removing test values file * updating generated files * Fix to test for keep_metrics with tempo integration * Updating port name for metrics collection in tempo integration test. * updating output.yaml for tempo integration test * Test fix - port name for tempo-monolith is different than tempo distributed
bentonam
added a commit
that referenced
this pull request
Feb 12, 2025
* Remove extra lines in app-o11y notes * Added namespaces property The namespaces property is already supported by the ksm helm chart, but wasn't documented in the k8s chart * Drop debug logs by default * fixed scrubTimestamp bug Ensured that only a leading or trailing space is removed when the timestamp is scrubbed * Update ts format * Documentation * Set default allow list to null * Updated Meta-Monitoring Example * Updates * Updated Tests and Rebuilt * Update charts/k8s-monitoring/charts/feature-cluster-metrics/values.yaml Co-authored-by: Pete Wall <pete.wall@grafana.com> * Fix a few things: (#1200) * Fix a few things: * Pod Logs annotations and labels * Turn off authentication for Grafana in integration tests * Fix validation messages and check for pod logs Signed-off-by: Pete Wall <pete.wall@grafana.com> * Fix test Signed-off-by: Pete Wall <pete.wall@grafana.com> --------- Signed-off-by: Pete Wall <pete.wall@grafana.com> * Added otlp-gateway as part of validation check (#1202) * Added otlp-gateway as part of validation check * updated check to use regex instead of contains * added tempo checks * Fixed metrics/logs messaging * Bump v2 version to 2.0.7 Signed-off-by: Robbie Lankford <robert.lankford@grafana.com> * Add unit tests for the new Grafana cloud validators. (#1204) utilize dig that handles undefined fields Signed-off-by: Pete Wall <pete.wall@grafana.com> * Bump v2 version to 2.0.8 Signed-off-by: Robbie Lankford <robert.lankford@grafana.com> * Update Update dependency "kepler" for Helm chart "feature-cluster-metrics" to 0.5.13 (#1194) Co-authored-by: petewall <petewall@users.noreply.github.com> * Update Update dependency "kepler" for Helm chart "k8s-monitoring-v1" to 0.5.13 (#1195) Co-authored-by: petewall <petewall@users.noreply.github.com> * add application-observability platform test (#1206) * add application-observability platform test --------- Signed-off-by: Robbie Lankford <robert.lankford@grafana.com> * Added Tempo Integration (#1168) * Initial commit for tempo integration. * Adding in tempo integration tests * Update to default allow list for metrics Don't have the default allow list currently, so blanking it out while I compile it. * Adding default metric allow list * Fix to tempo integration test * Add in tempo single binary deployment for tests * removing test values file * updating generated files * Fix to test for keep_metrics with tempo integration * Updating port name for metrics collection in tempo integration test. * updating output.yaml for tempo integration test * Test fix - port name for tempo-monolith is different than tempo distributed * Add validation for otlp destination protocol (#1212) * Add validation for otlp destination protocol Signed-off-by: Pete Wall <pete.wall@grafana.com> * Update charts/k8s-monitoring/tests/destination_validations_test.yaml Co-authored-by: Robert Lankford <rlankfo@gmail.com> * Actually test the right error message Signed-off-by: Pete Wall <pete.wall@grafana.com> --------- Signed-off-by: Pete Wall <pete.wall@grafana.com> Co-authored-by: Robert Lankford <rlankfo@gmail.com> * Actually implement proxy URL for loki destinations (#1215) Signed-off-by: Pete Wall <pete.wall@grafana.com> * Add the ability to set an additional service for the recevier (#1213) Signed-off-by: Pete Wall <pete.wall@grafana.com> * adjust default batch size for feature-application-observability (#1205) * update default batch size in feature-application-observability Signed-off-by: Robbie Lankford <robert.lankford@grafana.com> * update tests and generated files --------- Signed-off-by: Robbie Lankford <robert.lankford@grafana.com> * make build (#1216) Signed-off-by: Robbie Lankford <robert.lankford@grafana.com> * Make it possible to skip mysql logs integration (#1218) * Make it possible to skip mysql logs integration Signed-off-by: Pete Wall <pete.wall@grafana.com> * Catch more instances Signed-off-by: Pete Wall <pete.wall@grafana.com> --------- Signed-off-by: Pete Wall <pete.wall@grafana.com> * Fix Pod log annotation and label assignment (#1222) Signed-off-by: Pete Wall <pete.wall@grafana.com> * Bump versions to 1.6.24 and 2.0.9 Signed-off-by: Pete Wall <pete.wall@grafana.com> * Updates * Fixed integration bug not merging booleans * WIP * Fixed Deep Copy / Merge of Loki Values and added Tests * Fixed Deep Copy / Merge of Mimir Values and added Tests * Fixed Deep Copy / Merge of Grafana Values and added Tests * Fixed Deep Copy / Merge of Tempo Values and added Tests * Rebuilt * Fix a few things: (#1200) * Fix a few things: * Pod Logs annotations and labels * Turn off authentication for Grafana in integration tests * Fix validation messages and check for pod logs Signed-off-by: Pete Wall <pete.wall@grafana.com> * Fix test Signed-off-by: Pete Wall <pete.wall@grafana.com> --------- Signed-off-by: Pete Wall <pete.wall@grafana.com> * Only run these workflows on weekday mornings Signed-off-by: Pete Wall <pete.wall@grafana.com> * Updated Tests and Rebuilt * Rebuilt * Rebuilt * Fixed Tests --------- Signed-off-by: Pete Wall <pete.wall@grafana.com> Signed-off-by: Robbie Lankford <robert.lankford@grafana.com> Co-authored-by: Pete Wall <pete.wall@grafana.com> Co-authored-by: Robbie Lankford <robert.lankford@grafana.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: petewall <petewall@users.noreply.github.com> Co-authored-by: Robert Lankford <rlankfo@gmail.com> Co-authored-by: Sheldon Jackson <5133739+Imshelledin21@users.noreply.github.com>
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.
Adds support for Tempo Integration / Meta-Monitoring