Skip to content

Commit e055d30

Browse files
committed
[Monitoring] Remove unhelpful Monitoring tests (#30144)
This removes some monitoring tests that have been silenced for a long time. These tests don't really provide any value for the upgrade suite and they just create noise due to their occasional timing-related failures.
1 parent bf03c53 commit e055d30

File tree

4 files changed

+0
-163
lines changed

4 files changed

+0
-163
lines changed

x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,34 +42,6 @@ public void waitForTemplates() throws Exception {
4242
XPackRestTestHelper.waitForMlTemplates(client());
4343
}
4444

45-
/**
46-
* Enables an HTTP exporter for monitoring so that we can test the production-level exporter (not the local exporter).
47-
*
48-
* The build.gradle file disables data collection, so the expectation is that any monitoring rest tests will use the
49-
* "_xpack/monitoring/_bulk" endpoint to lazily setup the templates on-demand and fill in data without worrying about
50-
* timing.
51-
*/
52-
@Before
53-
public void waitForMonitoring() throws Exception {
54-
final String[] nodes = System.getProperty("tests.rest.cluster").split(",");
55-
final Map<String, Object> settings = new HashMap<>();
56-
57-
settings.put("xpack.monitoring.exporters._http.enabled", true);
58-
// only select the last node to avoid getting the "old" node in a mixed cluster
59-
// if we ever randomize the order that the nodes are restarted (or add more nodes), then we need to verify which node we select
60-
settings.put("xpack.monitoring.exporters._http.host", nodes[nodes.length - 1]);
61-
62-
assertBusy(() -> {
63-
final ClientYamlTestResponse response =
64-
getAdminExecutionContext().callApi("cluster.put_settings",
65-
emptyMap(),
66-
singletonList(singletonMap("transient", settings)),
67-
emptyMap());
68-
69-
assertThat(response.evaluate("acknowledged"), is(true));
70-
});
71-
}
72-
7345
@AfterClass
7446
public static void upgradeSecurityIfNecessary() throws Exception {
7547
if (System.getProperty("tests.rest.suite").equals("old_cluster")) {

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/60_monitoring.yml

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

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/60_monitoring.yml

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

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/60_monitoring.yml

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

0 commit comments

Comments
 (0)