Skip to content

Commit ee7b238

Browse files
Merge branch 'master' into improve-page-load-axis
2 parents a92a6bc + db78d70 commit ee7b238

File tree

40 files changed

+529
-410
lines changed

40 files changed

+529
-410
lines changed

docs/developer/advanced/development-basepath.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ You can set this explicitly using `server.basePath` in <<settings>>.
77

88
Use the server.rewriteBasePath setting to tell {kib} if it should remove the basePath from requests it receives, and to prevent a deprecation warning at startup. This setting cannot end in a slash (/).
99

10-
If you want to turn off the basepath when in development mode, start {kib} with the `--no-basepath` flag
10+
If you want to turn off the basepath when in development mode, start {kib} with the `--no-base-path` flag
1111

1212
[source,bash]
1313
----
14-
yarn start --no-basepath
14+
yarn start --no-base-path
1515
----
1616

1717

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Add scripted field to field list
99
<b>Signature:</b>
1010

1111
```typescript
12-
addScriptedField(name: string, script: string, fieldType?: string, lang?: string): Promise<void>;
12+
addScriptedField(name: string, script: string, fieldType?: string): Promise<void>;
1313
```
1414

1515
## Parameters
@@ -19,7 +19,6 @@ addScriptedField(name: string, script: string, fieldType?: string, lang?: string
1919
| name | <code>string</code> | |
2020
| script | <code>string</code> | |
2121
| fieldType | <code>string</code> | |
22-
| lang | <code>string</code> | |
2322

2423
<b>Returns:</b>
2524

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.istimebasedwildcard.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export declare class IndexPattern implements IIndexPattern
4141
4242
| Method | Modifiers | Description |
4343
| --- | --- | --- |
44-
| [addScriptedField(name, script, fieldType, lang)](./kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md) | | Add scripted field to field list |
44+
| [addScriptedField(name, script, fieldType)](./kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md) | | Add scripted field to field list |
4545
| [getAggregationRestrictions()](./kibana-plugin-plugins-data-public.indexpattern.getaggregationrestrictions.md) | | |
4646
| [getAsSavedObjectBody()](./kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md) | | Returns index pattern as saved object body for saving |
4747
| [getComputedFields()](./kibana-plugin-plugins-data-public.indexpattern.getcomputedfields.md) | | |
@@ -52,7 +52,6 @@ export declare class IndexPattern implements IIndexPattern
5252
| [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) | | Get the source filtering configuration for that index. |
5353
| [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) | | |
5454
| [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) | | |
55-
| [isTimeBasedWildcard()](./kibana-plugin-plugins-data-public.indexpattern.istimebasedwildcard.md) | | |
5655
| [isTimeNanosBased()](./kibana-plugin-plugins-data-public.indexpattern.istimenanosbased.md) | | |
5756
| [popularizeField(fieldName, unit)](./kibana-plugin-plugins-data-public.indexpattern.popularizefield.md) | | |
5857
| [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) | | Remove scripted field from field list |

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Add scripted field to field list
99
<b>Signature:</b>
1010

1111
```typescript
12-
addScriptedField(name: string, script: string, fieldType?: string, lang?: string): Promise<void>;
12+
addScriptedField(name: string, script: string, fieldType?: string): Promise<void>;
1313
```
1414

1515
## Parameters
@@ -19,7 +19,6 @@ addScriptedField(name: string, script: string, fieldType?: string, lang?: string
1919
| name | <code>string</code> | |
2020
| script | <code>string</code> | |
2121
| fieldType | <code>string</code> | |
22-
| lang | <code>string</code> | |
2322

2423
<b>Returns:</b>
2524

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.istimebasedwildcard.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export declare class IndexPattern implements IIndexPattern
4141
4242
| Method | Modifiers | Description |
4343
| --- | --- | --- |
44-
| [addScriptedField(name, script, fieldType, lang)](./kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md) | | Add scripted field to field list |
44+
| [addScriptedField(name, script, fieldType)](./kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md) | | Add scripted field to field list |
4545
| [getAggregationRestrictions()](./kibana-plugin-plugins-data-server.indexpattern.getaggregationrestrictions.md) | | |
4646
| [getAsSavedObjectBody()](./kibana-plugin-plugins-data-server.indexpattern.getassavedobjectbody.md) | | Returns index pattern as saved object body for saving |
4747
| [getComputedFields()](./kibana-plugin-plugins-data-server.indexpattern.getcomputedfields.md) | | |
@@ -52,7 +52,6 @@ export declare class IndexPattern implements IIndexPattern
5252
| [getSourceFiltering()](./kibana-plugin-plugins-data-server.indexpattern.getsourcefiltering.md) | | Get the source filtering configuration for that index. |
5353
| [getTimeField()](./kibana-plugin-plugins-data-server.indexpattern.gettimefield.md) | | |
5454
| [isTimeBased()](./kibana-plugin-plugins-data-server.indexpattern.istimebased.md) | | |
55-
| [isTimeBasedWildcard()](./kibana-plugin-plugins-data-server.indexpattern.istimebasedwildcard.md) | | |
5655
| [isTimeNanosBased()](./kibana-plugin-plugins-data-server.indexpattern.istimenanosbased.md) | | |
5756
| [popularizeField(fieldName, unit)](./kibana-plugin-plugins-data-server.indexpattern.popularizefield.md) | | |
5857
| [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md) | | Remove scripted field from field list |

docs/getting-started/tutorial-define-index.asciidoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ index named `shakespeare,` and the accounts data set, which has an index named
2424
. In the *Index pattern name* field, enter `shakes*`.
2525
+
2626
[role="screenshot"]
27-
image::images/tutorial-pattern-1.png[shakes* index patterns]
27+
image::images/tutorial-pattern-1.png[Image showing how to enter shakes* in Index Pattern Name field]
2828

2929
. Click *Next step*.
3030

@@ -54,4 +54,3 @@ available, open the menu, go to *Dev Tools > Console*, then enter `GET _cat/indi
5454
For Windows, run `Invoke-RestMethod -Uri "http://localhost:9200/_cat/indices"` in Powershell.
5555

5656

57-

packages/kbn-telemetry-tools/src/tools/__fixture__/mock_schema.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,19 @@
3535
}
3636
},
3737
"my_array": {
38-
"properties": {
39-
"total": {
40-
"type": "number"
41-
},
42-
"type": {
43-
"type": "boolean"
38+
"type": "array",
39+
"items": {
40+
"properties": {
41+
"total": {
42+
"type": "number"
43+
},
44+
"type": {
45+
"type": "boolean"
46+
}
4447
}
4548
}
4649
},
47-
"my_str_array": { "type": "keyword" }
50+
"my_str_array": { "type": "array", "items": { "type": "keyword" } }
4851
}
4952
}
5053
}

packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,15 @@ export const parsedWorkingCollector: ParsedUsageCollection = [
5555
},
5656
},
5757
my_array: {
58-
total: {
59-
type: 'number',
58+
type: 'array',
59+
items: {
60+
total: {
61+
type: 'number',
62+
},
63+
type: { type: 'boolean' },
6064
},
61-
type: { type: 'boolean' },
6265
},
63-
my_str_array: { type: 'keyword' },
66+
my_str_array: { type: 'array', items: { type: 'keyword' } },
6467
},
6568
},
6669
fetch: {
@@ -91,18 +94,22 @@ export const parsedWorkingCollector: ParsedUsageCollection = [
9194
},
9295
},
9396
my_array: {
94-
total: {
95-
kind: SyntaxKind.NumberKeyword,
96-
type: 'NumberKeyword',
97-
},
98-
type: {
99-
kind: SyntaxKind.BooleanKeyword,
100-
type: 'BooleanKeyword',
97+
items: {
98+
total: {
99+
kind: SyntaxKind.NumberKeyword,
100+
type: 'NumberKeyword',
101+
},
102+
type: {
103+
kind: SyntaxKind.BooleanKeyword,
104+
type: 'BooleanKeyword',
105+
},
101106
},
102107
},
103108
my_str_array: {
104-
kind: SyntaxKind.StringKeyword,
105-
type: 'StringKeyword',
109+
items: {
110+
kind: SyntaxKind.StringKeyword,
111+
type: 'StringKeyword',
112+
},
106113
},
107114
},
108115
},

0 commit comments

Comments
 (0)