Skip to content

[DOCS] Merges duplicate pages for SAML realms #49209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 18, 2019
+32 −258
Merged

[DOCS] Merges duplicate pages for SAML realms #49209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06a681c
[DOCS] Merges duplicate pages for SAML realms
lcawl Nov 15, 2019
3a920d6
[DOCS] Removes redundant procedure
lcawl Nov 15, 2019
e356788
Merge branch 'master' into security-saml
lcawl Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion docs/reference/redirects.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,4 +944,30 @@ See <<native-realm-configuration>>.
[role="exclude",id="native-settings"]
==== Native realm settings

See <<ref-native-settings>>.
See <<ref-native-settings>>.

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

See <<saml-guide>>.

[role="exclude",id="saml-settings"]
==== SAML realm settings

See <<ref-saml-settings>>.

[role="exclude",id="_saml_realm_signing_settings"]
==== SAML realm signing settings

See <<ref-saml-signing-settings>>.

[role="exclude",id="_saml_realm_encryption_settings"]
==== SAML realm encryption settings

See <<ref-saml-encryption-settings>>.

[role="exclude",id="_saml_realm_ssl_settings"]
==== SAML realm SSL settings

See <<ref-saml-ssl-settings>>.

230 changes: 0 additions & 230 deletions x-pack/docs/en/security/authentication/configuring-saml-realm.asciidoc
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions x-pack/docs/en/security/authentication/saml-guide.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,10 @@ SAML authentication is enabled by configuring a SAML realm within the
authentication chain for {es}.

This realm has a few mandatory settings, and a number of optional settings.
The available settings are described in detail in the
<<saml-settings, SAML realm documentation>>, this guide will walk you through
the most common settings.
The available settings are described in detail in <<security-settings>>. For
example, <<ref-saml-settings>>, <<ref-saml-signing-settings>>,
<<ref-saml-encryption-settings>>, <<ref-saml-ssl-settings>>.
This guide will walk you through the most common settings.

Create a realm by adding the following to your `elasticsearch.yml`
configuration file. Each configuration value is explained below.
Expand Down
21 changes: 0 additions & 21 deletions x-pack/docs/en/security/authentication/saml-realm.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,3 @@ chain.
In order to simplify the process of configuring SAML authentication within the
Elastic Stack, there is a step-by-step guide to
<<saml-guide, Configuring Elasticsearch and Kibana to use SAML single sign-on>>.

The remainder of this document will describe {es} specific configuration options
for SAML realms.

[[saml-settings]]
==== SAML realm settings

See <<ref-saml-settings>>.

==== SAML realm signing settings

See <<ref-saml-signing-settings>>.

==== SAML realm encryption settings

See <<ref-saml-encryption-settings>>.

==== SAML realm SSL settings

See <<ref-saml-ssl-settings>>.

4 changes: 1 addition & 3 deletions x-pack/docs/en/security/configuring-es.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ your subscription. For more information, see https://www.elastic.co/subscription
** <<configuring-ldap-realm,LDAP realms>>
** <<native-realm,Native realms>>
** <<configuring-pki-realm,PKI realms>>
** <<configuring-saml-realm,SAML realms>>
** <<saml-realm,SAML realms>>

. Set up roles and users to control access to {es}.
+
Expand Down Expand Up @@ -147,8 +147,6 @@ include::authentication/configuring-active-directory-realm.asciidoc[]
include::authentication/configuring-file-realm.asciidoc[]
include::authentication/configuring-ldap-realm.asciidoc[]
include::authentication/configuring-pki-realm.asciidoc[]
include::authentication/configuring-saml-realm.asciidoc[]

include::authentication/configuring-kerberos-realm.asciidoc[]

include::reference/files.asciidoc[]
Expand Down