Upgrade Kibana to Elasticsearch 7.0 (#29184)

This commit is contained in:
Chris Davies 2019-01-30 09:08:58 -05:00 committed by GitHub
parent eec327b1fe
commit 2510ccb0ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
184 changed files with 21705 additions and 44743 deletions

View file

@ -29,7 +29,7 @@ fi
export KIBANA_DIR="$dir"
export XPACK_DIR="$KIBANA_DIR/x-pack"
export PARENT_DIR="$(cd "$KIBANA_DIR/.."; pwd)"
export TEST_ES_SNAPSHOT_VERSION="7.0.0-fbd1a09d"
echo "-> KIBANA_DIR $KIBANA_DIR"
echo "-> XPACK_DIR $XPACK_DIR"
echo "-> PARENT_DIR $PARENT_DIR"

View file

@ -113,6 +113,7 @@ describe('esArchiver: createCreateIndexStream()', () => {
sinon.assert.calledWith(client.indices.create, {
method: 'PUT',
index: 'index',
include_type_name: false,
body: {
settings: undefined,
mappings: undefined,

View file

@ -44,6 +44,9 @@ export function createCreateIndexStream({ client, stats, skipExisting, log, kiba
async function handleIndex(record) {
const { index, settings, mappings, aliases } = record.value;
// Determine if the mapping belongs to a pre-7.0 instance, for BWC tests, mainly
const isPre7Mapping = !!mappings && Object.keys(mappings).length > 0 && !mappings.properties;
async function attemptToCreate(attemptNumber = 1) {
try {
if (index.startsWith('.kibana')) {
@ -53,6 +56,7 @@ export function createCreateIndexStream({ client, stats, skipExisting, log, kiba
await client.indices.create({
method: 'PUT',
index,
include_type_name: isPre7Mapping,
body: { settings, mappings, aliases },
});

View file

@ -137,7 +137,7 @@ async function getKibanaStatuses({ kibanaUrl }) {
export async function createDefaultSpace({ index, client }) {
await client.index({
index,
type: 'doc',
type: '_doc',
id: 'space:default',
body: {
type: 'space',

View file

@ -19,7 +19,6 @@
export {
getTypes,
getRootType,
getProperty,
getRootProperties,
getRootPropertiesObjects,

View file

@ -19,8 +19,6 @@
import toPath from 'lodash/internal/toPath';
import { getRootType } from './get_root_type';
/**
* Recursively read properties from the mapping object of type "object"
* until the `path` is resolved.
@ -53,7 +51,7 @@ function getPropertyMappingFromObjectMapping(mapping, path) {
*/
export function getProperty(mappings, path) {
return getPropertyMappingFromObjectMapping(
mappings[getRootType(mappings)],
mappings,
toPath(path)
);
}

View file

@ -20,26 +20,24 @@
import { getProperty } from './get_property';
const MAPPINGS = {
rootType: {
properties: {
foo: {
properties: {
name: {
type: 'text'
},
description: {
type: 'text'
}
properties: {
foo: {
properties: {
name: {
type: 'text'
},
description: {
type: 'text'
}
},
bar: {
properties: {
baz: {
type: 'text',
fields: {
box: {
type: 'keyword'
}
}
},
bar: {
properties: {
baz: {
type: 'text',
fields: {
box: {
type: 'keyword'
}
}
}
@ -58,28 +56,28 @@ function runTest(key, mapping) {
describe('getProperty(mappings, path)', () => {
describe('string key', () => {
it('finds root properties', () => {
runTest('foo', MAPPINGS.rootType.properties.foo);
runTest('foo', MAPPINGS.properties.foo);
});
it('finds nested properties', () => {
runTest('foo.name', MAPPINGS.rootType.properties.foo.properties.name);
runTest('foo.description', MAPPINGS.rootType.properties.foo.properties.description);
runTest('bar.baz', MAPPINGS.rootType.properties.bar.properties.baz);
runTest('foo.name', MAPPINGS.properties.foo.properties.name);
runTest('foo.description', MAPPINGS.properties.foo.properties.description);
runTest('bar.baz', MAPPINGS.properties.bar.properties.baz);
});
it('finds nested multi-fields', () => {
runTest('bar.baz.box', MAPPINGS.rootType.properties.bar.properties.baz.fields.box);
runTest('bar.baz.box', MAPPINGS.properties.bar.properties.baz.fields.box);
});
});
describe('array of string keys', () => {
it('finds root properties', () => {
runTest(['foo'], MAPPINGS.rootType.properties.foo);
runTest(['foo'], MAPPINGS.properties.foo);
});
it('finds nested properties', () => {
runTest(['foo', 'name'], MAPPINGS.rootType.properties.foo.properties.name);
runTest(['foo', 'description'], MAPPINGS.rootType.properties.foo.properties.description);
runTest(['bar', 'baz'], MAPPINGS.rootType.properties.bar.properties.baz);
runTest(['foo', 'name'], MAPPINGS.properties.foo.properties.name);
runTest(['foo', 'description'], MAPPINGS.properties.foo.properties.description);
runTest(['bar', 'baz'], MAPPINGS.properties.bar.properties.baz);
});
it('finds nested multi-fields', () => {
runTest(['bar', 'baz', 'box'], MAPPINGS.rootType.properties.bar.properties.baz.fields.box);
runTest(['bar', 'baz', 'box'], MAPPINGS.properties.bar.properties.baz.fields.box);
});
});
});

View file

@ -17,8 +17,6 @@
* under the License.
*/
import { getRootType } from './get_root_type';
/**
* Get the property mappings for the root type in the EsMappingsDsl
*
@ -34,12 +32,10 @@ import { getRootType } from './get_root_type';
* This data can be found at `{indexName}.mappings.{typeName}.properties`
* in the es indices.get() response.
*
* @param {EsMappingsDsl} mappings
* @param {EsMappingsDsl} mapping
* @return {EsPropertyMappings}
*/
export function getRootProperties(mappings) {
const mapping = mappings[getRootType(mappings)];
export function getRootProperties(mapping) {
if (mapping.type !== 'object' && !mapping.properties) {
throw new TypeError('Unable to get property names non-object root mapping');
}

View file

@ -21,11 +21,9 @@ import { getRootPropertiesObjects } from './get_root_properties_objects';
test(`returns single object with properties`, () => {
const mappings = {
rootType: {
properties: {
foo: {
properties: {}
}
properties: {
foo: {
properties: {}
}
}
};
@ -40,11 +38,9 @@ test(`returns single object with properties`, () => {
test(`returns single object with type === 'object'`, () => {
const mappings = {
rootType: {
properties: {
foo: {
type: 'object'
}
properties: {
foo: {
type: 'object'
}
}
};
@ -59,14 +55,12 @@ test(`returns single object with type === 'object'`, () => {
test(`returns two objects with properties`, () => {
const mappings = {
rootType: {
properties: {
foo: {
properties: {}
},
bar: {
properties: {}
}
properties: {
foo: {
properties: {}
},
bar: {
properties: {}
}
}
};
@ -84,14 +78,12 @@ test(`returns two objects with properties`, () => {
test(`returns two objects with type === 'object'`, () => {
const mappings = {
rootType: {
properties: {
foo: {
type: 'object'
},
bar: {
type: 'object'
}
properties: {
foo: {
type: 'object'
},
bar: {
type: 'object'
}
}
};
@ -109,11 +101,9 @@ test(`returns two objects with type === 'object'`, () => {
test(`excludes objects without properties and type of keyword`, () => {
const mappings = {
rootType: {
properties: {
foo: {
type: 'keyword'
}
properties: {
foo: {
type: 'keyword'
}
}
};
@ -124,14 +114,12 @@ test(`excludes objects without properties and type of keyword`, () => {
test(`excludes two objects without properties and type of keyword`, () => {
const mappings = {
rootType: {
properties: {
foo: {
type: 'keyword'
},
bar: {
type: 'keyword'
}
properties: {
foo: {
type: 'keyword'
},
bar: {
type: 'keyword'
}
}
};
@ -142,14 +130,12 @@ test(`excludes two objects without properties and type of keyword`, () => {
test(`includes one object with properties and excludes one object without properties`, () => {
const mappings = {
rootType: {
properties: {
foo: {
properties: {}
},
bar: {
type: 'keyword'
}
properties: {
foo: {
properties: {}
},
bar: {
type: 'keyword'
}
}
};
@ -164,14 +150,12 @@ test(`includes one object with properties and excludes one object without proper
test(`includes one object with type === 'object' and excludes one object without properties`, () => {
const mappings = {
rootType: {
properties: {
foo: {
type: 'object'
},
bar: {
type: 'keyword'
}
properties: {
foo: {
type: 'object'
},
bar: {
type: 'keyword'
}
}
};

View file

@ -1,38 +0,0 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import { getTypes } from './get_types';
/**
* Get the singular root type in the EsMappingsDsl
* object. If there are no types, or there are more
* that one type, this function will throw an error.
*
* @param {EsMappingsDsl} mappings
* @return {string}
*/
export function getRootType(mappings) {
const allTypes = getTypes(mappings);
if (allTypes.length !== 1) {
throw new TypeError(`Unable to get root type of mappings object with ${allTypes.length} root types.`);
}
return allTypes[0];
}

View file

@ -19,6 +19,5 @@
export { getProperty } from './get_property';
export { getTypes } from './get_types';
export { getRootType } from './get_root_type';
export { getRootProperties } from './get_root_properties';
export { getRootPropertiesObjects } from './get_root_properties_objects';

View file

@ -113,9 +113,7 @@ export const createInstallRoute = () => ({
}
},
mappings: {
_doc: {
properties: dataIndexConfig.fields
}
properties: dataIndexConfig.fields
}
}
};

View file

@ -2,36 +2,34 @@
exports[`buildActiveMappings combines all mappings and includes core mappings 1`] = `
Object {
"doc": Object {
"dynamic": "strict",
"properties": Object {
"aaa": Object {
"type": "text",
},
"bbb": Object {
"type": "long",
},
"config": Object {
"dynamic": "true",
"properties": Object {
"buildNum": Object {
"type": "keyword",
},
"dynamic": "strict",
"properties": Object {
"aaa": Object {
"type": "text",
},
"bbb": Object {
"type": "long",
},
"config": Object {
"dynamic": "true",
"properties": Object {
"buildNum": Object {
"type": "keyword",
},
},
"migrationVersion": Object {
"dynamic": "true",
"type": "object",
},
"namespace": Object {
"type": "keyword",
},
"type": Object {
"type": "keyword",
},
"updated_at": Object {
"type": "date",
},
},
"migrationVersion": Object {
"dynamic": "true",
"type": "object",
},
"namespace": Object {
"type": "keyword",
},
"type": Object {
"type": "keyword",
},
"updated_at": Object {
"type": "date",
},
},
}

View file

@ -9,7 +9,6 @@ Array [
"index": Object {
"_id": "niceguy:fredrogers",
"_index": ".myalias",
"_type": "doc",
},
},
Object {
@ -25,7 +24,6 @@ Array [
"index": Object {
"_id": "badguy:rickygervais",
"_index": ".myalias",
"_type": "doc",
},
},
Object {

View file

@ -39,10 +39,8 @@ export function buildActiveMappings({
}): IndexMapping {
const mapping = defaultMapping();
return _.cloneDeep({
doc: {
...mapping.doc,
properties: validateAndMerge(mapping.doc.properties, properties),
},
...mapping,
properties: validateAndMerge(mapping.properties, properties),
});
}
@ -53,30 +51,28 @@ export function buildActiveMappings({
*/
function defaultMapping(): IndexMapping {
return {
doc: {
dynamic: 'strict',
properties: {
config: {
dynamic: 'true',
properties: {
buildNum: {
type: 'keyword',
},
dynamic: 'strict',
properties: {
config: {
dynamic: 'true',
properties: {
buildNum: {
type: 'keyword',
},
},
migrationVersion: {
dynamic: 'true',
type: 'object',
},
type: {
type: 'keyword',
},
namespace: {
type: 'keyword',
},
updated_at: {
type: 'date',
},
},
migrationVersion: {
dynamic: 'true',
type: 'object',
},
type: {
type: 'keyword',
},
namespace: {
type: 'keyword',
},
updated_at: {
type: 'date',
},
},
};

View file

@ -30,12 +30,11 @@ export interface CallCluster {
(path: 'indices.create' | 'indices.delete', opts: IndexCreationOpts): Promise<any>;
(path: 'indices.exists', opts: IndexOpts): Promise<boolean>;
(path: 'indices.existsAlias', opts: { name: string }): Promise<boolean>;
(path: 'indices.get', opts: IndicesGetOptions): Promise<IndicesInfo | NotFound>;
(path: 'indices.get', opts: IndexOpts & Ignorable): Promise<IndicesInfo | NotFound>;
(path: 'indices.getAlias', opts: { name: string } & Ignorable): Promise<AliasResult | NotFound>;
(path: 'indices.getMapping', opts: IndexOpts): Promise<MappingResult>;
(path: 'indices.getSettings', opts: IndexOpts): Promise<IndexSettingsResult>;
(path: 'indices.putMapping', opts: PutMappingOpts): Promise<any>;
(path: 'indices.putTemplate', opts: PutTemplateOpts): Promise<any>;
(path: 'indices.refresh', opts: IndexOpts): Promise<any>;
(path: 'indices.updateAliases', opts: UpdateAliasesOpts): Promise<any>;
(path: 'reindex', opts: ReindexOpts): Promise<any>;
@ -60,26 +59,11 @@ export interface CountOpts {
query: object;
};
index: string;
type: string;
}
export interface PutMappingOpts {
body: DocMapping;
body: IndexMapping;
index: string;
type: string;
include_type_name?: boolean;
}
export interface PutTemplateOpts {
name: string;
body: {
template: string;
settings: {
number_of_shards: number;
auto_expand_replicas: string;
};
mappings: IndexMapping;
};
}
export interface IndexOpts {
@ -88,7 +72,6 @@ export interface IndexOpts {
export interface IndexCreationOpts {
index: string;
include_type_name?: boolean;
body?: {
mappings?: IndexMapping;
settings?: {
@ -129,10 +112,6 @@ export interface ScrollOpts {
scrollId: string;
}
export interface IndicesGetOptions extends IndexOpts, Ignorable {
include_type_name?: boolean;
}
///////////////////////////////////////////////////////////////////
// callCluster result type definitions
///////////////////////////////////////////////////////////////////
@ -210,11 +189,7 @@ export interface MappingProperties {
[type: string]: any;
}
export interface DocMapping {
export interface IndexMapping {
dynamic: string;
properties: MappingProperties;
}
export interface IndexMapping {
doc: DocMapping;
}

View file

@ -22,25 +22,21 @@ import { determineMigrationAction, MigrationAction } from './determine_migration
describe('determineMigrationAction', () => {
test('requires no action if mappings are identical', () => {
const actual = {
doc: {
dynamic: 'strict',
properties: {
hello: {
properties: {
name: { type: 'text' },
},
dynamic: 'strict',
properties: {
hello: {
properties: {
name: { type: 'text' },
},
},
},
};
const expected = {
doc: {
dynamic: 'strict',
properties: {
hello: {
properties: {
name: { type: 'text' },
},
dynamic: 'strict',
properties: {
hello: {
properties: {
name: { type: 'text' },
},
},
},
@ -51,21 +47,17 @@ describe('determineMigrationAction', () => {
test('requires no action if mappings differ only by dynamic properties', () => {
const actual = {
doc: {
dynamic: 'strict',
properties: {
hello: { dynamic: true, foo: 'bar' },
world: { baz: 'bing' },
},
dynamic: 'strict',
properties: {
hello: { dynamic: true, foo: 'bar' },
world: { baz: 'bing' },
},
};
const expected = {
doc: {
dynamic: 'strict',
properties: {
hello: { dynamic: 'true', goober: 'pea' },
world: { baz: 'bing' },
},
dynamic: 'strict',
properties: {
hello: { dynamic: 'true', goober: 'pea' },
world: { baz: 'bing' },
},
};
@ -74,21 +66,17 @@ describe('determineMigrationAction', () => {
test('requires no action if mappings differ only by equivalent coerced properties', () => {
const actual = {
doc: {
dynamic: 'strict',
properties: {
hello: { dynamic: 'false', baz: '2', foo: 'bar' },
world: { baz: 'bing' },
},
dynamic: 'strict',
properties: {
hello: { dynamic: 'false', baz: '2', foo: 'bar' },
world: { baz: 'bing' },
},
};
const expected = {
doc: {
dynamic: 'strict',
properties: {
hello: { dynamic: false, baz: 2, foo: 'bar' },
world: { baz: 'bing' },
},
dynamic: 'strict',
properties: {
hello: { dynamic: false, baz: 2, foo: 'bar' },
world: { baz: 'bing' },
},
};
@ -97,20 +85,16 @@ describe('determineMigrationAction', () => {
test('requires no action if a root property has been disabled', () => {
const actual = {
doc: {
dynamic: 'strict',
properties: {
hello: { dynamic: true, foo: 'bar' },
world: { baz: 'bing' },
},
dynamic: 'strict',
properties: {
hello: { dynamic: true, foo: 'bar' },
world: { baz: 'bing' },
},
};
const expected = {
doc: {
dynamic: 'strict',
properties: {
world: { baz: 'bing' },
},
dynamic: 'strict',
properties: {
world: { baz: 'bing' },
},
};
@ -119,19 +103,15 @@ describe('determineMigrationAction', () => {
test('requires migration if a sub-property differs', () => {
const actual = {
doc: {
dynamic: 'strict',
properties: {
world: { type: 'text' },
},
dynamic: 'strict',
properties: {
world: { type: 'text' },
},
};
const expected = {
doc: {
dynamic: 'strict',
properties: {
world: { type: 'keword' },
},
dynamic: 'strict',
properties: {
world: { type: 'keword' },
},
};
@ -140,19 +120,15 @@ describe('determineMigrationAction', () => {
test('requires migration if a type changes', () => {
const actual = {
doc: {
dynamic: 'strict',
properties: {
meaning: { type: 'text' },
},
dynamic: 'strict',
properties: {
meaning: { type: 'text' },
},
};
const expected = {
doc: {
dynamic: 'strict',
properties: {
meaning: 42,
},
dynamic: 'strict',
properties: {
meaning: 42,
},
};
@ -161,19 +137,15 @@ describe('determineMigrationAction', () => {
test('requires migration if doc dynamic value differs', () => {
const actual = {
doc: {
dynamic: 'strict',
properties: {
world: { type: 'text' },
},
dynamic: 'strict',
properties: {
world: { type: 'text' },
},
};
const expected = {
doc: {
dynamic: 'true',
properties: {
world: { type: 'text' },
},
dynamic: 'true',
properties: {
world: { type: 'text' },
},
};
@ -182,17 +154,13 @@ describe('determineMigrationAction', () => {
test('requires patching if we added a root property', () => {
const actual = {
doc: {
dynamic: 'strict',
properties: {},
},
dynamic: 'strict',
properties: {},
};
const expected = {
doc: {
dynamic: 'strict',
properties: {
world: { type: 'keword' },
},
dynamic: 'strict',
properties: {
world: { type: 'keword' },
},
};
@ -201,26 +169,22 @@ describe('determineMigrationAction', () => {
test('requires patching if we added a sub-property', () => {
const actual = {
doc: {
dynamic: 'strict',
properties: {
world: {
properties: {
a: 'a',
},
dynamic: 'strict',
properties: {
world: {
properties: {
a: 'a',
},
},
},
};
const expected = {
doc: {
dynamic: 'strict',
properties: {
world: {
properties: {
a: 'a',
b: 'b',
},
dynamic: 'strict',
properties: {
world: {
properties: {
a: 'a',
b: 'b',
},
},
},
@ -231,26 +195,22 @@ describe('determineMigrationAction', () => {
test('requires migration if a sub property has been removed', () => {
const actual = {
doc: {
dynamic: 'strict',
properties: {
world: {
properties: {
a: 'a',
b: 'b',
},
dynamic: 'strict',
properties: {
world: {
properties: {
a: 'a',
b: 'b',
},
},
},
};
const expected = {
doc: {
dynamic: 'strict',
properties: {
world: {
properties: {
b: 'b',
},
dynamic: 'strict',
properties: {
world: {
properties: {
b: 'b',
},
},
},

View file

@ -38,12 +38,12 @@ export function determineMigrationAction(
actual: IndexMapping,
expected: IndexMapping
): MigrationAction {
if (actual.doc.dynamic !== expected.doc.dynamic) {
if (actual.dynamic !== expected.dynamic) {
return MigrationAction.Migrate;
}
const actualProps = actual.doc.properties;
const expectedProps = expected.doc.properties;
const actualProps = actual.properties;
const expectedProps = expected.properties;
// There's a special case for root-level properties: if a root property is in actual,
// but not in expected, it is treated like a disabled plugin and requires no action.

View file

@ -19,7 +19,6 @@
import _ from 'lodash';
import sinon from 'sinon';
import { ROOT_TYPE } from '../../serialization';
import * as Index from './elastic_index';
describe('ElasticIndex', () => {
@ -37,7 +36,7 @@ describe('ElasticIndex', () => {
aliases: {},
exists: false,
indexName: '.kibana-test',
mappings: { doc: { dynamic: 'strict', properties: {} } },
mappings: { dynamic: 'strict', properties: {} },
});
});
@ -79,7 +78,7 @@ describe('ElasticIndex', () => {
return {
[index]: {
aliases: { foo: index },
mappings: { doc: { dynamic: 'strict', properties: { a: 'b' } } },
mappings: { dynamic: 'strict', properties: { a: 'b' } },
},
};
});
@ -87,7 +86,7 @@ describe('ElasticIndex', () => {
const info = await Index.fetchInfo(callCluster, '.baz');
expect(info).toEqual({
aliases: { foo: '.baz' },
mappings: { doc: { dynamic: 'strict', properties: { a: 'b' } } },
mappings: { dynamic: 'strict', properties: { a: 'b' } },
exists: true,
indexName: '.baz',
});
@ -127,7 +126,6 @@ describe('ElasticIndex', () => {
const callCluster = sinon.spy(async (path: string, { body, type, index }: any) => {
expect(path).toEqual('indices.putMapping');
expect(index).toEqual('.shazm');
expect(type).toEqual(ROOT_TYPE);
expect(body).toEqual({
dynamic: 'strict',
properties: {
@ -137,11 +135,9 @@ describe('ElasticIndex', () => {
});
await Index.putMappings(callCluster, '.shazm', {
doc: {
dynamic: 'strict',
properties: {
foo: 'bar',
},
dynamic: 'strict',
properties: {
foo: 'bar',
},
});
@ -246,10 +242,8 @@ describe('ElasticIndex', () => {
case 'indices.create':
expect(arg.body).toEqual({
mappings: {
doc: {
dynamic: 'strict',
properties: { foo: 'bar' },
},
dynamic: 'strict',
properties: { foo: 'bar' },
},
settings: { auto_expand_replicas: '0-1', number_of_shards: 1 },
});
@ -292,10 +286,8 @@ describe('ElasticIndex', () => {
exists: true,
indexName: '.ze-index',
mappings: {
doc: {
dynamic: 'strict',
properties: { foo: 'bar' },
},
dynamic: 'strict',
properties: { foo: 'bar' },
},
};
await Index.convertToAlias(callCluster, info, '.muchacha', 10);
@ -316,10 +308,8 @@ describe('ElasticIndex', () => {
case 'indices.create':
expect(arg.body).toEqual({
mappings: {
doc: {
dynamic: 'strict',
properties: { foo: 'bar' },
},
dynamic: 'strict',
properties: { foo: 'bar' },
},
settings: { auto_expand_replicas: '0-1', number_of_shards: 1 },
});
@ -355,10 +345,8 @@ describe('ElasticIndex', () => {
exists: true,
indexName: '.ze-index',
mappings: {
doc: {
dynamic: 'strict',
properties: { foo: 'bar' },
},
dynamic: 'strict',
properties: { foo: 'bar' },
},
};
await expect(Index.convertToAlias(callCluster, info, '.muchacha', 10)).rejects.toThrow(
@ -630,10 +618,8 @@ describe('ElasticIndex', () => {
const { hasMigrations, callCluster } = await testMigrationsUpToDate({
index: '.myalias',
mappings: {
doc: {
properties: {
dashboard: { type: 'text' },
},
properties: {
dashboard: { type: 'text' },
},
},
count: 0,
@ -647,7 +633,6 @@ describe('ElasticIndex', () => {
{
ignore: [404],
index: '.myalias',
include_type_name: true,
},
],
]);
@ -657,14 +642,12 @@ describe('ElasticIndex', () => {
const { hasMigrations, callCluster } = await testMigrationsUpToDate({
index: '.myalias',
mappings: {
doc: {
properties: {
migrationVersion: {
dynamic: 'true',
type: 'object',
},
dashboard: { type: 'text' },
properties: {
migrationVersion: {
dynamic: 'true',
type: 'object',
},
dashboard: { type: 'text' },
},
},
count: 2,
@ -680,14 +663,12 @@ describe('ElasticIndex', () => {
const { hasMigrations, callCluster } = await testMigrationsUpToDate({
index: '.myalias',
mappings: {
doc: {
properties: {
migrationVersion: {
dynamic: 'true',
type: 'object',
},
dashboard: { type: 'text' },
properties: {
migrationVersion: {
dynamic: 'true',
type: 'object',
},
dashboard: { type: 'text' },
},
},
count: 0,
@ -704,14 +685,12 @@ describe('ElasticIndex', () => {
const { hasMigrations, callCluster } = await testMigrationsUpToDate({
index: '.myalias',
mappings: {
doc: {
properties: {
migrationVersion: {
dynamic: 'true',
type: 'object',
},
dashboard: { type: 'text' },
properties: {
migrationVersion: {
dynamic: 'true',
type: 'object',
},
dashboard: { type: 'text' },
},
},
count: 3,
@ -728,14 +707,12 @@ describe('ElasticIndex', () => {
const { callCluster } = await testMigrationsUpToDate({
index: '.myalias',
mappings: {
doc: {
properties: {
migrationVersion: {
dynamic: 'true',
type: 'object',
},
dashboard: { type: 'text' },
properties: {
migrationVersion: {
dynamic: 'true',
type: 'object',
},
dashboard: { type: 'text' },
},
},
count: 0,
@ -776,7 +753,6 @@ describe('ElasticIndex', () => {
},
},
index: '.myalias',
type: ROOT_TYPE,
},
]);
});

View file

@ -23,7 +23,7 @@
*/
import _ from 'lodash';
import { MigrationVersion, ROOT_TYPE } from '../../serialization';
import { MigrationVersion } from '../../serialization';
import {
AliasAction,
CallCluster,
@ -33,10 +33,8 @@ import {
ShardsInfo,
} from './call_cluster';
// Require rather than import gets us around the lack of TypeScript definitions
// for "getTypes"
// tslint:disable-next-line:no-var-requires
const { getTypes } = require('../../../mappings');
// @ts-ignore untyped dependency
import { getTypes } from '../../../mappings';
const settings = { number_of_shards: 1, auto_expand_replicas: '0-1' };
@ -55,7 +53,6 @@ export async function fetchInfo(callCluster: CallCluster, index: string): Promis
const result = await callCluster('indices.get', {
ignore: [404],
index,
include_type_name: true,
});
if ((result as NotFound).status === 404) {
@ -63,7 +60,7 @@ export async function fetchInfo(callCluster: CallCluster, index: string): Promis
aliases: {},
exists: false,
indexName: index,
mappings: { doc: { dynamic: 'strict', properties: {} } },
mappings: { dynamic: 'strict', properties: {} },
};
}
@ -128,7 +125,6 @@ export async function write(callCluster: CallCluster, index: string, docs: RawDo
index: {
_id: doc._id,
_index: index,
_type: ROOT_TYPE,
},
});
@ -171,7 +167,7 @@ export async function migrationsUpToDate(
try {
const indexInfo = await fetchInfo(callCluster, index);
if (!_.get(indexInfo, 'mappings.doc.properties.migrationVersion')) {
if (!_.get(indexInfo, 'mappings.properties.migrationVersion')) {
return false;
}
@ -196,7 +192,6 @@ export async function migrationsUpToDate(
},
},
index,
type: ROOT_TYPE,
});
assertResponseIncludeAllShards(response);
@ -223,11 +218,15 @@ export async function migrationsUpToDate(
*/
export function putMappings(callCluster: CallCluster, index: string, mappings: IndexMapping) {
return callCluster('indices.putMapping', {
body: mappings.doc,
index,
type: ROOT_TYPE,
// HACK: This is a temporary workaround for a disconnect between
// elasticsearchjs and Elasticsearch 7.0. The JS library requires
// type, but Elasticsearch 7.0 has deprecated type...
include_type_name: true,
});
type: '_doc',
body: mappings,
} as any);
}
export async function createIndex(
@ -238,7 +237,6 @@ export async function createIndex(
await callCluster('indices.create', {
body: { mappings, settings },
index,
include_type_name: true,
});
}
@ -310,14 +308,16 @@ export async function claimAlias(
* @param {FullIndexInfo} indexInfo
*/
function assertIsSupportedIndex(indexInfo: FullIndexInfo) {
const currentTypes = getTypes(indexInfo.mappings);
const isV5Index = currentTypes.length > 1 || currentTypes[0] !== ROOT_TYPE;
if (isV5Index) {
const mappings = indexInfo.mappings as any;
const isV7Index = !!mappings.properties;
if (!isV7Index) {
throw new Error(
`Index ${indexInfo.indexName} belongs to a version of Kibana ` +
`that cannot be automatically migrated. Reset it or use the X-Pack upgrade assistant.`
);
}
return indexInfo;
}

View file

@ -20,7 +20,7 @@
import _ from 'lodash';
import sinon from 'sinon';
import { SavedObjectsSchema } from '../../schema';
import { ROOT_TYPE, SavedObjectDoc, SavedObjectsSerializer } from '../../serialization';
import { SavedObjectDoc, SavedObjectsSerializer } from '../../serialization';
import { CallCluster } from './call_cluster';
import { IndexMigrator } from './index_migrator';
@ -52,9 +52,9 @@ describe('IndexMigrator', () => {
updated_at: { type: 'date' },
},
},
index: '.kibana_1',
include_type_name: true,
type: ROOT_TYPE,
type: '_doc',
index: '.kibana_1',
});
});
@ -72,25 +72,22 @@ describe('IndexMigrator', () => {
sinon.assert.calledWith(callCluster, 'indices.create', {
body: {
mappings: {
doc: {
dynamic: 'strict',
properties: {
config: {
dynamic: 'true',
properties: { buildNum: { type: 'keyword' } },
},
foo: { type: 'long' },
migrationVersion: { dynamic: 'true', type: 'object' },
namespace: { type: 'keyword' },
type: { type: 'keyword' },
updated_at: { type: 'date' },
dynamic: 'strict',
properties: {
config: {
dynamic: 'true',
properties: { buildNum: { type: 'keyword' } },
},
foo: { type: 'long' },
migrationVersion: { dynamic: 'true', type: 'object' },
namespace: { type: 'keyword' },
type: { type: 'keyword' },
updated_at: { type: 'date' },
},
},
settings: { number_of_shards: 1, auto_expand_replicas: '0-1' },
},
index: '.kibana_1',
include_type_name: true,
});
});
@ -169,15 +166,12 @@ describe('IndexMigrator', () => {
'.kibana_1': {
aliases: {},
mappings: {
doc: {
properties: {
author: { type: 'text' },
},
properties: {
author: { type: 'text' },
},
},
},
},
include_type_name: true,
});
await new IndexMigrator(opts).migrate();
@ -185,26 +179,23 @@ describe('IndexMigrator', () => {
sinon.assert.calledWith(callCluster, 'indices.create', {
body: {
mappings: {
doc: {
dynamic: 'strict',
properties: {
author: { type: 'text' },
config: {
dynamic: 'true',
properties: { buildNum: { type: 'keyword' } },
},
foo: { type: 'text' },
migrationVersion: { dynamic: 'true', type: 'object' },
namespace: { type: 'keyword' },
type: { type: 'keyword' },
updated_at: { type: 'date' },
dynamic: 'strict',
properties: {
author: { type: 'text' },
config: {
dynamic: 'true',
properties: { buildNum: { type: 'keyword' } },
},
foo: { type: 'text' },
migrationVersion: { dynamic: 'true', type: 'object' },
namespace: { type: 'keyword' },
type: { type: 'keyword' },
updated_at: { type: 'date' },
},
},
settings: { number_of_shards: 1, auto_expand_replicas: '0-1' },
},
index: '.kibana_2',
include_type_name: true,
});
});
@ -285,13 +276,13 @@ describe('IndexMigrator', () => {
expect(callCluster.args.filter(([action]) => action === 'bulk').length).toEqual(2);
sinon.assert.calledWith(callCluster, 'bulk', {
body: [
{ index: { _id: 'foo:1', _index: '.kibana_2', _type: ROOT_TYPE } },
{ index: { _id: 'foo:1', _index: '.kibana_2' } },
{ foo: { name: 1 }, type: 'foo', migrationVersion: {} },
],
});
sinon.assert.calledWith(callCluster, 'bulk', {
body: [
{ index: { _id: 'foo:2', _index: '.kibana_2', _type: ROOT_TYPE } },
{ index: { _id: 'foo:2', _index: '.kibana_2' } },
{ foo: { name: 2 }, type: 'foo', migrationVersion: {} },
],
});
@ -320,11 +311,9 @@ function withIndex(callCluster: sinon.SinonStub, opts: any = {}) {
'.kibana_1': {
aliases: { '.kibana': {} },
mappings: {
doc: {
dynamic: 'strict',
properties: {
migrationVersion: { dynamic: 'true', type: 'object' },
},
dynamic: 'strict',
properties: {
migrationVersion: { dynamic: 'true', type: 'object' },
},
},
},

View file

@ -20,7 +20,7 @@
import _ from 'lodash';
import sinon from 'sinon';
import { SavedObjectsSchema } from '../../schema';
import { ROOT_TYPE, SavedObjectsSerializer } from '../../serialization';
import { SavedObjectsSerializer } from '../../serialization';
import { migrateRawDocs } from './migrate_raw_docs';
describe('migrateRawDocs', () => {
@ -35,12 +35,10 @@ describe('migrateRawDocs', () => {
{
_id: 'a:b',
_source: { type: 'a', a: { name: 'HOI!' }, migrationVersion: {} },
_type: ROOT_TYPE,
},
{
_id: 'c:d',
_source: { type: 'c', c: { name: 'HOI!' }, migrationVersion: {} },
_type: ROOT_TYPE,
},
]);
@ -59,7 +57,6 @@ describe('migrateRawDocs', () => {
{
_id: 'c:d',
_source: { type: 'c', c: { name: 'TADA' }, migrationVersion: {} },
_type: ROOT_TYPE,
},
]);

View file

@ -104,12 +104,10 @@ function createDestContext(
exists: false,
indexName: nextIndexName(source.indexName, alias),
mappings: {
doc: {
...activeMappings.doc,
properties: {
...source.mappings.doc.properties,
...activeMappings.doc.properties,
},
...activeMappings,
properties: {
...source.mappings.properties,
...activeMappings.properties,
},
},
};

View file

@ -2,36 +2,34 @@
exports[`KibanaMigrator getActiveMappings returns full index mappings w/ core properties 1`] = `
Object {
"doc": Object {
"dynamic": "strict",
"properties": Object {
"amap": Object {
"type": "text",
},
"bmap": Object {
"type": "text",
},
"config": Object {
"dynamic": "true",
"properties": Object {
"buildNum": Object {
"type": "keyword",
},
"dynamic": "strict",
"properties": Object {
"amap": Object {
"type": "text",
},
"bmap": Object {
"type": "text",
},
"config": Object {
"dynamic": "true",
"properties": Object {
"buildNum": Object {
"type": "keyword",
},
},
"migrationVersion": Object {
"dynamic": "true",
"type": "object",
},
"namespace": Object {
"type": "keyword",
},
"type": Object {
"type": "keyword",
},
"updated_at": Object {
"type": "date",
},
},
"migrationVersion": Object {
"dynamic": "true",
"type": "object",
},
"namespace": Object {
"type": "keyword",
},
"type": Object {
"type": "keyword",
},
"updated_at": Object {
"type": "date",
},
},
}

View file

@ -25,11 +25,6 @@
import uuid from 'uuid';
import { SavedObjectsSchema } from '../schema';
/**
* The root document type. In 7.0, this needs to change to '_doc'.
*/
export const ROOT_TYPE = 'doc';
/**
* A raw document as represented directly in the saved object index.
*/
@ -130,7 +125,6 @@ export class SavedObjectsSerializer {
return {
_id: this.generateRawId(namespace, type, id),
_source: source,
_type: ROOT_TYPE,
...(version != null && { _version: version }),
};
}

View file

@ -18,7 +18,7 @@
*/
import _ from 'lodash';
import { ROOT_TYPE, SavedObjectsSerializer } from '.';
import { SavedObjectsSerializer } from '.';
import { SavedObjectsSchema } from '../schema';
describe('saved object conversion', () => {
@ -68,7 +68,6 @@ describe('saved object conversion', () => {
const serializer = new SavedObjectsSerializer(new SavedObjectsSchema());
const actual = serializer.rawToSavedObject({
_id: 'hello:world',
_type: ROOT_TYPE,
_version: 3,
_source: {
type: 'hello',
@ -153,7 +152,6 @@ describe('saved object conversion', () => {
const serializer = new SavedObjectsSerializer(new SavedObjectsSchema());
const actual = serializer.rawToSavedObject({
_id: 'universe',
_type: ROOT_TYPE,
_source: {
type: 'hello',
hello: {
@ -175,7 +173,6 @@ describe('saved object conversion', () => {
const serializer = new SavedObjectsSerializer(new SavedObjectsSchema());
const actual = serializer.rawToSavedObject({
_id: 'universe',
_type: ROOT_TYPE,
_source: {
type: 'hello',
},
@ -191,7 +188,6 @@ describe('saved object conversion', () => {
expect(() =>
serializer.rawToSavedObject({
_id: 'universe',
_type: ROOT_TYPE,
_source: {
hello: {
world: 'earth',
@ -205,7 +201,6 @@ describe('saved object conversion', () => {
const serializer = new SavedObjectsSerializer(new SavedObjectsSchema());
const raw = {
_id: 'foo-namespace:foo:bar',
_type: ROOT_TYPE,
_version: 24,
_source: {
type: 'foo',
@ -387,7 +382,6 @@ describe('saved object conversion', () => {
attributes: {},
} as any);
expect(actual).toHaveProperty('_type', ROOT_TYPE);
expect(actual._source).toHaveProperty('type', 'foo');
});

View file

@ -31,46 +31,6 @@ import { SavedObjectsClient } from './saved_objects_client';
// Eventually, we hope to build a first-class import / export API, at which point, we can
// remove the migrator from the saved objects client and leave only document validation here.
export function createSavedObjectsService(server, schema, serializer, migrator) {
const onBeforeWrite = async () => {
const adminCluster = server.plugins.elasticsearch.getCluster('admin');
try {
const index = server.config().get('kibana.index');
await adminCluster.callWithInternalUser('indices.putTemplate', {
name: `kibana_index_template:${index}`,
include_type_name: true,
body: {
template: index,
settings: {
number_of_shards: 1,
auto_expand_replicas: '0-1',
},
mappings: server.getKibanaIndexMappingsDsl(),
},
});
} catch (error) {
server.logWithMetadata(
['debug', 'savedObjects'],
`Attempt to write indexTemplate for SavedObjects index failed: ${error.message}`,
{
es: {
resp: error.body,
status: error.status,
},
err: {
message: error.message,
stack: error.stack,
},
}
);
// We reject with `es.ServiceUnavailable` because writing an index
// template is a very simple operation so if we get an error here
// then something must be very broken
throw new adminCluster.errors.ServiceUnavailable();
}
};
const mappings = server.getKibanaIndexMappingsDsl();
const repositoryProvider = new SavedObjectsRepositoryProvider({
index: server.config().get('kibana.index'),
@ -78,13 +38,11 @@ export function createSavedObjectsService(server, schema, serializer, migrator)
mappings,
schema,
serializer,
onBeforeWrite,
});
const scopedClientProvider = new ScopedSavedObjectsClientProvider({
index: server.config().get('kibana.index'),
mappings,
onBeforeWrite,
defaultClientFactory({
request,
}) {

View file

@ -18,7 +18,7 @@
*/
import { omit } from 'lodash';
import { getRootType, getRootPropertiesObjects } from '../../../mappings';
import { getRootPropertiesObjects } from '../../../mappings';
import { getSearchDsl } from './search_dsl';
import { includedFields } from './included_fields';
import { decorateEsError } from './decorate_es_error';
@ -50,7 +50,9 @@ export class SavedObjectsRepository {
this._index = index;
this._mappings = mappings;
this._schema = schema;
this._type = getRootType(this._mappings);
// ES7 and up expects the root type to be _doc
this._type = '_doc';
this._onBeforeWrite = onBeforeWrite;
this._unwrappedCallCluster = async (...args) => {
await migrator.awaitMigration();

View file

@ -44,7 +44,7 @@ describe('SavedObjectsRepository', () => {
total: 4,
hits: [{
_index: '.kibana',
_type: 'doc',
_type: '_doc',
_id: 'index-pattern:logstash-*',
_score: 1,
_source: {
@ -58,7 +58,7 @@ describe('SavedObjectsRepository', () => {
}
}, {
_index: '.kibana',
_type: 'doc',
_type: '_doc',
_id: 'config:6.0.0-alpha1',
_score: 1,
_source: {
@ -71,7 +71,7 @@ describe('SavedObjectsRepository', () => {
}
}, {
_index: '.kibana',
_type: 'doc',
_type: '_doc',
_id: 'index-pattern:stocks-*',
_score: 1,
_source: {
@ -85,7 +85,7 @@ describe('SavedObjectsRepository', () => {
}
}, {
_index: '.kibana',
_type: 'doc',
_type: '_doc',
_id: 'globaltype:something',
_score: 1,
_source: {
@ -104,7 +104,7 @@ describe('SavedObjectsRepository', () => {
total: 4,
hits: [{
_index: '.kibana',
_type: 'doc',
_type: '_doc',
_id: 'foo-namespace:index-pattern:logstash-*',
_score: 1,
_source: {
@ -119,7 +119,7 @@ describe('SavedObjectsRepository', () => {
}
}, {
_index: '.kibana',
_type: 'doc',
_type: '_doc',
_id: 'foo-namespace:config:6.0.0-alpha1',
_score: 1,
_source: {
@ -133,7 +133,7 @@ describe('SavedObjectsRepository', () => {
}
}, {
_index: '.kibana',
_type: 'doc',
_type: '_doc',
_id: 'foo-namespace:index-pattern:stocks-*',
_score: 1,
_source: {
@ -148,7 +148,7 @@ describe('SavedObjectsRepository', () => {
}
}, {
_index: '.kibana',
_type: 'doc',
_type: '_doc',
_id: 'globaltype:something',
_score: 1,
_source: {
@ -178,27 +178,25 @@ describe('SavedObjectsRepository', () => {
};
const mappings = {
doc: {
properties: {
'index-pattern': {
properties: {
someField: {
type: 'keyword'
}
properties: {
'index-pattern': {
properties: {
someField: {
type: 'keyword'
}
},
'dashboard': {
properties: {
otherField: {
type: 'keyword'
}
}
},
'dashboard': {
properties: {
otherField: {
type: 'keyword'
}
},
'globaltype': {
properties: {
yetAnotherField: {
type: 'keyword'
}
}
},
'globaltype': {
properties: {
yetAnotherField: {
type: 'keyword'
}
}
}
@ -237,7 +235,7 @@ describe('SavedObjectsRepository', () => {
describe('#create', () => {
beforeEach(() => {
callAdminCluster.callsFake((method, params) => ({
_type: 'doc',
_type: '_doc',
_id: params.id,
_version: 2
}));
@ -440,9 +438,9 @@ describe('SavedObjectsRepository', () => {
expect(bulkCalls.length).toEqual(1);
expect(bulkCalls[0][1].body).toEqual([
{ create: { _type: 'doc', _id: 'config:one' } },
{ create: { _type: '_doc', _id: 'config:one' } },
{ type: 'config', ...mockTimestampFields, config: { title: 'Test One' } },
{ create: { _type: 'doc', _id: 'index-pattern:two' } },
{ create: { _type: '_doc', _id: 'index-pattern:two' } },
{ type: 'index-pattern', ...mockTimestampFields, 'index-pattern': { title: 'Test Two' } }
]);
@ -464,9 +462,9 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledWithExactly(callAdminCluster, 'bulk', sinon.match({
body: [
{ create: { _type: 'doc', _id: 'config:one' } },
{ create: { _type: '_doc', _id: 'config:one' } },
{ type: 'config', ...mockTimestampFields, config: { title: 'Test One!!' }, migrationVersion: { foo: '2.3.4' } },
{ create: { _type: 'doc', _id: 'index-pattern:two' } },
{ create: { _type: '_doc', _id: 'index-pattern:two' } },
{ type: 'index-pattern', ...mockTimestampFields, 'index-pattern': { title: 'Test Two!!' }, migrationVersion: { foo: '2.3.4' } }
]
}));
@ -480,7 +478,7 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledWithExactly(callAdminCluster, 'bulk', sinon.match({
body: [
// uses create because overwriting is not allowed
{ create: { _type: 'doc', _id: 'foo:bar' } },
{ create: { _type: '_doc', _id: 'foo:bar' } },
{ type: 'foo', ...mockTimestampFields, 'foo': {} },
]
}));
@ -495,7 +493,7 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledWithExactly(callAdminCluster, 'bulk', sinon.match({
body: [
// uses index because overwriting is allowed
{ index: { _type: 'doc', _id: 'foo:bar' } },
{ index: { _type: '_doc', _id: 'foo:bar' } },
{ type: 'foo', ...mockTimestampFields, 'foo': {} },
]
}));
@ -508,7 +506,7 @@ describe('SavedObjectsRepository', () => {
errors: false,
items: [{
create: {
_type: 'doc',
_type: '_doc',
_id: 'config:one',
error: {
reason: 'type[config] missing'
@ -516,7 +514,7 @@ describe('SavedObjectsRepository', () => {
}
}, {
create: {
_type: 'doc',
_type: '_doc',
_id: 'index-pattern:two',
_version: 2
}
@ -550,13 +548,13 @@ describe('SavedObjectsRepository', () => {
errors: false,
items: [{
create: {
_type: 'doc',
_type: '_doc',
_id: 'config:one',
_version: 2
}
}, {
create: {
_type: 'doc',
_type: '_doc',
_id: 'index-pattern:two',
_version: 2
}
@ -603,9 +601,9 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledOnce(callAdminCluster);
sinon.assert.calledWithExactly(callAdminCluster, 'bulk', sinon.match({
body: [
{ create: { _type: 'doc', _id: 'foo-namespace:config:one' } },
{ create: { _type: '_doc', _id: 'foo-namespace:config:one' } },
{ namespace: 'foo-namespace', type: 'config', ...mockTimestampFields, config: { title: 'Test One' } },
{ create: { _type: 'doc', _id: 'foo-namespace:index-pattern:two' } },
{ create: { _type: '_doc', _id: 'foo-namespace:index-pattern:two' } },
{ namespace: 'foo-namespace', type: 'index-pattern', ...mockTimestampFields, 'index-pattern': { title: 'Test Two' } }
]
}));
@ -621,9 +619,9 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledOnce(callAdminCluster);
sinon.assert.calledWithExactly(callAdminCluster, 'bulk', sinon.match({
body: [
{ create: { _type: 'doc', _id: 'config:one' } },
{ create: { _type: '_doc', _id: 'config:one' } },
{ type: 'config', ...mockTimestampFields, config: { title: 'Test One' } },
{ create: { _type: 'doc', _id: 'index-pattern:two' } },
{ create: { _type: '_doc', _id: 'index-pattern:two' } },
{ type: 'index-pattern', ...mockTimestampFields, 'index-pattern': { title: 'Test Two' } }
]
}));
@ -643,7 +641,7 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledOnce(callAdminCluster);
sinon.assert.calledWithExactly(callAdminCluster, 'bulk', sinon.match({
body: [
{ create: { _type: 'doc', _id: 'globaltype:one' } },
{ create: { _type: '_doc', _id: 'globaltype:one' } },
{ type: 'globaltype', ...mockTimestampFields, 'globaltype': { title: 'Test One' } },
]
}));
@ -688,7 +686,7 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledOnce(callAdminCluster);
sinon.assert.calledWithExactly(callAdminCluster, 'delete', {
type: 'doc',
type: '_doc',
id: 'foo-namespace:index-pattern:logstash-*',
refresh: 'wait_for',
index: '.kibana-test',
@ -706,7 +704,7 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledOnce(callAdminCluster);
sinon.assert.calledWithExactly(callAdminCluster, 'delete', {
type: 'doc',
type: '_doc',
id: 'index-pattern:logstash-*',
refresh: 'wait_for',
index: '.kibana-test',
@ -726,7 +724,7 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledOnce(callAdminCluster);
sinon.assert.calledWithExactly(callAdminCluster, 'delete', {
type: 'doc',
type: '_doc',
id: 'globaltype:logstash-*',
refresh: 'wait_for',
index: '.kibana-test',
@ -925,7 +923,7 @@ describe('SavedObjectsRepository', () => {
describe('#get', () => {
const noNamespaceResult = {
_id: 'index-pattern:logstash-*',
_type: 'doc',
_type: '_doc',
_version: 2,
_source: {
type: 'index-pattern',
@ -938,7 +936,7 @@ describe('SavedObjectsRepository', () => {
};
const namespacedResult = {
_id: 'foo-namespace:index-pattern:logstash-*',
_type: 'doc',
_type: '_doc',
_version: 2,
_source: {
namespace: 'foo-namespace',
@ -1000,7 +998,7 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledOnce(callAdminCluster);
sinon.assert.calledWithExactly(callAdminCluster, sinon.match.string, sinon.match({
id: 'foo-namespace:index-pattern:logstash-*',
type: 'doc'
type: '_doc'
}));
});
@ -1012,7 +1010,7 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledOnce(callAdminCluster);
sinon.assert.calledWithExactly(callAdminCluster, sinon.match.string, sinon.match({
id: 'index-pattern:logstash-*',
type: 'doc'
type: '_doc'
}));
});
@ -1026,7 +1024,7 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledOnce(callAdminCluster);
sinon.assert.calledWithExactly(callAdminCluster, sinon.match.string, sinon.match({
id: 'globaltype:logstash-*',
type: 'doc'
type: '_doc'
}));
});
});
@ -1058,9 +1056,9 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledWithExactly(callAdminCluster, sinon.match.string, sinon.match({
body: {
docs: [
{ _type: 'doc', _id: 'config:one' },
{ _type: 'doc', _id: 'index-pattern:two' },
{ _type: 'doc', _id: 'globaltype:three' },
{ _type: '_doc', _id: 'config:one' },
{ _type: '_doc', _id: 'index-pattern:two' },
{ _type: '_doc', _id: 'globaltype:three' },
]
}
}));
@ -1085,9 +1083,9 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledWithExactly(callAdminCluster, sinon.match.string, sinon.match({
body: {
docs: [
{ _type: 'doc', _id: 'foo-namespace:config:one' },
{ _type: 'doc', _id: 'foo-namespace:index-pattern:two' },
{ _type: 'doc', _id: 'globaltype:three' },
{ _type: '_doc', _id: 'foo-namespace:config:one' },
{ _type: '_doc', _id: 'foo-namespace:index-pattern:two' },
{ _type: '_doc', _id: 'globaltype:three' },
]
}
}));
@ -1108,13 +1106,13 @@ describe('SavedObjectsRepository', () => {
it('reports error on missed objects', async () => {
callAdminCluster.returns(Promise.resolve({
docs: [{
_type: 'doc',
_type: '_doc',
_id: 'config:good',
found: true,
_version: 2,
_source: { ...mockTimestampFields, config: { title: 'Test' } }
}, {
_type: 'doc',
_type: '_doc',
_id: 'config:bad',
found: false
}]
@ -1152,7 +1150,7 @@ describe('SavedObjectsRepository', () => {
beforeEach(() => {
callAdminCluster.returns(Promise.resolve({
_id: `${type}:${id}`,
_type: 'doc',
_type: '_doc',
_version: newVersion,
result: 'updated'
}));
@ -1202,7 +1200,7 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledOnce(callAdminCluster);
sinon.assert.calledWithExactly(callAdminCluster, 'update', {
type: 'doc',
type: '_doc',
id: 'foo-namespace:index-pattern:logstash-*',
version: undefined,
body: {
@ -1221,7 +1219,7 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledOnce(callAdminCluster);
sinon.assert.calledWithExactly(callAdminCluster, 'update', {
type: 'doc',
type: '_doc',
id: 'index-pattern:logstash-*',
version: undefined,
body: {
@ -1244,7 +1242,7 @@ describe('SavedObjectsRepository', () => {
sinon.assert.calledOnce(callAdminCluster);
sinon.assert.calledWithExactly(callAdminCluster, 'update', {
type: 'doc',
type: '_doc',
id: 'globaltype:foo',
version: undefined,
body: {
@ -1262,7 +1260,7 @@ describe('SavedObjectsRepository', () => {
describe('#incrementCounter', () => {
beforeEach(() => {
callAdminCluster.callsFake((method, params) => ({
_type: 'doc',
_type: '_doc',
_id: params.id,
_version: 2,
_index: '.kibana',
@ -1282,7 +1280,7 @@ describe('SavedObjectsRepository', () => {
it('formats Elasticsearch response', async () => {
callAdminCluster.callsFake((method, params) => ({
_type: 'doc',
_type: '_doc',
_id: params.id,
_version: 2,
_index: '.kibana',
@ -1382,7 +1380,7 @@ describe('SavedObjectsRepository', () => {
it(`doesn't prepend namespace to the id or add namespace property when providing namespace for namespace agnostic type`, async () => {
callAdminCluster.callsFake((method, params) => ({
_type: 'doc',
_type: '_doc',
_id: params.id,
_version: 2,
_index: '.kibana',

View file

@ -20,42 +20,40 @@
import { getQueryParams } from './query_params';
const MAPPINGS = {
rootType: {
properties: {
type: {
type: 'keyword'
},
pending: {
properties: {
title: {
type: 'text',
}
properties: {
type: {
type: 'keyword'
},
pending: {
properties: {
title: {
type: 'text',
}
},
saved: {
properties: {
title: {
type: 'text',
fields: {
raw: {
type: 'keyword'
}
}
},
saved: {
properties: {
title: {
type: 'text',
fields: {
raw: {
type: 'keyword'
}
},
obj: {
properties: {
key1: {
type: 'text'
}
}
},
obj: {
properties: {
key1: {
type: 'text'
}
}
}
},
global: {
properties: {
name: {
type: 'keyword',
}
}
},
global: {
properties: {
name: {
type: 'keyword',
}
}
}

View file

@ -20,43 +20,41 @@
import { getSortingParams } from './sorting_params';
const MAPPINGS = {
rootType: {
properties: {
type: {
type: 'text',
fields: {
raw: {
type: 'keyword'
}
properties: {
type: {
type: 'text',
fields: {
raw: {
type: 'keyword'
}
},
pending: {
properties: {
title: {
type: 'text',
fields: {
raw: {
type: 'keyword'
}
}
},
pending: {
properties: {
title: {
type: 'text',
fields: {
raw: {
type: 'keyword'
}
}
}
},
saved: {
properties: {
title: {
type: 'text',
fields: {
raw: {
type: 'keyword'
}
}
},
saved: {
properties: {
title: {
type: 'text',
fields: {
raw: {
type: 'keyword'
}
},
obj: {
properties: {
key1: {
type: 'text'
}
}
},
obj: {
properties: {
key1: {
type: 'text'
}
}
}

View file

@ -35,22 +35,12 @@ export function docExistsSuite() {
const { kbnServer, uiSettings, callCluster } = getServices();
// delete the kibana index to ensure we start fresh
await callCluster('indices.delete', {
await callCluster('deleteByQuery', {
index: kbnServer.config.get('kibana.index'),
ignore: [404]
});
// write a setting to create kibana index and savedConfig
await kbnServer.inject({
method: 'POST',
url: '/api/kibana/settings/defaultIndex',
payload: { value: 'abc' }
});
// delete our defaultIndex setting to make doc empty
await kbnServer.inject({
method: 'DELETE',
url: '/api/kibana/settings/defaultIndex',
body: {
conflicts: 'proceed',
query: { match_all: {} }
},
});
if (initialSettings) {

View file

@ -25,7 +25,6 @@ import {
import { docExistsSuite } from './doc_exists';
import { docMissingSuite } from './doc_missing';
import { docMissingAndIndexReadOnlySuite } from './doc_missing_and_index_read_only';
import { indexMissingSuite } from './index_missing';
describe('uiSettings/routes', function () {
/**
@ -48,7 +47,6 @@ describe('uiSettings/routes', function () {
this.timeout(10000);
before(startServers);
describe('index missing', indexMissingSuite);
describe('doc missing', docMissingSuite);
describe('doc missing and index readonly', docMissingAndIndexReadOnlySuite);
describe('doc exists', docExistsSuite);

View file

@ -1,174 +0,0 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import expect from 'expect.js';
import sinon from 'sinon';
import {
getServices,
chance,
assertSinonMatch,
} from './lib';
export function indexMissingSuite() {
async function setup() {
const { callCluster, kbnServer, deleteKibanaIndex } = getServices();
const indexName = kbnServer.config.get('kibana.index');
// ensure the kibana index does not exist
await deleteKibanaIndex(callCluster);
return {
kbnServer,
// an incorrect number of shards is how we determine when the index was not created by Kibana,
// but automatically by writing to es when index didn't exist
async assertValidKibanaIndex() {
const resp = await callCluster('indices.get', {
index: indexName,
include_type_name: true,
});
expect(resp[indexName].mappings).to.have.property('doc');
expect(resp[indexName].mappings.doc.properties).to.have.keys(
'index-pattern',
'visualization',
'search',
'dashboard'
);
}
};
}
describe('get route', () => {
it('returns a 200 and creates doc, upgrades old value', async () => {
const { kbnServer } = await setup();
const { statusCode, result } = await kbnServer.inject({
method: 'GET',
url: '/api/kibana/settings'
});
expect(statusCode).to.be(200);
assertSinonMatch(result, {
settings: {
buildNum: {
userValue: sinon.match.number,
},
foo: {
userValue: 'bar',
isOverridden: true
}
}
});
});
});
describe('set route', () => {
it('returns a 200 and creates a valid kibana index', async () => {
const { kbnServer, assertValidKibanaIndex } = await setup();
const defaultIndex = chance.word();
const { statusCode, result } = await kbnServer.inject({
method: 'POST',
url: '/api/kibana/settings/defaultIndex',
payload: {
value: defaultIndex
}
});
expect(statusCode).to.be(200);
assertSinonMatch(result, {
settings: {
buildNum: {
userValue: sinon.match.number
},
defaultIndex: {
userValue: defaultIndex
},
foo: {
userValue: 'bar',
isOverridden: true
}
}
});
await assertValidKibanaIndex();
});
});
describe('setMany route', () => {
it('returns a 200 and creates a valid kibana index', async () => {
const { kbnServer, assertValidKibanaIndex } = await setup();
const defaultIndex = chance.word();
const { statusCode, result } = await kbnServer.inject({
method: 'POST',
url: '/api/kibana/settings',
payload: {
changes: { defaultIndex }
}
});
expect(statusCode).to.be(200);
assertSinonMatch(result, {
settings: {
buildNum: {
userValue: sinon.match.number
},
defaultIndex: {
userValue: defaultIndex
},
foo: {
userValue: 'bar',
isOverridden: true
}
}
});
await assertValidKibanaIndex();
});
});
describe('delete route', () => {
it('returns a 200 and creates a valid kibana index', async () => {
const { kbnServer, assertValidKibanaIndex } = await setup();
const { statusCode, result } = await kbnServer.inject({
method: 'DELETE',
url: '/api/kibana/settings/defaultIndex'
});
expect(statusCode).to.be(200);
assertSinonMatch(result, {
settings: {
buildNum: {
userValue: sinon.match.number
},
foo: {
userValue: 'bar',
isOverridden: true
}
}
});
await assertValidKibanaIndex();
});
});
}

View file

@ -219,14 +219,14 @@ async function createIndex({ callCluster, index }) {
};
await callCluster('indices.create', {
index,
body: { mappings: { doc: { dynamic: 'strict', properties } } },
body: { mappings: { dynamic: 'strict', properties } },
});
}
async function createDocs({ callCluster, index, docs }) {
await callCluster('bulk', {
body: docs.reduce((acc, doc) => {
acc.push({ index: { _id: doc.id, _index: index, _type: 'doc' } });
acc.push({ index: { _id: doc.id, _index: index } });
acc.push(_.omit(doc, 'id'));
return acc;
}, []),
@ -259,7 +259,7 @@ async function migrateIndex({ callCluster, index, migrations, mappingProperties,
async function fetchDocs({ callCluster, index }) {
const {
hits: { hits },
} = await callCluster('search', { index, type: 'doc' });
} = await callCluster('search', { index });
return hits.map(h => ({
...h._source,
id: h._id,

View file

@ -8,8 +8,6 @@
"number_of_replicas": "1"
}
},
"mappings": {
"doc": {}
}
"mappings": {}
}
}

View file

@ -9,25 +9,23 @@
}
},
"mappings": {
"type": {
"properties": {
"bar": {
"type": "boolean"
},
"baz": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
"properties": {
"bar": {
"type": "boolean"
},
"baz": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
},
"foo": {
"type": "long"
}
},
"foo": {
"type": "long"
}
}
}
}
}
}

View file

@ -9,20 +9,18 @@
}
},
"mappings": {
"type": {
"properties": {
"@timestamp": {
"type": "date"
},
"number_conflict": {
"type": "float"
},
"string_conflict": {
"type": "keyword"
},
"success": {
"type": "boolean"
}
"properties": {
"@timestamp": {
"type": "date"
},
"number_conflict": {
"type": "float"
},
"string_conflict": {
"type": "keyword"
},
"success": {
"type": "boolean"
}
}
}
@ -40,22 +38,20 @@
}
},
"mappings": {
"type": {
"properties": {
"@timestamp": {
"type": "date"
},
"number_conflict": {
"type": "integer"
},
"string_conflict": {
"type": "text"
},
"success": {
"type": "keyword"
}
"properties": {
"@timestamp": {
"type": "date"
},
"number_conflict": {
"type": "integer"
},
"string_conflict": {
"type": "text"
},
"success": {
"type": "keyword"
}
}
}
}
}
}

View file

@ -9,14 +9,12 @@
}
},
"mappings": {
"type": {
"properties": {
"Jan01": {
"type": "boolean"
},
"@timestamp": {
"type": "date"
}
"properties": {
"Jan01": {
"type": "boolean"
},
"@timestamp": {
"type": "date"
}
}
}
@ -34,14 +32,12 @@
}
},
"mappings": {
"type": {
"properties": {
"Jan02": {
"type": "boolean"
},
"@timestamp": {
"type": "date"
}
"properties": {
"Jan02": {
"type": "boolean"
},
"@timestamp": {
"type": "date"
}
}
}

View file

@ -9,14 +9,12 @@
}
},
"mappings": {
"type": {
"properties": {
"count": {
"type": "long"
},
"time": {
"type": "date"
}
"properties": {
"count": {
"type": "long"
},
"time": {
"type": "date"
}
}
}
@ -34,14 +32,12 @@
}
},
"mappings": {
"type": {
"properties": {
"count": {
"type": "long"
},
"time": {
"type": "date"
}
"properties": {
"count": {
"type": "long"
},
"time": {
"type": "date"
}
}
}
@ -59,14 +55,12 @@
}
},
"mappings": {
"type": {
"properties": {
"count": {
"type": "long"
},
"time": {
"type": "date"
}
"properties": {
"count": {
"type": "long"
},
"time": {
"type": "date"
}
}
}
@ -84,14 +78,12 @@
}
},
"mappings": {
"type": {
"properties": {
"count": {
"type": "long"
},
"time": {
"type": "date"
}
"properties": {
"count": {
"type": "long"
},
"time": {
"type": "date"
}
}
}
@ -109,14 +101,12 @@
}
},
"mappings": {
"type": {
"properties": {
"count": {
"type": "long"
},
"time": {
"type": "date"
}
"properties": {
"count": {
"type": "long"
},
"time": {
"type": "date"
}
}
}

View file

@ -10,272 +10,270 @@
}
},
"mappings": {
"doc": {
"dynamic": "strict",
"properties": {
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"defaultIndex": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"telemetry:optIn": {
"type": "boolean"
}
}
},
"dashboard": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"graph-workspace": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"numLinks": {
"type": "integer"
},
"numVertices": {
"type": "integer"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
},
"wsState": {
"type": "text"
}
}
},
"index-pattern": {
"properties": {
"fieldFormatMap": {
"type": "text"
},
"dynamic": "strict",
"properties": {
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"defaultIndex": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
"keyword": {
"type": "keyword",
"ignore_above": 256
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"telemetry:optIn": {
"type": "boolean"
}
},
"server": {
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"timelion-sheet": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"dashboard": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"type": {
"type": "keyword"
},
"updated_at": {
"type": "date"
},
"url": {
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
},
"graph-workspace": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"numLinks": {
"type": "integer"
},
"numVertices": {
"type": "integer"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
},
"wsState": {
"type": "text"
}
}
},
"index-pattern": {
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"timelion-sheet": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"type": {
"type": "keyword"
},
"updated_at": {
"type": "date"
},
"url": {
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
},
"visualization": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"visualization": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
}

View file

@ -9,247 +9,245 @@
}
},
"mappings": {
"doc": {
"dynamic": "strict",
"properties": {
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"defaultIndex": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}
}
},
"dashboard": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"index-pattern": {
"properties": {
"fieldFormatMap": {
"type": "text"
},
"dynamic": "strict",
"properties": {
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"defaultIndex": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"timelion-sheet": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"namespace": {
"type": "keyword"
},
"type": {
"type": "keyword"
},
"updated_at": {
"type": "date"
},
"url": {
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}
},
"visualization": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"dashboard": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"index-pattern": {
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"timelion-sheet": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"namespace": {
"type": "keyword"
},
"type": {
"type": "keyword"
},
"updated_at": {
"type": "date"
},
"url": {
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
}
},
"visualization": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
}
}
}
}
}
}

View file

@ -9,234 +9,232 @@
}
},
"mappings": {
"doc": {
"properties": {
"type": {
"type": "keyword"
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"properties": {
"type": {
"type": "keyword"
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
}
}
@ -256,15 +254,13 @@
}
},
"mappings": {
"bar": {
"properties": {
"foo": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
"properties": {
"foo": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}
@ -284,15 +280,13 @@
}
},
"mappings": {
"bar": {
"properties": {
"foo": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
"properties": {
"foo": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}

View file

@ -20,7 +20,7 @@
import expect from 'expect.js';
const TEST_INDEX_PATTERN = 'logstash-*';
const TEST_ANCHOR_TYPE = 'doc';
const TEST_ANCHOR_TYPE = '_doc';
const TEST_ANCHOR_ID = 'AU_x3_BrGFA8no6QjjaI';
const TEST_ANCHOR_FILTER_FIELD = 'geo.src';
const TEST_ANCHOR_FILTER_VALUE = 'IN';

View file

@ -20,7 +20,7 @@
import expect from 'expect.js';
const TEST_INDEX_PATTERN = 'logstash-*';
const TEST_ANCHOR_TYPE = 'doc';
const TEST_ANCHOR_TYPE = '_doc';
const TEST_ANCHOR_ID = 'AU_x3_BrGFA8no6QjjaI';
const TEST_DEFAULT_CONTEXT_SIZE = 7;
const TEST_STEP_SIZE = 3;

View file

@ -80,80 +80,7 @@ export default function ({ getService, getPageObjects }) {
});
it('doc view should sort ascending', async function () {
// Note: Could just check the timestamp, but might as well check that the whole doc is as expected.
const ExpectedDoc =
'September 20th 2015, 00:00:00.000\ntype:apache index:logstash-2015.09.20 @timestamp:September 20th 2015, 00:00:00.000'
+ ' ip:143.84.142.7 extension:jpg response:200 geo.coordinates:{ "lat": 38.68407028, "lon": -120.9871642 }'
+ ' geo.src:ES geo.dest:US geo.srcdest:ES:US @tags:error, info utc_time:September 20th 2015, 00:00:00.000'
+ ' referer:http://www.slate.com/success/vladimir-kovalyonok agent:Mozilla/4.0 (compatible; MSIE 6.0;'
+ ' Windows NT 5.1; SV1; .NET CLR 1.1.4322) clientip:143.84.142.7 bytes:1,623'
+ ' host:media-for-the-masses.theacademyofperformingartsandscience.org request:/uploads/steven-hawley.jpg'
+ ' url:https://media-for-the-masses.theacademyofperformingartsandscience.org/uploads/steven-hawley.jpg'
+ ' @message:143.84.142.7 - - [2015-09-20T00:00:00.000Z] "GET /uploads/steven-hawley.jpg HTTP/1.1" 200'
+ ' 1623 "-" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)" spaces:this is a'
+ ' thing with lots of spaces wwwwoooooo xss:<script>console.log("xss")</script>'
+ ' headings:<h3>kimiya-yui</h5>, http://www.slate.com/success/koichi-wakata'
+ ' links:thomas-marshburn@twitter.com, http://www.slate.com/info/michael-p-anderson, www.twitter.com'
+ ' relatedContent:{ "url":'
+ ' "http://www.laweekly.com/music/jay-electronica-much-better-than-his-name-would-suggest-2412364",'
+ ' "og:type": "article", "og:title": "Jay Electronica: Much Better Than His Name Would Suggest",'
+ ' "og:description": "You may not know who Jay Electronica is yet, but I&#039;m willing to bet that you'
+ ' would had he chosen a better name. Jay Electronica does not sound like the ...", "og:url":'
+ ' "http://www.laweekly.com/music/jay-electronica-much-better-than-his-name-would-suggest-2412364",'
+ ' "article:published_time": "2008-04-04T16:00:00-07:00", "article:modified_time":'
+ ' "2014-11-27T08:01:03-08:00", "article:section": "Music", "og:site_name": "LA Weekly", "twitter:title":'
+ ' "Jay Electronica: Much Better Than His Name Would Suggest", "twitter:description": "You may not know'
+ ' who Jay Electronica is yet, but I&#039;m willing to bet that you would had he chosen a better name.'
+ ' Jay Electronica does not sound like the ...", "twitter:card": "summary", "twitter:site": "@laweekly"'
+ ' }, { "url": "http://www.laweekly.com/news/mandoe-on-gower-near-fountain-2368123", "og:type":'
+ ' "article", "og:title": "MANDOE On Gower Near Fountain", "og:description": "MANDOE has a stunner on a'
+ ' wall north of an east-west street crossing Gower around Fountain (but not on Fountain). MADNOE, PROSE'
+ ' and FUKM are listed on t...", "og:url": "'
+ 'http://www.laweekly.com/news/mandoe-on-gower-near-fountain-2368123", "article:published_time":'
+ ' "2008-04-25T07:26:41-07:00", "article:modified_time": "2014-10-28T15:00:08-07:00", "article:section":'
+ ' "News", "og:image": "'
+ 'http://images1.laweekly.com/imager/mandoe-on-gower-near-fountain/u/original/2430891/img_6648.jpg",'
+ ' "og:image:height": "640", "og:image:width": "480", "og:site_name": "LA Weekly", "twitter:title": '
+ '"MANDOE On Gower Near Fountain", "twitter:description": "MANDOE has a stunner on a wall north of an'
+ ' east-west street crossing Gower around Fountain (but not on Fountain). MADNOE, PROSE and FUKM are'
+ ' listed on t...", "twitter:card": "summary", "twitter:image": "'
+ 'http://images1.laweekly.com/imager/mandoe-on-gower-near-fountain/u/original/2430891/img_6648.jpg", '
+ '"twitter:site": "@laweekly" }, { "url": "http://www.laweekly.com/arts/meghan-finds-the-love-2373346",'
+ ' "og:type": "article", "og:title": "Meghan Finds The Love", "og:description": "LA Weekly is the'
+ ' definitive source of information for news, music, movies, restaurants, reviews, and events in Los'
+ ' Angeles.", "og:url": "http://www.laweekly.com/arts/meghan-finds-the-love-2373346",'
+ ' "article:published_time": "2005-10-20T18:10:25-07:00", "article:modified_time":'
+ ' "2014-11-25T19:52:35-08:00", "article:section": "Arts", "og:site_name": "LA Weekly", "twitter:title":'
+ ' "Meghan Finds The Love", "twitter:description": "LA Weekly is the definitive source of information for'
+ ' news, music, movies, restaurants, reviews, and events in Los Angeles.", "twitter:card": "summary",'
+ ' "twitter:site": "@laweekly" }, { "url": "http://www.laweekly.com/arts/these-clowns-are-with-me-2371051'
+ '", "og:type": "article", "og:title": "These Clowns Are With Me", "og:description": "&nbsp; &nbsp; I'
+ ' didn&#039;t mean to blow off all my responsibilities yesterday, but when a schmoozy Hollywood luncheon'
+ ' turns into a full-on party by 3pm, and...", "og:url": "'
+ 'http://www.laweekly.com/arts/these-clowns-are-with-me-2371051", "article:published_time": '
+ '"2006-03-04T17:03:42-08:00", "article:modified_time": "2014-11-25T17:05:47-08:00", "article:section":'
+ ' "Arts", "og:image": "'
+ 'http://images1.laweekly.com/imager/these-clowns-are-with-me/u/original/2434556/e4b8scd.jpg",'
+ ' "og:image:height": "375", "og:image:width": "500", "og:site_name": "LA Weekly", "twitter:title":'
+ ' "These Clowns Are With Me", "twitter:description": "&nbsp; &nbsp; I didn&#039;t mean to blow off all'
+ ' my responsibilities yesterday, but when a schmoozy Hollywood luncheon turns into a full-on party by'
+ ' 3pm, and...", "twitter:card": "summary", "twitter:image": "'
+ 'http://images1.laweekly.com/imager/these-clowns-are-with-me/u/original/2434556/e4b8scd.jpg",'
+ ' "twitter:site": "@laweekly" }, { "url": "http://www.laweekly.com/arts/shopping-daze-2373807",'
+ ' "og:type": "article", "og:title": "Shopping Daze", "og:description": "LA Weekly is the definitive '
+ 'source of information for news, music, movies, restaurants, reviews, and events in Los Angeles.",'
+ ' "og:url": "http://www.laweekly.com/arts/shopping-daze-2373807", "article:published_time":'
+ ' "2006-12-13T12:12:04-08:00", "article:modified_time": "2014-11-25T20:15:21-08:00", "article:section":'
+ ' "Arts", "og:site_name": "LA Weekly", "twitter:title": "Shopping Daze", "twitter:description": "LA'
+ ' Weekly is the definitive source of information for news, music, movies, restaurants, reviews, and'
+ ' events in Los Angeles.", "twitter:card": "summary", "twitter:site": "@laweekly" } machine.os:osx'
+ ' machine.ram:15,032,385,536 _id:AU_x3_g3GFA8no6QjkFm _type:doc _index:logstash-2015.09.20 _score: -'
+ ' relatedContent.article:modified_time:October 28th 2014, 22:00:08.000, November 26th 2014,'
+ ' 01:05:47.000, November 26th 2014, 03:52:35.000, November 26th 2014, 04:15:21.000, November 27th 2014,'
+ ' 16:01:03.000 relatedContent.article:published_time:October 21st 2005, 01:10:25.000, March 5th 2006,'
+ ' 01:03:42.000, December 13th 2006, 20:12:04.000, April 4th 2008, 23:00:00.000, April 25th 2008,'
+ ' 14:26:41.000';
const expectedTimeStamp = 'September 20th 2015, 00:00:00.000';
await PageObjects.discover.clickDocSortDown();
// we don't technically need this sleep here because the tryForTime will retry and the
@ -162,7 +89,8 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.common.sleep(2000);
await retry.try(async function tryingForTime() {
const rowData = await PageObjects.discover.getDocTableIndex(1);
expect(rowData).to.be(ExpectedDoc);
expect(rowData.startsWith(expectedTimeStamp)).to.be.ok();
});
});

View file

@ -56,7 +56,7 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.settings.setScriptedFieldScript(`doc['bytes'].value`);
const response = await es.update({
index: '.kibana',
type: 'doc',
type: '_doc',
id: 'index-pattern:logstash-*',
body: {
'doc': { 'index-pattern': { 'fieldFormatMap': '{"geo.src":{"id":"number"}}' } }
@ -83,7 +83,7 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.settings.setFieldFormat('url');
const response = await es.update({
index: '.kibana',
type: 'doc',
type: '_doc',
id: 'index-pattern:logstash-*',
body: {
'doc': { 'index-pattern': { 'fieldFormatMap': '{"geo.dest":{"id":"number"}}' } }

View file

@ -29,7 +29,7 @@ export default function ({ getService, getPageObjects }) {
describe('creating and deleting default index', function describeIndexTests() {
before(function () {
// delete .kibana index and then wait for Kibana to re-create it
// Delete .kibana index and then wait for Kibana to re-create it
return kibanaServer.uiSettings.replace({})
.then(function () {
return PageObjects.settings.navigateTo();

View file

@ -9,15 +9,13 @@
}
},
"mappings": {
"doc": {
"properties": {
"message": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
"properties": {
"message": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}
@ -37,11 +35,9 @@
}
},
"mappings": {
"doc": {
"properties": {
"date": {
"type": "date"
}
"properties": {
"date": {
"type": "date"
}
}
}
@ -59,15 +55,13 @@
}
},
"mappings": {
"doc": {
"properties": {
"message": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
"properties": {
"message": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}
@ -87,15 +81,13 @@
}
},
"mappings": {
"doc": {
"properties": {
"message": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
"properties": {
"message": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}
@ -115,11 +107,9 @@
}
},
"mappings": {
"doc": {
"properties": {
"date": {
"type": "date"
}
"properties": {
"date": {
"type": "date"
}
}
}
@ -137,11 +127,9 @@
}
},
"mappings": {
"doc": {
"properties": {
"date": {
"type": "date"
}
"properties": {
"date": {
"type": "date"
}
}
}
@ -159,11 +147,9 @@
}
},
"mappings": {
"doc": {
"properties": {
"date": {
"type": "date"
}
"properties": {
"date": {
"type": "date"
}
}
}
@ -181,11 +167,9 @@
}
},
"mappings": {
"doc": {
"properties": {
"date": {
"type": "date"
}
"properties": {
"date": {
"type": "date"
}
}
}
@ -203,15 +187,13 @@
}
},
"mappings": {
"doc": {
"properties": {
"message": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
"properties": {
"message": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}

View file

@ -10,265 +10,263 @@
}
},
"mappings": {
"doc": {
"dynamic": "strict",
"properties": {
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"dateFormat:tz": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"defaultIndex": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"notifications:lifetime:banner": {
"type": "long"
},
"notifications:lifetime:error": {
"type": "long"
},
"notifications:lifetime:info": {
"type": "long"
},
"notifications:lifetime:warning": {
"type": "long"
}
}
},
"dashboard": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"index-pattern": {
"properties": {
"fieldFormatMap": {
"type": "text"
},
"dynamic": "strict",
"properties": {
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"dateFormat:tz": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
"keyword": {
"type": "keyword",
"ignore_above": 256
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"timelion-sheet": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"defaultIndex": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"notifications:lifetime:banner": {
"type": "long"
},
"notifications:lifetime:error": {
"type": "long"
},
"notifications:lifetime:info": {
"type": "long"
},
"notifications:lifetime:warning": {
"type": "long"
}
},
"type": {
"type": "keyword"
},
"updated_at": {
"type": "date"
},
"url": {
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
},
"dashboard": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"index-pattern": {
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"timelion-sheet": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"type": {
"type": "keyword"
},
"updated_at": {
"type": "date"
},
"url": {
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
},
"visualization": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"visualization": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
}
}
}
}
}
}

View file

@ -9,232 +9,230 @@
}
},
"mappings": {
"doc": {
"properties": {
"type": {
"type": "keyword"
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"properties": {
"type": {
"type": "keyword"
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}

View file

@ -9,234 +9,232 @@
}
},
"mappings": {
"doc": {
"properties": {
"type": {
"type": "keyword"
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"properties": {
"type": {
"type": "keyword"
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
}

View file

@ -9,241 +9,239 @@
}
},
"mappings": {
"doc": {
"properties": {
"type": {
"type": "keyword"
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
"properties": {
"type": {
"type": "keyword"
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
}
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"dateFormat:tz": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"dateFormat:tz": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}

View file

@ -9,14 +9,20 @@
}
},
"mappings": {
"doc": {
"properties": {
"speaker": {"type": "keyword"},
"play_name": {"type": "keyword"},
"line_id": {"type": "integer"},
"speech_number": {"type": "integer"}
"properties": {
"speaker": {
"type": "keyword"
},
"play_name": {
"type": "keyword"
},
"line_id": {
"type": "integer"
},
"speech_number": {
"type": "integer"
}
}
}
}
}
}

View file

@ -9,19 +9,17 @@
}
},
"mappings": {
"test": {
"properties": {
"mybook": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
"properties": {
"mybook": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}
}
}
}
}
}

View file

@ -9,244 +9,242 @@
}
},
"mappings": {
"doc": {
"dynamic": "strict",
"properties": {
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"defaultIndex": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}
}
},
"dashboard": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"index-pattern": {
"properties": {
"fieldFormatMap": {
"type": "text"
},
"dynamic": "strict",
"properties": {
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"defaultIndex": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"timelion-sheet": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"type": {
"type": "keyword"
},
"updated_at": {
"type": "date"
},
"url": {
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}
},
"visualization": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"dashboard": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"index-pattern": {
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"timelion-sheet": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"type": {
"type": "keyword"
},
"updated_at": {
"type": "date"
},
"url": {
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
}
},
"visualization": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
}
}
}
}
}
}

View file

@ -9,89 +9,87 @@
}
},
"mappings": {
"_doc": {
"properties": {
"AvgTicketPrice": {
"type": "float"
},
"Cancelled": {
"type": "boolean"
},
"Carrier": {
"type": "keyword"
},
"Dest": {
"type": "keyword"
},
"DestAirportID": {
"type": "keyword"
},
"DestCityName": {
"type": "keyword"
},
"DestCountry": {
"type": "keyword"
},
"DestLocation": {
"type": "geo_point"
},
"DestRegion": {
"type": "keyword"
},
"DestWeather": {
"type": "keyword"
},
"DistanceKilometers": {
"type": "float"
},
"DistanceMiles": {
"type": "float"
},
"FlightDelay": {
"type": "boolean"
},
"FlightDelayMin": {
"type": "integer"
},
"FlightDelayType": {
"type": "keyword"
},
"FlightNum": {
"type": "keyword"
},
"FlightTimeHour": {
"type": "keyword"
},
"FlightTimeMin": {
"type": "float"
},
"Origin": {
"type": "keyword"
},
"OriginAirportID": {
"type": "keyword"
},
"OriginCityName": {
"type": "keyword"
},
"OriginCountry": {
"type": "keyword"
},
"OriginLocation": {
"type": "geo_point"
},
"OriginRegion": {
"type": "keyword"
},
"OriginWeather": {
"type": "keyword"
},
"dayOfWeek": {
"type": "integer"
},
"timestamp": {
"type": "date"
}
"properties": {
"AvgTicketPrice": {
"type": "float"
},
"Cancelled": {
"type": "boolean"
},
"Carrier": {
"type": "keyword"
},
"Dest": {
"type": "keyword"
},
"DestAirportID": {
"type": "keyword"
},
"DestCityName": {
"type": "keyword"
},
"DestCountry": {
"type": "keyword"
},
"DestLocation": {
"type": "geo_point"
},
"DestRegion": {
"type": "keyword"
},
"DestWeather": {
"type": "keyword"
},
"DistanceKilometers": {
"type": "float"
},
"DistanceMiles": {
"type": "float"
},
"FlightDelay": {
"type": "boolean"
},
"FlightDelayMin": {
"type": "integer"
},
"FlightDelayType": {
"type": "keyword"
},
"FlightNum": {
"type": "keyword"
},
"FlightTimeHour": {
"type": "keyword"
},
"FlightTimeMin": {
"type": "float"
},
"Origin": {
"type": "keyword"
},
"OriginAirportID": {
"type": "keyword"
},
"OriginCityName": {
"type": "keyword"
},
"OriginCountry": {
"type": "keyword"
},
"OriginLocation": {
"type": "geo_point"
},
"OriginRegion": {
"type": "keyword"
},
"OriginWeather": {
"type": "keyword"
},
"dayOfWeek": {
"type": "integer"
},
"timestamp": {
"type": "date"
}
}
},

View file

@ -14,13 +14,11 @@
}
},
"mappings": {
"test": {
"properties": {
"date": {
"type": "date"
}
"properties": {
"date": {
"type": "date"
}
}
}
}
}
}

File diff suppressed because it is too large Load diff

View file

@ -9,234 +9,232 @@
}
},
"mappings": {
"doc": {
"properties": {
"type": {
"type": "keyword"
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
"properties": {
"type": {
"type": "keyword"
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
}

View file

@ -10,269 +10,267 @@
}
},
"mappings": {
"doc": {
"dynamic": "strict",
"properties": {
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"defaultIndex": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}
}
},
"dashboard": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"graph-workspace": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"numLinks": {
"type": "integer"
},
"numVertices": {
"type": "integer"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
},
"wsState": {
"type": "text"
}
}
},
"index-pattern": {
"properties": {
"fieldFormatMap": {
"type": "text"
},
"dynamic": "strict",
"properties": {
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"defaultIndex": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"timelion-sheet": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"type": {
"type": "keyword"
},
"updated_at": {
"type": "date"
},
"url": {
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}
},
"visualization": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"dashboard": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"graph-workspace": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"numLinks": {
"type": "integer"
},
"numVertices": {
"type": "integer"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
},
"wsState": {
"type": "text"
}
}
},
"index-pattern": {
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"timelion-sheet": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"type": {
"type": "keyword"
},
"updated_at": {
"type": "date"
},
"url": {
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
}
},
"visualization": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
}

View file

@ -9,232 +9,230 @@
}
},
"mappings": {
"doc": {
"properties": {
"type": {
"type": "keyword"
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"properties": {
"type": {
"type": "keyword"
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}

View file

@ -9,234 +9,232 @@
}
},
"mappings": {
"doc": {
"properties": {
"type": {
"type": "keyword"
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
"properties": {
"type": {
"type": "keyword"
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
}

View file

@ -9,234 +9,232 @@
}
},
"mappings": {
"doc": {
"properties": {
"type": {
"type": "keyword"
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
"properties": {
"type": {
"type": "keyword"
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
}

View file

@ -9,232 +9,230 @@
}
},
"mappings": {
"doc": {
"properties": {
"type": {
"type": "keyword"
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
"properties": {
"type": {
"type": "keyword"
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
}
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}

View file

@ -9,252 +9,250 @@
}
},
"mappings": {
"doc": {
"properties": {
"type": {
"type": "keyword"
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"properties": {
"type": {
"type": "keyword"
},
"index-pattern": {
"dynamic": "strict",
"properties": {
"fieldFormatMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
}
}
},
"server": {
"dynamic": "strict",
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"dashboard": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"search": {
"dynamic": "strict",
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"url": {
"dynamic": "strict",
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
"keyword": {
"type": "keyword",
"ignore_above": 2048
}
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"dateFormat:tz": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"dateFormat:tz": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
},
"defaultIndex": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"defaultIndex": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"visualization": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion-sheet": {
"dynamic": "strict",
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
}

View file

@ -44,6 +44,8 @@ export function ContextPageProvider({ getService, getPageObjects }) {
hash: `${config.get('apps.context.hash')}/${indexPattern}/${anchorType}/${anchorId}?_a=${initialState}`,
});
log.debug(`browser.get(${appUrl})`);
await browser.get(appUrl);
await PageObjects.header.awaitGlobalLoadingIndicatorHidden();
await this.waitUntilContextLoadingHasFinished();
@ -91,8 +93,8 @@ export function ContextPageProvider({ getService, getPageObjects }) {
return await retry.try(async () => {
const successorLoadMoreButton = await this.getSuccessorLoadMoreButton();
const predecessorLoadMoreButton = await this.getPredecessorLoadMoreButton();
if (!(successorLoadMoreButton.isEnabled() && successorLoadMoreButton.isDisplayed() &&
predecessorLoadMoreButton.isEnabled() && predecessorLoadMoreButton.isDisplayed())) {
if (!(await successorLoadMoreButton.isEnabled() && await successorLoadMoreButton.isDisplayed() &&
await predecessorLoadMoreButton.isEnabled() && await predecessorLoadMoreButton.isDisplayed())) {
throw new Error('loading context rows');
}
});

View file

@ -24,6 +24,7 @@ async function executeUpgrade(callWithRequest) {
return callWithRequest('indices.putMapping', {
index: INDEX_NAMES.PIPELINES,
include_type_name: true,
type: TYPE_NAMES.PIPELINES,
body: {
properties: {

View file

@ -88,6 +88,7 @@ export function createIndex(client, indexName,
if (!exists) {
return client.indices.create({
index: indexName,
include_type_name: true,
body: body
})
.then(() => true)
@ -99,7 +100,12 @@ export function createIndex(client, indexName,
* This catch block is in place to not fail a job if the job runner hits this race condition.
* Unfortunately we don't have a logger in scope to log a warning.
*/
err; // no-op
const isIndexExistsError = err && err.body && err.body.error && err.body.error.type === 'resource_already_exists_exception';
if (isIndexExistsError) {
return true;
}
throw err;
});
}
return exists;

View file

@ -86,18 +86,18 @@
"count": 0
},
"apm": {
"totalEvents": null,
"memRss": null,
"memTotal": null,
"totalEvents": 0,
"memRss": 0,
"memTotal": 0,
"apms": {
"total": null
"total": 0
}
},
"beats": {
"totalEvents": null,
"bytesSent": null,
"totalEvents": 0,
"bytesSent": 0,
"beats": {
"total": null,
"total": 0,
"types": []
}
},
@ -201,18 +201,18 @@
"count": 0
},
"apm": {
"totalEvents": null,
"memRss": null,
"memTotal": null,
"totalEvents": 0,
"memRss": 0,
"memTotal": 0,
"apms": {
"total": null
"total": 0
}
},
"beats": {
"totalEvents": null,
"bytesSent": null,
"totalEvents": 0,
"bytesSent": 0,
"beats": {
"total": null,
"total": 0,
"types": []
}
},
@ -318,18 +318,18 @@
"count": 1
},
"apm": {
"totalEvents": null,
"memRss": null,
"memTotal": null,
"totalEvents": 0,
"memRss": 0,
"memTotal": 0,
"apms": {
"total": null
"total": 0
}
},
"beats": {
"totalEvents": null,
"bytesSent": null,
"totalEvents": 0,
"bytesSent": 0,
"beats": {
"total": null,
"total": 0,
"types": []
}
},

View file

@ -88,18 +88,18 @@
"count": 1
},
"apm": {
"totalEvents": null,
"memRss": null,
"memTotal": null,
"totalEvents": 0,
"memRss": 0,
"memTotal": 0,
"apms": {
"total": null
"total": 0
}
},
"beats": {
"totalEvents": null,
"bytesSent": null,
"totalEvents": 0,
"bytesSent": 0,
"beats": {
"total": null,
"total": 0,
"types": []
}
},

Some files were not shown because too many files have changed in this diff Show more