From 6f0fe6b26599a9d3a27710386fdc143038426d51 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 27 Aug 2024 17:22:13 -0700 Subject: [PATCH 1/5] Add health_check extension to bundled otel.yml file --- otel.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/otel.yml b/otel.yml index 89351371405..38d517bb0cb 100644 --- a/otel.yml +++ b/otel.yml @@ -21,6 +21,9 @@ extensions: check_interval: 1s limit_mib: 700 spike_limit_mib: 180 + health_check: + endpoint: "localhost:13133" + path: "/health/status" service: extensions: [memory_limiter] From 5186d4a271e029c4da58abc6598b8acdefa54123 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 27 Aug 2024 17:29:11 -0700 Subject: [PATCH 2/5] Adding CHANGELOG --- .../1724804905-otel-health-check.yaml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 changelog/fragments/1724804905-otel-health-check.yaml diff --git a/changelog/fragments/1724804905-otel-health-check.yaml b/changelog/fragments/1724804905-otel-health-check.yaml new file mode 100644 index 00000000000..d9d36a5be25 --- /dev/null +++ b/changelog/fragments/1724804905-otel-health-check.yaml @@ -0,0 +1,32 @@ +# Kind can be one of: +# - breaking-change: a change to previously-documented behavior +# - deprecation: functionality that is being removed in a later release +# - bug-fix: fixes a problem in a previous version +# - enhancement: extends functionality but does not break or fix existing behavior +# - feature: new functionality +# - known-issue: problems that we are aware of in a given version +# - security: impacts on the security of a product or a user’s deployment. +# - upgrade: important information for someone upgrading from a prior version +# - other: does not fit into any of the other categories +kind: bug-fix + +# Change summary; a 80ish characters long description of the change. +summary: Add health_check extension to otel.yml file bundled with Elastic Agent package + +# Long description; in case the summary is not enough to describe the change +# this field accommodate a description without length limits. +# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment. +#description: + +# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. +component: elastic-agent + +# PR URL; optional; the PR number that added the changeset. +# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added. +# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number. +# Please provide it if you are adding a fragment for a different PR. +pr: https://github.com/elastic/elastic-agent/pull/5369 + +# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of). +# If not present is automatically filled by the tooling with the issue linked to the PR number. +#issue: https://github.com/owner/repo/1234 From b0962362c5a6cf5ff0e967842b0df703a5204bc0 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 27 Aug 2024 23:26:14 -0700 Subject: [PATCH 3/5] Add extension to pipeline Co-authored-by: Roger Coll --- otel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/otel.yml b/otel.yml index 38d517bb0cb..e21750f6e19 100644 --- a/otel.yml +++ b/otel.yml @@ -26,7 +26,7 @@ extensions: path: "/health/status" service: - extensions: [memory_limiter] + extensions: [health_check, memory_limiter] pipelines: logs: receivers: [filelog] From 6f2306c6c8a3833d23662a909ef9a0d493cd8ba3 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 27 Aug 2024 23:27:26 -0700 Subject: [PATCH 4/5] Change path to health check endpoint --- otel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/otel.yml b/otel.yml index e21750f6e19..97793964c7c 100644 --- a/otel.yml +++ b/otel.yml @@ -23,7 +23,7 @@ extensions: spike_limit_mib: 180 health_check: endpoint: "localhost:13133" - path: "/health/status" + path: "/liveness" service: extensions: [health_check, memory_limiter] From eabc1792f787c94c1c23680a6407afcc23b558a8 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 30 Aug 2024 11:44:32 -0700 Subject: [PATCH 5/5] Revert change to health check endpoint path --- otel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/otel.yml b/otel.yml index 97793964c7c..e21750f6e19 100644 --- a/otel.yml +++ b/otel.yml @@ -23,7 +23,7 @@ extensions: spike_limit_mib: 180 health_check: endpoint: "localhost:13133" - path: "/liveness" + path: "/health/status" service: extensions: [health_check, memory_limiter]