-
Notifications
You must be signed in to change notification settings - Fork 335
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.
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
Switches Stack Overview to asciidoctor builds #649
Conversation
This one renders has some problems:
from asciidoc vs:
from asciidoctor. I'll have to look into those Edit Me links..... |
I opened #661 |
Now that #627 is merged, I get different errors when I try to build this book:
I can get rid that message by removing the callouts in https://github.com/elastic/elasticsearch/blob/master/docs/reference/ccr/getting-started.asciidoc on line 134, but they don't seem incorrect to me so I think this is a bug.
I can get rid of that message by removing the callouts in https://github.com/elastic/stack-docs/blob/master/docs/en/stack/troubleshooting.asciidoc on line 74, but ditto above re this being a bug.
Is this last one related to asciidoctor/asciidoctor#3133? |
It is, but I have a solution for that in #680 |
Yeah. There is something up here. I'll dig into it once I've got #680 in. |
The documentation build errors seem to be solved by #721 |
The latest issue I'm seeing now is related to code blocks deep in ordered lists: |
e82e969
to
0db3e51
Compare
I think this is more of the same "lists are pickier" issue we've hit before. When I do this it seems to work in both AsciiDoc and Asciidoctor: diff --git a/docs/en/stack/security/troubleshooting.asciidoc b/docs/en/stack/security/troubleshooting.asciidoc
index d12c1f5..97203a8 100644
--- a/docs/en/stack/security/troubleshooting.asciidoc
+++ b/docs/en/stack/security/troubleshooting.asciidoc
@@ -426,36 +426,34 @@ these issues.
. *Symptoms:*
+
---
Authentication in {kib} fails and the following error is printed in the {es}
logs:
-
++
....
Cannot find any matching realm for [SamlPrepareAuthenticationRequest{realmName=null,
assertionConsumerServiceURL=https://my.kibana.url/api/security/v1/saml}]
....
-
++
*Resolution:*
-
++
{es}, {kib} and your Identity Provider need all have the same view on what the
Assertion Consumer Service URL of the SAML Service Provider is.
-
++
.. {es} discovers this via the `sp.acs` setting in your {es} SAML realm configuration
.. {kib} constructs this value using the `server.host` and `server.port` in
`kibana.yml`. For instance:
+
---
[source, shell]
-----------------------------------------------
server.host: kibanaserver.org
server.port: 3456
-----------------------------------------------
-
++
These settings would mean that {kib} would construct the Assertion Consumer
Service URL as `https://kibanaserver.org:3456/api/secuirity/v1/saml`. However,
if for example, {kib} is behind a reverse proxy and you have configured the
following `xpack.security.public.*` settings:
-
++
[source, shell]
-----------------------------------------------
xpack.security.public:
@@ -463,33 +461,31 @@ xpack.security.public:
hostname: kibana.proxy.com
port: 8080
-----------------------------------------------
-
++
These settings would instruct {kib} to construct the Assertion Consumer Service
URL as `https://kibana.proxy.com:8080/api/secuirity/v1/saml`
---
-
++
.. The SAML Identity Provider is either explicitly configured by the IdP
administrator or consumes the SAML metadata that are generated by {es} and as
such contain the same value for the Assertion Consumer Service URL as the one
that is configured in the the `sp.acs` setting in the {es} SAML realm
configuration.
-
++
The error encountered here indicates that the Assertion Consumer Service URL
that {kib} has constructed via one of the aforementioned ways
(`https://my.kibana.url/api/security/v1/saml`) is not the one that {es} is
configured with. Note that these two URLs are compared as case-sensitive strings
and not as canonicalized URLs.
-
++
Often, this can be resolved by changing the `sp.acs` URL in `elasticearch.yml`
to match the value that {kib} has constructed. Note however, that the SAML IdP
configuration needs to also be adjusted to reflect this change.
-
++
Alternatively, if you think {kib} is using the wrong value for the Assertion
Consumer Service URL, you will need to change the configuration in `kibana.yml`
by adjusting either the `server.host` and `server.port` to change the URL {kib}
listens to or the `xpack.security.public.*` settings to make {kib} aware about
its correct public URL.
---
. *Symptoms:*
+ I admit that isn't pleasant, but it is something. |
This also seems to work and is shorter: diff --git a/docs/en/stack/security/troubleshooting.asciidoc b/docs/en/stack/security/troubleshooting.asciidoc
index d12c1f5..82e7675 100644
--- a/docs/en/stack/security/troubleshooting.asciidoc
+++ b/docs/en/stack/security/troubleshooting.asciidoc
@@ -439,6 +439,7 @@ assertionConsumerServiceURL=https://my.kibana.url/api/security/v1/saml}]
{es}, {kib} and your Identity Provider need all have the same view on what the
Assertion Consumer Service URL of the SAML Service Provider is.
+--
.. {es} discovers this via the `sp.acs` setting in your {es} SAML realm configuration
.. {kib} constructs this value using the `server.host` and `server.port` in
@@ -472,8 +473,9 @@ URL as `https://kibana.proxy.com:8080/api/secuirity/v1/saml`
administrator or consumes the SAML metadata that are generated by {es} and as
such contain the same value for the Assertion Consumer Service URL as the one
that is configured in the the `sp.acs` setting in the {es} SAML realm
-configuration.
-
+configuration.
++
+--
The error encountered here indicates that the Assertion Consumer Service URL
that {kib} has constructed via one of the aforementioned ways
(`https://my.kibana.url/api/security/v1/saml`) is not the one that {es} is |
Thanks, @nik9000 I've implemented the fix in elastic/stack-docs#293 |
Let me regenerate the diff for this one. |
There are many changes to the edit me links - they look like they mostly fix broken links actually. So 👍 This kind of thing is fairly common: - AsciiDoc
+ Asciidoctor
@@ -601,17 +601,7 @@
</div>
</div>
<p>
- <span class="beta">
- [
- <span class="beta_title">
- beta
- </span>
- ]
- <span class="detail">
- This functionality is in beta and is subject to change. The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.
- </span>
- </span>
- In 6.4 and later, you can use Metricbeat to collect and ship data about Kibana, rather than routing it through Elasticsearch. For example:
+ beta::[] In 6.4 and later, you can use Metricbeat to collect and ship data about Kibana, rather than routing it through Elasticsearch. For example:
</p>
<div class="informalfigure">
<div class="mediaobject"> This should be fixed by #799. |
Not sure if this was affected by #799, but I'm now seeing occurrences like this for https://www.elastic.co/guide/en/elastic-stack-overview/6.7/audit-index.html even after I try to escape the text: |
This happens because in Asciidoctor There is a solution! I'd forgotten about it until this came up: diff --git a/x-pack/docs/en/security/auditing/output-index.asciidoc b/x-pack/docs/en/security/auditing/output-index.asciidoc
index 0d2769e40fb..e684ce2565f 100644
--- a/x-pack/docs/en/security/auditing/output-index.asciidoc
+++ b/x-pack/docs/en/security/auditing/output-index.asciidoc
@@ -1,8 +1,13 @@
[role="xpack"]
[[audit-index]]
=== Index audit output
+ifdef::asciidoctor[]
+deprecated::[6.7.0, "The index output type is deprecated and will be removed in 7.0. The sole output for the audit trail will be the <<audit-log-output, logfile>> type."]
+endif::asciidoctor[]
+ifndef::asciidoctor[]
deprecated[6.7.0, The index output type is deprecated and will be removed in 7.0.
The sole output for the audit trail will be the <<audit-log-output, logfile>> type.]
+endif::asciidoctor[]
|
I think rather than fixing with ifdefs, it's time to flip the switch on this book and fix for Asciidoctor thereafter. Here we go! |
This PR updates the Stack Overview (https://www.elastic.co/guide/en/elastic-stack-overview/master/index.html) such that it's built via Asciidoctor.
Related to #606