diff --git a/x-pack/plugins/fleet/common/experimental_features.ts b/x-pack/plugins/fleet/common/experimental_features.ts
index 1c42bf3ab2afe..1cf35952904aa 100644
--- a/x-pack/plugins/fleet/common/experimental_features.ts
+++ b/x-pack/plugins/fleet/common/experimental_features.ts
@@ -10,7 +10,6 @@ export type ExperimentalFeatures = typeof allowedExperimentalValues;
const _allowedExperimentalValues = {
createPackagePolicyMultiPageLayout: true,
packageVerification: true,
- showDevtoolsRequest: true,
diagnosticFileUploadEnabled: true,
displayAgentMetrics: true,
showIntegrationsSubcategories: true,
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/devtools_request.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/devtools_request.tsx
index 91ca089f2ffe3..81f2304efee99 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/devtools_request.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/devtools_request.tsx
@@ -11,7 +11,6 @@ import { i18n } from '@kbn/i18n';
import { omit } from 'lodash';
import { set } from '@kbn/safer-lodash-set';
-import { ExperimentalFeaturesService } from '../../../../../services';
import {
generateCreatePackagePolicyDevToolsRequest,
generateCreateAgentPolicyDevToolsRequest,
@@ -39,12 +38,7 @@ export function useDevToolsRequest({
packageInfo?: PackageInfo;
packagePolicyId?: string;
}) {
- const { showDevtoolsRequest: isShowDevtoolRequestExperimentEnabled } =
- ExperimentalFeaturesService.get();
-
- const showDevtoolsRequest =
- !HIDDEN_API_REFERENCE_PACKAGES.includes(packageInfo?.name ?? '') &&
- isShowDevtoolRequestExperimentEnabled;
+ const showDevtoolsRequest = !HIDDEN_API_REFERENCE_PACKAGES.includes(packageInfo?.name ?? '');
const [devtoolRequest, devtoolRequestDescription] = useMemo(() => {
if (selectedPolicyTab === SelectedPolicyTab.NEW) {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/settings/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/settings/index.tsx
index 50baac84ff4a0..efb7066b0d5e0 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/settings/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/settings/index.tsx
@@ -40,7 +40,6 @@ import {
ConfirmDeployAgentPolicyModal,
} from '../../../components';
import { DevtoolsRequestFlyoutButton } from '../../../../../components';
-import { ExperimentalFeaturesService } from '../../../../../services';
import { generateUpdateAgentPolicyDevToolsRequest } from '../../../services';
import { UNKNOWN_SPACE } from '../../../../../../../../common/constants';
@@ -155,7 +154,6 @@ export const SettingsView = memo<{ agentPolicy: AgentPolicy }>(
setIsLoading(false);
};
- const { showDevtoolsRequest } = ExperimentalFeaturesService.get();
const devtoolRequest = useMemo(
() =>
generateUpdateAgentPolicyDevToolsRequest(
@@ -235,28 +233,26 @@ export const SettingsView = memo<{ agentPolicy: AgentPolicy }>(
/>
- {showDevtoolsRequest ? (
-
- 0 ||
- hasAdvancedSettingsErrors ||
- hasInvalidSpaceError
+
+ 0 ||
+ hasAdvancedSettingsErrors ||
+ hasInvalidSpaceError
+ }
+ btnProps={{
+ color: 'text',
+ }}
+ description={i18n.translate(
+ 'xpack.fleet.editAgentPolicy.devtoolsRequestDescription',
+ {
+ defaultMessage: 'This Kibana request updates an agent policy.',
}
- btnProps={{
- color: 'text',
- }}
- description={i18n.translate(
- 'xpack.fleet.editAgentPolicy.devtoolsRequestDescription',
- {
- defaultMessage: 'This Kibana request updates an agent policy.',
- }
- )}
- request={devtoolRequest}
- />
-
- ) : null}
+ )}
+ request={devtoolRequest}
+ />
+
= ({
/>
);
- const { showDevtoolsRequest } = ExperimentalFeaturesService.get();
const agentPolicyContent = useMemo(
() => generateCreateAgentPolicyDevToolsRequest(agentPolicy, withSysMonitoring),
[agentPolicy, withSysMonitoring]
@@ -128,25 +126,23 @@ export const CreateAgentPolicyFlyout: React.FunctionComponent = ({
- {showDevtoolsRequest ? (
-
- 0 ||
- hasAdvancedSettingsErrors ||
- hasInvalidSpaceError
+
+ 0 ||
+ hasAdvancedSettingsErrors ||
+ hasInvalidSpaceError
+ }
+ description={i18n.translate(
+ 'xpack.fleet.createAgentPolicy.devtoolsRequestDescription',
+ {
+ defaultMessage: 'This Kibana request creates a new agent policy.',
}
- description={i18n.translate(
- 'xpack.fleet.createAgentPolicy.devtoolsRequestDescription',
- {
- defaultMessage: 'This Kibana request creates a new agent policy.',
- }
- )}
- request={agentPolicyContent}
- />
-
- ) : null}
+ )}
+ request={agentPolicyContent}
+ />
+