Skip to content

Commit 366b4c9

Browse files
committed
Merge branch 'release/7.2.0'
2 parents b59bbbf + 27d721b commit 366b4c9

File tree

16 files changed

+1764
-857
lines changed

16 files changed

+1764
-857
lines changed

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ matrix:
1313
fast_finish: true
1414
include:
1515
- php: 7.1
16-
env: ES_VERSION="7.0.0"
16+
env: ES_VERSION="7.2.0"
1717
- php: 7.2
18-
env: ES_VERSION="7.0.0"
18+
env: ES_VERSION="7.2.0"
1919
- php: 7.3
20-
env: ES_VERSION="7.0.0"
20+
env: ES_VERSION="7.2.0"
2121
- php: 7.1
22-
env: ES_VERSION="7.1.0"
22+
env: ES_VERSION="7.2.1"
2323
- php: 7.2
24-
env: ES_VERSION="7.1.0"
24+
env: ES_VERSION="7.2.1"
2525
- php: 7.3
26-
env: ES_VERSION="7.1.0"
26+
env: ES_VERSION="7.2.1"
2727
- php: 7.3
28-
env: ES_VERSION="7.2.0"
28+
env: ES_VERSION="7.3.0"
2929
allow_failures:
3030
- php: 7.3
31-
env: ES_VERSION="7.2.0"
31+
env: ES_VERSION="7.3.0"
3232

3333
env:
3434
global:

src/Elasticsearch/Client.php

Lines changed: 595 additions & 377 deletions
Large diffs are not rendered by default.

src/Elasticsearch/Endpoints/Cluster/Health.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public function getURI(): string
3131
public function getParamWhitelist(): array
3232
{
3333
return [
34+
'expand_wildcards',
3435
'level',
3536
'local',
3637
'master_timeout',

src/Elasticsearch/Endpoints/FieldCaps.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public function getParamWhitelist(): array
3535
'fields',
3636
'ignore_unavailable',
3737
'allow_no_indices',
38-
'expand_wildcards'
38+
'expand_wildcards',
39+
'include_unmapped'
3940
];
4041
}
4142

src/Elasticsearch/Endpoints/Indices/Close.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public function getParamWhitelist(): array
3838
'master_timeout',
3939
'ignore_unavailable',
4040
'allow_no_indices',
41-
'expand_wildcards'
41+
'expand_wildcards',
42+
'wait_for_active_shards'
4243
];
4344
}
4445

src/Elasticsearch/Endpoints/Indices/Stats.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ public function getParamWhitelist(): array
6868
'groups',
6969
'level',
7070
'types',
71-
'include_segment_file_sizes'
71+
'include_segment_file_sizes',
72+
'include_unloaded_segments',
73+
'expand_wildcards',
74+
'forbid_closed_indices'
7275
];
7376
}
7477

src/Elasticsearch/Namespaces/CatNamespace.php

Lines changed: 258 additions & 112 deletions
Large diffs are not rendered by default.

src/Elasticsearch/Namespaces/ClusterNamespace.php

Lines changed: 90 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,24 @@
1616
class ClusterNamespace extends AbstractNamespace
1717
{
1818
/**
19-
* $params['index'] = (string) Limit the information returned to a specific index
20-
* ['level'] = (enum) Specify the level of detail for returned information
21-
* ['local'] = (boolean) Return local information, do not retrieve the state from master node (default: false)
22-
* ['master_timeout'] = (time) Explicit operation timeout for connection to master node
23-
* ['timeout'] = (time) Explicit operation timeout
24-
* ['wait_for_active_shards'] = (number) Wait until the specified number of shards is active
25-
* ['wait_for_nodes'] = (number) Wait until the specified number of nodes is available
26-
* ['wait_for_relocating_shards'] = (number) Wait until the specified number of relocating shards is finished
27-
* ['wait_for_status'] = (enum) Wait until cluster is in a specific state
19+
* Endpoint: cluster.health
2820
*
21+
* @see http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html
22+
*
23+
* $params[
24+
* 'index' => '(list) Limit the information returned to a specific index',
25+
* 'expand_wildcards' => '(enum) Whether to expand wildcard expression to concrete indices that are open, closed or both. (Options = open,closed,none,all) (Default = all)',
26+
* 'level' => '(enum) Specify the level of detail for returned information (Options = cluster,indices,shards) (Default = cluster)',
27+
* 'local' => '(boolean) Return local information, do not retrieve the state from master node (default: false)',
28+
* 'master_timeout' => '(time) Explicit operation timeout for connection to master node',
29+
* 'timeout' => '(time) Explicit operation timeout',
30+
* 'wait_for_active_shards' => '(string) Wait until the specified number of shards is active',
31+
* 'wait_for_nodes' => '(string) Wait until the specified number of nodes is available',
32+
* 'wait_for_events' => '(enum) Wait until all currently queued events with the given priority are processed (Options = immediate,urgent,high,normal,low,languid)',
33+
* 'wait_for_no_relocating_shards' => '(boolean) Whether to wait until there are no relocating shards in the cluster',
34+
* 'wait_for_no_initializing_shards' => '(boolean) Whether to wait until there are no initializing shards in the cluster',
35+
* 'wait_for_status' => '(enum) Wait until cluster is in a specific state (Options = green,yellow,red)',
36+
* ]
2937
* @return callable|array
3038
*/
3139
public function health(array $params = [])
@@ -48,11 +56,19 @@ public function health(array $params = [])
4856
}
4957

