From 8c032495a07c7f52f68b872d40094098b7cf6501 Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Tue, 3 Dec 2024 10:16:59 -0500 Subject: [PATCH 1/2] Use correct technical preview tags (#1514) (cherry picked from commit b5ea7614a5b3099e23dee449041fd650b06d3d76) # Conflicts: # docs/en/ingest-management/commands.asciidoc --- docs/en/ingest-management/commands.asciidoc | 44 +++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/docs/en/ingest-management/commands.asciidoc b/docs/en/ingest-management/commands.asciidoc index fe4486d32..e6f9d4d4a 100644 --- a/docs/en/ingest-management/commands.asciidoc +++ b/docs/en/ingest-management/commands.asciidoc @@ -28,8 +28,13 @@ invoking the wrong binary. * <> * <> * <> +<<<<<<< HEAD * <> [technical preview] * <> [technical preview] +======= +* <> preview:[] +* <> +>>>>>>> b5ea7614 (Use correct technical preview tags (#1514)) * <> * <> * <> @@ -825,6 +830,23 @@ This option is useful in organizations that limit `root` access on Linux or macO For details and limitations for running {agent} in this mode, refer to {fleet-guide}/elastic-agent-unprivileged.html[Run {agent} without administrative privileges]. Note that changing to `unprivileged` mode is prevented if the agent is currently enrolled in a policy that includes an integration that requires administrative access, such as the {elastic-defend} integration. +<<<<<<< HEAD +======= ++ +preview:[] To run {agent} without superuser privileges as a pre-existing user or group, for instance under an Active Directory account, you can specify the user or group, and the password to use. ++ +For example: ++ +[source,shell] +---- +elastic-agent install --unprivileged --user="my.path\username" --password="mypassword" +---- ++ +[source,shell] +---- +elastic-agent install --unprivileged --group="my.path\groupname" --password="mypassword" +---- +>>>>>>> b5ea7614 (Use correct technical preview tags (#1514)) `--url `:: {fleet-server} URL to use to enroll the {agent} into {fleet}. @@ -1177,6 +1199,11 @@ For details and limitations for running {agent} in this mode, refer to {fleet-gu Note that changing a running {agent} to `unprivileged` mode is prevented if the agent is currently enrolled with a policy that contains the {elastic-defend} integration. +<<<<<<< HEAD +======= +preview:[] To run {agent} without superuser privileges as a pre-existing user or group, for instance under an Active Directory account, add either a `--user` or `--group` parameter together with a `--password` parameter. + +>>>>>>> b5ea7614 (Use correct technical preview tags (#1514)) [discrete] === Examples @@ -1185,6 +1212,23 @@ Note that changing a running {agent} to `unprivileged` mode is prevented if the elastic-agent unprivileged ---- +<<<<<<< HEAD +======= +preview:[] Run {agent} without administrative privileges, as a pre-existing user: + +[source,shell] +---- +elastic-agent unprivileged --user="my.pathl\username" --password="mypassword" +---- + +preview:[] Run {agent} without administrative privileges, as a pre-existing group: + +[source,shell] +---- +elastic-agent unprivileged --group="my.pathl\groupname" --password="mypassword" +---- + +>>>>>>> b5ea7614 (Use correct technical preview tags (#1514)) ++++
++++ From 0e5948cf979592698bd06d50fc41f06253754af9 Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Tue, 3 Dec 2024 10:29:03 -0500 Subject: [PATCH 2/2] Update commands.asciidoc --- docs/en/ingest-management/commands.asciidoc | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/docs/en/ingest-management/commands.asciidoc b/docs/en/ingest-management/commands.asciidoc index e6f9d4d4a..5d415639f 100644 --- a/docs/en/ingest-management/commands.asciidoc +++ b/docs/en/ingest-management/commands.asciidoc @@ -28,13 +28,8 @@ invoking the wrong binary. * <> * <> * <> -<<<<<<< HEAD -* <> [technical preview] -* <> [technical preview] -======= * <> preview:[] * <> ->>>>>>> b5ea7614 (Use correct technical preview tags (#1514)) * <> * <> * <> @@ -830,8 +825,6 @@ This option is useful in organizations that limit `root` access on Linux or macO For details and limitations for running {agent} in this mode, refer to {fleet-guide}/elastic-agent-unprivileged.html[Run {agent} without administrative privileges]. Note that changing to `unprivileged` mode is prevented if the agent is currently enrolled in a policy that includes an integration that requires administrative access, such as the {elastic-defend} integration. -<<<<<<< HEAD -======= + preview:[] To run {agent} without superuser privileges as a pre-existing user or group, for instance under an Active Directory account, you can specify the user or group, and the password to use. + @@ -846,7 +839,6 @@ elastic-agent install --unprivileged --user="my.path\username" --password="mypa ---- elastic-agent install --unprivileged --group="my.path\groupname" --password="mypassword" ---- ->>>>>>> b5ea7614 (Use correct technical preview tags (#1514)) `--url `:: {fleet-server} URL to use to enroll the {agent} into {fleet}. @@ -1199,11 +1191,8 @@ For details and limitations for running {agent} in this mode, refer to {fleet-gu Note that changing a running {agent} to `unprivileged` mode is prevented if the agent is currently enrolled with a policy that contains the {elastic-defend} integration. -<<<<<<< HEAD -======= preview:[] To run {agent} without superuser privileges as a pre-existing user or group, for instance under an Active Directory account, add either a `--user` or `--group` parameter together with a `--password` parameter. ->>>>>>> b5ea7614 (Use correct technical preview tags (#1514)) [discrete] === Examples @@ -1212,8 +1201,6 @@ preview:[] To run {agent} without superuser privileges as a pre-existing user or elastic-agent unprivileged ---- -<<<<<<< HEAD -======= preview:[] Run {agent} without administrative privileges, as a pre-existing user: [source,shell] @@ -1228,7 +1215,6 @@ preview:[] Run {agent} without administrative privileges, as a pre-existing grou elastic-agent unprivileged --group="my.pathl\groupname" --password="mypassword" ---- ->>>>>>> b5ea7614 (Use correct technical preview tags (#1514)) ++++
++++