Skip to content

Reenable MonitoringIT.testMonitoringService #38332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 11, 2019
Merged

Reenable MonitoringIT.testMonitoringService #38332

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cea058
Reenable MonitoringIT.testMonitoringService
tlrx Feb 4, 2019
59f3a5d
Merge branch 'master' into reenable-monitoring-it-service
tlrx Feb 6, 2019
1b3a5ba
Merge branch 'master' into reenable-monitoring-it-service
tlrx Feb 8, 2019
3b5f79f
Merge branch 'master' into reenable-monitoring-it-service
tlrx Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ...monitoring/src/test/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -189,7 +190,6 @@ public void testMonitoringBulk() throws Exception {
* This test waits for the monitoring service to collect monitoring documents and then checks that all expected documents
* have been indexed with the expected information.
*/
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/29880")
public void testMonitoringService() throws Exception {
final boolean createAPMIndex = randomBoolean();
final String indexName = createAPMIndex ? "apm-2017.11.06" : "books";
Expand Down Expand Up @@ -374,9 +374,6 @@ private void assertClusterStatsMonitoringDoc(final Map<String, Object> document,
assertThat(clusterState.remove("cluster_uuid"), notNullValue());
assertThat(clusterState.remove("master_node"), notNullValue());
assertThat(clusterState.remove("nodes"), notNullValue());
Copy link
Contributor

@jakelandis jakelandis Feb 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious to why we are removing these assertions ?

Copy link
Member Author

@tlrx tlrx Feb 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's been added for Zen 2 but removed afterwards, but not noticed since the test was muted.

assertThat(clusterState.remove("term"), notNullValue());
assertThat(clusterState.remove("last_committed_config"), notNullValue());
assertThat(clusterState.remove("last_accepted_config"), notNullValue());
assertThat(clusterState.keySet(), empty());

final Map<String, Object> clusterSettings = (Map<String, Object>) source.get("cluster_settings");
Expand Down Expand Up @@ -612,7 +609,7 @@ public void enableMonitoring() throws Exception {
.setSize(0)
.get().getHits().getTotalHits().value,
greaterThan(0L));
});
}, 30L, TimeUnit.SECONDS);
}

/**
Expand Down Expand Up @@ -649,7 +646,7 @@ public void disableMonitoring() throws Exception {
} catch (Exception e) {
throw new ElasticsearchException("Failed to wait for monitoring exporters to stop:", e);
}
});
}, 30L, TimeUnit.SECONDS);
}

private boolean getMonitoringUsageExportersDefined() throws Exception {
Expand Down