Skip to content

Commit a1a9f27

Browse files
Merge branch 'master' into fix/siem-eslint
2 parents 3457d3b + 59e0a1c commit a1a9f27

File tree

165 files changed

+77878
-45587
lines changed

Some content is hidden

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

165 files changed

+77878
-45587
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@
360360
"chance": "1.0.18",
361361
"cheerio": "0.22.0",
362362
"chokidar": "3.2.1",
363-
"chromedriver": "^78.0.1",
363+
"chromedriver": "^77.0.0",
364364
"classnames": "2.2.6",
365365
"dedent": "^0.7.0",
366366
"delete-empty": "^2.0.0",

src/es_archiver/lib/indices/__tests__/create_index_stream.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ describe('esArchiver: createCreateIndexStream()', () => {
113113
sinon.assert.calledWith(client.indices.create, {
114114
method: 'PUT',
115115
index: 'index',
116-
include_type_name: false,
117116
body: {
118117
settings: undefined,
119118
mappings: undefined,

src/es_archiver/lib/indices/create_index_stream.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ export function createCreateIndexStream({ client, stats, skipExisting, log }) {
4141

4242
async function handleIndex(record) {
4343
const { index, settings, mappings, aliases } = record.value;
44-
45-
// Determine if the mapping belongs to a pre-7.0 instance, for BWC tests, mainly
46-
const isPre7Mapping = !!mappings && Object.keys(mappings).length > 0 && !mappings.properties;
4744
const isKibana = index.startsWith('.kibana');
4845

4946
async function attemptToCreate(attemptNumber = 1) {
@@ -55,7 +52,6 @@ export function createCreateIndexStream({ client, stats, skipExisting, log }) {
5552
await client.indices.create({
5653
method: 'PUT',
5754
index,
58-
include_type_name: isPre7Mapping,
5955
body: {
6056
settings,
6157
mappings,

src/legacy/core_plugins/console/server/api_server/spec/generated/indices.create.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"indices.create": {
33
"url_params": {
4-
"include_type_name": "__flag__",
54
"wait_for_active_shards": "",
65
"timeout": "",
76
"master_timeout": ""

src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"indices.get": {
33
"url_params": {
4-
"include_type_name": "__flag__",
54
"local": "__flag__",
65
"ignore_unavailable": "__flag__",
76
"allow_no_indices": "__flag__",

src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_field_mapping.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"indices.get_field_mapping": {
33
"url_params": {
4-
"include_type_name": "__flag__",
54
"include_defaults": "__flag__",
65
"ignore_unavailable": "__flag__",
76
"allow_no_indices": "__flag__",

src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_template.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"indices.get_template": {
33
"url_params": {
4-
"include_type_name": "__flag__",
54
"flat_settings": "__flag__",
65
"master_timeout": "",
76
"local": "__flag__"

src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_template.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"indices.put_template": {
33
"url_params": {
4-
"include_type_name": "__flag__",
54
"order": "",
65
"create": "__flag__",
76
"timeout": "",

src/legacy/core_plugins/console/server/api_server/spec/generated/indices.rollover.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"indices.rollover": {
33
"url_params": {
4-
"include_type_name": "__flag__",
54
"timeout": "",
65
"dry_run": "__flag__",
76
"master_timeout": "",

src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)