diff --git a/changelog/fragments/1731951823-Skip-notify-Fleet-on-Windows-uninstall.yaml b/changelog/fragments/1731951823-Skip-notify-Fleet-on-Windows-uninstall.yaml new file mode 100644 index 00000000000..5a23d2e3361 --- /dev/null +++ b/changelog/fragments/1731951823-Skip-notify-Fleet-on-Windows-uninstall.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: feature + +# Change summary; a 80ish characters long description of the change. +summary: Skip notify Fleet on Windows uninstall + +# 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: + +# 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/6065 + +# 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/elastic/elastic-agent/issues/5952 diff --git a/internal/pkg/agent/install/uninstall.go b/internal/pkg/agent/install/uninstall.go index 2bd3b52f727..ea9cfca4ca9 100644 --- a/internal/pkg/agent/install/uninstall.go +++ b/internal/pkg/agent/install/uninstall.go @@ -144,7 +144,9 @@ func Uninstall(ctx context.Context, cfgFile, topPath, uninstallToken string, log } pt.Describe("Removed install directory") - if notifyFleet { + // Skip on Windows because of https://github.com/elastic/elastic-agent/issues/5952 + // Once the root-cause is identified then this can be re-enabled on Windows. + if notifyFleet && runtime.GOOS != "windows" { notifyFleetAuditUninstall(ctx, log, pt, cfg, ai) //nolint:errcheck // ignore the error as we can't act on it } diff --git a/testing/integration/install_test.go b/testing/integration/install_test.go index 50bf0363b5b..cd94c013688 100644 --- a/testing/integration/install_test.go +++ b/testing/integration/install_test.go @@ -293,6 +293,15 @@ func TestInstallUninstallAudit(t *testing.T) { Stack: &define.Stack{}, // needs a fleet-server. Sudo: true, Local: false, + // Skip Windows as it has been disabled because of https://github.com/elastic/elastic-agent/issues/5952 + OS: []define.OS{ + { + Type: define.Linux, + }, + { + Type: define.Darwin, + }, + }, }) ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))