maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Monitoring] Add mappings for standalone archives and fix tests (#31315)

Browse source 
* Add mappings for standalone and fix tests

* We are apparently mutating this and need to return a copy each time
This commit is contained in:
Chris Roberson 2019-02-19 09:05:46 -05:00 committed by GitHub
parent 6eb24c4b91
commit 384298499a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 76 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
View file

@ -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 => {

20
x-pack/plugins/monitoring/server/lib/standalone_clusters/standalone_cluster_definition.js → x-pack/plugins/monitoring/server/lib/standalone_clusters/get_standalone_cluster_definition.js
View file

@ -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: {}
}
}
}
};
};

2
x-pack/plugins/monitoring/server/lib/standalone_clusters/index.js
View file

@ -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';

2
x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/cluster.json
View file

@ -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}]

59
x-pack/test/functional/es_archives/monitoring/standalone_cluster/mappings.json Normal file
View file

@ -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"
}
}
}
}