Skip to content

Commit 9d40715

Browse files
committed
Merge branch 'master' into verify-official-plugin-signature
* master: Update the version checks around ip_range bucket keys, now that the change was backported. Mute IndexMasterFailoverIT.testMasterFailoverDuringIndexingWithMappingChanges Use geohash cell instead of just a corner in geo_bounding_box (elastic#30698) Limit user to single concurrent auth per realm (elastic#30794) [Tests] Move templated _rank_eval tests (elastic#30679) Security: fix dynamic mapping updates with aliases (elastic#30787) Ensure that ip_range aggregations always return bucket keys. (elastic#30701) Use remote client in TransportFieldCapsAction (elastic#30838) Move Watcher versioning setting to meta field (elastic#30832) [Docs] Explain incomplete dates in range queries (elastic#30689) Move persistent task registrations to core (elastic#30755) Decouple ClusterStateTaskListener & ClusterApplier (elastic#30809) Send client headers from TransportClient (elastic#30803) Packaging: Ensure upgrade_is_oss flag file is always deleted (elastic#30732) Force stable file modes for built packages (elastic#30823) [DOCS] Fixes typos in security settings Fix GeoShapeQueryBuilder serialization after backport
2 parents 50fdd05 + f55b09b commit 9d40715

File tree

67 files changed

+1460
-715
lines changed

Some content is hidden

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

67 files changed

+1460
-715
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import org.gradle.api.internal.artifacts.dependencies.DefaultProjectDependency
1111
import org.gradle.api.tasks.Copy
1212
import org.gradle.api.tasks.Delete
1313
import org.gradle.api.tasks.Exec
14+
import org.gradle.api.tasks.StopExecutionException
1415
import org.gradle.api.tasks.TaskState
1516

1617
import static java.util.Collections.unmodifiableList
@@ -285,8 +286,10 @@ class VagrantTestPlugin implements Plugin<Project> {
285286
dependsOn copyPackagingArchives
286287
doFirst {
287288
project.delete("${archivesDir}/upgrade_is_oss")
289+
if (project.extensions.esvagrant.upgradeFromVersion.before('6.3.0')) {
290+
throw new StopExecutionException("upgrade version is before 6.3.0")
291+
}
288292
}
289-
onlyIf { project.extensions.esvagrant.upgradeFromVersion.onOrAfter('6.3.0') }
290293
file "${archivesDir}/upgrade_is_oss"
291294
contents ''
292295
}

distribution/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
244244
if (it.relativePath.segments[-2] == 'bin') {
245245
// bin files, wherever they are within modules (eg platform specific) should be executable
246246
it.mode = 0755
247+
} else {
248+
it.mode = 0644
247249
}
248250
}
249251
if (oss) {

distribution/packages/build.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ Closure commonPackageConfig(String type, boolean oss) {
122122
}
123123
from(rootProject.projectDir) {
124124
include 'README.textile'
125+
fileMode 0644
125126
}
126127
into('lib') {
127128
with copySpec {
@@ -133,6 +134,7 @@ Closure commonPackageConfig(String type, boolean oss) {
133134
directory('/' + segments[0..i].join('/'), 0755)
134135
}
135136
}
137+
fcp.mode = 0644
136138
}
137139
}
138140
into('modules') {
@@ -144,6 +146,11 @@ Closure commonPackageConfig(String type, boolean oss) {
144146
for (int i = segments.length - 2; i > 0 && segments[i] != 'modules'; --i) {
145147
directory('/' + segments[0..i].join('/'), 0755)
146148
}
149+
if (segments[-2] == 'bin') {
150+
fcp.mode = 0755
151+
} else {
152+
fcp.mode = 0644
153+
}
147154
}
148155
}
149156
}
@@ -162,6 +169,7 @@ Closure commonPackageConfig(String type, boolean oss) {
162169
include oss ? 'APACHE-LICENSE-2.0.txt' : 'ELASTIC-LICENSE.txt'
163170
rename { 'LICENSE.txt' }
164171
}
172+
fileMode 0644
165173
}
166174
}
167175

