Skip to content

Commit

Permalink
Merge branch 'master' into add-time-format
Browse files Browse the repository at this point in the history
  • Loading branch information
FrankHassanabad committed Oct 7, 2020
2 parents d527ea5 + 128485c commit 3f5ea9f
Show file tree
Hide file tree
Showing 42 changed files with 954 additions and 225 deletions.
3 changes: 2 additions & 1 deletion .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"targetBranchChoices": [
{ "name": "master", "checked": true },
{ "name": "7.x", "checked": true },
"7.10",
"7.9",
"7.8",
"7.7",
Expand All @@ -27,7 +28,7 @@
"targetPRLabels": ["backport"],
"branchLabelMapping": {
"^v8.0.0$": "master",
"^v7.10.0$": "7.x",
"^v7.11.0$": "7.x",
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[chapter]
[role="xpack"]
[[ingest-manager]]
= {ingest-manager}
[[fleet]]
= {fleet}

experimental[]

{ingest-manager} in {kib} enables you to add and manage integrations for popular
{fleet} in {kib} enables you to add and manage integrations for popular
services and platforms, as well as manage {elastic-agent} installations in
standalone or {fleet} mode.

Expand All @@ -17,11 +17,13 @@ Standalone mode requires you to manually configure and manage the agent locally.
* An overview of the data ingest in your {es} cluster.
* Multiple integrations to collect and transform data.

//TODO: Redo screen capture.

[role="screenshot"]
image::ingest_manager/images/ingest-manager-start.png[{ingest-manager} app in {kib}]
image::fleet/images/fleet-start.png[{fleet} app in {kib}]

[float]
== Get started

To get started with {ingest-management}, refer to the
To get started with {fleet}, refer to the
{ingest-guide}/index.html[Ingest Management Guide].
Binary file added docs/fleet/images/fleet-start.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/ingest_manager/images/ingest-manager-start.png
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
[role="xpack"]
[[ingest-manager-settings-kb]]
=== {ingest-manager} settings in {kib}
[[fleet-settings-kb]]
=== {fleet} settings in {kib}
++++
<titleabbrev>{ingest-manager} settings</titleabbrev>
<titleabbrev>{fleet} settings</titleabbrev>
++++

experimental[]

You can configure `xpack.fleet` settings in your `kibana.yml`.
By default, {ingest-manager} is enabled. To use {fleet}, you also need to configure {kib} and {es} hosts.
By default, {fleet} is enabled. To use {fleet}, you also need to configure {kib} and {es} hosts.

See the {ingest-guide}/index.html[Ingest Management] docs for more information.

[[general-ingest-manager-settings-kb]]
==== General {ingest-manager} settings
[[general-fleet-settings-kb]]
==== General {fleet} settings

[cols="2*<"]
|===
| `xpack.fleet.enabled` {ess-icon}
| Set to `true` (default) to enable {ingest-manager}.
| Set to `true` (default) to enable {fleet}.
| `xpack.fleet.agents.enabled` {ess-icon}
| Set to `true` (default) to enable {fleet}.
|===

[[ingest-manager-data-visualizer-settings]]
[[fleet-data-visualizer-settings]]

==== {package-manager} settings

Expand Down
2 changes: 1 addition & 1 deletion docs/settings/settings-xkb.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ include::ml-settings.asciidoc[]
include::reporting-settings.asciidoc[]
include::spaces-settings.asciidoc[]
include::i18n-settings.asciidoc[]
include::ingest-manager-settings.asciidoc[]
include::fleet-settings.asciidoc[]
2 changes: 1 addition & 1 deletion docs/setup/settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ include::{kib-repo-dir}/settings/alert-action-settings.asciidoc[]
include::{kib-repo-dir}/settings/apm-settings.asciidoc[]
include::{kib-repo-dir}/settings/dev-settings.asciidoc[]
include::{kib-repo-dir}/settings/graph-settings.asciidoc[]
include::{kib-repo-dir}/settings/ingest-manager-settings.asciidoc[]
include::{kib-repo-dir}/settings/fleet-settings.asciidoc[]
include::{kib-repo-dir}/settings/i18n-settings.asciidoc[]
include::{kib-repo-dir}/settings/logs-ui-settings.asciidoc[]
include::{kib-repo-dir}/settings/infrastructure-ui-settings.asciidoc[]
Expand Down
2 changes: 1 addition & 1 deletion docs/user/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ include::monitoring/index.asciidoc[]

include::management.asciidoc[]

include::{kib-repo-dir}/ingest_manager/ingest-manager.asciidoc[]
include::{kib-repo-dir}/fleet/fleet.asciidoc[]

include::reporting/index.asciidoc[]

Expand Down
12 changes: 9 additions & 3 deletions packages/kbn-pm/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ function help() {
--oss Do not include the x-pack when running command.
--skip-kibana-plugins Filter all plugins in ./plugins and ../kibana-extra when running command.
--no-cache Disable the bootstrap cache
--no-validate Disable the bootstrap yarn.lock validation
--verbose Set log level to verbose
--debug Set log level to debug
--quiet Set log level to error
Expand All @@ -222,9 +223,10 @@ async function run(argv) {
i: 'include'
},
default: {
cache: true
cache: true,
validate: true
},
boolean: ['prefer-offline', 'frozen-lockfile', 'cache']
boolean: ['prefer-offline', 'frozen-lockfile', 'cache', 'validate']
});
const args = options._;

Expand Down Expand Up @@ -8998,7 +9000,11 @@ const BootstrapCommand = {
}

const yarnLock = await Object(_utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__["readYarnLock"])(kbn);
await Object(_utils_validate_yarn_lock__WEBPACK_IMPORTED_MODULE_7__["validateYarnLock"])(kbn, yarnLock);

if (options.validate) {
await Object(_utils_validate_yarn_lock__WEBPACK_IMPORTED_MODULE_7__["validateYarnLock"])(kbn, yarnLock);
}

await Object(_utils_link_project_executables__WEBPACK_IMPORTED_MODULE_0__["linkProjectExecutables"])(projects, projectGraph);
/**
* At the end of the bootstrapping process we call all `kbn:bootstrap` scripts
Expand Down
4 changes: 3 additions & 1 deletion packages/kbn-pm/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function help() {
--oss Do not include the x-pack when running command.
--skip-kibana-plugins Filter all plugins in ./plugins and ../kibana-extra when running command.
--no-cache Disable the bootstrap cache
--no-validate Disable the bootstrap yarn.lock validation
--verbose Set log level to verbose
--debug Set log level to debug
--quiet Set log level to error
Expand Down Expand Up @@ -80,8 +81,9 @@ export async function run(argv: string[]) {
},
default: {
cache: true,
validate: true,
},
boolean: ['prefer-offline', 'frozen-lockfile', 'cache'],
boolean: ['prefer-offline', 'frozen-lockfile', 'cache', 'validate'],
});

const args = options._;
Expand Down
26 changes: 0 additions & 26 deletions packages/kbn-pm/src/commands/__snapshots__/bootstrap.test.ts.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions packages/kbn-pm/src/commands/bootstrap.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ afterEach(() => {
jest.restoreAllMocks();
});

test('handles dependencies of dependencies', async () => {
// FLAKY: https://github.com/elastic/kibana/issues/79891
test.skip('handles dependencies of dependencies', async () => {
const kibana = createProject({
dependencies: {
bar: '1.0.0',
Expand Down Expand Up @@ -141,7 +142,8 @@ test('handles dependencies of dependencies', async () => {
`);
});

test('does not run installer if no deps in package', async () => {
// FLAKY: https://github.com/elastic/kibana/issues/79891
test.skip('does not run installer if no deps in package', async () => {
const kibana = createProject({
dependencies: {
bar: '1.0.0',
Expand Down
4 changes: 3 additions & 1 deletion packages/kbn-pm/src/commands/bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ export const BootstrapCommand: ICommand = {

const yarnLock = await readYarnLock(kbn);

await validateYarnLock(kbn, yarnLock);
if (options.validate) {
await validateYarnLock(kbn, yarnLock);
}

await linkProjectExecutables(projects, projectGraph);

Expand Down
6 changes: 3 additions & 3 deletions src/plugins/dashboard/server/saved_objects/dashboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ export const dashboardSavedObjectType: SavedObjectsType = {
description: { type: 'text' },
hits: { type: 'integer', index: false, doc_values: false },
kibanaSavedObjectMeta: {
properties: { searchSourceJSON: { type: 'text', index: false, doc_values: false } },
properties: { searchSourceJSON: { type: 'text', index: false } },
},
optionsJSON: { type: 'text', index: false, doc_values: false },
panelsJSON: { type: 'text', index: false, doc_values: false },
optionsJSON: { type: 'text', index: false },
panelsJSON: { type: 'text', index: false },
refreshInterval: {
properties: {
display: { type: 'keyword', index: false, doc_values: false },
Expand Down
7 changes: 6 additions & 1 deletion src/plugins/data/public/search/errors/timeout_error.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,12 @@ export class SearchTimeoutError extends KbnError {
<>
<EuiSpacer size="s" />
<EuiText textAlign="right">
<EuiButton color="danger" onClick={() => this.onClick(application)} size="s">
<EuiButton
color="danger"
onClick={() => this.onClick(application)}
size="s"
data-test-subj="searchTimeoutError"
>
{actionText}
</EuiButton>
</EuiText>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
}

.globalFilterItem-isError, .globalFilterItem-isWarning {
text-decoration: none;

.globalFilterLabel__value {
font-weight: $euiFontWeightBold;
}
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/data/public/ui/search_bar/search_bar.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ function wrapSearchBarInContext(testProps: any) {
);
}

describe('SearchBar', () => {
// FLAKY: https://github.com/elastic/kibana/issues/79910
describe.skip('SearchBar', () => {
const SEARCH_BAR_TEST_ID = 'globalQueryBar';
const SEARCH_BAR_ROOT = '.globalQueryBar';
const FILTER_BAR = '.globalFilterBar';
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/discover/server/saved_objects/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const searchSavedObjectType: SavedObjectsType = {
hits: { type: 'integer', index: false, doc_values: false },
kibanaSavedObjectMeta: {
properties: {
searchSourceJSON: { type: 'text', index: false, doc_values: false },
searchSourceJSON: { type: 'text', index: false },
},
},
sort: { type: 'keyword', index: false, doc_values: false },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@ export function EmbeddableErrorLabel(props: Props) {
return (
<div className="embPanel__labelWrapper">
<div className="embPanel__label">
<EuiToolTip content={props.error.message}>
<EuiBadge color="danger">{labelText}</EuiBadge>
<EuiToolTip data-test-subj="embeddableErrorMessage" content={props.error.message}>
<EuiBadge data-test-subj="embeddableErrorLabel" color="danger">
{labelText}
</EuiBadge>
</EuiToolTip>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/plugins/vis_type_timeseries/common/vis_schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ export const metricsItems = schema.object({
})
)
),
numberOfSignificantValueDigits: numberOptional,
percentiles: schema.maybe(
schema.arrayOf(
schema.object({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,19 @@ import { FieldSelect } from './field_select';
import { AggRow } from './agg_row';
import { createChangeHandler } from '../lib/create_change_handler';
import { createSelectHandler } from '../lib/create_select_handler';
import { createNumberHandler } from '../lib/create_number_handler';
import {
htmlIdGenerator,
EuiSpacer,
EuiFlexGroup,
EuiFlexGrid,
EuiFlexItem,
EuiFormLabel,
EuiFormRow,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public';
import { Percentiles, newPercentile } from './percentile_ui';
import { PercentileHdr } from './percentile_hdr';

const RESTRICT_FIELDS = [KBN_FIELD_TYPES.NUMBER, KBN_FIELD_TYPES.HISTOGRAM];

Expand All @@ -46,6 +48,8 @@ export function PercentileAgg(props) {

const handleChange = createChangeHandler(props.onChange, model);
const handleSelectChange = createSelectHandler(handleChange);
const handleNumberChange = createNumberHandler(handleChange);

const indexPattern =
(series.override_index_pattern && series.series_index_pattern) || panel.index_pattern;

Expand All @@ -66,7 +70,7 @@ export function PercentileAgg(props) {
siblings={props.siblings}
dragHandleProps={props.dragHandleProps}
>
<EuiFlexGroup gutterSize="s">
<EuiFlexGrid gutterSize="s" columns={2}>
<EuiFlexItem>
<EuiFormLabel htmlFor={htmlId('aggregation')}>
<FormattedMessage
Expand Down Expand Up @@ -103,11 +107,25 @@ export function PercentileAgg(props) {
/>
</EuiFormRow>
</EuiFlexItem>
</EuiFlexGroup>

<EuiSpacer size="m" />

<Percentiles onChange={handleChange} name="percentiles" model={model} panel={panel} />
<EuiFlexItem>
<EuiFormRow
label={
<FormattedMessage
id="visTypeTimeseries.percentile.percents"
defaultMessage="Percents"
/>
}
>
<Percentiles onChange={handleChange} name="percentiles" model={model} panel={panel} />
</EuiFormRow>
</EuiFlexItem>
<EuiFlexItem>
<PercentileHdr
value={model.numberOfSignificantValueDigits}
onChange={handleNumberChange('numberOfSignificantValueDigits')}
/>
</EuiFlexItem>
</EuiFlexGrid>
</AggRow>
);
}
Expand Down
Loading

0 comments on commit 3f5ea9f

Please sign in to comment.