diff --git a/package.json b/package.json index 5ee42c36b621a..3c3677216a044 100644 --- a/package.json +++ b/package.json @@ -122,8 +122,8 @@ "d3-cloud": "1.2.1", "del": "^3.0.0", "dragula": "3.7.0", - "elasticsearch": "^15.1.1", - "elasticsearch-browser": "^15.1.1", + "elasticsearch": "^15.2.0", + "elasticsearch-browser": "^15.2.0", "encode-uri-query": "1.0.0", "even-better": "7.0.2", "execa": "^0.10.0", @@ -345,7 +345,7 @@ "license-checker": "^16.0.0", "listr": "^0.14.1", "load-grunt-config": "0.19.2", - "makelogs": "^4.1.0", + "makelogs": "^4.3.0", "mocha": "^5.2.0", "mock-fs": "^4.4.2", "murmurhash3js": "3.0.1", diff --git a/src/core_plugins/elasticsearch/index.js b/src/core_plugins/elasticsearch/index.js index 0f954d2eed5de..a98344a4d98dd 100644 --- a/src/core_plugins/elasticsearch/index.js +++ b/src/core_plugins/elasticsearch/index.js @@ -60,7 +60,7 @@ export default function (kibana) { startupTimeout: number().default(5000), logQueries: boolean().default(false), ssl: sslSchema, - apiVersion: Joi.string().default('master'), + apiVersion: Joi.string().default('6.5'), healthCheck: object({ delay: number().default(2500) }).default(), diff --git a/x-pack/package.json b/x-pack/package.json index 8f85b828fd2b0..af0ada62608c5 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -161,7 +161,7 @@ "dataloader": "^1.4.0", "dedent": "^0.7.0", "dragselect": "1.8.1", - "elasticsearch": "^15.1.1", + "elasticsearch": "^15.2.0", "extract-zip": "1.5.0", "file-saver": "^1.3.8", "font-awesome": "4.4.0", diff --git a/x-pack/yarn.lock b/x-pack/yarn.lock index 794700134e50e..2bf0cbe65c47b 100644 --- a/x-pack/yarn.lock +++ b/x-pack/yarn.lock @@ -3310,10 +3310,10 @@ ecdsa-sig-formatter@1.0.10: dependencies: safe-buffer "^5.0.1" -elasticsearch@^15.1.1: - version "15.1.1" - resolved "https://registry.yarnpkg.com/elasticsearch/-/elasticsearch-15.1.1.tgz#242f2378fccd601586ff763a8a933cd5d41c945f" - integrity sha512-Yr9xy10rUMjDty7qCys7X9AIW5+PX4Gtv2NksZqXIc+AZiWna/y2QwZdiSLtb5LTOKDp7PbegfuokhIjMHUpKw== +elasticsearch@^15.2.0: + version "15.2.0" + resolved "https://registry.yarnpkg.com/elasticsearch/-/elasticsearch-15.2.0.tgz#234362b5aa743d9c0a925566569ea7813b8f2569" + integrity sha512-jOFcBoEh3Sn3gjUTozInODZTLriJtfppAUC7jnQCUE+OUj8o7GoAyC+L4h/L3ZxmXNFbQCunqVR+nmSofHdo9A== dependencies: agentkeepalive "^3.4.1" chalk "^1.0.0" diff --git a/yarn.lock b/yarn.lock index e1127d9195b66..931dbe0d44f1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5402,27 +5402,15 @@ ejs@^2.2.4: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" integrity sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo= -elasticsearch-browser@^15.1.1: - version "15.1.1" - resolved "https://registry.yarnpkg.com/elasticsearch-browser/-/elasticsearch-browser-15.1.1.tgz#aff065eff546a585c7e61da896b808fe5812de3d" - integrity sha512-QV5l0OufbAVmzA4dsDLKqUJFRcIiUM5f9eM+nZNj4sW5Legp6YfxuCT2aN5+Zd9RL5J8cb5xSZglqIXtllqZKA== +elasticsearch-browser@^15.2.0: + version "15.2.0" + resolved "https://registry.yarnpkg.com/elasticsearch-browser/-/elasticsearch-browser-15.2.0.tgz#3af0d4b6ffbd125842c7082bbdd99ae4afcba27b" + integrity sha512-Rhz7SkuPeiBtRZP2xn98NhiECJQSTrzUEDHXkepkYXqH755kjPzpJB2rvioKDkA+4gegOyHk2yx+VDGcMXQhVg== -elasticsearch@^14.2.0: - version "14.2.1" - resolved "https://registry.yarnpkg.com/elasticsearch/-/elasticsearch-14.2.1.tgz#d10cb0b9562ca6614d178c30a112b93f6e8570d1" - integrity sha1-0QywuVYspmFNF4wwoRK5P26FcNE= - dependencies: - agentkeepalive "^3.4.1" - chalk "^1.0.0" - lodash "2.4.2" - lodash.get "^4.4.2" - lodash.isempty "^4.4.0" - lodash.trimend "^4.5.1" - -elasticsearch@^15.1.1: - version "15.1.1" - resolved "https://registry.yarnpkg.com/elasticsearch/-/elasticsearch-15.1.1.tgz#242f2378fccd601586ff763a8a933cd5d41c945f" - integrity sha512-Yr9xy10rUMjDty7qCys7X9AIW5+PX4Gtv2NksZqXIc+AZiWna/y2QwZdiSLtb5LTOKDp7PbegfuokhIjMHUpKw== +elasticsearch@^15.2.0: + version "15.2.0" + resolved "https://registry.yarnpkg.com/elasticsearch/-/elasticsearch-15.2.0.tgz#234362b5aa743d9c0a925566569ea7813b8f2569" + integrity sha512-jOFcBoEh3Sn3gjUTozInODZTLriJtfppAUC7jnQCUE+OUj8o7GoAyC+L4h/L3ZxmXNFbQCunqVR+nmSofHdo9A== dependencies: agentkeepalive "^3.4.1" chalk "^1.0.0" @@ -10617,11 +10605,6 @@ lodash.topath@^4.5.2: resolved "https://registry.yarnpkg.com/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009" integrity sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak= -lodash.trimend@^4.5.1: - version "4.5.1" - resolved "https://registry.yarnpkg.com/lodash.trimend/-/lodash.trimend-4.5.1.tgz#12804437286b98cad8996b79414e11300114082f" - integrity sha1-EoBENyhrmMrYmWt5QU4RMAEUCC8= - lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -10639,11 +10622,6 @@ lodash.uniqueid@^3.0.0: dependencies: lodash._root "^3.0.0" -lodash@2.4.2, lodash@~2.4.1: - version "2.4.2" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e" - integrity sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4= - lodash@3.10.1, lodash@^3.10.0, lodash@^3.10.1, lodash@^3.3.1, lodash@^3.8.0, lodash@~3.10.1: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" @@ -10669,6 +10647,11 @@ lodash@^4.0.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, l resolved "https://registry.yarnpkg.com/@elastic/lodash/-/lodash-3.10.1-kibana1.tgz#9baa52c296ec06a52461f8516bb94172ef53a7fe" integrity sha512-JIL1V6Kd9mhm7OCO5nmpMF8hW2iw1godcXgBikhIlTvsu6hBA8Xnxfc/AukdysTfJo4zWaZ8PzlJX/hKN/DlDA== +lodash@~2.4.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e" + integrity sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4= + lodash@~4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.3.0.tgz#efd9c4a6ec53f3b05412429915c3e4824e4d25a4" @@ -10828,14 +10811,14 @@ makeerror@1.0.x: dependencies: tmpl "1.0.x" -makelogs@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/makelogs/-/makelogs-4.1.0.tgz#9bb74ede29844648196f47b405bbd1383e5dca3a" - integrity sha512-MUSPMQBN6aLRQ+BEOdXK93+3WECgek1pd1OoTOJjrxBBNiWZn5C0riywvuGki6Xiwj2CrjW7+nATdogDSd6TgA== +makelogs@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/makelogs/-/makelogs-4.3.0.tgz#cfcf9dbe8988f70a06472101e6731cdb27466ab2" + integrity sha512-2jSmXtlYhrr0/Y2AqVt0OmySEmxdJlUAd6UJgiPM40TZRfzyO/e51P4LrVnVqujp2pLHktTG6VcTUujyiQQsOA== dependencies: async "^1.4.2" bluebird "^2.10.0" - elasticsearch "^14.2.0" + elasticsearch "^15.2.0" inquirer "^0.11.1" lodash "~2.4.1" moment "^2.10.6"