5058
/**
51-
* $params['dry_run'] = (boolean) Simulate the operation only and return the resulting state
52-
* ['filter_metadata'] = (boolean) Don't return cluster state metadata (default: false)
53-
* ['body'] = (boolean) Don't return cluster state metadata (default: false)
54-
* ['explain'] = (boolean) Return an explanation of why the commands can or cannot be executed
59+
* Endpoint: cluster.reroute
60+
*
61+
* @see http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-reroute.html
5562
*
63+
* $params[
64+
* 'body' => '(string) The definition of `commands` to perform (`move`, `cancel`, `allocate`)',
65+
* 'dry_run' => '(boolean) Simulate the operation only and return the resulting state',
66+
* 'explain' => '(boolean) Return an explanation of why the commands can or cannot be executed',
67+
* 'retry_failed' => '(boolean) Retries allocation of shards that are blocked due to too many subsequent allocation failures',
68+
* 'metric' => '(list) Limit the information returned to the specified metrics. Defaults to all but metadata (Options = _all,blocks,metadata,nodes,routing_table,master_node,version)',
69+
* 'master_timeout' => '(time) Explicit operation timeout for connection to master node',
70+
* 'timeout' => '(time) Explicit operation timeout',
71+
* ]
5672
* @return callable|array
5773
*/
5874
public function reroute(array $params = [])
@@ -75,15 +91,22 @@ public function reroute(array $params = [])
7591
}
7692

7793
/**
78-
* $params['filter_blocks'] = (boolean) Do not return information about blocks
79-
* ['filter_index_templates'] = (boolean) Do not return information about index templates
80-
* ['filter_indices'] = (list) Limit returned metadata information to specific indices
81-
* ['filter_metadata'] = (boolean) Do not return information about indices metadata
82-
* ['filter_nodes'] = (boolean) Do not return information about nodes
83-
* ['filter_routing_table'] = (boolean) Do not return information about shard allocation (`routing_table` and `routing_nodes`)
84-
* ['local'] = (boolean) Return local information, do not retrieve the state from master node (default: false)
85-
* ['master_timeout'] = (time) Specify timeout for connection to master
94+
* Endpoint: cluster.state
95+
*
96+
* @see http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-state.html
8697
*
98+
* $params[
99+
* 'index' => '(list) A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices',
100+
* 'metric' => '(list) Limit the information returned to the specified metrics',
101+
* 'local' => '(boolean) Return local information, do not retrieve the state from master node (default: false)',
102+
* 'master_timeout' => '(time) Specify timeout for connection to master',
103+
* 'flat_settings' => '(boolean) Return settings in flat format (default: false)',
104+
* 'wait_for_metadata_version' => '(number) Wait for the metadata version to be equal or greater than the specified metadata version',
105+
* 'wait_for_timeout' => '(time) The maximum time to wait for wait_for_metadata_version before timing out',
106+
* 'ignore_unavailable' => '(boolean) Whether specified concrete indices should be ignored when unavailable (missing or closed)',
107+
* 'allow_no_indices' => '(boolean) Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)',
108+
* 'expand_wildcards' => '(enum) Whether to expand wildcard expression to concrete indices that are open, closed or both. (Options = open,closed,none,all) (Default = open)',
109+
* ]
87110
* @return callable|array
88111
*/
89112
public function state(array $params = [])
@@ -108,9 +131,15 @@ public function state(array $params = [])
108131
}
109132

