Skip to content

Commit

Permalink
agent:
Browse files Browse the repository at this point in the history
* separate batch for metrics
* increase timer for cadvisor
  • Loading branch information
d7561985 committed Apr 27, 2023
1 parent 5a833a1 commit 03170aa
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion charts/agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 9 additions & 5 deletions charts/agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ]
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 03170aa

Please sign in to comment.