Skip to content

Commit

Permalink
Merge branch '7.8' into backport/7.8/pr-68486
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Jun 10, 2020
2 parents d0f12e6 + dcad64a commit 3788585
Show file tree
Hide file tree
Showing 23 changed files with 35 additions and 309 deletions.
4 changes: 2 additions & 2 deletions docs/drilldowns/drilldowns.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ that shows a single data center or server.
[[how-drilldowns-work]]
=== How drilldowns work

Drilldowns are {kib} actions that you configure and store
in the dashboard saved object. Drilldowns are specific to the dashboard panel
Drilldowns are user-configurable {kib} actions that are stored with the
dashboard metadata. Drilldowns are specific to the dashboard panel
for which you create them—they are not shared across panels.
A panel can have multiple drilldowns.

Expand Down
2 changes: 1 addition & 1 deletion docs/infrastructure/infra-ui.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ You can:

* Select *View Metrics* to <<xpack-view-metrics, view detailed infrastructure metrics>>.

* Select *View Logs* to <<xpack-logs-using, view the logs>> in the *Logs* app.
* Select *View Logs* to {logs-guide}/inspect-log-events.html[view the logs] in the *Logs* app.

Depending on the features you have installed and configured, you may also be able to:

Expand Down
46 changes: 0 additions & 46 deletions docs/logs/configuring.asciidoc

This file was deleted.

11 changes: 0 additions & 11 deletions docs/logs/getting-started.asciidoc

This file was deleted.

Binary file removed docs/logs/images/alert-actions-menu.png
Binary file not shown.
Binary file removed docs/logs/images/alert-flyout.png
Binary file not shown.
Binary file removed docs/logs/images/analysis-tab-create-ml-job.png
Binary file not shown.
Binary file removed docs/logs/images/log-rate-anomalies.png
Binary file not shown.
Binary file removed docs/logs/images/log-rate-entries.png
Binary file not shown.
Binary file removed docs/logs/images/log-time-filter.png
Binary file not shown.
Binary file removed docs/logs/images/logs-action-menu.png
Binary file not shown.
Binary file removed docs/logs/images/logs-add-data.png
Binary file not shown.
Binary file not shown.
Binary file removed docs/logs/images/logs-time-selector.png
Binary file not shown.
Binary file removed docs/logs/images/logs-view-event-with-filter.png
Binary file not shown.
Binary file removed docs/logs/images/logs-view-event.png
Binary file not shown.
Binary file removed docs/logs/images/logs-view-in-context.png
Binary file not shown.
24 changes: 5 additions & 19 deletions docs/logs/index.asciidoc
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
[chapter]
[role="xpack"]
[[xpack-logs]]
= Logs

[partintro]
--
The Logs app in Kibana enables you to explore logs for common servers, containers, and services.

The Logs app has a compact, console-like display that you can customize.
Expand All @@ -13,23 +12,10 @@ You can open the Logs app from the *Logs* tab in Kibana.
You can also open the Logs app directly from a component in the Metrics app.
In this case, you will only see the logs for the selected component.

* <<xpack-logs-getting-started>>
* <<xpack-logs-using>>
* <<xpack-logs-configuring>>
* <<xpack-logs-analysis>>
* <<xpack-logs-alerting>>

[role="screenshot"]
image::logs/images/logs-console.png[Log Console in Kibana]

--

include::getting-started.asciidoc[]

include::using.asciidoc[]

include::configuring.asciidoc[]
image::logs/images/logs-console.png[Logs Console in Kibana]

include::log-rate.asciidoc[]
[float]
=== Get started

include::logs-alerting.asciidoc[]
To get started with Elastic Logs, refer to {logs-guide}/install-logs-monitoring.html[Install Logs].
94 changes: 0 additions & 94 deletions docs/logs/log-rate.asciidoc

This file was deleted.

27 changes: 0 additions & 27 deletions docs/logs/logs-alerting.asciidoc

This file was deleted.

100 changes: 0 additions & 100 deletions docs/logs/using.asciidoc

This file was deleted.

27 changes: 26 additions & 1 deletion docs/redirects.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This page has moved. Please see <<infra-configure-source>>.
[role="exclude",id="logs-read-only-access"]
== Configure source read-only access

This page has moved. Please see <<xpack-logs-configuring>>.
This page has moved. Please see {logs-guide}/configure-logs-source.html[logs configuration].

[role="exclude",id="creating-df-kib"]
== Creating {transforms}
Expand Down Expand Up @@ -96,3 +96,28 @@ This page was deleted. See <<development-visualize-index>>.
== Developing Visualizations

This page was deleted. See <<development-visualize-index>>.

[role="exclude",id="xpack-logs-getting-started"]
== Getting started with logs monitoring

This page has moved. Please see the new section in the {logs-guide}/install-logs-monitoring.html[Logs Monitoring Guide].

[role="exclude",id="xpack-logs-using"]
== Using the Logs app

This page has moved. Please see the new section in the {logs-guide}/logs-app-overview.html[Logs Monitoring Guide].

[role="exclude",id="xpack-logs-configuring"]
== Configuring the Logs data

This page has moved. Please see the new section in the {logs-guide}/configure-logs-source.html[Logs Monitoring Guide].

[role="exclude",id="xpack-logs-analysis"]
== Detecting and inspecting log anomalies

This page has moved. Please see the new section in the {logs-guide}/detect-log-anomalies.html[Logs Monitoring Guide]

[role="exclude",id="xpack-logs-alerting"]
== Logs alerting

This page has moved. Please see the new section in the {logs-guide}/create-log-alert.html[Logs Monitoring Guide]
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,7 @@ export default function ({ getService }: FtrProviderContext) {
const sessionCookie = request.cookie(cookies[0])!;
checkCookieIsSet(sessionCookie);

const isAnonymousAccessEnabled = (config.get(
'esTestCluster.serverArgs'
) as string[]).some((setting) => setting.startsWith('xpack.security.authc.anonymous'));

// `superuser_anonymous` role is derived from the enabled anonymous access.
const expectedUserRoles = isAnonymousAccessEnabled
? ['kibana_admin', 'superuser_anonymous']
: ['kibana_admin'];
const expectedUserRoles = ['kibana_admin'];

await supertest
.get('/internal/security/me')
Expand Down

0 comments on commit 3788585

Please sign in to comment.