Skip to content

Commit 16c32dc

Browse files
committed
Merge branch 'master' of github.com:yctercero/kibana into rule_markdown_de_fe
2 parents 03fcaa7 + 271c959 commit 16c32dc

File tree

107 files changed

+3551
-3255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+3551
-3255
lines changed

src/core/server/saved_objects/serialization/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export interface SavedObjectsRawDocSource {
5050
* scenario out of the box.
5151
*/
5252
interface SavedObjectDoc {
53-
attributes: unknown;
53+
attributes: any;
5454
id?: string; // NOTE: SavedObjectDoc is used for uncreated objects where `id` is optional
5555
type: string;
5656
namespace?: string;

src/legacy/core_plugins/data/index.ts

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
import { resolve } from 'path';
2121
import { Legacy } from '../../../../kibana';
22-
import { mappings } from './mappings';
23-
import { SavedQuery } from '../../../plugins/data/public';
2422

2523
// eslint-disable-next-line import/no-default-export
2624
export default function DataPlugin(kibana: any) {
@@ -36,23 +34,6 @@ export default function DataPlugin(kibana: any) {
3634
init: (server: Legacy.Server) => ({}),
3735
uiExports: {
3836
injectDefaultVars: () => ({}),
39-
mappings,
40-
savedObjectsManagement: {
41-
query: {
42-
icon: 'search',
43-
defaultSearchField: 'title',
44-
isImportableAndExportable: true,
45-
getTitle(obj: SavedQuery) {
46-
return obj.attributes.title;
47-
},
48-
getInAppUrl(obj: SavedQuery) {
49-
return {
50-
path: `/app/kibana#/discover?_a=(savedQuery:'${encodeURIComponent(obj.id)}')`,
51-
uiCapabilitiesPath: 'discover.show',
52-
};
53-
},
54-
},
55-
},
5637
},
5738
};
5839

src/legacy/core_plugins/kibana/index.js

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -126,57 +126,6 @@ export default function(kibana) {
126126
],
127127

128128
savedObjectsManagement: {
129-
'index-pattern': {
130-
icon: 'indexPatternApp',
131-
defaultSearchField: 'title',
132-
isImportableAndExportable: true,
133-
getTitle(obj) {
134-
return obj.attributes.title;
135-
},
136-
getEditUrl(obj) {
137-
return `/management/kibana/index_patterns/${encodeURIComponent(obj.id)}`;
138-
},
139-
getInAppUrl(obj) {
140-
return {
141-
path: `/app/kibana#/management/kibana/index_patterns/${encodeURIComponent(obj.id)}`,
142-
uiCapabilitiesPath: 'management.kibana.index_patterns',
143-
};
144-
},
145-
},
146-
visualization: {
147-
icon: 'visualizeApp',
148-
defaultSearchField: 'title',
149-
isImportableAndExportable: true,
150-
getTitle(obj) {
151-
return obj.attributes.title;
152-
},
153-
getEditUrl(obj) {
154-
return `/management/kibana/objects/savedVisualizations/${encodeURIComponent(obj.id)}`;
155-
},
156-
getInAppUrl(obj) {
157-
return {
158-
path: `/app/kibana#/visualize/edit/${encodeURIComponent(obj.id)}`,
159-
uiCapabilitiesPath: 'visualize.show',
160-
};
161-
},
162-
},
163-
search: {
164-
icon: 'discoverApp',
165-
defaultSearchField: 'title',
166-
isImportableAndExportable: true,
167-
getTitle(obj) {
168-
return obj.attributes.title;
169-
},
170-
getEditUrl(obj) {
171-
return `/management/kibana/objects/savedSearches/${encodeURIComponent(obj.id)}`;
172-
},
173-
getInAppUrl(obj) {
174-
return {
175-
path: `/app/kibana#/discover/${encodeURIComponent(obj.id)}`,
176-
uiCapabilitiesPath: 'discover.show',
177-
};
178-
},
179-
},
180129
dashboard: {
181130
icon: 'dashboardApp',
182131
defaultSearchField: 'title',

src/legacy/core_plugins/kibana/mappings.json

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,4 @@
11
{
2-
"index-pattern": {
3-
"properties": {
4-
"fieldFormatMap": {
5-
"type": "text"
6-
},
7-
"fields": {
8-
"type": "text"
9-
},
10-
"intervalName": {
11-
"type": "keyword"
12-
},
13-
"notExpandable": {
14-
"type": "boolean"
15-
},
16-
"sourceFilters": {
17-
"type": "text"
18-
},
19-
"timeFieldName": {
20-
"type": "keyword"
21-
},
22-
"title": {
23-
"type": "text"
24-
},
25-
"type": {
26-
"type": "keyword"
27-
},
28-
"typeMeta": {
29-
"type": "keyword"
30-
}
31-
}
32-
},
33-
"visualization": {
34-
"properties": {
35-
"description": {
36-
"type": "text"
37-
},
38-
"kibanaSavedObjectMeta": {
39-
"properties": {
40-
"searchSourceJSON": {
41-
"type": "text"
42-
}
43-
}
44-
},
45-
"savedSearchRefName": {
46-
"type": "keyword"
47-
},
48-
"title": {
49-
"type": "text"
50-
},
51-
"uiStateJSON": {
52-
"type": "text"
53-
},
54-
"version": {
55-
"type": "integer"
56-
},
57-
"visState": {
58-
"type": "text"
59-
}
60-
}
61-
},
62-
"search": {
63-
"properties": {
64-
"columns": {
65-
"type": "keyword"
66-
},
67-
"description": {
68-
"type": "text"
69-
},
70-
"hits": {
71-
"type": "integer"
72-
},
73-
"kibanaSavedObjectMeta": {
74-
"properties": {
75-
"searchSourceJSON": {
76-
"type": "text"
77-
}
78-
}
79-
},
80-
"sort": {
81-
"type": "keyword"
82-
},
83-
"title": {
84-
"type": "text"
85-
},
86-
"version": {
87-
"type": "integer"
88-
}
89-
}
90-
},
912
"dashboard": {
923
"properties": {
934
"description": {

0 commit comments

Comments
 (0)