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.

Sign up for GitHub

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

Change memory_limiter checks interval from 5s to 2s #178

Merged
merged 1 commit into from
Jul 15, 2021
Merged

Change memory_limiter checks interval from 5s to 2s #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## Unreleased

### Changed

- Set more frequent checks for memory_limiter (#178)

### Fixed

- All missing attributes are added to prometheus metrics reported
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/splunk-otel-collector/templates/config/_common.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Common config for the otel-collector memory_limiter processor
{{- define "splunk-otel-collector.otelMemoryLimiterConfig" -}}
memory_limiter:
# check_interval is the time between measurements of memory usage.
check_interval: 5s
check_interval: 2s
# By default limit_mib is set to 80% of container memory limit
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
# Agent will set this value.
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ data:
node_from_env_var: K8S_NODE_NAME
memory_limiter:
ballast_size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
check_interval: 5s
check_interval: 2s
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
resource:
attributes:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ data:
batch: null
memory_limiter:
ballast_size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
check_interval: 5s
check_interval: 2s
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
resource:
attributes:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 826663a823f84bf1225877b27bffc55e8471bf244e93cc8ee5a441c3012a9f37
checksum/config: 9f9d550fd6e040efd7fb334956705bd1ef645f897865419d90b7a1e70aa578da
spec:
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 2d65a1fc80af6a7020e35ebf6390a981f99ea87c066848845da721513ab4784b
checksum/config: 92d7b33eb5df88128edbeb08989ac25b5bcc8ab8e0b376a6ee39789d211ea6cb
spec:
serviceAccountName: default-splunk-otel-collector
containers:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/configmap-otel-collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ data:
- podUID
memory_limiter:
ballast_size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
check_interval: 5s
check_interval: 2s
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
resource/add_cluster_name:
attributes:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/deployment-collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
component: otel-collector
release: default
annotations:
checksum/config: 23fb8e3ca7ae878920c7c82e5c4d451b22614848a3f65293747c77ac46127c1e
checksum/config: aac5ee68eab32e53c04cc3a8cd7c3a9ae4ae6a13b144a6ae226007d2f492290f
spec:
serviceAccountName: default-splunk-otel-collector
containers:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ data:
node_from_env_var: K8S_NODE_NAME
memory_limiter:
ballast_size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
check_interval: 5s
check_interval: 2s
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
resource:
attributes:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 45d855c74c87edf260c527d28e7acc8bb75d16a5d7c17ccf3b3c5290fae94003
checksum/config: 273af242215a07673467eff47f8565b84e2267947e22b9e2322f32f1483e6bbe
spec:
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ data:
node_from_env_var: K8S_NODE_NAME
memory_limiter:
ballast_size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
check_interval: 5s
check_interval: 2s
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
resource:
attributes:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ data:
batch: null
memory_limiter:
ballast_size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
check_interval: 5s
check_interval: 2s
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
resource:
attributes:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 81f5de159129a1ac8223e1b2bc17f0544bc85a7d08604f83346be894eb743dfc
checksum/config: dd5614a25e90b798edc25999f13b1d3405412936bf45f66f9cd47902a98c0c00
spec:
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 2d65a1fc80af6a7020e35ebf6390a981f99ea87c066848845da721513ab4784b
checksum/config: 92d7b33eb5df88128edbeb08989ac25b5bcc8ab8e0b376a6ee39789d211ea6cb
spec:
serviceAccountName: default-splunk-otel-collector
containers:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/traces-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ data:
node_from_env_var: K8S_NODE_NAME
memory_limiter:
ballast_size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
check_interval: 5s
check_interval: 2s
limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
resource:
attributes:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/traces-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 77b32076671999cc98988a884a739830771ee48638cce17715864dde26734962
checksum/config: f84a292ea9ca1dd1a27825a4c8bf9dc31be7cf306426910b6cf97c5fa2c10d5b
spec:
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
Expand Down