Skip to content
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

[7.17] fix: remove ndjson.org (backport #5376) #5392

Merged
merged 3 commits into from
Jun 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 12, 2024

Fixes https://github.com/elastic/security-docs-internal/issues/20. The original website expired and it's currently serving malicious content.

Previews

ESS:

Serverless:

Backporting notes

  • Mergify should be able to create all 8.x backports, and the 7.14-7.17 backports. To create backport PRs for 7.9-7.13, we'll need to use the backport tool.
  • For backports earlier than 7.17, we’ll need to manually remove the serverless folder & files from the backport PRs. Our GitHub action will do this automatically for backports to 7.17 and later.
    This is an automatic backport of pull request fix: remove ndjson.org #5376 done by Mergify.

* fix: replace ndjson.org with ndjson spec

the original website expired and it's currently serving malicious content.

* Removing link

* capitalization fix

---------

Co-authored-by: nastasha.solomon <[email protected]>
Co-authored-by: Joe Peeples <[email protected]>
(cherry picked from commit 5beed29)

# Conflicts:
#	docs/events/timeline-ui-overview.asciidoc
#	docs/serverless/investigate/timeline-templates-ui.mdx
#	docs/serverless/investigate/timelines-ui.mdx
Copy link
Contributor Author

mergify bot commented Jun 12, 2024

Cherry-pick of 5beed29 has failed:

On branch mergify/bp/7.17/pr-5376
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 5beed294.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/events/timeline-templates.asciidoc
	modified:   docs/getting-started/siem-ui.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   docs/events/timeline-ui-overview.asciidoc
	deleted by us:   docs/serverless/investigate/timeline-templates-ui.mdx
	deleted by us:   docs/serverless/investigate/timelines-ui.mdx

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link

A documentation preview will be available soon.

Request a new doc build by commenting
  • Rebuild this PR: run docs-build
  • Rebuild this PR and all Elastic docs: run docs-build rebuild

run docs-build is much faster than run docs-build rebuild. A rebuild should only be needed in rare situations.

If your PR continues to fail for an unknown reason, the doc build pipeline may be broken. Elastic employees can check the pipeline status here.

@benironside benironside merged commit 5b8fa48 into 7.17 Jun 12, 2024
4 checks passed
@mergify mergify bot deleted the mergify/bp/7.17/pr-5376 branch June 12, 2024 22:19
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.

2 participants