From 0e083695672ef3055a008964f6c33675dea236f4 Mon Sep 17 00:00:00 2001 From: jvoravong <47871238+jvoravong@users.noreply.github.com> Date: Thu, 14 Nov 2024 09:33:42 -0700 Subject: [PATCH] Update hostmetrics receiver config to accommodate recent receiver updates (#1533) --- .chloggen/fix-hostmetrics-fs-bug.yaml | 12 ++++++++++++ .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../add-sampler/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../crio-logging/rendered_manifests/daemonset.yaml | 2 +- .../default/rendered_manifests/configmap-agent.yaml | 1 - examples/default/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../discovery-mode/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../multi-metrics/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../only-metrics/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - examples/use-proxy/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/configmap-agent.yaml | 1 - .../rendered_manifests/daemonset.yaml | 2 +- .../templates/config/_otel-agent.tpl | 3 --- 60 files changed, 41 insertions(+), 61 deletions(-) create mode 100644 .chloggen/fix-hostmetrics-fs-bug.yaml diff --git a/.chloggen/fix-hostmetrics-fs-bug.yaml b/.chloggen/fix-hostmetrics-fs-bug.yaml new file mode 100644 index 0000000000..e801e0c952 --- /dev/null +++ b/.chloggen/fix-hostmetrics-fs-bug.yaml @@ -0,0 +1,12 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix +# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other) +component: agent +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix bug where hostmetrics receiver was failing to scrape the filesystem +# One or more tracking issues related to the change +issues: [1533] +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml index cd7251cd30..3305bddc4c 100644 --- a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml +++ b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml @@ -304,7 +304,6 @@ data: endpoint: 0.0.0.0:8006 hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index c764e80230..ee17b0adfc 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 5897f0d311d853e5dc4e3273b3a12b8f5edbdf37f43b805eb28fb56738076c09 + checksum/config: 3af0da2e1171b1d2cb08b3604c7a3972f847f2f285ac22d2affea9226a806e98 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml index 7ee6a3194a..9a893a21fc 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml @@ -253,7 +253,6 @@ data: endpoint: 0.0.0.0:8006 hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml index 35103d6fad..24501b4ffb 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 9ecf5749d19f89689f9be61d6d03dce579874778c292abfccc0a59dc89581276 + checksum/config: 7bf4394b1568ba3e02d2613e396bff6dc7421918ad1cda4bd3406bdb3632fbba kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml index 8bc0daecb7..cbb7de6f14 100644 --- a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml +++ b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml @@ -135,7 +135,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index be279badc6..027d2e4ba7 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 169396fbe55446a78afbaf7403cf031640025f8ee2a7819ff9e0b3f703c48416 + checksum/config: 4e1a94226c9471e5a1d19e439287583328d266f6b5e47c20788a4ae7f182bf0e kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-sampler/rendered_manifests/configmap-agent.yaml b/examples/add-sampler/rendered_manifests/configmap-agent.yaml index 47a3ffef97..531c64e5ac 100644 --- a/examples/add-sampler/rendered_manifests/configmap-agent.yaml +++ b/examples/add-sampler/rendered_manifests/configmap-agent.yaml @@ -138,7 +138,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index 8139dc1715..b4012e41ec 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: a0c1d6d0759b86392d024cb2aea440560dad83b0fa783e0584cec1765124eb31 + checksum/config: d5a1314c0ae21cc1bb687a15146059b4948cdb08906d29f1badea5ed39c75f1e kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml index d57a546f08..17c8225fbd 100644 --- a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml +++ b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml @@ -288,7 +288,6 @@ data: endpoint: 0.0.0.0:8006 hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index bf9bae6b7e..046bdf8de5 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 6af3e0019755b46997613f4f3ec602280859a8833d75b965625b2ef642e4a37d + checksum/config: 8b29365de01901b8e4f247dd680fe8f3e4bb648186f0dbba936de93761138e84 kubectl.kubernetes.io/default-container: otel-collector sidecar.istio.io/inject: "false" spec: diff --git a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml index 1a2fbe6745..b54c198587 100644 --- a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml +++ b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml @@ -135,7 +135,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index 631a5457bd..6603481510 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 66ea1893fbeae1f78151b2e2ba0fbf369bd9e96680c99d615421899e3f78267c + checksum/config: 19210a4d2b4256f84c6c2f9a0cac6d311ca065a706aa9bb58c2f895c43c1e08a kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml index ca5c7758fa..ba4b09170d 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml @@ -119,7 +119,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index b92d5c0fcb..dfb623f437 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 9eb10f148d287a4b6622bfb22f79996543d3b9e2efcc6ae78b7188495516937e + checksum/config: dabda8534b04b9dd1758f91dd851fab6fae78959827d686da8dbc67d7e6e92a4 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml index aba9326dbd..728f9041f5 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml @@ -140,7 +140,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml index bf5be5e414..30db5af6a8 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 66ddbfc62d4de0ce3b68d2c1872b16572f47f2f8080e7e386161df479f8065fd + checksum/config: 0ee722ec16b9d357e4a1a9f1e7b05382bcda448daaa18d14b659ba23d53d5b3b kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/crio-logging/rendered_manifests/configmap-agent.yaml b/examples/crio-logging/rendered_manifests/configmap-agent.yaml index 1a2fbe6745..b54c198587 100644 --- a/examples/crio-logging/rendered_manifests/configmap-agent.yaml +++ b/examples/crio-logging/rendered_manifests/configmap-agent.yaml @@ -135,7 +135,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index 631a5457bd..6603481510 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 66ea1893fbeae1f78151b2e2ba0fbf369bd9e96680c99d615421899e3f78267c + checksum/config: 19210a4d2b4256f84c6c2f9a0cac6d311ca065a706aa9bb58c2f895c43c1e08a kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/default/rendered_manifests/configmap-agent.yaml b/examples/default/rendered_manifests/configmap-agent.yaml index 1a2fbe6745..b54c198587 100644 --- a/examples/default/rendered_manifests/configmap-agent.yaml +++ b/examples/default/rendered_manifests/configmap-agent.yaml @@ -135,7 +135,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index 631a5457bd..6603481510 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 66ea1893fbeae1f78151b2e2ba0fbf369bd9e96680c99d615421899e3f78267c + checksum/config: 19210a4d2b4256f84c6c2f9a0cac6d311ca065a706aa9bb58c2f895c43c1e08a kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml index f01ff399d6..40b92a2b57 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml @@ -341,7 +341,6 @@ data: endpoint: 0.0.0.0:8006 hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index ca3e7ce71a..6acf392371 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 7a163a8ecc2a2b94d605aa6e4af537d38474cdd233736cfe1ce92f791f5ca14c + checksum/config: c8ad70bff177f2fb81edc095bc7d4d906060ddc9202a03b79351953395be1e55 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml index aa4964d4f0..fe9e749446 100644 --- a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml +++ b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml @@ -135,7 +135,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/discovery-mode/rendered_manifests/daemonset.yaml b/examples/discovery-mode/rendered_manifests/daemonset.yaml index 5ed2f0d842..890d311740 100644 --- a/examples/discovery-mode/rendered_manifests/daemonset.yaml +++ b/examples/discovery-mode/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 7ac696c9d6557eb9a17c7b11855c3340bf4cca4fdb6f29f2e786b99111c5e3da + checksum/config: 3b215fb6a8fa42b7c3f269d37b0778183573fa022fd0c96d82b84dbf039195a4 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml index 4a745d3cb6..2fdf542c84 100644 --- a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml @@ -137,7 +137,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index c61afbcd92..6c204198fc 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 254237f10018e104f521f6a59fe4d3951ed7939a46e644c673cb8a6cc7bf1409 + checksum/config: 468e54ac9269bf4538e6bf40c9b7d458d16af5a967a3d14cbfcf8e40b69c9463 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml index e88f31b4ca..dcea2700ec 100644 --- a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml @@ -137,7 +137,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index d672d8f145..b0634369f2 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 832dc5a9f658ea6202ccfd19ce4de6e6708d7e36cf9b4af45ba833525b7f8ed9 + checksum/config: 33a14708a1c41953a4be3029e971877b294680a97ec67935d6df7d84c44b4c19 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml index e799d780b5..d920787d82 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml @@ -136,7 +136,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index ee13313506..2e78ae4f63 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 1222388b773b45c22fba5ee123ee7886b73a36e3c98e43a7c6589edb128a623f + checksum/config: 1f18218ca098bf1fb8c8e2d4cdbbe31c46dbf11b7223961a523016efd9eda402 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml index 42436cbfe3..c3a595fb16 100644 --- a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml @@ -136,7 +136,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index 3fd62d14f3..05d57eb1ab 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 5048a211b2f78811a5db0ab248406fad14df426e088451d829ccd33989dfe21f + checksum/config: 2ed0cd82f547d1901c1eac39e990a46741baf1507c8a8269bfb58b2bec2c1385 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml index 7ddb2da532..4095d7cdbf 100644 --- a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml @@ -135,7 +135,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index 8c570adad5..aca69b19ba 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 54ca2d1b48b1b23d9bb00e90e40ce5b360e4d0568d5b83c13997c41f7df89265 + checksum/config: 77c7d562dece76e9d7a8a707769731f2aff65e887997b8b6dc49b5f4f26cd350 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml index fc4c5a349e..a724ba33a6 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml @@ -258,7 +258,6 @@ data: endpoint: 0.0.0.0:8006 hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml index f69842d5b7..b050492706 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 4452b183c15f42ef4e5a56c7e2d0386dc73fc445afe0b05b96e088fdbd1cdb48 + checksum/config: 829cb89ab06f2d6d045f8b9093558b27f58bbbf223f996f40fdeee306061149b kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml index 0c291adbc0..118e4961b7 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml @@ -341,7 +341,6 @@ data: endpoint: 0.0.0.0:8006 hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index db1bcbc899..42171c51d2 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: e113089c2457a0a2ffb5e0771b1154c813c14aa79a4f691355a4ad467f31bc74 + checksum/config: defb294cd22608e2859d6510417bb83d22da57a52c6e0681578c3ea05eb85bae kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml index 0e3bec2a6d..0f14a26749 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml @@ -136,7 +136,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index e13150a6a4..f6f6a43c61 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: ba9ab09a6f70830247a0b00b58c3c4f4236d0e9e87b053237fe1ea2f13d87bf7 + checksum/config: b5d90ea2e6656e7ac0514fa34ebe48871e8ed5281caaa2daac2c2552aa9aab22 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml index 04d277203d..f611ba769b 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml @@ -153,7 +153,6 @@ data: endpoint: 0.0.0.0:8006 hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml index 4d953eb396..f81dae12a9 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml @@ -33,7 +33,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: e71951905b0d4eca397efbb7464cc9c8b5f35ddc9fae5d961f7df5f8cdae2c79 + checksum/config: 0ce1270c1dc365bbb262db4308f9f9907ea8ddc26d18251dddc9d880d56f44d9 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml index 04d277203d..f611ba769b 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml @@ -153,7 +153,6 @@ data: endpoint: 0.0.0.0:8006 hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml index 823fb52d58..4d713da8dd 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml @@ -33,7 +33,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: c26bb8b0a6145187ac45fc03000e9cefc3b4e0249dd675ffc32f7df9e8b6c628 + checksum/config: d9d9dea16ff798c2162933b0c724465ec71b515401a6c2edf8e574dfd27792f5 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml index 8d4e06d848..fc004e62d7 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml @@ -313,7 +313,6 @@ data: endpoint: 0.0.0.0:8006 hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index 44d0afa87c..95c44ab6f1 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 9bff5dd7275afa63e3a75b2f37e8482172178abca0c2bfe896aad1fd7a26a2eb + checksum/config: 3ef1c4783466260551e8251405077b674102448f2832d4af3af640802a3a5bd8 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml index 49d7479561..028c859101 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml @@ -176,7 +176,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index aadc73436a..949f031909 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: ddd0aa01c066531017c546b67a1f3c47c3ac42950d1c5ea26d2783018fa3ecd8 + checksum/config: cc082d27f4e4d103f71a07d37ebe17e9816b263ce5cceb4b193e9510325e1d07 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-metrics/rendered_manifests/configmap-agent.yaml b/examples/only-metrics/rendered_manifests/configmap-agent.yaml index ef7798782e..9ed441172d 100644 --- a/examples/only-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics/rendered_manifests/configmap-agent.yaml @@ -130,7 +130,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index 46fc8b67f7..6fbd7d4dd2 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 70df5589ce129176a80b24fc6dd1c90ea4d4b4b9b7766d163d86b1d40ce6c872 + checksum/config: a3443aa3722fe740a31dcfa85a98fa971111d5820f8c9823caabded30071b454 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml index 6f1726f978..32b0b5e061 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml @@ -139,7 +139,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml index 3999edf239..72a60ae316 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: b853f1d87a8f912972bf808d03d3db445254cbf84937f11de0e3e9decf913267 + checksum/config: becb71249c79b8c1c790e908c3151cff16d791a3865b8aab7f9451eeef5e6455 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/target-allocator/rendered_manifests/configmap-agent.yaml b/examples/target-allocator/rendered_manifests/configmap-agent.yaml index f1b3b01b59..8845326e89 100644 --- a/examples/target-allocator/rendered_manifests/configmap-agent.yaml +++ b/examples/target-allocator/rendered_manifests/configmap-agent.yaml @@ -135,7 +135,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/target-allocator/rendered_manifests/daemonset.yaml b/examples/target-allocator/rendered_manifests/daemonset.yaml index 5efbb08c2c..9936a1facf 100644 --- a/examples/target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/target-allocator/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 771b46481c1be309b7d708defb321b0198faec90eca5bdba1692ceafeb04d651 + checksum/config: bc985be41fe641873a5a617bab4ef64949ece131e96ddc6fc57114b0f570b5c5 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/use-proxy/rendered_manifests/configmap-agent.yaml b/examples/use-proxy/rendered_manifests/configmap-agent.yaml index 1a2fbe6745..b54c198587 100644 --- a/examples/use-proxy/rendered_manifests/configmap-agent.yaml +++ b/examples/use-proxy/rendered_manifests/configmap-agent.yaml @@ -135,7 +135,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index 4b886c1d07..17c42ae06e 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 66ea1893fbeae1f78151b2e2ba0fbf369bd9e96680c99d615421899e3f78267c + checksum/config: 19210a4d2b4256f84c6c2f9a0cac6d311ca065a706aa9bb58c2f895c43c1e08a kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml b/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml index 98199c1170..5bc8b9a444 100644 --- a/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml +++ b/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml @@ -135,7 +135,6 @@ data: receivers: hostmetrics: collection_interval: 10s - root_path: /hostfs scrapers: cpu: null disk: null diff --git a/examples/with-target-allocator/rendered_manifests/daemonset.yaml b/examples/with-target-allocator/rendered_manifests/daemonset.yaml index 08fc396540..9a5d3983e9 100644 --- a/examples/with-target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/with-target-allocator/rendered_manifests/daemonset.yaml @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 54570ca2b6062d017e03792203513f03ff18404d72e77a3582f42209f64a24f9 + checksum/config: d53979defd68ee24f8e8e70d250a4d8c3f95ecf912d99242f93ea4b12d95d8f5 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl index a1e7c2e50f..2b0b119e90 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl @@ -49,9 +49,6 @@ receivers: {{- if (eq (include "splunk-otel-collector.metricsEnabled" .) "true") }} hostmetrics: collection_interval: 10s - {{- if not .Values.isWindows }} - root_path: "/hostfs" - {{- end }} scrapers: cpu: disk: