Skip to content

Commit 5c1a3ad

Browse files
authored
Propagate root subobjects setting to downsample indexes (elastic#115358)
* Propagate root subobjects setting to downsample indexes * exclude tests from rest compat * remove subobjects propagation
1 parent 160faa2 commit 5c1a3ad

File tree

3 files changed

+292
-228
lines changed

3 files changed

+292
-228
lines changed

x-pack/plugin/downsample/qa/rest/build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,20 @@ tasks.named('yamlRestTest') {
3232
tasks.named('yamlRestCompatTest') {
3333
usesDefaultDistribution()
3434
}
35+
tasks.named("yamlRestCompatTestTransform").configure ({ task ->
36+
task.skipTest("downsample/10_basic/Downsample index with empty dimension on routing path", "Skip until pr/115358 gets backported")
37+
task.skipTest("downsample/10_basic/Downsample histogram as label", "Skip until pr/115358 gets backported")
38+
task.skipTest("downsample/10_basic/Downsample date timestamp field using strict_date_optional_time_nanos format",
39+
"Skip until pr/115358 gets backported")
40+
task.skipTest("downsample/10_basic/Downsample a downsampled index", "Skip until pr/115358 gets backported")
41+
task.skipTest("downsample/10_basic/Downsample date_nanos timestamp field using custom format", "Skip until pr/115358 gets backported")
42+
task.skipTest("downsample/10_basic/Downsample using coarse grained timestamp", "Skip until pr/115358 gets backported")
43+
task.skipTest("downsample/10_basic/Downsample label with ignore_above", "Skip until pr/115358 gets backported")
44+
task.skipTest("downsample/10_basic/Downsample object field", "Skip until pr/115358 gets backported")
45+
task.skipTest("downsample/10_basic/Downsample empty and missing labels", "Skip until pr/115358 gets backported")
46+
task.skipTest("downsample/10_basic/Downsample index", "Skip until pr/115358 gets backported")
47+
task.skipTest("downsample/10_basic/Downsample index with empty dimension", "Skip until pr/115358 gets backported")
48+
})
3549
if (BuildParams.inFipsJvm){
3650
// This test cluster is using a BASIC license and FIPS 140 mode is not supported in BASIC
3751
tasks.named("yamlRestTest").configure{enabled = false }
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
8+
package org.elasticsearch.xpack.downsample;
9+
10+
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
11+
12+
import org.elasticsearch.test.cluster.ElasticsearchCluster;
13+
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
14+
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
15+
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
16+
import org.junit.ClassRule;
17+
18+
public class DownsampleWithBasicRestIT extends ESClientYamlSuiteTestCase {
19+
20+
@ClassRule
21+
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
22+
.distribution(DistributionType.DEFAULT)
23+
.setting("xpack.security.enabled", "false")
24+
.build();
25+
26+
@Override
27+
protected String getTestRestCluster() {
28+
return cluster.getHttpAddresses();
29+
}
30+
31+
public DownsampleWithBasicRestIT(final ClientYamlTestCandidate testCandidate) {
32+
super(testCandidate);
33+
}
34+
35+
@ParametersFactory
36+
public static Iterable<Object[]> parameters() throws Exception {
37+
return ESClientYamlSuiteTestCase.createParameters();
38+
}
39+
40+
}

0 commit comments

Comments
 (0)