Integrations Cleanup and Updates #1197

bentonam · 2025-02-03T17:16:24Z

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

petewall

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.

charts/k8s-monitoring/charts/feature-cluster-metrics/values.yaml

petewall · 2025-02-03T17:29:38Z

charts/k8s-monitoring/charts/feature-cluster-metrics/values.yaml

@@ -434,6 +434,10 @@ kube-state-metrics:
  # @section -- kube-state-metrics
  namespace: ""

+  # Comma-separated list(string) or yaml list of namespaces to be enabled for collecting resources. By default all namespaces are collected.
+  # @section -- kube-state-metrics
+  namespaces: ""


This isn't used anywhere yet. Is this meant to filter the metrics post-scrape? as in, only keep metrics from these namesapces. What about non-namespaced metrics, like kube_node_info?

That is used by kube-state-metrics helm chart already. https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-state-metrics/values.yaml#L418

It just wasn't in our docs so it wasn't obvious how to set it if you wanted to limit the scope of KSM for meta-monitoring or other purposes.

Co-authored-by: Pete Wall <[email protected]>

bentonam · 2025-02-07T20:42:50Z

helm/helm#5238

* 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]>

…rics" to 0.5.13 (#1194) Co-authored-by: petewall <[email protected]>

…to 0.5.13 (#1195) Co-authored-by: petewall <[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]>

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

* 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]>

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]>

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

bentonam added 10 commits February 3, 2025 11:18

Remove extra lines in app-o11y notes

2de80e3

Added namespaces property

fd44e57

The namespaces property is already supported by the ksm helm chart, but wasn't documented in the k8s chart

Drop debug logs by default

f1b94f0

fixed scrubTimestamp bug

27c4164

Ensured that only a leading or trailing space is removed when the timestamp is scrubbed

Update ts format

a05ad4e

Documentation

65c54d3

Set default allow list to null

56b169a

Updated Meta-Monitoring Example

37b9bcd

Updates

26723e5

Updated Tests and Rebuilt

cc78a1c

bentonam requested review from a team, petewall and rlankfo as code owners February 3, 2025 17:16

bentonam requested review from skl, nevermind89x and sleepyfoodie February 3, 2025 17:16

petewall reviewed Feb 3, 2025

View reviewed changes

Update charts/k8s-monitoring/charts/feature-cluster-metrics/values.yaml

41b7494

Co-authored-by: Pete Wall <[email protected]>

petewall and others added 11 commits February 10, 2025 21:24

Added otlp-gateway as part of validation check (#1202)

5b3b1d9

* 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

952a9d6

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

Add unit tests for the new Grafana cloud validators. (#1204)

3c04831

utilize dig that handles undefined fields Signed-off-by: Pete Wall <[email protected]>

Bump v2 version to 2.0.8

475a1d2

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

Update Update dependency "kepler" for Helm chart "feature-cluster-met…

ee9c568

…rics" to 0.5.13 (#1194) Co-authored-by: petewall <[email protected]>

Update Update dependency "kepler" for Helm chart "k8s-monitoring-v1" …

a1caf4e

…to 0.5.13 (#1195) Co-authored-by: petewall <[email protected]>

add application-observability platform test (#1206)

af43837

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

Actually implement proxy URL for loki destinations (#1215)

5ac3d33

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

petewall and others added 21 commits February 10, 2025 21:24

Add the ability to set an additional service for the recevier (#1213)

38df6f8

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

adjust default batch size for feature-application-observability (#1205)

9edb37b

* 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]>

make build (#1216)

e9f96bf

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

Make it possible to skip mysql logs integration (#1218)

0f676ad

* 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 Pod log annotation and label assignment (#1222)

729ecb0

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

Bump versions to 1.6.24 and 2.0.9

0267b6e

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

Updates

1fa34d5

Fixed integration bug not merging booleans

a819ac2

WIP

9d2b88b

Fixed Deep Copy / Merge of Loki Values and added Tests

7fbeb00

Fixed Deep Copy / Merge of Mimir Values and added Tests

629f82d

Fixed Deep Copy / Merge of Grafana Values and added Tests

7ed7480

Fixed Deep Copy / Merge of Tempo Values and added Tests

64806e8

Rebuilt

bcd6ab1

Only run these workflows on weekday mornings

d1a22bb

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

Updated Tests and Rebuilt

ea5ed3d

Rebuilt

4bf9be8

Rebuilt

f5485ea

Fixed Tests

5aba37a

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrations Cleanup and Updates #1197

Integrations Cleanup and Updates #1197

bentonam commented Feb 3, 2025

petewall left a comment

petewall Feb 3, 2025

bentonam Feb 3, 2025

bentonam commented Feb 7, 2025

Integrations Cleanup and Updates #1197

Are you sure you want to change the base?

Integrations Cleanup and Updates #1197

Conversation

bentonam commented Feb 3, 2025

petewall left a comment

Choose a reason for hiding this comment

petewall Feb 3, 2025

Choose a reason for hiding this comment

bentonam Feb 3, 2025

Choose a reason for hiding this comment

bentonam commented Feb 7, 2025