mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
[9.0] [Fleet] Do not allow to edit anything else than namespace for managed policies (#216701) (#216871)
# Backport This will backport the following commits from `main` to `9.0`: - [[Fleet] Do not allow to edit anything else than namespace for managed policies (#216701)](https://github.com/elastic/kibana/pull/216701) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nicolas Chaulet","email":"nicolas.chaulet@elastic.co"},"sourceCommit":{"committedDate":"2025-04-02T15:06:02Z","message":"[Fleet] Do not allow to edit anything else than namespace for managed policies (#216701)","sha":"a750c7366e930261562a076b621f2b4dcf122b7d","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:prev-minor","v9.1.0"],"title":"[Fleet] Do not allow to edit anything else than namespace for managed policies","number":216701,"url":"https://github.com/elastic/kibana/pull/216701","mergeCommit":{"message":"[Fleet] Do not allow to edit anything else than namespace for managed policies (#216701)","sha":"a750c7366e930261562a076b621f2b4dcf122b7d"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/216701","number":216701,"mergeCommit":{"message":"[Fleet] Do not allow to edit anything else than namespace for managed policies (#216701)","sha":"a750c7366e930261562a076b621f2b4dcf122b7d"}}]}] BACKPORT--> Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
This commit is contained in:
parent
27d2fe72e8
commit
d6901a94e9
2 changed files with 14 additions and 12 deletions
|
@ -124,7 +124,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
|
|||
const [isUninstallCommandFlyoutOpen, setIsUninstallCommandFlyoutOpen] = useState(false);
|
||||
const policyHasElasticDefend = useMemo(() => hasElasticDefend(agentPolicy), [agentPolicy]);
|
||||
const isManagedPolicy = agentPolicy.is_managed === true;
|
||||
const isManagedorAgentlessPolicy = isManagedPolicy || agentPolicy?.supports_agentless === true;
|
||||
const isManagedOrAgentlessPolicy = isManagedPolicy || agentPolicy?.supports_agentless === true;
|
||||
|
||||
const userHasAccessToAllPolicySpaces = useMemo(
|
||||
() => ('space_ids' in agentPolicy ? !agentPolicy.space_ids?.includes(UNKNOWN_SPACE) : true),
|
||||
|
@ -438,7 +438,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
|
|||
>
|
||||
<EuiSpacer size="l" />
|
||||
<EuiCheckboxGroup
|
||||
disabled={disabled || isManagedorAgentlessPolicy}
|
||||
disabled={disabled || isManagedOrAgentlessPolicy}
|
||||
options={[
|
||||
{
|
||||
id: `${dataTypes.Logs}_${monitoringCheckboxIdSuffix}`,
|
||||
|
@ -574,7 +574,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
|
|||
>
|
||||
<EuiFieldNumber
|
||||
fullWidth
|
||||
disabled={disabled || isManagedorAgentlessPolicy}
|
||||
disabled={disabled || isManagedOrAgentlessPolicy}
|
||||
value={agentPolicy.inactivity_timeout || ''}
|
||||
min={0}
|
||||
onChange={(e) => {
|
||||
|
@ -615,7 +615,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
|
|||
isInvalid={Boolean(touchedFields.fleet_server_host_id && validation.fleet_server_host_id)}
|
||||
>
|
||||
<EuiSuperSelect
|
||||
disabled={disabled || isManagedorAgentlessPolicy}
|
||||
disabled={disabled || isManagedOrAgentlessPolicy}
|
||||
valueOfSelected={agentPolicy.fleet_server_host_id || DEFAULT_SELECT_VALUE}
|
||||
fullWidth
|
||||
isLoading={isLoadingFleetServerHostsOption}
|
||||
|
@ -697,7 +697,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
|
|||
isDisabled={disabled}
|
||||
>
|
||||
<EuiSuperSelect
|
||||
disabled={disabled || isManagedorAgentlessPolicy}
|
||||
disabled={disabled || isManagedOrAgentlessPolicy}
|
||||
valueOfSelected={agentPolicy.monitoring_output_id || DEFAULT_SELECT_VALUE}
|
||||
fullWidth
|
||||
isLoading={isLoadingOptions}
|
||||
|
@ -736,10 +736,10 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
|
|||
: null
|
||||
}
|
||||
isInvalid={Boolean(touchedFields.download_source_id && validation.download_source_id)}
|
||||
isDisabled={disabled}
|
||||
isDisabled={disabled || isManagedOrAgentlessPolicy}
|
||||
>
|
||||
<EuiSuperSelect
|
||||
disabled={disabled || agentPolicy?.supports_agentless === true}
|
||||
disabled={disabled || isManagedOrAgentlessPolicy}
|
||||
valueOfSelected={agentPolicy.download_source_id || DEFAULT_SELECT_VALUE}
|
||||
fullWidth
|
||||
isLoading={isLoadingDownloadSources}
|
||||
|
@ -770,9 +770,9 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
|
|||
/>
|
||||
}
|
||||
>
|
||||
<EuiFormRow fullWidth isDisabled={disabled}>
|
||||
<EuiFormRow fullWidth isDisabled={disabled || isManagedOrAgentlessPolicy}>
|
||||
<EuiRadioGroup
|
||||
disabled={disabled || agentPolicy?.supports_agentless === true}
|
||||
disabled={disabled || isManagedOrAgentlessPolicy}
|
||||
options={[
|
||||
{
|
||||
id: 'hostname',
|
||||
|
@ -863,11 +863,11 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
|
|||
: null
|
||||
}
|
||||
isInvalid={Boolean(touchedFields.unenroll_timeout && validation.unenroll_timeout)}
|
||||
isDisabled={disabled}
|
||||
isDisabled={disabled || isManagedOrAgentlessPolicy}
|
||||
>
|
||||
<EuiFieldNumber
|
||||
fullWidth
|
||||
disabled={disabled || isManagedorAgentlessPolicy}
|
||||
disabled={disabled || isManagedOrAgentlessPolicy}
|
||||
value={agentPolicy.unenroll_timeout || ''}
|
||||
min={0}
|
||||
onChange={(e) => {
|
||||
|
|
|
@ -189,7 +189,9 @@ export const AgentPolicyForm: React.FunctionComponent<Props> = ({
|
|||
<EuiSpacer size="m" />
|
||||
<ConfiguredSettings
|
||||
configuredSettings={AGENT_POLICY_ADVANCED_SETTINGS}
|
||||
disabled={isDisabled || !!agentPolicy?.supports_agentless}
|
||||
disabled={
|
||||
isDisabled || !!agentPolicy?.supports_agentless || !!agentPolicy?.is_managed
|
||||
}
|
||||
/>
|
||||
</>
|
||||
<EuiSpacer size="xl" />
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue