Skip to content

Commit 7e95f0b

Browse files
nnamdifrankiennamdifrankie
committed
pr-58038: fix test
1 parent 754895f commit 7e95f0b

File tree

3 files changed

+60
-24
lines changed

3 files changed

+60
-24
lines changed

‎x-pack/test/api_integration/apis/endpoint/metadata.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export default function({ getService }: FtrProviderContext) {
149149
.post('/api/endpoint/metadata')
150150
.set('kbn-xsrf', 'xxx')
151151
.send({
152-
filter: `host.os.variant:${variantValue}`,
152+
filter: `host.os.variant.keyword:${variantValue}`,
153153
})
154154
.expect(200);
155155
expect(body.total).to.eql(2);

‎x-pack/test/functional/es_archives/endpoint/metadata/api_feature/data.json‎

Lines changed: 40 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"@timestamp": 1579881969541,
88
"agent": {
99
"id": "963b081e-60d1-482c-befd-a5815fa8290f",
10-
"version": "6.6.1"
10+
"version": "6.6.1",
11+
"name" : "Elastic Endpoint"
1112
},
1213
"endpoint": {
1314
"policy": {
@@ -33,7 +34,8 @@
3334
"os": {
3435
"full": "Windows 10",
3536
"name": "windows 10.0",
36-
"version": "10.0"
37+
"version": "10.0",
38+
"variant" : "Windows Pro"
3739
}
3840
}
3941
}
@@ -49,7 +51,8 @@
4951
"@timestamp": 1579881969541,
5052
"agent": {
5153
"id": "b3412d6f-b022-4448-8fee-21cc936ea86b",
52-
"version": "6.0.0"
54+
"version": "6.0.0",
55+
"name" : "Elastic Endpoint"
5356
},
5457
"endpoint": {
5558
"policy": {
@@ -74,7 +77,8 @@
7477
"os": {
7578
"full": "Windows Server 2016",
7679
"name": "windows 10.0",
77-
"version": "10.0"
80+
"version": "10.0",
81+
"variant" : "Windows Server"
7882
}
7983
}
8084
}
@@ -90,7 +94,8 @@
9094
"@timestamp": 1579881969541,
9195
"agent": {
9296
"id": "3838df35-a095-4af4-8fce-0b6d78793f2e",
93-
"version": "6.8.0"
97+
"version": "6.8.0",
98+
"name" : "Elastic Endpoint"
9499
},
95100
"endpoint": {
96101
"policy": {
@@ -105,15 +110,16 @@
105110
"id": "fc0ff548-feba-41b6-8367-65e8790d0eaf",
106111
"ip": [
107112
"10.101.149.26",
108-
"10.12.85.216"
113+
"2606:a000:ffc0:39:11ef:37b9:3371:578c"
109114
],
110115
"mac": [
111116
"e2-6d-f9-0-46-2e"
112117
],
113118
"os": {
114119
"full": "Windows 10",
115120
"name": "windows 10.0",
116-
"version": "10.0"
121+
"version": "10.0",
122+
"variant" : "Windows Pro"
117123
}
118124
}
119125
}
@@ -129,7 +135,8 @@
129135
"@timestamp": 1579878369541,
130136
"agent": {
131137
"id": "963b081e-60d1-482c-befd-a5815fa8290f",
132-
"version": "6.6.1"
138+
"version": "6.6.1",
139+
"name" : "Elastic Endpoint"
133140
},
134141
"endpoint": {
135142
"policy": {
@@ -155,7 +162,8 @@
155162
"os": {
156163
"full": "Windows Server 2016",
157164
"name": "windows 10.0",
158-
"version": "10.0"
165+
"version": "10.0",
166+
"variant" : "Windows Server 2016"
159167
}
160168
}
161169
}
@@ -171,7 +179,8 @@
171179
"@timestamp": 1579878369541,
172180
"agent": {
173181
"id": "b3412d6f-b022-4448-8fee-21cc936ea86b",
174-
"version": "6.0.0"
182+
"version": "6.0.0",
183+
"name" : "Elastic Endpoint"
175184
},
176185
"endpoint": {
177186
"policy": {
@@ -195,7 +204,8 @@
195204
"os": {
196205
"full": "Windows Server 2012",
197206
"name": "windows 6.2",
198-
"version": "6.2"
207+
"version": "6.2",
208+
"variant" : "Windows Server 2012"
199209
}
200210
}
201211
}
@@ -211,7 +221,8 @@
211221
"@timestamp": 1579878369541,
212222
"agent": {
213223
"id": "3838df35-a095-4af4-8fce-0b6d78793f2e",
214-
"version": "6.8.0"
224+
"version": "6.8.0",
225+
"name" : "Elastic Endpoint"
215226
},
216227
"endpoint": {
217228
"policy": {
@@ -227,15 +238,16 @@
227238
"id": "fc0ff548-feba-41b6-8367-65e8790d0eaf",
228239
"ip": [
229240
"10.101.149.26",
230-
"10.12.85.216"
241+
"2606:a000:ffc0:39:11ef:37b9:3371:578c"
231242
],
232243
"mac": [
233244
"e2-6d-f9-0-46-2e"
234245
],
235246
"os": {
236247
"full": "Windows Server 2012",
237248
"name": "windows 6.2",
238-
"version": "6.2"
249+
"version": "6.2",
250+
"variant" : "Windows Server 2012"
239251
}
240252
}
241253
}
@@ -251,7 +263,8 @@
251263
"@timestamp": 1579874769541,
252264
"agent": {
253265
"id": "963b081e-60d1-482c-befd-a5815fa8290f",
254-
"version": "6.6.1"
266+
"version": "6.6.1",
267+
"name" : "Elastic Endpoint"
255268
},
256269
"endpoint": {
257270
"policy": {
@@ -276,7 +289,8 @@
276289
"os": {
277290
"full": "Windows Server 2012R2",
278291
"name": "windows 6.3",
279-
"version": "6.3"
292+
"version": "6.3",
293+
"variant" : "Windows Server 2012 R2"
280294
}
281295
}
282296
}
@@ -292,7 +306,8 @@
292306
"@timestamp": 1579874769541,
293307
"agent": {
294308
"id": "b3412d6f-b022-4448-8fee-21cc936ea86b",
295-
"version": "6.0.0"
309+
"version": "6.0.0",
310+
"name" : "Elastic Endpoint"
296311
},
297312
"endpoint": {
298313
"policy": {
@@ -316,7 +331,8 @@
316331
"os": {
317332
"full": "Windows Server 2012R2",
318333
"name": "windows 6.3",
319-
"version": "6.3"
334+
"version": "6.3",
335+
"variant" : "Windows Server 2012 R2"
320336
}
321337
}
322338
}
@@ -332,7 +348,8 @@
332348
"@timestamp": 1579874769541,
333349
"agent": {
334350
"id": "3838df35-a095-4af4-8fce-0b6d78793f2e",
335-
"version": "6.8.0"
351+
"version": "6.8.0",
352+
"name" : "Elastic Endpoint"
336353
},
337354
"endpoint": {
338355
"policy": {
@@ -348,17 +365,18 @@
348365
"id": "fc0ff548-feba-41b6-8367-65e8790d0eaf",
349366
"ip": [
350367
"10.101.149.26",
351-
"10.12.85.216"
368+
"2606:a000:ffc0:39:11ef:37b9:3371:578c"
352369
],
353370
"mac": [
354371
"e2-6d-f9-0-46-2e"
355372
],
356373
"os": {
357374
"full": "Windows Server 2012",
358375
"name": "windows 6.2",
359-
"version": "6.2"
376+
"version": "6.2",
377+
"variant" : "Windows Server 2012"
360378
}
361379
}
362380
}
363381
}
364-
}
382+
}

‎x-pack/test/functional/es_archives/endpoint/metadata/api_feature/mappings.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@
2828
}
2929
},
3030
"type": "text"
31+
},
32+
"name": {
33+
"fields": {
34+
"keyword": {
35+
"ignore_above": 256,
36+
"type": "keyword"
37+
}
38+
},
39+
"type": "text"
3140
}
3241
}
3342
},
@@ -122,6 +131,15 @@
122131
},
123132
"type": "text"
124133
},
134+
"variant": {
135+
"fields": {
136+
"keyword": {
137+
"ignore_above": 256,
138+
"type": "keyword"
139+
}
140+
},
141+
"type": "text"
142+
},
125143
"version": {
126144
"fields": {
127145
"keyword": {
@@ -144,4 +162,4 @@
144162
}
145163
}
146164
}
147-
}
165+
}

0 commit comments

Comments
 (0)