Skip to content

Commit 57af839

Browse files
committed
Merge remote-tracking branch 'origin/master' into 2020-04-15-dont-copy-liv-file
2 parents 7f2b8bc + c6928ed commit 57af839

File tree

57 files changed

+2534
-694
lines changed

Some content is hidden

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

57 files changed

+2534
-694
lines changed

docs/reference/commands/node-tool.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ repaired. If the cluster is still available then you can start up a fresh node
137137
on another host and {es} will bring this node into the cluster in place of the
138138
failed node.
139139

140-
Each node stores its data in the data directory defined by the
140+
Each node stores its data in the data directories defined by the
141141
<<path-settings,`path.data` setting>>. This means that in a disaster you can
142-
also restart a node by moving its data directory to another host, presuming
143-
that that data directory can be recovered from the faulty host.
142+
also restart a node by moving its data directories to another host, presuming
143+
that those data directories can be recovered from the faulty host.
144144

145145
{es} <<modules-discovery-quorums,requires a response from a majority of the
146146
master-eligible nodes>> in order to elect a master and to update the cluster

docs/reference/migration/migrate_8_0/indices.asciidoc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,17 @@ index setting].
116116
Accept the new behaviour, or specify `?wait_for_active_shards=0` to preserve
117117
the old behaviour if needed.
118118
====
119+
120+
.The index stats API's `types` query parameter has been removed.
121+
[%collapsible]
122+
====
123+
*Details* +
124+
The index stats API's `types` query parameter has been removed. Previously, you
125+
could combine `types` with the `indexing` query parameter to return indexing
126+
stats for specific mapping types. Mapping types have been removed in 8.0.
127+
128+
*Impact* +
129+
Discontinue use of the `types` query parameter. Requests that include the
130+
parameter will return an error.
131+
====
119132
//end::notable-breaking-changes[]

docs/reference/migration/migrate_8_0/node.asciidoc

Lines changed: 0 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -46,103 +46,6 @@ all the corresponding subfolders in parallel. Each node uses the same subfolder
4646
(e.g. `nodes/2`) across all its data paths.
4747
====
4848

49-
.Support for multiple data paths has been removed.
50-
[%collapsible]
51-
====
52-
*Details* +
53-
In earlier versions the `path.data` setting accepted a list of data paths, but
54-
if you specified multiple paths then the behaviour was unintuitive and usually
55-
did not give the desired outcomes. Support for multiple data paths is now
56-
removed.
57-
58-
*Impact* +
59-
Specify a single path in `path.data`. If needed, you can create a filesystem
60-
which spans multiple disks with a hardware virtualisation layer such as RAID,
61-
or a software virtualisation layer such as Logical Volume Manager (LVM) on
62-
Linux or Storage Spaces on Windows. If you wish to use multiple data paths on a
63-
single machine then you must run one node for each data path.
64-
65-
If you currently use multiple data paths in a
66-
{ref}/high-availability-cluster-design.html[highly available cluster] then you
67-
can migrate to a setup that uses a single path for each node without downtime
68-
using a process similar to a
69-
{ref}/restart-cluster.html#restart-cluster-rolling[rolling restart]: shut each
70-
node down in turn and replace it with one or more nodes each configured to use
71-
a single data path. In more detail, for each node that currently has multiple
72-
data paths you should follow the following process. In principle you can
73-
perform this migration during a rolling upgrade to 8.0, but we recommend
74-
migrating to a single-data-path setup before starting to upgrade.
75-
76-
1. Take a snapshot to protect your data in case of disaster.
77-
78-
2. Optionally, migrate the data away from the target node by using an
79-
{ref}/modules-cluster.html#cluster-shard-allocation-filtering[allocation filter]:
80-
+
81-
[source,console]
82-
--------------------------------------------------
83-
PUT _cluster/settings
84-
{
85-
"transient": {
86-
"cluster.routing.allocation.exclude._name": "target-node-name"
87-
}
88-
}
89-
--------------------------------------------------
90-
+
91-
You can use the {ref}/cat-allocation.html[cat allocation API] to track progress
92-
of this data migration. If some shards do not migrate then the
93-
{ref}/cluster-allocation-explain.html[cluster allocation explain API] will help
94-
you to determine why.
95-
96-
3. Follow the steps in the
97-
{ref}/restart-cluster.html#restart-cluster-rolling[rolling restart process]
98-
up to and including shutting the target node down.
99-
100-
4. Ensure your cluster health is `yellow` or `green`, so that there is a copy
101-
of every shard assigned to at least one of the other nodes in your cluster.
102-
103-
5. If applicable, remove the allocation filter applied in the earlier step.
104-
+
105-
[source,console]
106-
--------------------------------------------------
107-
PUT _cluster/settings
108-
{
109-
"transient": {
110-
"cluster.routing.allocation.exclude._name": null
111-
}
112-
}
113-
--------------------------------------------------
114-
115-
6. Discard the data held by the stopped node by deleting the contents of its
116-
data paths.
117-
118-
7. Reconfigure your storage. For instance, combine your disks into a single
119-
filesystem using LVM or Storage Spaces. Ensure that your reconfigured storage
120-
has sufficient space for the data that it will hold.
121-
122-
8. Reconfigure your node by adjusting the `path.data` setting in its
123-
`elasticsearch.yml` file. If needed, install more nodes each with their own
124-
`path.data` setting pointing at a separate data path.
125-
126-
9. Start the new nodes and follow the rest of the
127-
{ref}/restart-cluster.html#restart-cluster-rolling[rolling restart process] for
128-
them.
129-
130-
10. Ensure your cluster health is `green`, so that every shard has been
131-
assigned.
132-
133-
You can alternatively add some number of single-data-path nodes to your
134-
cluster, migrate all your data over to these new nodes using
135-
{ref}/modules-cluster.html#cluster-shard-allocation-filtering[allocation filters],
136-
and then remove the old nodes from the cluster. This approach will temporarily
137-
double the size of your cluster so it will only work if you have the capacity to
138-
expand your cluster like this.
139-
140-
If you currently use multiple data paths but your cluster is not highly
141-
available then the you can migrate to a non-deprecated configuration by taking
142-
a snapshot, creating a new cluster with the desired configuration and restoring
143-
the snapshot into it.
144-
====
145-
14649
.Closed indices created in {es} 6.x and earlier versions are not supported.
14750
[%collapsible]
14851
====

