Skip to content

Commit 13fe95b

Browse files
gmmorrisgmmorris
authored
Enables the EventLog Client to query across ILM versions of the .event-log index (#81920)
Fixes a bug in the EventLog client which caused it to query for events created in the current version instead of querying across versions.
1 parent 28a726f commit 13fe95b

File tree

5 files changed

+879
-3
lines changed

5 files changed

+879
-3
lines changed

‎x-pack/plugins/event_log/server/event_log_client.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ describe('EventLogStart', () => {
114114
).toEqual(result);
115115

116116
expect(esContext.esAdapter.queryEventsBySavedObject).toHaveBeenCalledWith(
117-
esContext.esNames.alias,
117+
esContext.esNames.indexPattern,
118118
undefined,
119119
'saved-object-type',
120120
'saved-object-id',
@@ -195,7 +195,7 @@ describe('EventLogStart', () => {
195195
).toEqual(result);
196196

197197
expect(esContext.esAdapter.queryEventsBySavedObject).toHaveBeenCalledWith(
198-
esContext.esNames.alias,
198+
esContext.esNames.indexPattern,
199199
undefined,
200200
'saved-object-type',
201201
'saved-object-id',

‎x-pack/plugins/event_log/server/event_log_client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export class EventLogClient implements IEventLogClient {
9292
await this.savedObjectGetter(type, id);
9393

9494
return await this.esContext.esAdapter.queryEventsBySavedObject(
95-
this.esContext.esNames.alias,
95+
this.esContext.esNames.indexPattern,
9696
namespace,
9797
type,
9898
id,

‎x-pack/test/functional/es_archives/event_log_multiple_indicies/data.json‎

Lines changed: 274 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,274 @@
1+
{
2+
"type": "doc",
3+
"value": {
4+
"id": "config:8.0.0",
5+
"index": ".kibana_1",
6+
"source": {
7+
"config": {
8+
"buildNum": 9007199254740991
9+
},
10+
"migrationVersion": {
11+
"config": "7.9.0"
12+
},
13+
"references": [
14+
],
15+
"type": "config",
16+
"updated_at": "2020-10-28T15:19:15.795Z"
17+
}
18+
}
19+
}
20+
21+
{
22+
"type": "doc",
23+
"value": {
24+
"id": "space:default",
25+
"index": ".kibana_1",
26+
"source": {
27+
"migrationVersion": {
28+
"space": "6.6.0"
29+
},
30+
"references": [
31+
],
32+
"space": {
33+
"_reserved": true,
34+
"color": "#00bfb3",
35+
"description": "This is your default space!",
36+
"disabledFeatures": [
37+
],
38+
"name": "Default"
39+
},
40+
"type": "space",
41+
"updated_at": "2020-10-28T15:19:15.857Z"
42+
}
43+
}
44+
}
45+
46+
{
47+
"type": "doc",
48+
"value": {
49+
"id": "space:namespace-a",
50+
"index": ".kibana_1",
51+
"source": {
52+
"migrationVersion": {
53+
"space": "6.6.0"
54+
},
55+
"references": [
56+
],
57+
"space": {
58+
"disabledFeatures": [
59+
],
60+
"name": "Space A"
61+
},
62+
"type": "space",
63+
"updated_at": "2020-10-28T15:19:52.887Z"
64+
}
65+
}
66+
}
67+
68+
{
69+
"type": "doc",
70+
"value": {
71+
"id": "event_log_test:421f2511-5cd1-44fd-95df-e0df83e354d5",
72+
"index": ".kibana_1",
73+
"source": {
74+
"event_log_test": {
75+
},
76+
"references": [
77+
],
78+
"type": "event_log_test",
79+
"updated_at": "2020-10-28T15:19:53.861Z"
80+
}
81+
}
82+
}
83+
84+
{
85+
"type": "doc",
86+
"value": {
87+
"id": "XKbLb3UBt6Z_MVvSSPbe",
88+
"index": ".kibana-event-log-7.9.0-000001",
89+
"source": {
90+
"@timestamp": "2020-10-28T15:19:54.841Z",
91+
"ecs": {
92+
"version": "1.5.0"
93+
},
94+
"event": {
95+
"action": "test",
96+
"duration": 0,
97+
"end": "2020-10-28T15:19:54.841Z",
98+
"provider": "event_log_fixture",
99+
"start": "2020-10-28T15:19:54.841Z"
100+
},
101+
"kibana": {
102+
"saved_objects": [
103+
{
104+
"id": "421f2511-5cd1-44fd-95df-e0df83e354d5",
105+
"rel": "primary",
106+
"type": "event_log_test"
107+
}
108+
],
109+
"server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d"
110+
},
111+
"message": "test 2020-10-28T15:19:53.825Z"
112+
}
113+
}
114+
}
115+
116+
{
117+
"type": "doc",
118+
"value": {
119+
"id": "XabLb3UBt6Z_MVvSSfYD",
120+
"index": ".kibana-event-log-7.9.0-000001",
121+
"source": {
122+
"@timestamp": "2020-10-28T15:19:54.879Z",
123+
"ecs": {
124+
"version": "1.5.0"
125+
},
126+
"event": {
127+
"action": "test",
128+
"duration": 0,
129+
"end": "2020-10-28T15:19:54.879Z",
130+
"provider": "event_log_fixture",
131+
"start": "2020-10-28T15:19:54.879Z"
132+
},
133+
"kibana": {
134+
"saved_objects": [
135+
{
136+
"id": "421f2511-5cd1-44fd-95df-e0df83e354d5",
137+
"rel": "primary",
138+
"type": "event_log_test"
139+
}
140+
],
141+
"server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d"
142+
},
143+
"message": "test 2020-10-28T15:19:54.849Z"
144+
}
145+
}
146+
}
147+
148+
{
149+
"type": "doc",
150+
"value": {
151+
"id": "XqbLb3UBt6Z_MVvSSfYe",
152+
"index": ".kibana-event-log-7.9.0-000001",
153+
"source": {
154+
"@timestamp": "2020-10-28T15:19:54.905Z",
155+
"ecs": {
156+
"version": "1.5.0"
157+
},
158+
"event": {
159+
"action": "test",
160+
"duration": 0,
161+
"end": "2020-10-28T15:19:54.905Z",
162+
"provider": "event_log_fixture",
163+
"start": "2020-10-28T15:19:54.905Z"
164+
},
165+
"kibana": {
166+
"saved_objects": [
167+
{
168+
"id": "421f2511-5cd1-44fd-95df-e0df83e354d5",
169+
"rel": "primary",
170+
"type": "event_log_test"
171+
}
172+
],
173+
"server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d"
174+
},
175+
"message": "test 2020-10-28T15:19:54.881Z"
176+
}
177+
}
178+
}
179+
180+
{
181+
"type": "doc",
182+
"value": {
183+
"id": "X6bLb3UBt6Z_MVvSTfYk",
184+
"index": ".kibana-event-log-8.0.0-000001",
185+
"source": {
186+
"@timestamp": "2020-10-28T15:19:55.933Z",
187+
"ecs": {
188+
"version": "1.5.0"
189+
},
190+
"event": {
191+
"action": "test",
192+
"duration": 0,
193+
"end": "2020-10-28T15:19:55.933Z",
194+
"provider": "event_log_fixture",
195+
"start": "2020-10-28T15:19:55.933Z"
196+
},
197+
"kibana": {
198+
"saved_objects": [
199+
{
200+
"id": "421f2511-5cd1-44fd-95df-e0df83e354d5",
201+
"rel": "primary",
202+
"type": "event_log_test"
203+
}
204+
],
205+
"server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d"
206+
},
207+
"message": "test 2020-10-28T15:19:55.913Z"
208+
}
209+
}
210+
}
211+
212+
{
213+
"type": "doc",
214+
"value": {
215+
"id": "YKbLb3UBt6Z_MVvSTfY8",
216+
"index": ".kibana-event-log-8.0.0-000001",
217+
"source": {
218+
"@timestamp": "2020-10-28T15:19:55.957Z",
219+
"ecs": {
220+
"version": "1.5.0"
221+
},
222+
"event": {
223+
"action": "test",
224+
"duration": 0,
225+
"end": "2020-10-28T15:19:55.957Z",
226+
"provider": "event_log_fixture",
227+
"start": "2020-10-28T15:19:55.957Z"
228+
},
229+
"kibana": {
230+
"saved_objects": [
231+
{
232+
"id": "421f2511-5cd1-44fd-95df-e0df83e354d5",
233+
"rel": "primary",
234+
"type": "event_log_test"
235+
}
236+
],
237+
"server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d"
238+
},
239+
"message": "test 2020-10-28T15:19:55.938Z"
240+
}
241+
}
242+
}
243+
244+
{
245+
"type": "doc",
246+
"value": {
247+
"id": "YabLb3UBt6Z_MVvSTfZc",
248+
"index": ".kibana-event-log-8.0.0-000001",
249+
"source": {
250+
"@timestamp": "2020-10-28T15:19:55.991Z",
251+
"ecs": {
252+
"version": "1.5.0"
253+
},
254+
"event": {
255+
"action": "test",
256+
"duration": 0,
257+
"end": "2020-10-28T15:19:55.991Z",
258+
"provider": "event_log_fixture",
259+
"start": "2020-10-28T15:19:55.991Z"
260+
},
261+
"kibana": {
262+
"saved_objects": [
263+
{
264+
"id": "421f2511-5cd1-44fd-95df-e0df83e354d5",
265+
"rel": "primary",
266+
"type": "event_log_test"
267+
}
268+
],
269+
"server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d"
270+
},
271+
"message": "test 2020-10-28T15:19:55.962Z"
272+
}
273+
}
274+
}

0 commit comments

Comments
 (0)