@@ -189,14 +197,17 @@ Closure commonPackageConfig(String type, boolean oss) {
189197
// ========= systemd =========
190198
into('/usr/lib/tmpfiles.d') {
191199
from "${packagingFiles}/systemd/elasticsearch.conf"
200+
fileMode 0644
192201
}
193202
into('/usr/lib/systemd/system') {
194203
fileType CONFIG | NOREPLACE
195204
from "${packagingFiles}/systemd/elasticsearch.service"
205+
fileMode 0644
196206
}
197207
into('/usr/lib/sysctl.d') {
198208
fileType CONFIG | NOREPLACE
199209
from "${packagingFiles}/systemd/sysctl/elasticsearch.conf"
210+
fileMode 0644
200211
}
201212

202213
// ========= sysV init =========

docs/reference/aggregations/bucket/iprange-aggregation.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ Response:
3737
"ip_ranges": {
3838
"buckets" : [
3939
{
40+
"key": "*-10.0.0.5",
4041
"to": "10.0.0.5",
4142
"doc_count": 10
4243
},
4344
{
45+
"key": "10.0.0.5-*",
4446
"from": "10.0.0.5",
4547
"doc_count": 260
4648
}

docs/reference/migration/migrate_7_0/search.asciidoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
* Purely negative queries (only MUST_NOT clauses) now return a score of `0`
1313
rather than `1`.
1414

15+
* The boundary specified using geohashes in the `geo_bounding_box` query
16+
now include entire geohash cell, instead of just geohash center.
17+
1518
==== Adaptive replica selection enabled by default
1619

1720
Adaptive replica selection has been enabled by default. If you wish to return to

docs/reference/query-dsl/geo-bounding-box-query.asciidoc

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,38 @@ GET /_search
231231
--------------------------------------------------
232232
// CONSOLE
233233

234+
235+
When geohashes are used to specify the bounding the edges of the
236+
bounding box, the geohashes are treated as rectangles. The bounding
237+
box is defined in such a way that its top left corresponds to the top
238+
left corner of the geohash specified in the `top_left` parameter and
239+
its bottom right is defined as the bottom right of the geohash
240+
specified in the `bottom_right` parameter.
241+
242+
In order to specify a bounding box that would match entire area of a
243+
geohash the geohash can be specified in both `top_left` and
244+
`bottom_right` parameters:
245+
246+
[source,js]
247+
--------------------------------------------------
248+
GET /_search
249+
{
250+
"query": {
251+
"geo_bounding_box" : {
252+
"pin.location" : {
253+
"top_left" : "dr",
254+
"bottom_right" : "dr"
255+
}
256+
}
257+
}
258+
}
259+
--------------------------------------------------
260+
// CONSOLE
261+
262+
In this example, the geohash `dr` will produce the bounding box
263+
query with the top left corner at `45.0,-78.75` and the bottom right
264+
corner at `39.375,-67.5`.
265+
234266
[float]
235267
==== Vertices
236268

docs/reference/query-dsl/range-query.asciidoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,12 @@ GET _search
109109
--------------------------------------------------
110110
// CONSOLE
111111

112+
Note that if the date misses some of the year, month and day coordinates, the
113+
missing parts are filled with the start of
114+
https://en.wikipedia.org/wiki/Unix_time[unix time], which is January 1st, 1970.
115+
This means, that when e.g. specifying `dd` as the format, a value like `"gte" : 10`
116+
will translate to `1970-01-10T00:00:00.000Z`.
117+
112118
===== Time zone in range queries
113119

114120
Dates can be converted from another timezone to UTC either by specifying the

qa/smoke-test-rank-eval-with-mustache/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,3 @@ dependencies {
3131
* and will be fixed later.
3232
* Tracked by https://github.com/elastic/elasticsearch/issues/30628
3333
*/
34-
if ("zip".equals(integTestCluster.distribution)) {
35-
integTestRunner.enabled = false
36-
}

qa/smoke-test-rank-eval-with-mustache/src/test/java/org/elasticsearch/index/rankeval/SmokeMultipleTemplatesIT.java

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

0 commit comments

Comments
 (0)