Skip to content

Commit 5dc7ccc

Browse files
authored
Fix remaining logs tests (elastic#100407)
In this PR we convert the remaining 3 yaml logs tests to java rest tests. This should remove all the flaky tests from the data stream yaml suite that's why we are reenabling it. Closes: elastic#99911 Closes: elastic#97795
1 parent c4e55ab commit 5dc7ccc

File tree

8 files changed

+946
-756
lines changed

8 files changed

+946
-756
lines changed

modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/EcsLogsDataStreamIT.java

Lines changed: 433 additions & 0 deletions
Large diffs are not rendered by default.

modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/LogsDataStreamIT.java

Lines changed: 392 additions & 16 deletions
Large diffs are not rendered by default.
Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
{
2+
"@timestamp": "2023-05-16T13:49:40.377Z",
3+
"test": "elastic-agent-log",
4+
"container": {
5+
"image": {
6+
"name": "docker.elastic.co/beats/elastic-agent:8.9.0-SNAPSHOT"
7+
},
8+
"runtime": "containerd",
9+
"id": "bdabf58305b2b537d06b85764c588ff659190d875cb5470214bc16ba50ea1a4d"
10+
},
11+
"kubernetes": {
12+
"container": {
13+
"name": "elastic-agent"
14+
},
15+
"node": {
16+
"uid": "0f4dd3b8-0b29-418e-ad7a-ebc55bc279ff",
17+
"hostname": "multi-v1.27.1-worker",
18+
"name": "multi-v1.27.1-worker",
19+
"labels": {
20+
"kubernetes_io/hostname": "multi-v1.27.1-worker",
21+
"beta_kubernetes_io/os": "linux",
22+
"kubernetes_io/arch": "arm64",
23+
"kubernetes_io/os": "linux",
24+
"beta_kubernetes_io/arch": "arm64"
25+
}
26+
},
27+
"pod": {
28+
"uid": "c91d1354-27cf-40f3-a2d6-e2b75aa96bf2",
29+
"ip": "172.18.0.4",
30+
"test_ip": "172.18.0.5",
31+
"name": "elastic-agent-managed-daemonset-jwktj"
32+
},
33+
"namespace": "kube-system",
34+
"namespace_uid": "63294aeb-b23f-429d-827c-e793ccf91024",
35+
"daemonset": {
36+
"name": "elastic-agent-managed-daemonset"
37+
},
38+
"namespace_labels": {
39+
"kubernetes_io/metadata_name": "kube-system"
40+
},
41+
"labels": {
42+
"controller-revision-hash": "7ff74fcd4b",
43+
"pod-template-generation": "1",
44+
"k8s-app": "elastic-agent"
45+
}
46+
},
47+
"agent": {
48+
"name": "multi-v1.27.1-worker",
49+
"id": "230358e2-6c5d-4675-9069-04feaddad64b",
50+
"ephemeral_id": "e0934bfb-7e35-4bcc-a935-803643841213",
51+
"type": "filebeat",
52+
"version": "8.9.0"
53+
},
54+
"log": {
55+
"file": {
56+
"path": "/var/log/containers/elastic-agent-managed-daemonset-jwktj_kube-system_elastic-agent-bdabf58305b2b537d06b85764c588ff659190d875cb5470214bc16ba50ea1a4d.log"
57+
},
58+
"offset": 635247
59+
},
60+
"elastic_agent": {
61+
"id": "230358e2-6c5d-4675-9069-04feaddad64b",
62+
"version": "8.9.0",
63+
"snapshot": true
64+
},
65+
"message": "{\"log.level\":\"info\",\"@timestamp\":\"2023-05-16T13:49:40.374Z\",\"message\":\"Non-zero metrics in the last 30s\",\"component\":{\"binary\":\"metricbeat\",\"dataset\":\"elastic_agent.metricbeat\",\"id\":\"kubernetes/metrics-a92ab320-f3ed-11ed-9c8d-45656839f031\",\"type\":\"kubernetes/metrics\"},\"log\":{\"source\":\"kubernetes/metrics-a92ab320-f3ed-11ed-9c8d-45656839f031\"},\"log.logger\":\"monitoring\",\"log.origin\":{\"file.line\":187,\"file.name\":\"log/log.go\"},\"service.name\":\"metricbeat\",\"ecs.version\":\"1.6.0\"}",
66+
"orchestrator": {
67+
"cluster": {
68+
"name": "multi-v1.27.1",
69+
"url": "multi-v1.27.1-control-plane:6443"
70+
}
71+
},
72+
"input": {
73+
"type": "filestream"
74+
},
75+
"ecs": {
76+
"version": "8.0.0"
77+
},
78+
"stream": "stderr",
79+
"data_stream": {
80+
"namespace": "default",
81+
"dataset": "kubernetes.container_logs"
82+
},
83+
"host": {
84+
"hostname": "multi-v1.27.1-worker",
85+
"os": {
86+
"kernel": "5.15.49-linuxkit",
87+
"codename": "focal",
88+
"name": "Ubuntu",
89+
"type": "linux",
90+
"family": "debian",
91+
"version": "20.04.6 LTS (Focal Fossa)",
92+
"platform": "ubuntu"
93+
},
94+
"ip": [
95+
"10.244.2.1",
96+
"10.244.2.1",
97+
"172.18.0.4",
98+
"fc00:f853:ccd:e793::4",
99+
"fe80::42:acff:fe12:4",
100+
"172.21.0.9"
101+
],
102+
"containerized": false,
103+
"name": "multi-v1.27.1-worker",
104+
"id": "b2c527655d7746328f0686e25d3c413a",
105+
"mac": [
106+
"02-42-AC-12-00-04",
107+
"02-42-AC-15-00-09",
108+
"32-7E-AA-73-39-04",
109+
"EA-F3-80-1D-88-E3"
110+
],
111+
"architecture": "aarch64"
112+
},
113+
"event": {
114+
"agent_id_status": "verified",
115+
"ingested": "2023-05-16T13:49:47Z",
116+
"dataset": "kubernetes.container_logs"
117+
}
118+
}

modules/data-streams/src/yamlRestTest/java/org/elasticsearch/datastreams/DataStreamsClientYamlTestSuiteIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
1111

12-
import org.apache.lucene.tests.util.LuceneTestCase;
1312
import org.elasticsearch.common.settings.SecureString;
1413
import org.elasticsearch.common.settings.Settings;
1514
import org.elasticsearch.common.util.concurrent.ThreadContext;
@@ -20,7 +19,6 @@
2019
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
2120
import org.junit.ClassRule;
2221

23-
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/99764")
2422
public class DataStreamsClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
2523

2624
public DataStreamsClientYamlTestSuiteIT(final ClientYamlTestCandidate testCandidate) {

modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/230_logs_message_pipeline.yml

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

0 commit comments

Comments
 (0)