Merge branch 'mapsTestUserassign' of github.com:bhavyarm/kibana into …

…mapsTestUserassign

docs/developer/plugin/migrating-legacy-plugins-examples.asciidoc

@@ -902,8 +902,9 @@ The most significant changes on the Kibana side for the consumers are the follow
 ===== User client accessor
 Internal /current user client accessors has been renamed and are now
 properties instead of functions:
-** `callAsInternalUser('ping')` -> `asInternalUser.ping()`
-** `callAsCurrentUser('ping')` -> `asCurrentUser.ping()`
+
+* `callAsInternalUser('ping')` -> `asInternalUser.ping()`
+* `callAsCurrentUser('ping')` -> `asCurrentUser.ping()`
 * the API now reflects the `Client`’s instead of leveraging the
 string-based endpoint names the `LegacyAPICaller` was using.
 

src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker

@@ -166,6 +166,9 @@ kibana_vars=(
  xpack.code.security.gitProtocolWhitelist
  xpack.encryptedSavedObjects.encryptionKey
  xpack.encryptedSavedObjects.keyRotation.decryptionOnlyKeys
+ xpack.fleet.agents.elasticsearch.host
+ xpack.fleet.agents.kibana.host
+ xpack.fleet.agents.tlsCheckDisabled
  xpack.graph.enabled
  xpack.graph.canEditDrillDownUrls
  xpack.graph.savePolicy

src/plugins/discover/public/application/angular/discover.js

@@ -252,7 +252,8 @@ function discoverController($element, $route, $scope, $timeout, $window, Promise
  if (!_.isEqual(newStatePartial, oldStatePartial)) {
  $scope.$evalAsync(async () => {
  if (oldStatePartial.index !== newStatePartial.index) {
- //in case of index switch the route has currently to be reloaded, legacy
+ //in case of index pattern switch the route has currently to be reloaded, legacy
+ $route.reload();
  return;
  }
 
@@ -289,8 +290,7 @@ function discoverController($element, $route, $scope, $timeout, $window, Promise
  $scope.state.sort,
  config.get(MODIFY_COLUMNS_ON_SWITCH)
  );
- await replaceUrlAppState(nextAppState);
- $route.reload();
+ await setAppState(nextAppState);
  }
  };
 

src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts

@@ -73,7 +73,7 @@ export const applicationUsageSchema = {
  logs: commonSchema,
  metrics: commonSchema,
  infra: commonSchema, // It's a forward app so we'll likely never report it
- ingestManager: commonSchema,
+ fleet: commonSchema,
  lens: commonSchema,
  maps: commonSchema,
  ml: commonSchema,

src/plugins/share/server/routes/lib/short_url_assert_valid.test.ts

@@ -19,36 +19,39 @@
 
 import { shortUrlAssertValid } from './short_url_assert_valid';
 
+const PROTOCOL_ERROR = /^Short url targets cannot have a protocol/;
+const HOSTNAME_ERROR = /^Short url targets cannot have a hostname/;
+const PATH_ERROR = /^Short url target path must be in the format/;
+
 describe('shortUrlAssertValid()', () => {
  const invalid = [
- ['protocol', 'http://localhost:5601/app/kibana'],
- ['protocol', 'https://localhost:5601/app/kibana'],
- ['protocol', 'mailto:foo@bar.net'],
- ['protocol', 'javascript:alert("hi")'], // eslint-disable-line no-script-url
- ['hostname', 'localhost/app/kibana'],
- ['hostname and port', 'local.host:5601/app/kibana'],
- ['hostname and auth', 'user:pass@localhost.net/app/kibana'],
- ['path traversal', '/app/../../not-kibana'],
- ['deep path', '/app/kibana/foo'],
- ['deep path', '/app/kibana/foo/bar'],
- ['base path', '/base/app/kibana'],
+ ['protocol', 'http://localhost:5601/app/kibana', PROTOCOL_ERROR],
+ ['protocol', 'https://localhost:5601/app/kibana', PROTOCOL_ERROR],
+ ['protocol', 'mailto:foo@bar.net', PROTOCOL_ERROR],
+ ['protocol', 'javascript:alert("hi")', PROTOCOL_ERROR], // eslint-disable-line no-script-url
+ ['hostname', 'localhost/app/kibana', PATH_ERROR], // according to spec, this is not a valid URL -- you cannot specify a hostname without a protocol
+ ['hostname and port', 'local.host:5601/app/kibana', PROTOCOL_ERROR], // parser detects 'local.host' as the protocol
+ ['hostname and auth', 'user:pass@localhost.net/app/kibana', PROTOCOL_ERROR], // parser detects 'user' as the protocol
+ ['path traversal', '/app/../../not-kibana', PATH_ERROR], // fails because there are >2 path parts
+ ['path traversal', '/../not-kibana', PATH_ERROR], // fails because first path part is not 'app'
+ ['deep path', '/app/kibana/foo', PATH_ERROR], // fails because there are >2 path parts
+ ['deeper path', '/app/kibana/foo/bar', PATH_ERROR], // fails because there are >2 path parts
+ ['base path', '/base/app/kibana', PATH_ERROR], // fails because there are >2 path parts
+ ['path with an extra leading slash', '//foo/app/kibana', HOSTNAME_ERROR], // parser detects 'foo' as the hostname
+ ['path with an extra leading slash', '///app/kibana', HOSTNAME_ERROR], // parser detects '' as the hostname
+ ['path without app', '/foo/kibana', PATH_ERROR], // fails because first path part is not 'app'
+ ['path without appId', '/app/', PATH_ERROR], // fails because there is only one path part (leading and trailing slashes are trimmed)
  ];
 
- invalid.forEach(([desc, url]) => {
- it(`fails when url has ${desc}`, () => {
- try {
- shortUrlAssertValid(url);
- throw new Error(`expected assertion to throw`);
- } catch (err) {
- if (!err || !err.isBoom) {
- throw err;
- }
- }
+ invalid.forEach(([desc, url, error]) => {
+ it(`fails when url has ${desc as string}`, () => {
+ expect(() => shortUrlAssertValid(url as string)).toThrowError(error);
  });
  });
 
  const valid = [
  '/app/kibana',
+ '/app/kibana/', // leading and trailing slashes are trimmed
  '/app/monitoring#angular/route',
  '/app/text#document-id',
  '/app/some?with=query',

src/plugins/share/server/routes/lib/short_url_assert_valid.ts

@@ -22,18 +22,22 @@ import { trim } from 'lodash';
 import Boom from '@hapi/boom';
 
 export function shortUrlAssertValid(url: string) {
- const { protocol, hostname, pathname } = parse(url);
+ const { protocol, hostname, pathname } = parse(
+ url,
+ false /* parseQueryString */,
+ true /* slashesDenoteHost */
+ );
 
- if (protocol) {
+ if (protocol !== null) {
  throw Boom.notAcceptable(`Short url targets cannot have a protocol, found "${protocol}"`);
  }
 
- if (hostname) {
+ if (hostname !== null) {
  throw Boom.notAcceptable(`Short url targets cannot have a hostname, found "${hostname}"`);
  }
 
  const pathnameParts = trim(pathname === null ? undefined : pathname, '/').split('/');
- if (pathnameParts.length !== 2) {
+ if (pathnameParts.length !== 2 || pathnameParts[0] !== 'app' || !pathnameParts[1]) {
  throw Boom.notAcceptable(
  `Short url target path must be in the format "/app/{{appId}}", found "${pathname}"`
  );

src/plugins/telemetry/schema/oss_plugins.json

@@ -616,7 +616,7 @@
  }
  }
  },
- "ingestManager": {
+ "fleet": {
  "properties": {
  "clicks_total": {
  "type": "long"

src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import { startsWith } from 'lodash';
 import moment from 'moment';
 
 export function timeShift(resp, panel, series) {
@@ -26,13 +26,15 @@ export function timeShift(resp, panel, series) {
  const matches = series.offset_time.match(/^([+-]?[\d]+)([shmdwMy]|ms)$/);
 
  if (matches) {
- const offsetValue = Number(matches[1]);
+ const offsetValue = matches[1];
  const offsetUnit = matches[2];
- const offset = moment.duration(offsetValue, offsetUnit).valueOf();
 
  results.forEach((item) => {
- if (_.startsWith(item.id, series.id)) {
- item.data = item.data.map(([time, value]) => [time + offset, value]);
+ if (startsWith(item.id, series.id)) {
+ item.data = item.data.map((row) => [
+ moment.utc(row[0]).add(offsetValue, offsetUnit).valueOf(),
+ row[1],
+ ]);
  }
  });
  }

test/functional/apps/discover/_indexpattern_without_timefield.ts

@@ -20,6 +20,7 @@
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
+ const browser = getService('browser');
  const esArchiver = getService('esArchiver');
  const kibanaServer = getService('kibanaServer');
  const security = getService('security');
@@ -50,5 +51,21 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  throw new Error('Expected timepicker to exist');
  }
  });
+ it('should switch between with and without timefield using the browser back button', async () => {
+ await PageObjects.discover.selectIndexPattern('without-timefield');
+ if (await PageObjects.timePicker.timePickerExists()) {
+ throw new Error('Expected timepicker not to exist');
+ }
+
+ await PageObjects.discover.selectIndexPattern('with-timefield');
+ if (!(await PageObjects.timePicker.timePickerExists())) {
+ throw new Error('Expected timepicker to exist');
+ }
+ // Navigating back to discover
+ await browser.goBack();
+ if (await PageObjects.timePicker.timePickerExists()) {
+ throw new Error('Expected timepicker not to exist');
+ }
+ });
  });
 }

x-pack/plugins/infra/public/components/logging/log_entry_examples/log_entry_examples.tsx

@@ -46,4 +46,5 @@ const Wrapper = euiStyled.div`
  flex-direction: column;
  flex: 1 0 0%;
  overflow: hidden;
+ padding-top: 1px; // Buffer for the "Reload" buttons' hover state
 `;

x-pack/plugins/infra/public/components/logging/log_entry_examples/log_entry_examples_empty_indicator.tsx

@@ -10,7 +10,7 @@ import React from 'react';
 export const LogEntryExampleMessagesEmptyIndicator: React.FunctionComponent<{
  onReload: () => void;
 }> = ({ onReload }) => (
- <EuiFlexGroup alignItems="center" justifyContent="center">
+ <EuiFlexGroup alignItems="center">
  <EuiFlexItem grow={false} className="eui-textNoWrap">
  <FormattedMessage
  id="xpack.infra.logs.logEntryExamples.exampleEmptyDescription"

x-pack/plugins/infra/public/components/logging/log_entry_examples/log_entry_examples_failure_indicator.tsx

@@ -10,7 +10,7 @@ import React from 'react';
 export const LogEntryExampleMessagesFailureIndicator: React.FunctionComponent<{
  onRetry: () => void;
 }> = ({ onRetry }) => (
- <EuiFlexGroup alignItems="center" justifyContent="center">
+ <EuiFlexGroup alignItems="center">
  <EuiFlexItem grow={false} className="eui-textNoWrap">
  <EuiTextColor color="danger">
  <FormattedMessage

x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/expanded_row.tsx

@@ -51,9 +51,11 @@ export const AnomaliesTableExpandedRow: React.FunctionComponent<{
  <>
  <ExpandedContentWrapper direction="column">
  <EuiFlexItem>
- <EuiTitle size="s">
+ <EuiTitle size="xs">
  <h3>{examplesTitle}</h3>
  </EuiTitle>
+ </EuiFlexItem>
+ <EuiFlexItem>
  <LogEntryExampleMessages
  isLoading={isLoadingLogEntryExamples}
  hasFailedLoading={hasFailedLoadingLogEntryExamples}
@@ -84,8 +86,8 @@ export const AnomaliesTableExpandedRow: React.FunctionComponent<{
  <EuiFlexGroup>
  <EuiFlexItem grow={false}>
  <EuiStat
- titleSize="s"
- title={`${numeral(anomaly.typical).format('0.00a')} ${i18n.translate(
+ titleSize="xs"
+ title={`${numeral(anomaly.typical).format('0.[00]a')} ${i18n.translate(
  'xpack.infra.logs.analysis.anomaliesExpandedRowTypicalRateTitle',
  {
  defaultMessage: '{typicalCount, plural, one {message} other {messages}}',
@@ -102,8 +104,8 @@ export const AnomaliesTableExpandedRow: React.FunctionComponent<{
  </EuiFlexItem>
  <EuiFlexItem grow={false}>
  <EuiStat
- titleSize="s"
- title={`${numeral(anomaly.actual).format('0.00a')} ${i18n.translate(
+ titleSize="xs"
+ title={`${numeral(anomaly.actual).format('0.[00]a')} ${i18n.translate(
  'xpack.infra.logs.analysis.anomaliesExpandedRowActualRateTitle',
  {
  defaultMessage: '{actualCount, plural, one {message} other {messages}}',

x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx

@@ -84,6 +84,7 @@ const LogInContextWrapper = euiStyled.div<{ width: number | string; height: numb
  padding: 16px;
  width: ${(props) => (typeof props.width === 'number' ? `${props.width}px` : props.width)};
  height: ${(props) => (typeof props.height === 'number' ? `${props.height}px` : props.height)};
+ max-height: 75vh; // Same as EuiModal
 `;
 
 const LogEntryContext: React.FC<{ context: LogEntry['context'] }> = ({ context }) => {

x-pack/plugins/uptime/common/runtime_types/ping/ping.ts

@@ -86,6 +86,10 @@ export const MonitorType = t.intersection([
 
 export type Monitor = t.TypeOf<typeof MonitorType>;
 
+export const PingHeadersType = t.record(t.string, t.union([t.string, t.array(t.string)]));
+
+export type PingHeaders = t.TypeOf<typeof PingHeadersType>;
+
 export const PingType = t.intersection([
  t.type({
  timestamp: t.string,
@@ -135,7 +139,7 @@ export const PingType = t.intersection([
  bytes: t.number,
  redirects: t.array(t.string),
  status_code: t.number,
- headers: t.record(t.string, t.string),
+ headers: PingHeadersType,
  }),
  version: t.string,
  }),

x-pack/plugins/uptime/public/components/monitor/ping_list/headers.tsx

@@ -7,9 +7,10 @@
 import React from 'react';
 import { EuiAccordion, EuiDescriptionList, EuiSpacer, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { PingHeaders as HeadersProp } from '../../../../common/runtime_types';
 
 interface Props {
- headers: Record<string, string>;
+ headers: HeadersProp;
 }
 
 export const PingHeaders = ({ headers }: Props) => {