docs/reference/migration/migrate_8_0/search.asciidoc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,4 +234,15 @@ been removed in 8.0.0. This parameter is a no-op and has no effect on the query.
234234
Discontinue use of the `type` parameter. `geo_bounding_box` queries that include
235235
this parameter will return an error.
236236
====
237+
238+
.The `type` query has been removed.
239+
[%collapsible]
240+
====
241+
*Details* +
242+
The `type` query has been removed. Mapping types have been removed in 8.0.
243+
244+
*Impact* +
245+
Discontinue use of the `type` query. Requests that include the `type` query
246+
will return an error.
247+
====
237248
//end::notable-breaking-changes[]

docs/reference/ml/df-analytics/apis/get-trained-models.asciidoc

Lines changed: 80 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Retrieves configuration information for a trained model.
2727
[[ml-get-trained-models-prereq]]
2828
== {api-prereq-title}
2929

30-
Requires the `monitor_ml` cluster privilege. This privilege is included in the
30+
Requires the `monitor_ml` cluster privilege. This privilege is included in the
3131
`machine_learning_user` built-in role.
3232

3333

@@ -71,9 +71,9 @@ default value is empty, indicating no optional fields are included. Valid
7171
options are:
7272
- `definition`: Includes the model definition.
7373
- `feature_importance_baseline`: Includes the baseline for {feat-imp} values.
74-
- `hyperparameters`: Includes the information about hyperparameters used to
75-
train the model. This information consists of the value, the absolute and
76-
relative importance of the hyperparameter as well as an indicator of whether
74+
- `hyperparameters`: Includes the information about hyperparameters used to
75+
train the model. This information consists of the value, the absolute and
76+
relative importance of the hyperparameter as well as an indicator of whether
7777
it was specified by the user or tuned during hyperparameter optimization.
7878
- `total_feature_importance`: Includes the total {feat-imp} for the training
7979
data set.
@@ -222,8 +222,8 @@ include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-ner]
222222
[%collapsible%open]
223223
======
224224
`classification_labels`::::
225-
(Optional, string)
226-
An array of classification labels. NER supports only
225+
(Optional, string)
226+
An array of classification labels. NER supports only
227227
Inside-Outside-Beginning labels (IOB) and only persons, organizations, locations,
228228
and miscellaneous. For example:
229229
`["O", "B-PER", "I-PER", "B-ORG", "I-ORG", "B-LOC", "I-LOC", "B-MISC", "I-MISC"]`.
@@ -338,7 +338,7 @@ include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-text-classific
338338
[%collapsible%open]
339339
======
340340
`classification_labels`::::
341-
(Optional, string)
341+
(Optional, string)
342342
An array of classification labels.
343343
344344
`num_top_classes`::::
@@ -414,6 +414,68 @@ include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-nlp-tokenizati
414414
(Optional, integer)
415415
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-nlp-tokenization-bert-max-sequence-length]
416416
417+
`with_special_tokens`::::
418+
(Optional, boolean)
419+
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-nlp-tokenization-bert-with-special-tokens]
420+
========
421+
=======
422+
`vocabulary`::::
423+
(Optional, object)
424+
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-nlp-vocabulary]
425+
+
426+
.Properties of vocabulary
427+
[%collapsible%open]
428+
=======
429+
`index`::::
430+
(Required, string)
431+
The index where the vocabulary is stored.
432+
=======
433+
======
434+
`zero_shot_classification`::::
435+
(Object, optional)
436+
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-zero-shot-classification]
437+
+
438+
.Properties of zero_shot_classification inference
439+
[%collapsible%open]
440+
======
441+
`classification_labels`::::
442+
(Required, array)
443+
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-zero-shot-classification-classification-labels]
444+
445+
`hypothesis_template`::::
446+
(Optional, string)
447+
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-zero-shot-classification-hypothesis-template]
448+
449+
`labels`::::
450+
(Optional, array)
451+
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-zero-shot-classification-labels]
452+
453+
`multi_label`::::
454+
(Optional, boolean)
455+
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-zero-shot-classification-multi-label]
456+
457+
`tokenization`::::
458+
(Optional, object)
459+
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-nlp-tokenization]
460+
+
461+
.Properties of tokenization
462+
[%collapsible%open]
463+
=======
464+
`bert`::::
465+
(Optional, object)
466+
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-nlp-tokenization-bert]
467+
+
468+
.Properties of bert
469+
[%collapsible%open]
470+
========
471+
`do_lower_case`::::
472+
(Optional, boolean)
473+
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-nlp-tokenization-bert-do-lower-case]
474+
475+
`max_sequence_length`::::
476+
(Optional, integer)
477+
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-nlp-tokenization-bert-max-sequence-length]
478+
417479
`with_special_tokens`::::
418480
(Optional, boolean)
419481
include::{es-repo-dir}/ml/ml-shared.asciidoc[tag=inference-config-nlp-tokenization-bert-with-special-tokens]
@@ -456,7 +518,7 @@ provided.
456518
=====
457519
`index`:::
458520
(Required, object)
459-
Indicates that the model definition is stored in an index. It is required to be empty as
521+
Indicates that the model definition is stored in an index. It is required to be empty as
460522
the index for storing model definitions is configured automatically.
461523
=====
462524
// End location
@@ -480,18 +542,18 @@ it is a single value. For {classanalysis}, there is a value for each class.
480542

