Skip to content

Commit 216ff69

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.x' into backport/7.x/pr-58387
2 parents 5d410ed + 3b588c5 commit 216ff69

777 files changed

Lines changed: 16632 additions & 14725 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ const ELASTIC_LICENSE_HEADER = `
4949
*/
5050
`;
5151

52+
const allMochaRulesOff = {};
53+
Object.keys(require('eslint-plugin-mocha').rules).forEach(k => {
54+
allMochaRulesOff['mocha/' + k] = 'off';
55+
});
56+
5257
module.exports = {
5358
root: true,
5459

@@ -518,6 +523,14 @@ module.exports = {
518523
},
519524
},
520525

526+
/**
527+
* Harden specific rules
528+
*/
529+
{
530+
files: ['test/harden/*.js'],
531+
rules: allMochaRulesOff,
532+
},
533+
521534
/**
522535
* APM overrides
523536
*/

‎docs/apm/advanced-queries.asciidoc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ TIP: Read the {kibana-ref}/kuery-query.html[Kibana Query Language Enhancements]
2121

2222
[float]
2323
[[discover-advanced-queries]]
24-
=== Querying in the Discover app
24+
=== Querying in Discover
2525

26-
It may also be helpful to view your APM data in the {kibana-ref}/discover.html[Discover app].
27-
Querying documents in Discover works the same way as querying in the APM app,
28-
and all of the example APM app queries can also be used in the Discover app.
26+
It may also be helpful to view your APM data in {kibana-ref}/discover.html[*Discover*].
27+
Querying documents in *Discover* works the same way as querying in the APM app,
28+
and all of the example APM app queries can also be used in *Discover*.
2929

3030
[float]
31-
==== Example Discover app query
31+
==== Example Discover query
3232

33-
One example where you may want to make use of the Discover app,
33+
One example where you may want to make use of *Discover*,
3434
is for viewing _all_ transactions for an endpoint, instead of just a sample.
3535

3636
TIP: Starting in v7.6, you can view 10 samples per bucket in the APM app, instead of just one.
3737

3838
Use the APM app to find a transaction name and time bucket that you're interested in learning more about.
39-
Then, switch to the Discover app and make a search:
39+
Then, switch to *Discover* and make a search:
4040

4141
["source","sh"]
4242
-----

0 commit comments

Comments
 (0)