Skip to content

Commit

Permalink
Fix links, streamline grammar, and other editorial changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Locke committed Aug 16, 2021
1 parent ed7e2fe commit 4dce318
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 14 deletions.
11 changes: 6 additions & 5 deletions docs/java-rest/high-level/security/enroll_kibana.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ executed operation as follows:
--------------------------------------------------
include-tagged::{doc-tests}/EnrollmentDocumentationIT.java[{api}-response]
--------------------------------------------------
<1> The name of a token that can be used as a bearer token for the `elastic/kibana` service account.
See link:/security/authentication/service-accounts.html#authenticate-with-service-account-token.html[Authenticate with service account tokens] for more information
<2> The value of the aforementioned token.
<3> The CA certificate used to sign the node certificates that {es} uses for TLS on the HTTP layer.
The certificate is returned as a Base64 encoded string of the ASN.1 DER encoding of the certificate.
<1> The bearer token for the `elastic/kibana` service account.
Use this token to {ref}/service-accounts.html#authenticate-with-service-account-token[authenticate the service account] with {es}.
<2> The value of the bearer token for the `elastic/kibana` service account.
<3> The CA certificate used to sign the node certificates that {es} uses for TLS
on the HTTP layer. The certificate is returned as a Base64 encoded string of the
ASN.1 DER encoding of the certificate.


[id="{upid}-{api}-execute-async"]
Expand Down
2 changes: 1 addition & 1 deletion x-pack/docs/en/rest-api/security.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ include::security/clear-privileges-cache.asciidoc[]
include::security/clear-api-key-cache.asciidoc[]
include::security/clear-service-token-caches.asciidoc[]
include::security/create-api-keys.asciidoc[]
include::security/enroll-kibana.asciidoc[]
include::security/put-app-privileges.asciidoc[]
include::security/create-role-mappings.asciidoc[]
include::security/create-roles.asciidoc[]
Expand All @@ -154,6 +153,7 @@ include::security/delete-service-token.asciidoc[]
include::security/delete-users.asciidoc[]
include::security/disable-users.asciidoc[]
include::security/enable-users.asciidoc[]
include::security/enroll-kibana.asciidoc[]
include::security/enroll-node.asciidoc[]
include::security/get-api-keys.asciidoc[]
include::security/get-app-privileges.asciidoc[]
Expand Down
13 changes: 7 additions & 6 deletions x-pack/docs/en/rest-api/security/enroll-kibana.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@ The API returns the following response:
"name" : "enroll-process-token-1629123923000", <1>
"value": "AAEAAWVsYXN0aWM...vZmxlZXQtc2VydmVyL3Rva2VuMTo3TFdaSDZ" <2>
},
"http_ca" : "MIIJlAIBAzCCCVoGCSqGSIb3....vsDfsA3UZBAjEPfhubpQysAICCAA=", <3>
"http_ca" : "MIIJlAIBAzVoGCSqGSIb3...vsDfsA3UZBAjEPfhubpQysAICAA=", <3>
}
----
<1> The name of a token that can be used as a bearer token for the `elastic/kibana` service account.
See link:/security/authentication/service-accounts.html#authenticate-with-service-account-token.html[Authenticate with service account tokens] for more information
<2> The value of the aforementioned token.
<3> The CA certificate used to sign the node certificates that {es} uses for TLS on the HTTP layer.
The certificate is returned as a Base64 encoded string of the ASN.1 DER encoding of the certificate.
<1> The bearer token for the `elastic/kibana` service account.
Use this token to {ref}/service-accounts.html#authenticate-with-service-account-token[authenticate the service account] with {es}.
<2> The value of the bearer token for the `elastic/kibana` service account.
<3> The CA certificate used to sign the node certificates that {es} uses for TLS
on the HTTP layer. The certificate is returned as a Base64 encoded string of the
ASN.1 DER encoding of the certificate.
2 changes: 1 addition & 1 deletion x-pack/docs/en/rest-api/security/enroll-node.asciidoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[[security-api-node-enrollment]]
=== Enroll Node API
++++
<titleabbrev>Enroll Node</titleabbrev>
<titleabbrev>Enroll node</titleabbrev>
++++

Allows a new node to join an existing cluster with security features enabled.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ traditional roles

Service accounts are not included in the response of the
<<security-api-get-user,get users API>>. To retrieve a service account, use the
<<security-api-get-service-accounts,get service accounts API>>.
<<security-api-get-service-accounts,get service accounts API>>. Use the
<<security-api-get-service-credentials,get service account credentials API>>
to retrieve all service credentials for a service account.

[discrete]
[[service-accounts-explanation]]
Expand Down

0 comments on commit 4dce318

Please sign in to comment.