From 03170aa563748a35b1c50f147f1ec4b6a6e7c941 Mon Sep 17 00:00:00 2001 From: Dmitry Harupa Date: Thu, 27 Apr 2023 11:19:37 +0200 Subject: [PATCH] agent: * separate batch for metrics * increase timer for cadvisor --- charts/agent/Chart.yaml | 2 +- charts/agent/values.yaml | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/charts/agent/Chart.yaml b/charts/agent/Chart.yaml index 9343fe6..0e80627 100644 --- a/charts/agent/Chart.yaml +++ b/charts/agent/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.27 +version: 0.5.28 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/agent/values.yaml b/charts/agent/values.yaml index 2709d9b..421abe3 100644 --- a/charts/agent/values.yaml +++ b/charts/agent/values.yaml @@ -255,7 +255,7 @@ receivers: target_label: __metrics_path__ replacement: /api/v1/nodes/$$1/proxy/metrics - job_name: 'kubernetes-cadvisor' - scrape_interval: 15s + scrape_interval: 1m scheme: https tls_config: ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt @@ -436,11 +436,11 @@ config: exporters: [ logging, otlp/global ] metrics/2: receivers: [ prometheus ] - processors: [ resource, transform, memory_limiter, batch ] + processors: [ resource, transform, memory_limiter, batch/metrics ] exporters: [ logging, otlp/global ] metrics: receivers: [ otlp, ] - processors: [ resource, transform, memory_limiter, batch ] + processors: [ resource, transform, memory_limiter, batch/metrics ] exporters: [ logging, otlp/global ] logs: receivers: [ fluentforward, otlp, filelog ] @@ -489,7 +489,7 @@ config: - replace_all_patterns(attributes, "key", "service.name", "job") - delete_key(attributes, "k8s.pod.uid") - delete_key(attributes, "k8s.container.restart_count") - - replace_all_patterns(attributes, "key", "k8s.node.name", "nodename") + - replace_all_patterns(attributes, "key", "k8s.node.name", "node") - replace_all_patterns(attributes, "key", "k8s.namespace.name", "k8s_namespace") - replace_all_patterns(attributes, "key", "k8s.pod.name", "instance") - replace_all_patterns(attributes, "key", "k8s.container.name", "k8s_container") @@ -552,7 +552,11 @@ config: batch: send_batch_size: 100 send_batch_max_size: 1000 - timeout: 15ms + timeout: 15s + batch/metrics: + send_batch_size: 100 + send_batch_max_size: 1000 + timeout: 5s # Enabling the memory_limiter is strongly recommended for every pipeline. # Configuration is based on the amount of memory allocated to the collector. # The configuration below assumes 2GB of memory. In general, the ballast