From 384298499af8b2957e24c6bd1851bffecae6575c Mon Sep 17 00:00:00 2001 From: Chris Roberson Date: Tue, 19 Feb 2019 09:05:46 -0500 Subject: [PATCH] [Monitoring] Add mappings for standalone archives and fix tests (#31315) * Add mappings for standalone and fix tests * We are apparently mutating this and need to return a copy each time --- .../lib/cluster/get_clusters_from_request.js | 7 ++- ...s => get_standalone_cluster_definition.js} | 20 ++++--- .../server/lib/standalone_clusters/index.js | 2 +- .../standalone_cluster/fixtures/cluster.json | 2 +- .../standalone_cluster/mappings.json | 59 +++++++++++++++++++ 5 files changed, 76 insertions(+), 14 deletions(-) rename x-pack/plugins/monitoring/server/lib/standalone_clusters/{standalone_cluster_definition.js => get_standalone_cluster_definition.js} (57%) create mode 100644 x-pack/test/functional/es_archives/monitoring/standalone_cluster/mappings.json diff --git a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js index 2f4541264a48..fc571dac19b0 100644 --- a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js +++ b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js @@ -21,7 +21,7 @@ import { CLUSTER_ALERTS_SEARCH_SIZE, STANDALONE_CLUSTER_CLUSTER_UUID } from '../ import { getApmsForClusters } from '../apm/get_apms_for_clusters'; import { i18n } from '@kbn/i18n'; import { checkCcrEnabled } from '../elasticsearch/ccr'; -import { standaloneClusterDefinition, hasStandaloneClusters } from '../standalone_clusters'; +import { getStandaloneClusterDefinition, hasStandaloneClusters } from '../standalone_clusters'; /** * Get all clusters or the cluster associated with {@code clusterUuid} when it is defined. @@ -41,7 +41,7 @@ export async function getClustersFromRequest(req, indexPatterns, { clusterUuid, let clusters = []; if (isStandaloneCluster) { - clusters.push(standaloneClusterDefinition); + clusters.push(getStandaloneClusterDefinition()); } else { // get clusters with stats and cluster state @@ -56,7 +56,7 @@ export async function getClustersFromRequest(req, indexPatterns, { clusterUuid, ]; if (await hasStandaloneClusters(req, indexPatternsToCheckForNonClusters)) { - clusters.push(standaloneClusterDefinition); + clusters.push(getStandaloneClusterDefinition()); } } @@ -112,6 +112,7 @@ export async function getClustersFromRequest(req, indexPatterns, { clusterUuid, } // add kibana data + const kibanas = isStandaloneCluster ? [] : await getKibanasForClusters(req, kbnIndexPattern, clusters); // add the kibana data to each cluster kibanas.forEach(kibana => { diff --git a/x-pack/plugins/monitoring/server/lib/standalone_clusters/standalone_cluster_definition.js b/x-pack/plugins/monitoring/server/lib/standalone_clusters/get_standalone_cluster_definition.js similarity index 57% rename from x-pack/plugins/monitoring/server/lib/standalone_clusters/standalone_cluster_definition.js rename to x-pack/plugins/monitoring/server/lib/standalone_clusters/get_standalone_cluster_definition.js index 78b8c017d7a5..362cb015cd42 100644 --- a/x-pack/plugins/monitoring/server/lib/standalone_clusters/standalone_cluster_definition.js +++ b/x-pack/plugins/monitoring/server/lib/standalone_clusters/get_standalone_cluster_definition.js @@ -5,14 +5,16 @@ */ import { STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../common/constants'; -export const standaloneClusterDefinition = { - cluster_uuid: STANDALONE_CLUSTER_CLUSTER_UUID, - license: {}, - cluster_state: {}, - cluster_stats: { - nodes: { - jvm: {}, - count: {} +export const getStandaloneClusterDefinition = () => { + return { + cluster_uuid: STANDALONE_CLUSTER_CLUSTER_UUID, + license: {}, + cluster_state: {}, + cluster_stats: { + nodes: { + jvm: {}, + count: {} + } } - } + }; }; diff --git a/x-pack/plugins/monitoring/server/lib/standalone_clusters/index.js b/x-pack/plugins/monitoring/server/lib/standalone_clusters/index.js index 5ff0c03b40da..3f6151cc8eb8 100644 --- a/x-pack/plugins/monitoring/server/lib/standalone_clusters/index.js +++ b/x-pack/plugins/monitoring/server/lib/standalone_clusters/index.js @@ -5,5 +5,5 @@ */ export { hasStandaloneClusters } from './has_standalone_clusters'; -export { standaloneClusterDefinition } from './standalone_cluster_definition'; +export { getStandaloneClusterDefinition } from './get_standalone_cluster_definition'; export { standaloneClusterFilter } from './standalone_cluster_query_filter'; diff --git a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/cluster.json b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/cluster.json index d500e1922a99..061f664d25ee 100644 --- a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/cluster.json +++ b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/cluster.json @@ -1 +1 @@ -[{"isSupported":true,"cluster_uuid":"__standalone_cluster__","license":{},"elasticsearch":{"cluster_stats":{"indices":{},"nodes":{"count":{},"jvm":{}}}},"logstash":{},"kibana":{"status":null,"requests_total":0,"concurrent_connections":0,"response_time_max":0,"memory_size":0,"memory_limit":0,"count":0},"beats":{"totalEvents":348,"bytesSent":319913,"beats":{"total":1,"types":[{"type":"Packetbeat","count":1}]}},"apm":{"totalEvents":0,"memRss":0,"memTotal":0,"apms":{"total":0}},"alerts":{"message":"Cluster Alerts are not displayed because the [production] cluster's license could not be determined."},"isPrimary":false}] +[{"cluster_uuid":"__standalone_cluster__","license":{},"elasticsearch":{"cluster_stats":{"indices":{},"nodes":{"count":{},"jvm":{}}}},"logstash":{},"kibana":{},"beats":{"totalEvents":348,"bytesSent":319913,"beats":{"total":1,"types":[{"type":"Packetbeat","count":1}]}},"apm":{"totalEvents":0,"memRss":0,"memTotal":0,"apms":{"total":0}},"alerts":{"message":"Cluster Alerts are not displayed because the [production] cluster's license could not be determined."},"isPrimary":false}] diff --git a/x-pack/test/functional/es_archives/monitoring/standalone_cluster/mappings.json b/x-pack/test/functional/es_archives/monitoring/standalone_cluster/mappings.json new file mode 100644 index 000000000000..18c67e2218a5 --- /dev/null +++ b/x-pack/test/functional/es_archives/monitoring/standalone_cluster/mappings.json @@ -0,0 +1,59 @@ +{ + "type": "index", + "value": { + "index": ".monitoring-es-6-2019.02.04", + "settings": { + "index": { + "codec": "best_compression", + "format": "6", + "number_of_replicas": "1", + "number_of_shards": "1" + } + } + } +} + +{ + "type": "index", + "value": { + "index": ".monitoring-alerts-6", + "settings": { + "index": { + "codec": "best_compression", + "format": "6", + "number_of_replicas": "1", + "number_of_shards": "1" + } + } + } +} + +{ + "type": "index", + "value": { + "index": ".monitoring-kibana-6-2019.02.04", + "settings": { + "index": { + "codec": "best_compression", + "format": "6", + "number_of_replicas": "1", + "number_of_shards": "1" + } + } + } +} + +{ + "type": "index", + "value": { + "index": ".monitoring-beats-6-2019.02.04", + "settings": { + "index": { + "codec": "best_compression", + "format": "6", + "number_of_replicas": "1", + "number_of_shards": "1" + } + } + } +}