Skip to content

Commit a37612a

Browse files
author
Maja Grubic
authored
Merge branch 'master' into discover-ssource-fields
2 parents f1bd9e7 + 82c30a3 commit a37612a

77 files changed

Lines changed: 1620 additions & 728 deletions

File tree

Some content is hidden

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

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Delete any items that are not applicable to this PR.
1111
- [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
1212
- [ ] Any UI touched in this PR is usable by keyboard only (learn more about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
1313
- [ ] Any UI touched in this PR does not create any new axe failures (run axe in browser: [FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/), [Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
14+
- [ ] If a plugin configuration key changed, check if it needs to be whitelisted in the [cloud](https://github.com/elastic/cloud) and added to the [docker list](https://github.com/elastic/kibana/blob/c29adfef29e921cc447d2a5ed06ac2047ceab552/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker)
1415
- [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
1516
- [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
1617

‎.npmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
puppeteer_skip_chromium_download=true

‎package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
"number": 8467,
2020
"sha": "6cb7fec4e154faa0a4a3fee4b33dfef91b9870d9"
2121
},
22-
"config": {
23-
"puppeteer_skip_chromium_download": true
24-
},
2522
"homepage": "https://www.elastic.co/products/kibana",
2623
"bugs": {
2724
"url": "http://github.com/elastic/kibana/issues"

‎rfcs/text/0013_search_sessions.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ interface ISessionService {
285285
* @param url TODO: is the URL provided here? How?
286286
* @returns The stored `SearchSessionAttributes` object
287287
* @throws Throws an error in OSS.
288-
* @internal (Consumers should use searchInterceptor.sendToBackground())
289288
*/
290289
store: (
291290
request: KibanaRequest,

‎src/dev/build/tasks/clean_tasks.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ export const CleanPackages: Task = {
4141
description: 'Cleaning source for packages that are now installed in node_modules',
4242

4343
async run(config, log, build) {
44-
await deleteAll([build.resolvePath('packages'), build.resolvePath('yarn.lock')], log);
44+
await deleteAll(
45+
[build.resolvePath('packages'), build.resolvePath('yarn.lock'), build.resolvePath('.npmrc')],
46+
log
47+
);
4548
},
4649
};
4750

‎src/dev/build/tasks/copy_source_task.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export const CopySource: Task = {
2727
dot: false,
2828
select: [
2929
'yarn.lock',
30+
'.npmrc',
3031
'src/**',
3132
'!src/**/*.{test,test.mocks,mock}.{js,ts,tsx}',
3233
'!src/**/mocks.ts', // special file who imports .mock files

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,17 @@ kibana_vars=(
138138
tilemap.url
139139
timelion.enabled
140140
vega.enableExternalUrls
141+
xpack.actions.allowedHosts
142+
xpack.actions.enabled
143+
xpack.actions.enabledActionTypes
144+
xpack.actions.preconfigured
141145
xpack.actions.proxyUrl
146+
xpack.actions.proxyHeaders
147+
xpack.actions.proxyRejectUnauthorizedCertificates
148+
xpack.actions.rejectUnauthorized
149+
xpack.alerts.healthCheck.interval
150+
xpack.alerts.invalidateApiKeysTask.interval
151+
xpack.alerts.invalidateApiKeysTask.removalDelay
142152
xpack.apm.enabled
143153
xpack.apm.serviceMapEnabled
144154
xpack.apm.ui.enabled
@@ -166,6 +176,9 @@ kibana_vars=(
166176
xpack.code.security.gitProtocolWhitelist
167177
xpack.encryptedSavedObjects.encryptionKey
168178
xpack.encryptedSavedObjects.keyRotation.decryptionOnlyKeys
179+
xpack.event_log.enabled
180+
xpack.event_log.logEntries
181+
xpack.event_log.indexEntries
169182
xpack.fleet.agents.elasticsearch.host
170183
xpack.fleet.agents.kibana.host
171184
xpack.fleet.agents.tlsCheckDisabled
@@ -255,6 +268,18 @@ kibana_vars=(
255268
xpack.security.loginHelp
256269
xpack.spaces.enabled
257270
xpack.spaces.maxSpaces
271+
xpack.task_manager.enabled
272+
xpack.task_manager.max_attempts
273+
xpack.task_manager.poll_interval
274+
xpack.task_manager.max_poll_inactivity_cycles
275+
xpack.task_manager.request_capacity
276+
xpack.task_manager.index
277+
xpack.task_manager.max_workers
278+
xpack.task_manager.monitored_stats_required_freshness
279+
xpack.task_manager.monitored_aggregated_stats_refresh_rate
280+
xpack.task_manager.monitored_stats_running_average_window
281+
xpack.task_manager.monitored_task_execution_thresholds
282+
xpack.task_manager.version_conflict_threshold
258283
telemetry.allowChangingOptInStatus
259284
telemetry.enabled
260285
telemetry.optIn

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const services = getServices();
7878

7979
const {
8080
core,
81+
capabilities,
8182
chrome,
8283
data,
8384
history: getHistory,
@@ -107,8 +108,8 @@ app.config(($routeProvider) => {
107108
requireUICapability: 'discover.show',
108109
k7Breadcrumbs: ($route, $injector) =>
109110
$injector.invoke($route.current.params.id ? getSavedSearchBreadcrumbs : getRootBreadcrumbs),
110-
badge: (uiCapabilities) => {
111-
if (uiCapabilities.discover.save) {
111+
badge: () => {
112+
if (capabilities.discover.save) {
112113
return undefined;
113114
}
114115

@@ -185,7 +186,7 @@ app.directive('discoverApp', function () {
185186
};
186187
});
187188

188-
function discoverController($element, $route, $scope, $timeout, Promise, uiCapabilities) {
189+
function discoverController($element, $route, $scope, $timeout, Promise) {
189190
const { isDefault: isDefaultType } = indexPatternsUtils;
190191
const subscriptions = new Subscription();
191192
const refetch$ = new Subject();
@@ -345,7 +346,7 @@ function discoverController($element, $route, $scope, $timeout, Promise, uiCapab
345346
};
346347
$scope.minimumVisibleRows = 50;
347348
$scope.fetchStatus = fetchStatuses.UNINITIALIZED;
348-
$scope.showSaveQuery = uiCapabilities.discover.saveQuery;
349+
$scope.showSaveQuery = capabilities.discover.saveQuery;
349350
$scope.showTimeCol =
350351
!config.get('doc_table:hideTimeColumn', false) && $scope.indexPattern.timeFieldName;
351352

@@ -792,7 +793,7 @@ function discoverController($element, $route, $scope, $timeout, Promise, uiCapab
792793

793794
$scope.addColumn = function addColumn(columnName) {
794795
const { indexPattern, useNewFieldsApi } = $scope;
795-
if (uiCapabilities.discover.save) {
796+
if (capabilities.discover.save) {
796797
popularizeField(indexPattern, columnName, indexPatterns);
797798
}
798799
const columns = columnActions.addColumn($scope.state.columns, columnName, useNewFieldsApi);
@@ -801,7 +802,7 @@ function discoverController($element, $route, $scope, $timeout, Promise, uiCapab
801802

802803
$scope.removeColumn = function removeColumn(columnName) {
803804
const { indexPattern, useNewFieldsApi } = $scope;
804-
if (uiCapabilities.discover.save) {
805+
if (capabilities.discover.save) {
805806
popularizeField(indexPattern, columnName, indexPatterns);
806807
}
807808
const columns = columnActions.removeColumn($scope.state.columns, columnName, useNewFieldsApi);

‎x-pack/plugins/apm/common/utils/formatters/duration.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,8 @@ describe('duration formatters', () => {
4646
it('converts to formatted decimal milliseconds', () => {
4747
expect(asMillisecondDuration(0)).toEqual('0 ms');
4848
});
49+
it('formats correctly with undefined values', () => {
50+
expect(asMillisecondDuration(undefined)).toEqual('N/A');
51+
});
4952
});
5053
});

‎x-pack/plugins/apm/common/utils/formatters/duration.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ export function asDuration(
186186
* `asDuration`, but this is used in places like tables where we always want
187187
* the same units.
188188
*/
189-
export function asMillisecondDuration(time: number) {
189+
export function asMillisecondDuration(value: Maybe<number>) {
190190
return convertTo({
191191
unit: 'milliseconds',
192-
microseconds: time,
192+
microseconds: value,
193193
}).formatted;
194194
}

0 commit comments

Comments
 (0)