481543
`hyperparameters`:::
482544
(array)
483-
List of the available hyperparameters optimized during the
545+
List of the available hyperparameters optimized during the
484546
`fine_parameter_tuning` phase as well as specified by the user.
485547
+
486548
.Properties of hyperparameters
487549
[%collapsible%open]
488550
======
489551
`absolute_importance`::::
490552
(double)
491-
A positive number showing how much the parameter influences the variation of the
492-
{ml-docs}/dfa-regression-lossfunction.html[loss function]. For
493-
hyperparameters with values that are not specified by the user but tuned during
494-
hyperparameter optimization.
553+
A positive number showing how much the parameter influences the variation of the
554+
{ml-docs}/dfa-regression-lossfunction.html[loss function]. For
555+
hyperparameters with values that are not specified by the user but tuned during
556+
hyperparameter optimization.
495557
496558
`max_trees`::::
497559
(integer)
@@ -503,14 +565,14 @@ Name of the hyperparameter.
503565
504566
`relative_importance`::::
505567
(double)
506-
A number between 0 and 1 showing the proportion of influence on the variation of
507-
the loss function among all tuned hyperparameters. For hyperparameters with
508-
values that are not specified by the user but tuned during hyperparameter
568+
A number between 0 and 1 showing the proportion of influence on the variation of
569+
the loss function among all tuned hyperparameters. For hyperparameters with
570+
values that are not specified by the user but tuned during hyperparameter
509571
optimization.
510572
511573
`supplied`::::
512574
(Boolean)
513-
Indicates if the hyperparameter is specified by the user (`true`) or optimized
575+
Indicates if the hyperparameter is specified by the user (`true`) or optimized
514576
(`false`).
515577
516578
`value`::::
@@ -602,7 +664,7 @@ Identifier for the trained model.
602664
`model_type`::
603665
(Optional, string)
604666
The created model type. By default the model type is `tree_ensemble`.
605-
Appropriate types are:
667+
Appropriate types are:
606668
+
607669
--
608670
* `tree_ensemble`: The model definition is an ensemble model of decision trees.

0 commit comments

Comments
 (0)