From 3654ca12b71c437785f8d964588d9524ba3b7447 Mon Sep 17 00:00:00 2001 From: emilioalvap Date: Wed, 25 Oct 2023 17:33:59 +0200 Subject: [PATCH 1/4] Bump Node to 18.17 --- .../fragments/1698247934-hb-bump-node.yaml | 32 +++++++++++++++++++ .../docker/Dockerfile.elastic-agent.tmpl | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 changelog/fragments/1698247934-hb-bump-node.yaml diff --git a/changelog/fragments/1698247934-hb-bump-node.yaml b/changelog/fragments/1698247934-hb-bump-node.yaml new file mode 100644 index 00000000000..d21d8791877 --- /dev/null +++ b/changelog/fragments/1698247934-hb-bump-node.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: hb-bump-node-18.17 + +# 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: Bump NodeJS version bundled with Heartbeat to v18.17.1. + +# 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/owner/repo/1234 + +# 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 diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 314aa20d150..548de683fa2 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -170,7 +170,7 @@ RUN echo \ ENV ELASTIC_SYNTHETICS_CAPABLE=true ENV ELASTIC_AGENT_COMPLETE=true ENV TZ=UTC -ENV NODE_VERSION=18.16.0 +ENV NODE_VERSION=18.17.1 ENV PATH="$NODE_PATH/node/bin:$PATH" # Install the latest version of @elastic/synthetics forcefully ignoring the previously # cached node_modules, heartbeat then calls the global executable to run test suites From da608686d725c14b18c9245486536e71f29b0360 Mon Sep 17 00:00:00 2001 From: emilioalvap Date: Wed, 25 Oct 2023 17:38:00 +0200 Subject: [PATCH 2/4] Update changelog --- changelog/fragments/1698247934-hb-bump-node.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/fragments/1698247934-hb-bump-node.yaml b/changelog/fragments/1698247934-hb-bump-node.yaml index d21d8791877..60b8f83907f 100644 --- a/changelog/fragments/1698247934-hb-bump-node.yaml +++ b/changelog/fragments/1698247934-hb-bump-node.yaml @@ -25,7 +25,7 @@ component: "elastic-agent" # 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/owner/repo/1234 +pr: https://github.com/elastic/elastic-agent/pull/3655 # 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. From 5492e80dab8781b30ee9b4dd204cf4d33b8e938f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Alvarez=20Pi=C3=B1eiro?= <95703246+emilioalvap@users.noreply.github.com> Date: Wed, 25 Oct 2023 17:43:28 +0200 Subject: [PATCH 3/4] Apply suggestions from code review --- changelog/fragments/1698247934-hb-bump-node.yaml | 4 ++-- .../packaging/templates/docker/Dockerfile.elastic-agent.tmpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog/fragments/1698247934-hb-bump-node.yaml b/changelog/fragments/1698247934-hb-bump-node.yaml index 60b8f83907f..bc7eebfa048 100644 --- a/changelog/fragments/1698247934-hb-bump-node.yaml +++ b/changelog/fragments/1698247934-hb-bump-node.yaml @@ -11,12 +11,12 @@ kind: bug-fix # Change summary; a 80ish characters long description of the change. -summary: hb-bump-node-18.17 +summary: hb-bump-node-18.18.x # 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: Bump NodeJS version bundled with Heartbeat to v18.17.1. +description: Bump NodeJS version bundled with Heartbeat to v18.18.2. # Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. component: "elastic-agent" diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 548de683fa2..f69933ca225 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -170,7 +170,7 @@ RUN echo \ ENV ELASTIC_SYNTHETICS_CAPABLE=true ENV ELASTIC_AGENT_COMPLETE=true ENV TZ=UTC -ENV NODE_VERSION=18.17.1 +ENV NODE_VERSION=18.18.2 ENV PATH="$NODE_PATH/node/bin:$PATH" # Install the latest version of @elastic/synthetics forcefully ignoring the previously # cached node_modules, heartbeat then calls the global executable to run test suites From 0283f0b8e34389ba9b0bb78eee72815735874dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Alvarez=20Pi=C3=B1eiro?= <95703246+emilioalvap@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:26:02 +0200 Subject: [PATCH 4/4] Update changelog/fragments/1698247934-hb-bump-node.yaml --- changelog/fragments/1698247934-hb-bump-node.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/fragments/1698247934-hb-bump-node.yaml b/changelog/fragments/1698247934-hb-bump-node.yaml index bc7eebfa048..76bfb42d4ee 100644 --- a/changelog/fragments/1698247934-hb-bump-node.yaml +++ b/changelog/fragments/1698247934-hb-bump-node.yaml @@ -8,7 +8,7 @@ # - 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 +kind: other # Change summary; a 80ish characters long description of the change. summary: hb-bump-node-18.18.x