Skip to content

[DOCS] Fixes SIEM links#908

Merged
webmat merged 5 commits intoelastic:masterfrom
lcawl:siem-links
Aug 18, 2020
Merged

[DOCS] Fixes SIEM links#908
webmat merged 5 commits intoelastic:masterfrom
lcawl:siem-links

Conversation

@lcawl
Copy link
Copy Markdown
Contributor

@lcawl lcawl commented Aug 4, 2020

Related to elastic/docs#1932

This PR addresses the following links that will be broken when "current" shifts to the 7.9 documentation branch:

13:54:52 INFO:build_docs:Bad cross-document links:
13:54:52 INFO:build_docs:  /tmp/docsbuild/target_repo/html/en/ecs/1.3/ecs-products-solutions.html:
13:54:52 INFO:build_docs:   - en/siem/guide/7.9/siem-overview.html
13:54:52 INFO:build_docs:  /tmp/docsbuild/target_repo/html/en/ecs/1.4/ecs-products-solutions.html:
13:54:52 INFO:build_docs:   - en/siem/guide/7.9/siem-overview.html
13:54:52 INFO:build_docs:  /tmp/docsbuild/target_repo/html/en/ecs/1.5/ecs-products-solutions.html:
13:54:52 INFO:build_docs:   - en/siem/guide/7.9/siem-overview.html
13:54:52 INFO:build_docs:  /tmp/docsbuild/target_repo/html/en/ecs/current/ecs-products-solutions.html:
13:54:52 INFO:build_docs:   - en/siem/guide/7.9/siem-overview.html
13:54:52 INFO:build_docs:  /tmp/docsbuild/target_repo/html/en/ecs/master/ecs-products-solutions.html:
13:54:52 INFO:build_docs:   - en/siem/guide/7.9/siem-field-reference.html
13:54:52 INFO:build_docs:   - en/siem/guide/7.9/siem-overview.html

This needs to be applied to the following branches on release day:

@webmat
Copy link
Copy Markdown
Contributor

webmat commented Aug 5, 2020

Thanks @lcawl 🙂

benskelker
benskelker previously approved these changes Aug 11, 2020
Copy link
Copy Markdown
Contributor

@benskelker benskelker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @lcawl. @webmat can you also approve?

@webmat
Copy link
Copy Markdown
Contributor

webmat commented Aug 11, 2020

@benskelker Yes of course. Should this only be merged after 7.9 is out?

@benskelker
Copy link
Copy Markdown
Contributor

@webmat

Should this only be merged after 7.9 is out?

Yep. Thanks

Copy link
Copy Markdown
Contributor

@webmat webmat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @lcawl I just looked into the backports (#911 👀 ) and noticed you found and adjusted some missing shortcuts at the end of docs/using-getting-started.asciidoc 👍

Would you mind adding them in this PR for master as well?

On 7.9 release day, do you prefer to merge these PRs, or would you rather we do it? Either is fine for us 🙂

@ebeahan
Copy link
Copy Markdown
Member

ebeahan commented Aug 11, 2020

On 7.9 release day, do you prefer to merge these PRs, or would you rather we do it?

Just adding a note that if @lcawl would prefer to merge, we'll make sure the branch permissions are in place beforehand for release day.

@lcawl
Copy link
Copy Markdown
Contributor Author

lcawl commented Aug 11, 2020

Just adding a note that if @lcawl would prefer to merge, we'll make sure the branch permissions are in place beforehand for release day.

After I am authorized to merge this PR, will I be able to merge it despite the fact that the elasticsearch-ci/docs check is in a failed state? If not, we're in a chicken-and-egg state with elastic/docs#1932 (which changes "current" to 7.9, but is currently blocked from merging by these broken links).

If we can't merge this PR until the checks are green, I think we need to temporarily set these broken links to the 7.9 docs explicitly, then revert them to "current" after 7.9 is current.

webmat
webmat previously approved these changes Aug 12, 2020
Copy link
Copy Markdown
Contributor

@webmat webmat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the additional adjustment on the getting started.

Me or Eric can merge despite the CI failure, so we will do it at the time you need. That will be simplest.

@lcawl please let us both know when you need us to merge this (and the other PRs) and we'll do it then.

@lcawl
Copy link
Copy Markdown
Contributor Author

lcawl commented Aug 13, 2020

7 AM Pacific on release day would be great, thanks!

@webmat webmat added the 1.x label Aug 13, 2020
Mathieu Martin added 2 commits August 17, 2020 14:02
- Normalized capitalization
- Using the name "Elastic Security" everywhere
- Using the name "Logs Monitoring" to match the wording in the /logs/ docs
@webmat webmat self-assigned this Aug 17, 2020
@webmat
Copy link
Copy Markdown
Contributor

webmat commented Aug 17, 2020

@ebeahan I've put in a checklist in this PR's body, with links to the PRs targeting all of the branches we'll need to deploy on release day.

Some of them have been authored by Lisa and amended by me, some are 100% my own. Could you take a quick look at all of the PRs and approve them please?

Copy link
Copy Markdown
Member

@ebeahan ebeahan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@webmat webmat merged commit 7a5fd66 into elastic:master Aug 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants