Merge branch 'main' into hide-k8s

elastic · Nov 25, 2024 · efde177 · efde177
2 parents c2c4540 + d99431e
commit efde177
Show file tree

Hide file tree

Showing 38 changed files with 941 additions and 655 deletions.
diff --git a/.buildkite/scripts/build_kibana.sh b/.buildkite/scripts/build_kibana.sh
@@ -42,3 +42,12 @@ if is_pr_with_label "ci:build-cloud-image"; then
   Kibana cloud image: \`$CLOUD_IMAGE\`
 EOF
 fi
+
+echo "--- Archive Kibana Distribution"
+version="$(jq -r '.version' package.json)"
+linuxBuild="$KIBANA_DIR/target/kibana-$version-SNAPSHOT-linux-x86_64.tar.gz"
+installDir="$KIBANA_DIR/install/kibana"
+mkdir -p "$installDir"
+tar -xzf "$linuxBuild" -C "$installDir" --strip=1
+mkdir -p "$KIBANA_BUILD_LOCATION"
+cp -pR install/kibana/. "$KIBANA_BUILD_LOCATION/"
diff --git a/x-pack/plugins/fleet/common/constants/agent_policy.ts b/x-pack/plugins/fleet/common/constants/agent_policy.ts
@@ -38,7 +38,5 @@ export const LICENSE_FOR_SCHEDULE_UPGRADE = 'platinum';
 
 export const DEFAULT_MAX_AGENT_POLICIES_WITH_INACTIVITY_TIMEOUT = 750;
 
-export const AGENTLESS_POLICY_ID = 'agentless'; // the policy id defined here: https://github.com/elastic/project-controller/blob/main/internal/project/security/security_kibana_config.go#L86
-
 export const AGENT_LOG_LEVELS = ['error', 'warning', 'info', 'debug'] as const;
 export const DEFAULT_LOG_LEVEL = 'info' as const;
diff --git a/x-pack/plugins/fleet/common/experimental_features.ts b/x-pack/plugins/fleet/common/experimental_features.ts
@@ -21,7 +21,6 @@ const _allowedExperimentalValues = {
   kafkaOutput: true,
   outputSecretsStorage: true,
   remoteESOutput: true,
-  agentless: false,
   enableStrictKQLValidation: true,
   subfeaturePrivileges: false,
   advancedPolicySettings: true,

diff --git a/x-pack/plugins/fleet/common/types/models/agent_policy.ts b/x-pack/plugins/fleet/common/types/models/agent_policy.ts
@@ -272,7 +272,6 @@ export interface FleetServerPolicy {
 
 export interface AgentlessApiResponse {
   id: string;
-  region_id: string;
 }
 
 // Definitions for agent policy outputs endpoints

diff --git a/...reate_package_policy_page/components/steps/components/package_policy_input_panel.test.tsx b/...reate_package_policy_page/components/steps/components/package_policy_input_panel.test.tsx
@@ -360,11 +360,8 @@ describe('PackagePolicyInputPanel', () => {
     beforeEach(() => {
       useAgentlessMock.mockReturnValue({
         isAgentlessEnabled: true,
-        isAgentlessPackagePolicy: jest.fn(),
         isAgentlessAgentPolicy: jest.fn(),
         isAgentlessIntegration: jest.fn(),
-        isAgentlessApiEnabled: true,
-        isDefaultAgentlessPolicyEnabled: false,
       });
     });
 
@@ -395,11 +392,8 @@ describe('PackagePolicyInputPanel', () => {
     beforeEach(() => {
       useAgentlessMock.mockReturnValue({
         isAgentlessEnabled: false,
-        isAgentlessPackagePolicy: jest.fn(),
         isAgentlessAgentPolicy: jest.fn(),
         isAgentlessIntegration: jest.fn(),
-        isAgentlessApiEnabled: true,
-        isDefaultAgentlessPolicyEnabled: false,
       });
     });
 

diff --git a/.../fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx b/.../fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx
@@ -178,8 +178,7 @@ export function useOnSubmit({
   const [hasAgentPolicyError, setHasAgentPolicyError] = useState<boolean>(false);
   const hasErrors = validationResults ? validationHasErrors(validationResults) : false;
 
-  const { isAgentlessIntegration, isAgentlessAgentPolicy, isAgentlessPackagePolicy } =
-    useAgentless();
+  const { isAgentlessIntegration, isAgentlessAgentPolicy } = useAgentless();
 
   // Update agent policy method
   const updateAgentPolicies = useCallback(
@@ -316,9 +315,7 @@ export function useOnSubmit({
         (agentCount !== 0 ||
           (agentPolicies.length === 0 && selectedPolicyTab !== SelectedPolicyTab.NEW)) &&
         !(
-          isAgentlessIntegration(packageInfo) ||
-          isAgentlessPackagePolicy(packagePolicy) ||
-          isAgentlessAgentPolicy(overrideCreatedAgentPolicy)
+          isAgentlessIntegration(packageInfo) || isAgentlessAgentPolicy(overrideCreatedAgentPolicy)
         ) &&
         formState !== 'CONFIRM'
       ) {
@@ -365,9 +362,7 @@ export function useOnSubmit({
         : packagePolicy.policy_ids;
 
       const shouldForceInstallOnAgentless =
-        isAgentlessAgentPolicy(createdPolicy) ||
-        isAgentlessIntegration(packageInfo) ||
-        isAgentlessPackagePolicy(packagePolicy);
+        isAgentlessAgentPolicy(createdPolicy) || isAgentlessIntegration(packageInfo);
 
       const forceInstall = force || shouldForceInstallOnAgentless;
 
@@ -390,8 +385,7 @@ export function useOnSubmit({
       const hasGoogleCloudShell = data?.item ? getCloudShellUrlFromPackagePolicy(data.item) : false;
 
       // Check if agentless is configured in ESS and Serverless until Agentless API migrates to Serverless
-      const isAgentlessConfigured =
-        isAgentlessAgentPolicy(createdPolicy) || (data && isAgentlessPackagePolicy(data.item));
+      const isAgentlessConfigured = isAgentlessAgentPolicy(createdPolicy);
 
       // Removing this code will disabled the Save and Continue button. We need code below update form state and trigger correct modal depending on agent count
       if (hasFleetAddAgentsPrivileges && !isAgentlessConfigured) {
@@ -479,7 +473,6 @@ export function useOnSubmit({
       selectedPolicyTab,
       packagePolicy,
       isAgentlessAgentPolicy,
-      isAgentlessPackagePolicy,
       hasFleetAddAgentsPrivileges,
       withSysMonitoring,
       newAgentPolicy,