diff --git a/x-pack/plugins/upgrade_assistant/server/lib/__fixtures__/fake_deprecations.json b/x-pack/plugins/upgrade_assistant/server/lib/__fixtures__/fake_deprecations.json index 438c5c3246ddf..9779c693d72ce 100644 --- a/x-pack/plugins/upgrade_assistant/server/lib/__fixtures__/fake_deprecations.json +++ b/x-pack/plugins/upgrade_assistant/server/lib/__fixtures__/fake_deprecations.json @@ -13,7 +13,14 @@ "details": "{.monitoring-logstash=[Coercion of boolean fields], .monitoring-es=[Coercion of boolean fields], .ml-anomalies-=[Coercion of boolean fields], .watch-history-6=[Coercion of boolean fields], .monitoring-kibana=[Coercion of boolean fields], security-index-template=[Coercion of boolean fields]}" } ], - "node_settings": [], + "node_settings": [ + { + "level": "critical", + "message": "A node-level issue", + "url": "http://nodeissue.com", + "details": "This node thing is wrong" + } + ], "index_settings": { ".monitoring-es-6-2018.11.07": [ { diff --git a/x-pack/plugins/upgrade_assistant/server/lib/__snapshots__/es_migration_apis.test.ts.snap b/x-pack/plugins/upgrade_assistant/server/lib/__snapshots__/es_migration_apis.test.ts.snap index cb0e134a95c96..882911a44bfaf 100644 --- a/x-pack/plugins/upgrade_assistant/server/lib/__snapshots__/es_migration_apis.test.ts.snap +++ b/x-pack/plugins/upgrade_assistant/server/lib/__snapshots__/es_migration_apis.test.ts.snap @@ -15,6 +15,12 @@ Object { "message": "one or more templates use deprecated mapping settings", "url": "https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking_60_indices_changes.html", }, + Object { + "details": "This node thing is wrong", + "level": "critical", + "message": "A node-level issue", + "url": "http://nodeissue.com", + }, ], "indices": Array [ Object { @@ -60,6 +66,5 @@ Object { "url": "https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking_60_mappings_changes.html#_coercion_of_boolean_fields", }, ], - "nodes": Array [], } `; diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts index 0178eebb16cc0..0e23314b3648b 100644 --- a/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts +++ b/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.ts @@ -20,7 +20,6 @@ export interface EnrichedDeprecationInfo extends DeprecationInfo { export interface UpgradeAssistantStatus { cluster: EnrichedDeprecationInfo[]; - nodes: EnrichedDeprecationInfo[]; indices: EnrichedDeprecationInfo[]; [checkupType: string]: EnrichedDeprecationInfo[]; @@ -37,8 +36,7 @@ export async function getUpgradeAssistantStatus( })) as DeprecationAPIResponse; return { - cluster: deprecations.cluster_settings, - nodes: deprecations.node_settings, + cluster: deprecations.cluster_settings.concat(deprecations.node_settings), indices: getCombinedIndexInfos(deprecations, basePath), }; }