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

[8.15] (Doc+) Alerts UI cannot be CCS [serverless] + bonus fixes (backport #5582) #5585

Merged
merged 2 commits into from
Jul 19, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 19, 2024

Fixes included

  • Serverless twin follow-up to (Doc+) Alerts UI cannot be CCS #5513
    Adds admonition about data view picker in the Alerts page.

  • Updates the Data views in Elastic Security serverless page to match its ESS counterpart. It appears the serverless page was never updated to match ESS changes in Documents how to change the default security index #4695, so this gets ESS + serverless back in sync.

  • Fixes URL variable/attribute usage: a few links used apm-app-ref instead of kibana-ref to point to Kibana docs. Currently the two variables have the same value, so technically the links still go to the right place, but I think that in itself is an error. We should just use the Kibana variable if we want to point to Kibana docs.

  • Backports: The errant apm-app-ref attribute appears back to 8.0, but I think we can get by with fixing the current version (8.14) and moving on.

Previews

ESS:

Serverless:

* Add admonition to serverless

Serverless follow up to #5513

* Update serverless to match ESS

Serverless follow up to #4695

* Fix URL variable/attribute

Should use `kibana-ref` instead of apm-app-ref since this has nothing to do with APM

* No-op change to trigger build

(i hope)

(cherry picked from commit 9e7d734)

# Conflicts:
#	docs/serverless/explore/data-views-in-sec.mdx
@mergify mergify bot added the backport label Jul 19, 2024
@mergify mergify bot requested a review from a team as a code owner July 19, 2024 12:32
@mergify mergify bot added the conflicts label Jul 19, 2024
Copy link
Contributor Author

mergify bot commented Jul 19, 2024

Cherry-pick of 9e7d734 has failed:

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

You are currently cherry-picking commit 9e7d734a.
  (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/getting-started/data-views-in-sec.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/serverless/explore/data-views-in-sec.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.

@joepeeples
Copy link
Contributor

run docs-build

@joepeeples joepeeples merged commit 8048133 into 8.15 Jul 19, 2024
3 checks passed
@mergify mergify bot deleted the mergify/bp/8.15/pr-5582 branch July 19, 2024 13:28
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.

1 participant