[8.19] [Fleet] Remove agent policies revision bump after updating settings (elastic#239977) (elastic#240468)

# Backport

This will backport the following commits from `main` to `8.19`:
- [[Fleet] Remove agent policies revision bump after updating settings
(elastic#239977)](elastic#239977)

<!--- Backport version: 10.1.0 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Nicolas
Chaulet","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-10-22T14:47:47Z","message":"[Fleet]
Remove agent policies revision bump after updating settings
(elastic#239977)","sha":"f0912d36b342aa7a7b7e8e3084b5b88a888bab55","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport
missing","Team:Fleet","backport:version","v9.2.0","v9.3.0","v9.1.6","v8.19.6","v9.0.9"],"title":"[Fleet]
Remove agent policies revision bump after updating
settings","number":239977,"url":"https://github.com/elastic/kibana/pull/239977","mergeCommit":{"message":"[Fleet]
Remove agent policies revision bump after updating settings
(elastic#239977)","sha":"f0912d36b342aa7a7b7e8e3084b5b88a888bab55"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19","9.0"],"targetPullRequestStates":[{"branch":"9.2","label":"v9.2.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/240116","number":240116,"state":"OPEN"},{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/239977","number":239977,"mergeCommit":{"message":"[Fleet]
Remove agent policies revision bump after updating settings
(elastic#239977)","sha":"f0912d36b342aa7a7b7e8e3084b5b88a888bab55"}},{"branch":"9.1","label":"v9.1.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.9","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

---------

Co-authored-by: kibanamachine <[email protected]>

Author: nchaulet

x-pack/platform/plugins/shared/fleet/server/routes/settings/settings_handler.ts

@@ -12,7 +12,7 @@ import type {
   PutSettingsRequestSchema,
   PutSpaceSettingsRequestSchema,
 } from '../../types';
-import { settingsService, agentPolicyService, appContextService } from '../../services';
+import { settingsService } from '../../services';
 import { getSpaceSettings, saveSpaceSettings } from '../../services/spaces/space_settings';
 
 export const getSpaceSettingsHandler: FleetRequestHandler = async (context, request, response) => {
@@ -69,12 +69,10 @@ export const putSettingsHandler: FleetRequestHandler<
   TypeOf<typeof PutSettingsRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = (await context.fleet).internalSoClient;
-  const esClient = (await context.core).elasticsearch.client.asInternalUser;
-  const user = appContextService.getSecurityCore().authc.getCurrentUser(request) || undefined;
 
   try {
     const settings = await settingsService.saveSettings(soClient, request.body);
-    await agentPolicyService.bumpAllAgentPolicies(esClient, { user });
+
     const body = {
       item: settings,
     };

x-pack/platform/plugins/shared/fleet/server/types/rest_spec/settings.ts

@@ -32,9 +32,18 @@ export const PutSettingsRequestSchema = {
             return 'Protocol and path must be the same for each URL';
           }
         },
+        meta: {
+          deprecated: true,
+        },
+      })
+    ),
+    kibana_ca_sha256: schema.maybe(
+      schema.string({
+        meta: {
+          deprecated: true,
+        },
       })
     ),
-    kibana_ca_sha256: schema.maybe(schema.string()),
     prerelease_integrations_enabled: schema.maybe(schema.boolean()),
     delete_unenrolled_agents: schema.maybe(
       schema.object({

x-pack/platform/test/fleet_api_integration/apis/settings/get.ts

@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import type { CreateAgentPolicyResponse } from '@kbn/fleet-plugin/common';
+
+import type { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { skipIfNoDockerRegistry } from '../../helpers';
+import { SpaceTestApiClient } from '../space_awareness/api_helper';
+
+export default function (providerContext: FtrProviderContext) {
+  const { getService } = providerContext;
+  const supertest = getService('supertest');
+  const kibanaServer = getService('kibanaServer');
+  const fleetAndAgents = getService('fleetAndAgents');
+  const apiClient = new SpaceTestApiClient(supertest);
+
+  describe('Global Settings', function () {
+    skipIfNoDockerRegistry(providerContext);
+
+    let agentPolicy: CreateAgentPolicyResponse;
+    before(async () => {
+      await kibanaServer.savedObjects.cleanStandardList();
+      await fleetAndAgents.setup();
+
+      agentPolicy = await apiClient.createAgentPolicy();
+    });
+
+    after(async () => {
+      await kibanaServer.savedObjects.cleanStandardList();
+    });
+
+    it('should respond return settings', async function () {
+      await apiClient.getSettings();
+    });
+
+    it('should allow to save settings', async function () {
+      await apiClient.putSettings({
+        prerelease_integrations_enabled: true,
+      });
+
+      const updatedSettings = await apiClient.getSettings();
+      expect(updatedSettings.item.prerelease_integrations_enabled).to.be(true);
+
+      // it should not bump revision
+      const updatedAgentPolicy = await apiClient.getAgentPolicy(agentPolicy.item.id);
+      expect(updatedAgentPolicy.item.revision).to.be(agentPolicy.item.revision);
+    });
+  });
+}

x-pack/platform/test/fleet_api_integration/apis/settings/global_settings.ts

@@ -7,8 +7,8 @@
 
 export default function loadTests({ loadTestFile }) {
   describe('Settings Endpoints', () => {
-    loadTestFile(require.resolve('./get'));
     loadTestFile(require.resolve('./update'));
+    loadTestFile(require.resolve('./global_settings'));
     loadTestFile(require.resolve('./enrollment'));
     loadTestFile(require.resolve('./enrollment_privileges'));
   });

x-pack/platform/test/fleet_api_integration/apis/settings/index.js

@@ -6,7 +6,7 @@
  */
 
 import { v4 as uuidV4 } from 'uuid';
-import type { Agent } from 'supertest';
+import type { Agent, Response } from 'supertest';
 import {
   CreateAgentPolicyRequest,
   CreateAgentPolicyResponse,
@@ -39,6 +39,8 @@ import {
   PostFleetServerHostsResponse,
   PostOutputRequest,
   GetOneOutputResponse,
+  GetSettingsResponse,
+  PutSettingsRequest,
 } from '@kbn/fleet-plugin/common/types';
 import {
   GetUninstallTokenResponse,
@@ -47,6 +49,22 @@ import {
 import { SimplifiedPackagePolicy } from '@kbn/fleet-plugin/common/services/simplified_package_policy_helper';
 import { testUsers } from '../test_users';
 
+function expectStatusCode200(res: Response) {
+  if (res.statusCode === 200) {
+    return;
+  }
+
+  if (res.statusCode === 404) {
+    throw new Error('404 "Not Found"');
+  } else {
+    throw new Error(
+      `${res.statusCode}${res.body?.error ? ` "${res.body?.error}"` : ''}${
+        res.body?.message ? ` ${res.body?.message}` : ''
+      }`
+    );
+  }
+}
+
 export class SpaceTestApiClient {
   constructor(
     private readonly supertest: Agent,
@@ -375,6 +393,27 @@ export class SpaceTestApiClient {
 
     return res;
   }
+  // Settings
+  async getSettings(spaceId?: string): Promise<GetSettingsResponse> {
+    const res = await this.supertest.get(`${this.getBaseUrl(spaceId)}/api/fleet/settings`);
+
+    expectStatusCode200(res);
+
+    return res.body;
+  }
+  async putSettings(
+    data: PutSettingsRequest['body'],
+    spaceId?: string
+  ): Promise<GetSettingsResponse> {
+    const res = await this.supertest
+      .put(`${this.getBaseUrl(spaceId)}/api/fleet/settings`)
+      .set('kbn-xsrf', 'xxxx')
+      .send(data);
+
+    expectStatusCode200(res);
+
+    return res.body;
+  }
   // Space Settings
   async getSpaceSettings(spaceId?: string): Promise<GetSpaceSettingsResponse> {
     const { body: res } = await this.supertest