Skip to content

Commit ec7885f

Browse files
author
Joel Griffith
committed
Merge remote-tracking branch 'upstream/master' into sec/disallow-file-ip-requests
2 parents 841a460 + e925186 commit ec7885f

1,115 files changed

Lines changed: 320679 additions & 24447 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.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
/x-pack/test/functional/apps/machine_learning/ @elastic/ml-ui
3636
/x-pack/test/functional/services/machine_learning/ @elastic/ml-ui
3737
/x-pack/test/functional/services/ml.ts @elastic/ml-ui
38+
/x-pack/legacy/plugins/transform/ @elastic/ml-ui
3839

3940
# Operations
4041
/renovate.json5 @elastic/kibana-operations

‎.sass-lint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ files:
88
- 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
99
- 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
1010
- 'x-pack/legacy/plugins/lens/**/*.s+(a|c)ss'
11+
- 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
1112
rules:
1213
quotes:
1314
- 2

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,6 @@ def buildXpack() {
294294
def runErrorReporter() {
295295
bash """
296296
source src/dev/ci_setup/setup_env.sh
297-
node src/dev/failed_tests/cli
297+
node scripts/report_failed_tests
298298
"""
299299
}

‎docs/apm/troubleshooting.asciidoc‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
[[troubleshooting]]
2+
=== Troubleshooting common problems
3+
4+
If you have something to add to this section, please consider creating a pull request with
5+
your proposed changes at https://github.com/elastic/kibana.
6+
7+
Also check out the https://discuss.elastic.co/c/apm[APM discussion forum].
8+
9+
==== No APM data found
10+
11+
This section can help with any of the following:
12+
13+
* Data isn't displaying in the APM app
14+
* You're seeing a message like "No Services Found",
15+
* You're seeing errors like "Fielddata is disabled on text fields by default..."
16+
17+
There are a number of factors that could be at play here.
18+
One important thing to double-check first is your index template.
19+
20+
An APM index template must exist for the APM app to work correctly.
21+
By default, this index template is created by APM Server on startup.
22+
However, this only happens if `setup.template.enabled` is `true` in `apm-server.yml`.
23+
You can create the index template manually by running `apm-server setup`.
24+
Take note that index templates *cannot* be applied retroactively -- they are only applied at index creation time.
25+
More information is available in {apm-server-ref}/apm-server-configuration.html[Set up and configure].
26+
27+
You can check for the existence of an APM index template using the
28+
{ref}/indices-get-template.html[Get index template API].
29+
If you're using the default index naming pattern, that request would be:
30+
31+
[source,js]
32+
--------------------------------------------------
33+
GET /_template/apm-{version}
34+
--------------------------------------------------
35+
// CONSOLE
36+
37+
If you're not outputting data directly from APM Server to Elasticsearch (perhaps you're using Logstash or Kafka),
38+
then the index template will not be set up automatically. Instead, you'll need to
39+
{apm-server-ref}/_manually_loading_template_configuration.html#load-template-manually-alternate[load the template manually].
40+
41+
Finally, this problem can also occur if you've changed the index name that you write APM data to.
42+
The default index pattern can be found {apm-server-ref}/elasticsearch-output.html#index-option-es[here].
43+
If you change this setting, you must also configure the `setup.template.name` and `setup.template.pattern` options.
44+
See {apm-server-ref}/configuration-template.html[Load the Elasticsearch index template].

‎docs/apm/using-the-apm-ui.asciidoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ include::metrics.asciidoc[]
3535
include::agent-configuration.asciidoc[]
3636

3737
include::advanced-queries.asciidoc[]
38+
39+
include::troubleshooting.asciidoc[]

