Skip to content

Commit a756fc2

Browse files
committed
Merge branch 'main' of https://github.com/elastic/kibana into telemetry_unencrypted
2 parents 4944a9b + dd13c8e commit a756fc2

File tree

8 files changed

+75
-13
lines changed

8 files changed

+75
-13
lines changed

docs/maps/images/drawing_layer.png

304 KB
Loading

docs/maps/import-geospatial-data.asciidoc

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spaces in **{stack-manage-app}** in {kib}. For more information, see
1919
{ref}/security-privileges.html[Security privileges],
2020
<<kibana-privileges, {kib} privileges>>, and <<kibana-role-management, {kib} role management>>.
2121

22-
To upload GeoJSON files in {kib} with *Maps*, you must have:
22+
To upload GeoJSON files and draw features in {kib} with *Maps*, you must have:
2323

2424
* The `all` {kib} privilege for *Maps*
2525
* The `all` {kib} privilege for *{ipm-app}*
@@ -58,6 +58,55 @@ On the {kib} home page, you can upload a file and import it into an {es} index w
5858
. Use the file chooser to select a GeoJSON file.
5959
. Click *Import file*.
6060

61+
[discrete]
62+
=== Draw features in a map
63+
64+
Upload features into {es} by drawing lines, polygons, circles, bounding boxes, and points in a map.
65+
66+
To create a new index for drawing:
67+
68+
. <<maps-create, Create a map>>.
69+
. Click *Add layer*.
70+
. Select *Create index*.
71+
. Set *Index name*.
72+
. Click *Create index*.
73+
74+
To open an existing index for drawing:
75+
76+
. <<maps-create, Create a map>>.
77+
78+
. Click *Add layer*.
79+
80+
. Select *Documents*.
81+
82+
. Select the data view that points to your index. A <<data-views, data view>> can point to one or more indices. For feature editing, the data view must point to a single index.
83+
84+
. Click *Add layer*.
85+
86+
. Set *Scaling* to *Limit results to 10,000*.
87+
88+
. In **Filtering**:
89+
** Clear the *Apply global search to layer data* checkbox.
90+
** If your data view contains a default time field, clear the *Apply global time to layer data* checkbox.
91+
92+
. Click *Save & close*.
93+
94+
. In the legend, click the layer name and select *Edit features*.
95+
96+
When feature editing is open, a feature editing toolbox is displayed on the left side of the map.
97+
98+
[role="screenshot"]
99+
image::maps/images/drawing_layer.png[]
100+
101+
To draw features:
102+
103+
. Click on the line, polygon, circle, bounding box, or point icon.
104+
. Move the mouse cursor over the map and follow the on screen instructions to draw a feature.
105+
+
106+
When a feature is complete, the feature is added to the index as a new document.
107+
. Repeat to draw additional features.
108+
. When you are finished adding features, go to the legend, and click *Exit* under the layer name.
109+
61110
[discrete]
62111
=== Upload data with IP addresses
63112

x-pack/plugins/data_visualizer/kibana.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@
2020
"home",
2121
"lens",
2222
"dataViewFieldEditor",
23-
"customIntegrations"
23+
"customIntegrations",
24+
"cloud"
2425
],
2526
"requiredBundles": [
2627
"home",
2728
"kibanaReact",
2829
"maps",
2930
"esUiShared",
3031
"fieldFormats",
31-
"uiActions"
32+
"uiActions",
33+
"cloud"
3234
],
3335
"owner": {
3436
"name": "Machine Learning UI",

x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ import {
3030
processResults,
3131
} from '../../../common/components/utils';
3232

33+
import { Chat } from '../../../../../../cloud/public';
34+
3335
import { MODE } from './constants';
3436

3537
export class FileDataVisualizerView extends Component {
@@ -383,6 +385,7 @@ export class FileDataVisualizerView extends Component {
383385
)}
384386
</>
385387
)}
388+
<Chat />
386389
</div>
387390
);
388391
}

x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.tsx

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ interface Props {
2323
export type FileDataVisualizerSpec = typeof FileDataVisualizer;
2424
export const FileDataVisualizer: FC<Props> = ({ additionalLinks }) => {
2525
const coreStart = getCoreStart();
26-
const { data, maps, embeddable, share, security, fileUpload } = getPluginsStart();
26+
const { data, maps, embeddable, share, security, fileUpload, cloud } = getPluginsStart();
2727
const services = {
2828
data,
2929
maps,
@@ -34,17 +34,22 @@ export const FileDataVisualizer: FC<Props> = ({ additionalLinks }) => {
3434
...coreStart,
3535
};
3636

37+
const EmptyContext: FC = ({ children }) => <>{children}</>;
38+
const CloudContext = cloud?.CloudContextProvider || EmptyContext;
39+
3740
return (
3841
<KibanaThemeProvider theme$={coreStart.theme.theme$}>
3942
<KibanaContextProvider services={{ ...services }}>
40-
<FileDataVisualizerView
41-
indexPatterns={data.indexPatterns}
42-
savedObjectsClient={coreStart.savedObjects.client}
43-
http={coreStart.http}
44-
fileUpload={fileUpload}
45-
resultsLinks={additionalLinks}
46-
capabilities={coreStart.application.capabilities}
47-
/>
43+
<CloudContext>
44+
<FileDataVisualizerView
45+
indexPatterns={data.indexPatterns}
46+
savedObjectsClient={coreStart.savedObjects.client}
47+
http={coreStart.http}
48+
fileUpload={fileUpload}
49+
resultsLinks={additionalLinks}
50+
capabilities={coreStart.application.capabilities}
51+
/>
52+
</CloudContext>
4853
</KibanaContextProvider>
4954
</KibanaThemeProvider>
5055
);

x-pack/plugins/data_visualizer/public/plugin.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import { CoreSetup, CoreStart } from 'kibana/public';
99
import { ChartsPluginStart } from 'src/plugins/charts/public';
10+
import type { CloudStart } from '../../cloud/public';
1011
import type { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public';
1112
import type { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
1213
import { Plugin } from '../../../../src/core/public';
@@ -44,6 +45,7 @@ export interface DataVisualizerStartDependencies {
4445
dataViewFieldEditor?: IndexPatternFieldEditorStart;
4546
fieldFormats: FieldFormatsStart;
4647
uiActions?: UiActionsStart;
48+
cloud?: CloudStart;
4749
}
4850

4951
export type DataVisualizerPluginSetup = ReturnType<DataVisualizerPlugin['setup']>;

x-pack/plugins/data_visualizer/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
{ "path": "../file_upload/tsconfig.json" },
2626
{ "path": "../lens/tsconfig.json" },
2727
{ "path": "../maps/tsconfig.json" },
28+
{ "path": "../cloud/tsconfig.json" },
2829
{ "path": "../../../src/plugins/embeddable/tsconfig.json" }
2930
]
3031
}

x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/fleet_server_on_prem_instructions.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ export const AddFleetServerHostStepContent = ({
461461
<EuiFlexItem>
462462
<EuiFieldText
463463
fullWidth
464-
placeholder={'e.g. http://127.0.0.1:8220'}
464+
placeholder={'e.g. https://127.0.0.1:8220'}
465465
value={fleetServerHost}
466466
isInvalid={!!error}
467467
onChange={onChange}

0 commit comments

Comments
 (0)