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.

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

Integrations Cleanup and Updates #1197

Merged
merged 44 commits into from
Feb 12, 2025
Merged

Integrations Cleanup and Updates #1197

merged 44 commits into from
Feb 12, 2025

Conversation

bentonam
Copy link
Collaborator

@bentonam bentonam commented Feb 3, 2025

No description provided.

The namespaces property is already supported by the ksm helm chart, but wasn't documented in the k8s chart
Ensured that only a leading or trailing space is removed when the timestamp is scrubbed
Copy link
Collaborator

@petewall petewall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was the useDefaultAllowList not working for you? I switched to mergeOverwrite in the template, which should allow for users to set false values to overwrite the default true.

@bentonam
Copy link
Collaborator Author

bentonam commented Feb 7, 2025

helm/helm#5238

petewall and others added 11 commits February 10, 2025 21:24
* 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 <[email protected]>

* Fix test

Signed-off-by: Pete Wall <[email protected]>

---------

Signed-off-by: Pete Wall <[email protected]>
* Added otlp-gateway as part of validation check

* updated check to use regex instead of contains

* added tempo checks

* Fixed metrics/logs messaging
Signed-off-by: Robbie Lankford <[email protected]>
utilize dig that handles undefined fields

Signed-off-by: Pete Wall <[email protected]>
Signed-off-by: Robbie Lankford <[email protected]>
* add application-observability platform test

---------

Signed-off-by: Robbie Lankford <[email protected]>
* 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

Signed-off-by: Pete Wall <[email protected]>

* Update charts/k8s-monitoring/tests/destination_validations_test.yaml

Co-authored-by: Robert Lankford <[email protected]>

* Actually test the right error message

Signed-off-by: Pete Wall <[email protected]>

---------

Signed-off-by: Pete Wall <[email protected]>
Co-authored-by: Robert Lankford <[email protected]>
petewall and others added 22 commits February 10, 2025 21:24
* update default batch size in feature-application-observability

Signed-off-by: Robbie Lankford <[email protected]>

* update tests and generated files

---------

Signed-off-by: Robbie Lankford <[email protected]>
Signed-off-by: Robbie Lankford <[email protected]>
* Make it possible to skip mysql logs integration

Signed-off-by: Pete Wall <[email protected]>

* Catch more instances

Signed-off-by: Pete Wall <[email protected]>

---------

Signed-off-by: Pete Wall <[email protected]>
* 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 <[email protected]>

* Fix test

Signed-off-by: Pete Wall <[email protected]>

---------

Signed-off-by: Pete Wall <[email protected]>
…eanup

# Conflicts:
#	charts/k8s-monitoring/charts/feature-integrations/docs/integrations/tempo.md
#	charts/k8s-monitoring/charts/feature-integrations/integrations/tempo-values.yaml
#	charts/k8s-monitoring/charts/feature-integrations/schema-mods/definitions/tempo-integration.schema.json
#	charts/k8s-monitoring/charts/feature-integrations/templates/_integration_tempo_logs.tpl
#	charts/k8s-monitoring/charts/feature-integrations/templates/_integration_tempo_metrics.tpl
#	charts/k8s-monitoring/charts/feature-integrations/tests/tempo_logs_test.yaml
#	charts/k8s-monitoring/charts/feature-integrations/tests/tempo_metrics_test.yaml
#	charts/k8s-monitoring/charts/feature-integrations/values.schema.json
#	charts/k8s-monitoring/charts/feature-pod-logs/templates/_common_pod_discovery.alloy.tpl
#	charts/k8s-monitoring/charts/feature-pod-logs/tests/default_test.yaml
#	charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml
#	charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml
#	charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml
#	charts/k8s-monitoring/docs/examples/auth/oauth2/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/auth/oauth2/output.yaml
#	charts/k8s-monitoring/docs/examples/collector-storage/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/collector-storage/output.yaml
#	charts/k8s-monitoring/docs/examples/destinations/otlp-endpoint/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/destinations/otlp-endpoint/output.yaml
#	charts/k8s-monitoring/docs/examples/extra-rules/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/extra-rules/output.yaml
#	charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml
#	charts/k8s-monitoring/docs/examples/features/integrations/grafana/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/features/integrations/grafana/output.yaml
#	charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml
#	charts/k8s-monitoring/docs/examples/features/integrations/mimir/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/features/integrations/mimir/output.yaml
#	charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml
#	charts/k8s-monitoring/docs/examples/features/pod-logs/default/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/features/pod-logs/default/output.yaml
#	charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy
#	charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml
#	charts/k8s-monitoring/docs/examples/platforms/azure-aks/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml
#	charts/k8s-monitoring/docs/examples/platforms/eks-fargate/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/platforms/eks-fargate/output.yaml
#	charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml
#	charts/k8s-monitoring/docs/examples/platforms/openshift/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml
#	charts/k8s-monitoring/docs/examples/pod-labels-and-annotations/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/pod-labels-and-annotations/output.yaml
#	charts/k8s-monitoring/docs/examples/private-image-registries/globally/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/private-image-registries/globally/output.yaml
#	charts/k8s-monitoring/docs/examples/proxies/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/proxies/output.yaml
#	charts/k8s-monitoring/docs/examples/tolerations/alloy-logs.alloy
#	charts/k8s-monitoring/docs/examples/tolerations/output.yaml
#	charts/k8s-monitoring/tests/integration/auth/.rendered/output.yaml
#	charts/k8s-monitoring/tests/integration/cluster-monitoring/.rendered/output.yaml
#	charts/k8s-monitoring/tests/integration/control-plane-monitoring/.rendered/output.yaml
#	charts/k8s-monitoring/tests/integration/integration-grafana/.rendered/output.yaml
#	charts/k8s-monitoring/tests/integration/integration-loki/.rendered/output.yaml
#	charts/k8s-monitoring/tests/integration/integration-mysql/.rendered/output.yaml
#	charts/k8s-monitoring/tests/integration/integration-tempo/.rendered/output.yaml
#	charts/k8s-monitoring/tests/integration/istio-service-mesh/.rendered/output.yaml
#	charts/k8s-monitoring/tests/integration/pod-logs/.rendered/output.yaml
#	charts/k8s-monitoring/tests/integration/split-destinations/.rendered/output.yaml
#	charts/k8s-monitoring/tests/platform/eks-with-windows/.rendered/output.yaml
#	charts/k8s-monitoring/tests/platform/gke-autopilot/.rendered/output.yaml
#	charts/k8s-monitoring/tests/platform/grafana-cloud/app-observability/.rendered/output.yaml
#	charts/k8s-monitoring/tests/platform/grafana-cloud/k8s-monitoring/.rendered/output.yaml
@petewall
Copy link
Collaborator

LGTM

@bentonam bentonam merged commit 2bd0c7c into main Feb 12, 2025
37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants