Skip to content

Commit

Permalink
[DOCS] Merges duplicate pages for native realms (#49198)
Browse files Browse the repository at this point in the history
  • Loading branch information
lcawl authored Nov 15, 2019
1 parent 730faa8 commit d3062ec
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 27 deletions.
12 changes: 11 additions & 1 deletion docs/reference/redirects.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -934,4 +934,14 @@ See <<enable-audit-logging>>.
=== Compound word token filters

See <<analysis-dict-decomp-tokenfilter>> and
<<analysis-hyp-decomp-tokenfilter>>.
<<analysis-hyp-decomp-tokenfilter>>.

[role="exclude",id="configuring-native-realm"]
=== Configuring a native realm

See <<native-realm-configuration>>.

[role="exclude",id="native-settings"]
==== Native realm settings

See <<ref-native-settings>>.
2 changes: 1 addition & 1 deletion x-pack/docs/en/rest-api/security/change-password.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ You can use the <<security-api-put-user,create user API>> to update everything
but a user's `username` and `password`. This API changes a user's password.

For more information about the native realm, see
<<realms>> and <<configuring-native-realm>>.
<<realms>> and <<native-realm>>.


[[security-api-change-password-path-params]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ privilege.
==== {api-description-title}

For more information about the native realm, see
<<realms>> and <<configuring-native-realm>>.
<<realms>> and <<native-realm>>.

[[security-api-clear-role-cache-path-params]]
==== {api-path-parms-title}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/docs/en/rest-api/security/create-users.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ To change a user's password, use the
<<security-api-change-password, change password API>>.

For more information about the native realm, see
<<realms>> and <<configuring-native-realm>>.
<<realms>> and <<native-realm>>.

[[security-api-put-user-path-params]]
==== {api-path-parms-title}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/docs/en/rest-api/security/delete-users.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Deletes users from the native realm.
==== {api-description-title}

For more information about the native realm, see
<<realms>> and <<configuring-native-realm>>.
<<realms>> and <<native-realm>>.

[[security-api-delete-user-path-params]]
==== {api-path-parms-title}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/docs/en/rest-api/security/disable-users.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ revoke a user's access to {es}. To re-enable a user, there is an
<<security-api-enable-user,enable users API>>.

For more information about the native realm, see
<<realms>> and <<configuring-native-realm>>.
<<realms>> and <<native-realm>>.

[[security-api-disable-user-path-params]]
==== {api-path-parms-title}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/docs/en/rest-api/security/enable-users.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ By default, when you create users, they are enabled. You can use this enable
users API and the <<security-api-disable-user,disable users API>> to change that attribute.

For more information about the native realm, see
<<realms>> and <<configuring-native-realm>>.
<<realms>> and <<native-realm>>.

[[security-api-enable-user-path-params]]
==== {api-path-parms-title}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/docs/en/rest-api/security/get-users.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Retrieves information about users in the native realm and built-in users.
==== {api-description-title}

For more information about the native realm, see
<<realms>> and <<configuring-native-realm>>.
<<realms>> and <<native-realm>>.

[[security-api-get-user-path-params]]
==== {api-path-parms-title}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
[role="xpack"]
[[configuring-native-realm]]
=== Configuring a native realm

The easiest way to manage and authenticate users is with the internal `native`
realm.

The native realm is available by default when no other realms are
configured. If other realm settings have been configured in `elasticsearch.yml`,
you must add the native realm to the realm chain.
Expand Down Expand Up @@ -45,6 +38,3 @@ hash algorithm. To use different hash algorithms, see <<hashing-settings>>.

. Restart {es}.

. Manage your users in {kib} on the *Management / Security / Users* page.
Alternatively, use the <<security-api-users,User Management APIs>>.

8 changes: 1 addition & 7 deletions x-pack/docs/en/security/authentication/native-realm.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,9 @@ realm. You can use the REST APIs or Kibana to add and remove users, assign user
roles, and manage user passwords.

[[native-realm-configuration]]
[float]
==== Configuring a native realm

See <<configuring-native-realm>>.

[[native-settings]]
==== Native realm settings

See <<ref-native-settings>>.
include::configuring-native-realm.asciidoc[]

[[managing-native-users]]
==== Managing native users
Expand Down
3 changes: 1 addition & 2 deletions x-pack/docs/en/security/configuring-es.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ your subscription. For more information, see https://www.elastic.co/subscription
** <<configuring-file-realm,File realms>>
** <<configuring-kerberos-realm,Kerberos realms>>
** <<configuring-ldap-realm,LDAP realms>>
** <<configuring-native-realm,Native realms>>
** <<native-realm,Native realms>>
** <<configuring-pki-realm,PKI realms>>
** <<configuring-saml-realm,SAML realms>>

Expand Down Expand Up @@ -146,7 +146,6 @@ include::securing-communications/enabling-cipher-suites.asciidoc[]
include::authentication/configuring-active-directory-realm.asciidoc[]
include::authentication/configuring-file-realm.asciidoc[]
include::authentication/configuring-ldap-realm.asciidoc[]
include::authentication/configuring-native-realm.asciidoc[]
include::authentication/configuring-pki-realm.asciidoc[]
include::authentication/configuring-saml-realm.asciidoc[]

Expand Down

0 comments on commit d3062ec

Please sign in to comment.