‎docs/development/core/public/kibana-plugin-public.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
7070
| [Plugin](./kibana-plugin-public.plugin.md) | The interface that should be returned by a <code>PluginInitializer</code>. |
7171
| [PluginInitializerContext](./kibana-plugin-public.plugininitializercontext.md) | The available core services passed to a <code>PluginInitializer</code> |
7272
| [SavedObject](./kibana-plugin-public.savedobject.md) | |
73-
| [SavedObjectAttributes](./kibana-plugin-public.savedobjectattributes.md) | The data for a Saved Object is stored in the <code>attributes</code> key as either an object or an array of objects. |
73+
| [SavedObjectAttributes](./kibana-plugin-public.savedobjectattributes.md) | The data for a Saved Object is stored as an object in the <code>attributes</code> property. |
7474
| [SavedObjectReference](./kibana-plugin-public.savedobjectreference.md) | A reference to another saved object. |
7575
| [SavedObjectsBaseOptions](./kibana-plugin-public.savedobjectsbaseoptions.md) | |
7676
| [SavedObjectsBatchResponse](./kibana-plugin-public.savedobjectsbatchresponse.md) | |
@@ -104,7 +104,8 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
104104
| [PluginInitializer](./kibana-plugin-public.plugininitializer.md) | The <code>plugin</code> export at the root of a plugin's <code>public</code> directory should conform to this interface. |
105105
| [PluginOpaqueId](./kibana-plugin-public.pluginopaqueid.md) | |
106106
| [RecursiveReadonly](./kibana-plugin-public.recursivereadonly.md) | |
107-
| [SavedObjectAttribute](./kibana-plugin-public.savedobjectattribute.md) | |
107+
| [SavedObjectAttribute](./kibana-plugin-public.savedobjectattribute.md) | Type definition for a Saved Object attribute value |
108+
| [SavedObjectAttributeSingle](./kibana-plugin-public.savedobjectattributesingle.md) | Don't use this type, it's simply a helper type for [SavedObjectAttribute](./kibana-plugin-public.savedobjectattribute.md) |
108109
| [SavedObjectsClientContract](./kibana-plugin-public.savedobjectsclientcontract.md) | SavedObjectsClientContract as implemented by the [SavedObjectsClient](./kibana-plugin-public.savedobjectsclient.md) |
109110
| [ToastInput](./kibana-plugin-public.toastinput.md) | |
110111
| [UiSettingsClientContract](./kibana-plugin-public.uisettingsclientcontract.md) | [UiSettingsClient](./kibana-plugin-public.uisettingsclient.md) |

‎docs/development/core/public/kibana-plugin-public.savedobject.attributes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## SavedObject.attributes property
66

7-
The data for a Saved Object is stored in the `attributes` key as either an object or an array of objects.
7+
The data for a Saved Object is stored as an object in the `attributes` property.
88

99
<b>Signature:</b>
1010

‎docs/development/core/public/kibana-plugin-public.savedobject.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export interface SavedObject<T extends SavedObjectAttributes = any>
1515

1616
| Property | Type | Description |
1717
| --- | --- | --- |
18-
| [attributes](./kibana-plugin-public.savedobject.attributes.md) | <code>T</code> | The data for a Saved Object is stored in the <code>attributes</code> key as either an object or an array of objects. |
18+
| [attributes](./kibana-plugin-public.savedobject.attributes.md) | <code>T</code> | The data for a Saved Object is stored as an object in the <code>attributes</code> property. |
1919
| [error](./kibana-plugin-public.savedobject.error.md) | <code>{</code><br/><code> message: string;</code><br/><code> statusCode: number;</code><br/><code> }</code> | |
2020
| [id](./kibana-plugin-public.savedobject.id.md) | <code>string</code> | The ID of this Saved Object, guaranteed to be unique for all objects of the same <code>type</code> |
2121
| [migrationVersion](./kibana-plugin-public.savedobject.migrationversion.md) | <code>SavedObjectsMigrationVersion</code> | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |

‎docs/development/core/public/kibana-plugin-public.savedobjectattribute.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
## SavedObjectAttribute type
66

7+
Type definition for a Saved Object attribute value
78

89
<b>Signature:</b>
910

1011
```typescript
11-
export declare type SavedObjectAttribute = string | number | boolean | null | undefined | SavedObjectAttributes | SavedObjectAttributes[];
12+
export declare type SavedObjectAttribute = SavedObjectAttributeSingle | SavedObjectAttributeSingle[];
1213
```

‎docs/development/core/public/kibana-plugin-public.savedobjectattributes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## SavedObjectAttributes interface
66

7-
The data for a Saved Object is stored in the `attributes` key as either an object or an array of objects.
7+
The data for a Saved Object is stored as an object in the `attributes` property.
88

99
<b>Signature:</b>
1010

0 commit comments

Comments
 (0)