Skip to content

Commit 599658d

Browse files
committed
Merge branch 'main' into read-failure-store-privilege-authz
2 parents c8205fb + 7cec948 commit 599658d

File tree

41 files changed

+245
-188
lines changed

Some content is hidden

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

41 files changed

+245
-188
lines changed

docs/changelog/123588.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 123588
2+
summary: Give Kibana user 'all' permissions for .entity_analytics.* indices
3+
area: Infra/Core
4+
type: enhancement
5+
issues: []

docs/changelog/124451.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 124451
2+
summary: Improve downsample performance by avoiding to read unnecessary dimension values when downsampling.
3+
area: Downsampling
4+
type: bug
5+
issues: []
54.4 KB
Loading
209 KB
Loading
44.7 KB
Loading
162 KB
Loading
71.9 KB
Loading
249 KB
Loading

docs/reference/query-languages/query-dsl-function-score-query.md

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -510,13 +510,11 @@ Next, we show how the computed score looks like for each of the three possible d
510510

511511
When choosing `gauss` as the decay function in the above example, the contour and surface plot of the multiplier looks like this:
512512

513-
% :::{image} https://f.cloud.github.com/assets/4320215/768157/cd0e18a6-e898-11e2-9b3c-f0145078bd6f.png
514-
% :alt: cd0e18a6 e898 11e2 9b3c f0145078bd6f
515-
% :::
513+
:::{image} ../../images/normal-decay-keyword-gauss-1.png
514+
:::
516515

517-
% :::{image} https://f.cloud.github.com/assets/4320215/768160/ec43c928-e898-11e2-8e0d-f3c4519dbd89.png
518-
% :alt: ec43c928 e898 11e2 8e0d f3c4519dbd89
519-
% :::
516+
:::{image} ../../images/normal-decay-keyword-gauss-2.png
517+
:::
520518

521519
Suppose your original search results matches three hotels :
522520

@@ -531,28 +529,21 @@ Suppose your original search results matches three hotels :
531529

532530
When choosing `exp` as the decay function in the above example, the contour and surface plot of the multiplier looks like this:
533531

534-
% :::{image} https://f.cloud.github.com/assets/4320215/768161/082975c0-e899-11e2-86f7-174c3a729d64.png
535-
% :alt: 082975c0 e899 11e2 86f7 174c3a729d64
536-
% :::
537-
538-
% :::{image} https://f.cloud.github.com/assets/4320215/768162/0b606884-e899-11e2-907b-aefc77eefef6.png
539-
% :alt: 0b606884 e899 11e2 907b aefc77eefef6
540-
% :::
532+
:::{image} ../../images/exponential-decay-keyword-exp-1.png
533+
:::
541534

535+
:::{image} ../../images/exponential-decay-keyword-exp-2.png
536+
:::
542537

543538
### Linear decay, keyword `linear` [linear-decay]
544539

545540
When choosing `linear` as the decay function in the above example, the contour and surface plot of the multiplier looks like this:
546541

547-
% :::{image} https://f.cloud.github.com/assets/4320215/768164/1775b0ca-e899-11e2-9f4a-776b406305c6.png
548-
% :alt: 1775b0ca e899 11e2 9f4a 776b406305c6
549-
% :::
550-
551-
% :::{image} https://f.cloud.github.com/assets/4320215/768165/19d8b1aa-e899-11e2-91bc-6b0553e8d722.png
552-
% :alt: 19d8b1aa e899 11e2 91bc 6b0553e8d722
553-
% :::
554-
542+
:::{image} ../../images/linear-decay-keyword-linear-1.png
543+
:::
555544

545+
:::{image} ../../images/linear-decay-keyword-linear-2.png
546+
:::
556547

557548
## Supported fields for decay functions [_supported_fields_for_decay_functions]
558549

libs/entitlement/qa/entitled-plugin/src/main/java/org/elasticsearch/entitlement/qa/entitled/EntitledActions.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,19 @@ public static Path createTempSymbolicLink() throws IOException {
6666
return Files.createSymbolicLink(readDir().resolve("entitlements-link-" + random.nextLong()), readWriteDir());
6767
}
6868

69+
public static Path createK8sLikeMount() throws IOException {
70+
Path baseDir = readDir().resolve("k8s");
71+
var versionedDir = Files.createDirectories(baseDir.resolve("..version"));
72+
var actualFileMount = Files.createFile(versionedDir.resolve("mount-" + random.nextLong() + ".tmp"));
73+
74+
var dataDir = Files.createSymbolicLink(baseDir.resolve("..data"), versionedDir.getFileName());
75+
// mount-0.tmp -> ..data/mount-0.tmp -> ..version/mount-0.tmp
76+
return Files.createSymbolicLink(
77+
baseDir.resolve(actualFileMount.getFileName()),
78+
dataDir.getFileName().resolve(actualFileMount.getFileName())
79+
);
80+
}
81+
6982
public static URLConnection createHttpURLConnection() throws IOException {
7083
return URI.create("http://127.0.0.1:12345/").toURL().openConnection();
7184
}

0 commit comments

Comments
 (0)