Skip to content

Commit 14cdf38

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into timeslider
2 parents add90ad + b7719d6 commit 14cdf38

File tree

1,141 files changed

+24626
-11777
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,141 files changed

+24626
-11777
lines changed

‎.eslintrc.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,6 +1406,24 @@ module.exports = {
14061406
},
14071407
},
14081408

1409+
/**
1410+
* Do not allow `any`
1411+
*/
1412+
{
1413+
files: [
1414+
'packages/kbn-analytics/**',
1415+
// 'packages/kbn-telemetry-tools/**',
1416+
'src/plugins/kibana_usage_collection/**',
1417+
'src/plugins/usage_collection/**',
1418+
'src/plugins/telemetry/**',
1419+
'src/plugins/telemetry_collection_manager/**',
1420+
'src/plugins/telemetry_management_section/**',
1421+
'x-pack/plugins/telemetry_collection_xpack/**',
1422+
],
1423+
rules: {
1424+
'@typescript-eslint/no-explicit-any': 'error',
1425+
},
1426+
},
14091427
{
14101428
files: [
14111429
// core-team owned code

‎api_docs/security_solution.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
"description": [],
208208
"source": {
209209
"path": "x-pack/plugins/security_solution/public/plugin.tsx",
210-
"lineNumber": 353
210+
"lineNumber": 346
211211
}
212212
},
213213
{
@@ -221,15 +221,15 @@
221221
"description": [],
222222
"source": {
223223
"path": "x-pack/plugins/security_solution/public/plugin.tsx",
224-
"lineNumber": 353
224+
"lineNumber": 346
225225
}
226226
}
227227
],
228228
"tags": [],
229229
"returnComment": [],
230230
"source": {
231231
"path": "x-pack/plugins/security_solution/public/plugin.tsx",
232-
"lineNumber": 353
232+
"lineNumber": 346
233233
}
234234
},
235235
{
@@ -245,7 +245,7 @@
245245
"returnComment": [],
246246
"source": {
247247
"path": "x-pack/plugins/security_solution/public/plugin.tsx",
248-
"lineNumber": 398
248+
"lineNumber": 391
249249
}
250250
}
251251
],
@@ -276,7 +276,7 @@
276276
"description": [],
277277
"source": {
278278
"path": "x-pack/plugins/security_solution/public/types.ts",
279-
"lineNumber": 69
279+
"lineNumber": 68
280280
},
281281
"signature": [
282282
"() => Promise<",
@@ -287,7 +287,7 @@
287287
],
288288
"source": {
289289
"path": "x-pack/plugins/security_solution/public/types.ts",
290-
"lineNumber": 68
290+
"lineNumber": 67
291291
},
292292
"lifecycle": "setup",
293293
"initialIsOpen": true
@@ -301,7 +301,7 @@
301301
"children": [],
302302
"source": {
303303
"path": "x-pack/plugins/security_solution/public/types.ts",
304-
"lineNumber": 72
304+
"lineNumber": 71
305305
},
306306
"lifecycle": "start",
307307
"initialIsOpen": true
@@ -453,15 +453,15 @@
453453
"description": [],
454454
"source": {
455455
"path": "x-pack/plugins/security_solution/server/plugin.ts",
456-
"lineNumber": 147
456+
"lineNumber": 145
457457
}
458458
}
459459
],
460460
"tags": [],
461461
"returnComment": [],
462462
"source": {
463463
"path": "x-pack/plugins/security_solution/server/plugin.ts",
464-
"lineNumber": 147
464+
"lineNumber": 145
465465
}
466466
},
467467
{
@@ -521,7 +521,7 @@
521521
"description": [],
522522
"source": {
523523
"path": "x-pack/plugins/security_solution/server/plugin.ts",
524-
"lineNumber": 159
524+
"lineNumber": 157
525525
}
526526
},
527527
{
@@ -535,15 +535,15 @@
535535
"description": [],
536536
"source": {
537537
"path": "x-pack/plugins/security_solution/server/plugin.ts",
538-
"lineNumber": 159
538+
"lineNumber": 157
539539
}
540540
}
541541
],
542542
"tags": [],
543543
"returnComment": [],
544544
"source": {
545545
"path": "x-pack/plugins/security_solution/server/plugin.ts",
546-
"lineNumber": 159
546+
"lineNumber": 157
547547
}
548548
},
549549
{
@@ -582,7 +582,7 @@
582582
"description": [],
583583
"source": {
584584
"path": "x-pack/plugins/security_solution/server/plugin.ts",
585-
"lineNumber": 341
585+
"lineNumber": 338
586586
}
587587
},
588588
{
@@ -596,15 +596,15 @@
596596
"description": [],
597597
"source": {
598598
"path": "x-pack/plugins/security_solution/server/plugin.ts",
599-
"lineNumber": 341
599+
"lineNumber": 338
600600
}
601601
}
602602
],
603603
"tags": [],
604604
"returnComment": [],
605605
"source": {
606606
"path": "x-pack/plugins/security_solution/server/plugin.ts",
607-
"lineNumber": 341
607+
"lineNumber": 338
608608
}
609609
},
610610
{
@@ -620,13 +620,13 @@
620620
"returnComment": [],
621621
"source": {
622622
"path": "x-pack/plugins/security_solution/server/plugin.ts",
623-
"lineNumber": 423
623+
"lineNumber": 412
624624
}
625625
}
626626
],
627627
"source": {
628628
"path": "x-pack/plugins/security_solution/server/plugin.ts",
629-
"lineNumber": 131
629+
"lineNumber": 129
630630
},
631631
"initialIsOpen": false
632632
}
@@ -1484,7 +1484,7 @@
14841484
"children": [],
14851485
"source": {
14861486
"path": "x-pack/plugins/security_solution/server/plugin.ts",
1487-
"lineNumber": 107
1487+
"lineNumber": 105
14881488
},
14891489
"lifecycle": "setup",
14901490
"initialIsOpen": true
@@ -1498,7 +1498,7 @@
14981498
"children": [],
14991499
"source": {
15001500
"path": "x-pack/plugins/security_solution/server/plugin.ts",
1501-
"lineNumber": 110
1501+
"lineNumber": 108
15021502
},
15031503
"lifecycle": "start",
15041504
"initialIsOpen": true

0 commit comments

Comments
 (0)