Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elastic/kibana into dev-cli/remov…
Browse files Browse the repository at this point in the history
…e-cluster-detection
  • Loading branch information
spalger committed Nov 23, 2020
2 parents 6347688 + 3d5d99e commit 6b67a1d
Show file tree
Hide file tree
Showing 90 changed files with 840 additions and 802 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
/x-pack/test/functional_basic/apps/transform/ @elastic/ml-ui

# Maps
/x-pack/plugins/maps/ @elastic/kibana-gis
#CC# /x-pack/plugins/maps/ @elastic/kibana-gis
/x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
Expand Down
2 changes: 1 addition & 1 deletion docs/settings/alert-action-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Alerts and actions are enabled by default in {kib}, but require you configure th

. <<using-kibana-with-security,Set up {kib} to work with {stack} {security-features}>>.
. <<configuring-tls-kib-es,Set up TLS encryption between {kib} and {es}>>.
. <<general-alert-action-settings,Specify a value for `xpack.encryptedSavedObjects.encryptionKey`>>.
. If you are using an *on-premises* Elastic Stack deployment, <<general-alert-action-settings,specify a value for `xpack.encryptedSavedObjects.encryptionKey`>>.

You can configure the following settings in the `kibana.yml` file.

Expand Down
1 change: 0 additions & 1 deletion packages/kbn-config/src/__mocks__/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export function getEnvOptions(options: DeepPartial<EnvOptions> = {}): EnvOptions
configs: options.configs || [],
cliArgs: {
dev: true,
open: false,
quiet: false,
silent: false,
watch: false,
Expand Down
6 changes: 0 additions & 6 deletions packages/kbn-config/src/__snapshots__/env.test.ts.snap

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

1 change: 0 additions & 1 deletion packages/kbn-config/src/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export interface CliArgs {
watch: boolean;
repl: boolean;
basePath: boolean;
open: boolean;
oss: boolean;
/** @deprecated use disableOptimizer to know if the @kbn/optimizer is disabled in development */
optimize?: boolean;
Expand Down
1 change: 0 additions & 1 deletion packages/kbn-legacy-logging/yarn.lock

This file was deleted.

1 change: 0 additions & 1 deletion src/cli/cluster/cluster_manager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import { Worker } from './worker';

const CLI_ARGS: SomeCliArgs = {
disableOptimizer: true,
open: false,
oss: false,
quiet: false,
repl: false,
Expand Down
24 changes: 1 addition & 23 deletions src/cli/cluster/cluster_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
*/

import { resolve } from 'path';
import { format as formatUrl } from 'url';
import Fs from 'fs';

import opn from 'opn';
import { REPO_ROOT } from '@kbn/utils';
import { FSWatcher } from 'chokidar';
import * as Rx from 'rxjs';
Expand All @@ -41,7 +39,6 @@ export type SomeCliArgs = Pick<
| 'silent'
| 'repl'
| 'disableOptimizer'
| 'open'
| 'watch'
| 'oss'
| 'runExamples'
Expand All @@ -50,7 +47,7 @@ export type SomeCliArgs = Pick<
>;

const firstAllTrue = (...sources: Array<Rx.Observable<boolean>>) =>
Rx.combineLatest(...sources).pipe(
Rx.combineLatest(sources).pipe(
filter((values) => values.every((v) => v === true)),
take(1),
mapTo(undefined)
Expand Down Expand Up @@ -144,17 +141,6 @@ export class ClusterManager {
});
});

if (opts.open) {
this.setupOpen(
formatUrl({
protocol: config.get('server.ssl.enabled') ? 'https' : 'http',
hostname: config.get('server.host'),
port: config.get('server.port'),
pathname: this.basePathProxy ? this.basePathProxy.basePath : '',
})
);
}

if (opts.watch) {
const pluginPaths = config.get<string[]>('plugins.paths');
const scanDirs = [
Expand Down Expand Up @@ -206,14 +192,6 @@ export class ClusterManager {
}
}

setupOpen(openUrl: string) {
firstAllTrue(this.serverReady$, this.kbnOptimizerReady$)
.toPromise()
.then(() => {
opn(openUrl);
});
}

setupWatching(extraPaths: string[], pluginInternalDirsIgnore: string[]) {
// eslint-disable-next-line @typescript-eslint/no-var-requires
const chokidar = require('chokidar');
Expand Down
2 changes: 0 additions & 2 deletions src/cli/serve/serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ export default function (program) {
if (DEV_MODE_SUPPORTED) {
command
.option('--dev', 'Run the server with development mode defaults')
.option('--open', 'Open a browser window to the base url after the server is started')
.option('--ssl', 'Run the dev server using HTTPS')
.option('--dist', 'Use production assets from kbn/optimizer')
.option(
Expand Down Expand Up @@ -222,7 +221,6 @@ export default function (program) {
configs: [].concat(opts.config || []),
cliArgs: {
dev: !!opts.dev,
open: !!opts.open,
envName: unknownOptions.env ? unknownOptions.env.name : undefined,
quiet: !!opts.quiet,
silent: !!opts.silent,
Expand Down
1 change: 0 additions & 1 deletion src/core/test_helpers/kbn_server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ export function createRootWithSettings(
configs: [],
cliArgs: {
dev: false,
open: false,
quiet: false,
silent: false,
watch: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ interface Props {
[key: string]: any;
}

export const CheckBoxField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const CheckBoxField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);

return (
Expand All @@ -39,7 +39,7 @@ export const CheckBoxField = ({ field, euiFieldProps = {}, ...rest }: Props) =>
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiCheckbox
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ interface Props {
[key: string]: any;
}

export const ComboBoxField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const ComboBoxField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
// Errors for the comboBox value (the "array")
const errorMessageField = field.getErrorsMessages();

Expand Down Expand Up @@ -87,7 +87,7 @@ export const ComboBoxField = ({ field, euiFieldProps = {}, ...rest }: Props) =>
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiComboBox
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}

export const MultiSelectField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const MultiSelectField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);

return (
Expand All @@ -39,7 +39,7 @@ export const MultiSelectField = ({ field, euiFieldProps = {}, ...rest }: Props)
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiSelectable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}

export const NumericField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const NumericField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);

return (
Expand All @@ -39,7 +39,7 @@ export const NumericField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiFieldNumber
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}

export const RadioGroupField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const RadioGroupField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);

return (
Expand All @@ -39,7 +39,7 @@ export const RadioGroupField = ({ field, euiFieldProps = {}, ...rest }: Props) =
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiRadioGroup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}

export const RangeField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const RangeField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
const { onChange: onFieldChange } = field;

Expand All @@ -50,7 +50,7 @@ export const RangeField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiRange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ interface Props {
[key: string]: any;
}

export const SelectField = ({ field, euiFieldProps, ...rest }: Props) => {
export const SelectField = ({ field, euiFieldProps, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);

return (
Expand All @@ -44,7 +44,7 @@ export const SelectField = ({ field, euiFieldProps, ...rest }: Props) => {
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiSelect
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ interface Props {
[key: string]: any;
}

export const SuperSelectField = ({ field, euiFieldProps = { options: [] }, ...rest }: Props) => {
export const SuperSelectField = ({
field,
euiFieldProps = { options: [] },
idAria,
...rest
}: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);

return (
Expand All @@ -42,7 +47,7 @@ export const SuperSelectField = ({ field, euiFieldProps = { options: [] }, ...re
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiSuperSelect
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}

export const TextAreaField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const TextAreaField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);

return (
Expand All @@ -39,7 +39,7 @@ export const TextAreaField = ({ field, euiFieldProps = {}, ...rest }: Props) =>
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiTextArea
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}

export const TextField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const TextField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);

return (
Expand All @@ -39,7 +39,7 @@ export const TextField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiFieldText
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ interface Props {
[key: string]: any;
}

export const ToggleField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
export const ToggleField = ({ field, euiFieldProps = {}, idAria, ...rest }: Props) => {
const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);

// Shim for sufficient overlap between EuiSwitchEvent and FieldHook[onChange] event
Expand All @@ -46,7 +46,7 @@ export const ToggleField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
error={errorMessage}
isInvalid={isInvalid}
fullWidth
describedByIds={rest.idAria ? [rest.idAria] : undefined}
describedByIds={idAria ? [idAria] : undefined}
{...rest}
>
<EuiSwitch
Expand Down
4 changes: 4 additions & 0 deletions src/plugins/vis_type_timeseries/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@

export const MAX_BUCKETS_SETTING = 'metrics:max_buckets';
export const INDEXES_SEPARATOR = ',';

export const ROUTES = {
VIS_DATA: '/api/metrics/vis/data',
};
Loading

0 comments on commit 6b67a1d

Please sign in to comment.