diff --git a/CHANGELOG.md b/CHANGELOG.md index 7237918c17..aa7eca2d32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl index 6b1cf296c5..9ccabd5ce0 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_common.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_common.tpl @@ -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. diff --git a/rendered/manifests/agent-only/configmap-otel-agent.yaml b/rendered/manifests/agent-only/configmap-otel-agent.yaml index a4216db253..e0ee8ed724 100644 --- a/rendered/manifests/agent-only/configmap-otel-agent.yaml +++ b/rendered/manifests/agent-only/configmap-otel-agent.yaml @@ -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: diff --git a/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml b/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml index 3528a8d5eb..727cd034ed 100644 --- a/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml +++ b/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml @@ -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: diff --git a/rendered/manifests/agent-only/daemonset.yaml b/rendered/manifests/agent-only/daemonset.yaml index c548f622a6..d8f3436c13 100644 --- a/rendered/manifests/agent-only/daemonset.yaml +++ b/rendered/manifests/agent-only/daemonset.yaml @@ -23,7 +23,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 826663a823f84bf1225877b27bffc55e8471bf244e93cc8ee5a441c3012a9f37 + checksum/config: 9f9d550fd6e040efd7fb334956705bd1ef645f897865419d90b7a1e70aa578da spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml b/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml index 30a10b0555..d2da9aecc8 100644 --- a/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml +++ b/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml @@ -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: diff --git a/rendered/manifests/gateway-only/configmap-otel-collector.yaml b/rendered/manifests/gateway-only/configmap-otel-collector.yaml index 7ab7745060..4a1ecb7fc5 100644 --- a/rendered/manifests/gateway-only/configmap-otel-collector.yaml +++ b/rendered/manifests/gateway-only/configmap-otel-collector.yaml @@ -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: diff --git a/rendered/manifests/gateway-only/deployment-collector.yaml b/rendered/manifests/gateway-only/deployment-collector.yaml index 6600c51512..95babd19f0 100644 --- a/rendered/manifests/gateway-only/deployment-collector.yaml +++ b/rendered/manifests/gateway-only/deployment-collector.yaml @@ -24,7 +24,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: 23fb8e3ca7ae878920c7c82e5c4d451b22614848a3f65293747c77ac46127c1e + checksum/config: aac5ee68eab32e53c04cc3a8cd7c3a9ae4ae6a13b144a6ae226007d2f492290f spec: serviceAccountName: default-splunk-otel-collector containers: diff --git a/rendered/manifests/logs-only/configmap-otel-agent.yaml b/rendered/manifests/logs-only/configmap-otel-agent.yaml index ca9cb08b99..377048342d 100644 --- a/rendered/manifests/logs-only/configmap-otel-agent.yaml +++ b/rendered/manifests/logs-only/configmap-otel-agent.yaml @@ -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: diff --git a/rendered/manifests/logs-only/daemonset.yaml b/rendered/manifests/logs-only/daemonset.yaml index e46a7e41ba..205d58ee1a 100644 --- a/rendered/manifests/logs-only/daemonset.yaml +++ b/rendered/manifests/logs-only/daemonset.yaml @@ -23,7 +23,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 45d855c74c87edf260c527d28e7acc8bb75d16a5d7c17ccf3b3c5290fae94003 + checksum/config: 273af242215a07673467eff47f8565b84e2267947e22b9e2322f32f1483e6bbe spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/rendered/manifests/metrics-only/configmap-otel-agent.yaml b/rendered/manifests/metrics-only/configmap-otel-agent.yaml index ff2ba13805..4f87afbc5e 100644 --- a/rendered/manifests/metrics-only/configmap-otel-agent.yaml +++ b/rendered/manifests/metrics-only/configmap-otel-agent.yaml @@ -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: diff --git a/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml b/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml index 3528a8d5eb..727cd034ed 100644 --- a/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml +++ b/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml @@ -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: diff --git a/rendered/manifests/metrics-only/daemonset.yaml b/rendered/manifests/metrics-only/daemonset.yaml index 06888434e1..5323986462 100644 --- a/rendered/manifests/metrics-only/daemonset.yaml +++ b/rendered/manifests/metrics-only/daemonset.yaml @@ -22,7 +22,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 81f5de159129a1ac8223e1b2bc17f0544bc85a7d08604f83346be894eb743dfc + checksum/config: dd5614a25e90b798edc25999f13b1d3405412936bf45f66f9cd47902a98c0c00 spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml b/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml index 30a10b0555..d2da9aecc8 100644 --- a/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml +++ b/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml @@ -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: diff --git a/rendered/manifests/traces-only/configmap-otel-agent.yaml b/rendered/manifests/traces-only/configmap-otel-agent.yaml index 6fae520f7a..5a4f518398 100644 --- a/rendered/manifests/traces-only/configmap-otel-agent.yaml +++ b/rendered/manifests/traces-only/configmap-otel-agent.yaml @@ -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: diff --git a/rendered/manifests/traces-only/daemonset.yaml b/rendered/manifests/traces-only/daemonset.yaml index 26c0eff824..6f1c5cc96c 100644 --- a/rendered/manifests/traces-only/daemonset.yaml +++ b/rendered/manifests/traces-only/daemonset.yaml @@ -22,7 +22,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 77b32076671999cc98988a884a739830771ee48638cce17715864dde26734962 + checksum/config: f84a292ea9ca1dd1a27825a4c8bf9dc31be7cf306426910b6cf97c5fa2c10d5b spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet