Fixed Shield links to point to X-Pack instead

This commit is contained in:
Clinton Gormley 2016-10-17 14:01:59 +02:00
parent c28a0c4626
commit c60a481602
3 changed files with 7 additions and 7 deletions

View file

@ -2,7 +2,7 @@
= Kibana User Guide
:ref: http://www.elastic.co/guide/en/elasticsearch/reference/5.0/
:shield: https://www.elastic.co/guide/en/shield/5.0/
:xpack: https://www.elastic.co/guide/en/x-pack/5.0/
:scyld: X-Pack Security
:k4issue: https://github.com/elastic/kibana/issues/
:k4pull: https://github.com/elastic/kibana/pull/

View file

@ -96,7 +96,7 @@ and visualize data in the `logstash-*` indices.
. Assign the appropriate roles to your Kibana users or groups of users:
** If you're using the `native` realm, you can assign roles using the
{shield}/shield-rest.html#shield-users-rest[{scyld} User Management API]. For example, the following
{xpack}/security-api-users.html[{scyld} User Management API]. For example, the following
creates a user named `jacknich` and assigns it the `kibana_monitoring` role:
+
[source,js]
@ -110,7 +110,7 @@ POST /_xpack/security/user/jacknich
** If you are using an LDAP or Active Directory realm, you can either assign
roles on a per user basis, or assign roles to groups of users. By default, role
mappings are stored in {shield}/mapping-roles.html[`CONFIGDIR/x-pack/role_mapping.yml`].
mappings are stored in {xpack}/mapping-roles.html[`CONFIGDIR/x-pack/role_mapping.yml`].
For example, the following snippet assigns the `kibana_monitoring` role to the
group named `admins` and the user named Jack Nicholson:
+
@ -277,14 +277,14 @@ ca: /path/to/your/ca/cacert.pem
[float]
[[controlling-access]]
=== Controlling access
You can use http://www.elastic.co/overview/shield/[{scyld}] to control what Elasticsearch data users can access through Kibana.
You can use {xpack}/xpack-security.html[{scyld}] to control what Elasticsearch data users can access through Kibana.
{scyld} provides index-level access control. If a user isn't authorized to run
the query that populates a Kibana visualization, the user just sees an empty
visualization.
To configure access to Kibana using {scyld}, you create roles
for Kibana using the `my_kibana_user` default role as a starting point. For more
information, see {shield}/kibana.html#using-kibana4-with-shield[Using Kibana with {scyld}].
information, see {xpack}/kibana.html[Using Kibana with {scyld}].
[float]
[[load-balancing]]

View file

@ -25,8 +25,8 @@ That's it! Kibana is now running on port 5601.
On Unix, you can also install Kibana using the package manager suited for your distribution. For more
information, see <<setup-repositories, Installing Kibana with apt and yum>>.
IMPORTANT: If your Elasticsearch installation is protected by http://www.elastic.co/overview/shield/[Shield]
see {shield}/kibana.html#using-kibana4-with-shield[Using Kibana with Shield] for additional setup
IMPORTANT: If your Elasticsearch installation is protected by {xpack}/xpack-security.html[{scyld}]
see {xpack}/kibana.html[Using Kibana with X-Pack Security] for additional setup
instructions.
[float]