110133
/**
111-
* $params['flat_settings'] = (boolean) Return settings in flat format (default: false)
112-
* ['human'] = (boolean) Whether to return time and byte values in human-readable format.
134+
* Endpoint: cluster.stats
113135
*
136+
* @see http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-stats.html
137+
*
138+
* $params[
139+
* 'node_id' => '(list) A comma-separated list of node IDs or names to limit the returned information; use `_local` to return information from the node you're connecting to, leave empty to get information from all nodes',
140+
* 'flat_settings' => '(boolean) Return settings in flat format (default: false)',
141+
* 'timeout' => '(time) Explicit operation timeout',
142+
* ]
114143
* @return callable|array
115144
*/
116145
public function stats(array $params = [])
@@ -133,8 +162,16 @@ public function stats(array $params = [])
133162
}
134163

135164
/**
136-
* $params['body'] = ()
165+
* Endpoint: cluster.put_settings
166+
*
167+
* @see http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html
137168
*
169+
* $params[
170+
* 'body' => '(string) The settings to be updated. Can be either `transient` or `persistent` (survives cluster restart). (Required)',
171+
* 'flat_settings' => '(boolean) Return settings in flat format (default: false)',
172+
* 'master_timeout' => '(time) Explicit operation timeout for connection to master node',
173+
* 'timeout' => '(time) Explicit operation timeout',
174+
* ]
138175
* @return callable|array
139176
*/
140177
public function putSettings(array $params = [])
@@ -157,6 +194,16 @@ public function putSettings(array $params = [])
157194
}
158195

159196
/**
197+
* Endpoint: cluster.get_settings
198+
*
199+
* @see http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html
200+
*
201+
* $params[
202+
* 'flat_settings' => '(boolean) Return settings in flat format (default: false)',
203+
* 'master_timeout' => '(time) Explicit operation timeout for connection to master node',
204+
* 'timeout' => '(time) Explicit operation timeout',
205+
* 'include_defaults' => '(boolean) Whether to return all default clusters setting. (Default = false)',
206+
* ]
160207
* @return callable|array
161208
*/
162209
public function getSettings(array $params = [])
@@ -176,9 +223,14 @@ public function getSettings(array $params = [])
176223
}
177224

178225
/**
179-
* $params['local'] = (bool) Return local information, do not retrieve the state from master node (default: false)
180-
* ['master_timeout'] = (time) Specify timeout for connection to master
226+
* Endpoint: cluster.pending_tasks
227+
*
228+
* @see http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-pending.html
181229
*
230+
* $params[
231+
* 'local' => '(boolean) Return local information, do not retrieve the state from master node (default: false)',
232+
* 'master_timeout' => '(time) Specify timeout for connection to master',
233+
* ]
182234
* @return callable|array
183235
*/
184236
public function pendingTasks(array $params = [])
@@ -198,8 +250,15 @@ public function pendingTasks(array $params = [])
198250
}
199251

200252
/**
201-
* $params['include_yes_decisions'] = (bool) Return 'YES' decisions in explanation (default: false)
253+
* Endpoint: cluster.allocation_explain
254+
*
255+
* @see http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html
202256
*
257+
* $params[
258+
* 'body' => '(string) The index, shard, and primary flag to explain. Empty means 'explain the first unassigned shard'',
259+
* 'include_yes_decisions' => '(boolean) Return 'YES' decisions in explanation (default: false)',
260+
* 'include_disk_info' => '(boolean) Return information about disk usage and shard sizes (default: false)',
261+
* ]
203262
* @return callable|array
204263
*/
205264
public function allocationExplain(array $params = [])
@@ -222,6 +281,10 @@ public function allocationExplain(array $params = [])
222281
}
223282

224283
/**
284+
* Endpoint: cluster.remote_info
285+
*
286+
* @see http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html
287+
*
225288
* @return callable|array
226289
*/
227290
public function remoteInfo(array $params = [])

0 commit comments

Comments
 (0)