Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into eui-v76.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cee-chen committed Mar 9, 2023
2 parents 15a2b70 + 1e573da commit 7edfcf4
Show file tree
Hide file tree
Showing 206 changed files with 3,956 additions and 1,829 deletions.
2 changes: 2 additions & 0 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ steps:
- command: '.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh'
label: Trigger unsupported ftr tests
timeout_in_minutes: 10
depends_on:
- build
agents:
queue: 'kibana-default'

Expand Down
1 change: 1 addition & 0 deletions .buildkite/scripts/steps/artifacts/docker_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]]; then
cat << EOF | buildkite-agent pipeline upload
steps:
- trigger: k8s-gitops-update-image-tag
async: true
label: ":argo: Update image tag for Kibana"
branches: main
build:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@
"usng.js": "^0.4.5",
"utility-types": "^3.10.0",
"uuid": "9.0.0",
"vega": "5.22.1",
"vega": "^5.24.0",
"vega-interpreter": "^1.0.4",
"vega-lite": "^5.5.0",
"vega-schema-url-parser": "^2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-optimizer/src/worker/webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export function getWebpackConfig(
// already bundled with all its necessary dependencies
noParse: [
/[\/\\]node_modules[\/\\]lodash[\/\\]index\.js$/,
/[\/\\]node_modules[\/\\]vega[\/\\]build[\/\\]vega\.js$/,
/[\/\\]node_modules[\/\\]vega[\/\\]build-es5[\/\\]vega\.js$/,
],

rules: [
Expand Down

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

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/

import React from 'react';
import rison from '@kbn/rison';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
import {
Expand Down Expand Up @@ -94,7 +93,7 @@ export function OpenSearchPanel(props: OpenSearchPanelProps) {
onClick={props.onClose}
data-test-subj="manageSearchesBtn"
href={addBasePath(
`/app/management/kibana/objects?_a=${rison.encode({ tab: SEARCH_OBJECT_TYPE })}`
`/app/management/kibana/objects?initialQuery=type:(${SEARCH_OBJECT_TYPE})`
)}
>
<FormattedMessage
Expand Down
1 change: 0 additions & 1 deletion src/plugins/discover/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"@kbn/react-field",
"@kbn/monaco",
"@kbn/core-notifications-browser",
"@kbn/rison",
"@kbn/config-schema",
"@kbn/storybook",
"@kbn/shared-ux-router",
Expand Down
5 changes: 3 additions & 2 deletions src/plugins/vis_types/timelion/server/lib/load_functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import _ from 'lodash';
import globby from 'globby';
import path from 'path';
import normalizePath from 'normalize-path';
import processFunctionDefinition from './process_function_definition';

export default function (directory) {
Expand All @@ -19,7 +20,7 @@ export default function (directory) {
// Get a list of all files and use the filename as the object key
const files = _.map(
globby
.sync(path.resolve(__dirname, '../' + directory + '/*.js'))
.sync(normalizePath(path.resolve(__dirname, '../' + directory + '/*.js')))
.filter((filename) => !filename.includes('.test')),
function (file) {
const name = file.substring(file.lastIndexOf('/') + 1, file.lastIndexOf('.'));
Expand All @@ -29,7 +30,7 @@ export default function (directory) {

// Get a list of all directories with an index.js, use the directory name as the key in the object
const directories = _.chain(
globby.sync(path.resolve(__dirname, '../' + directory + '/*/index.js'))
globby.sync(normalizePath(path.resolve(__dirname, '../' + directory + '/*/index.js')))
)
.map(function (file) {
const parts = file.split('/');
Expand Down

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

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
ALERT_RULE_TYPE_ID,
ALERT_EVALUATION_THRESHOLD,
} from '@kbn/rule-data-utils';
import { TopAlert } from '@kbn/observability-plugin/public/pages/alerts';
import type { TopAlert } from '@kbn/observability-plugin/public';
import { filterNil } from '../../../../shared/charts/latency_chart';
import { TimeseriesChart } from '../../../../shared/charts/timeseries_chart';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
* 2.0.
*/

import { Rule } from '@kbn/alerting-plugin/common';
import { TopAlert } from '@kbn/observability-plugin/public/pages/alerts';
import { AlertSummaryField } from '@kbn/observability-plugin/public/pages/alert_details/types';
import { TIME_UNITS } from '@kbn/triggers-actions-ui-plugin/public';
import { SERVICE_ENVIRONMENT } from '../../../../../common/es_fields/apm';
import type { Rule } from '@kbn/alerting-plugin/common';
import type {
TopAlert,
AlertSummaryField,
} from '@kbn/observability-plugin/public';
import type { TIME_UNITS } from '@kbn/triggers-actions-ui-plugin/public';
import type { SERVICE_ENVIRONMENT } from '../../../../../common/es_fields/apm';

export const SERVICE_NAME = 'service.name' as const;
export const TRANSACTION_TYPE = 'transaction.type' as const;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('useNavigateFindings', () => {
});

expect(push).toHaveBeenCalledWith({
pathname: '/cloud_security_posture/findings/default',
pathname: '/cloud_security_posture/findings/configurations',
search:
"cspq=(filters:!((meta:(alias:!n,disabled:!f,key:foo,negate:!f,type:phrase),query:(match_phrase:(foo:1)))),query:(language:kuery,query:''))",
});
Expand All @@ -60,7 +60,7 @@ describe('useNavigateFindings', () => {
});

expect(push).toHaveBeenCalledWith({
pathname: '/cloud_security_posture/findings/default',
pathname: '/cloud_security_posture/findings/configurations',
search:
"cspq=(filters:!((meta:(alias:!n,disabled:!f,key:foo,negate:!t,type:phrase),query:(match_phrase:(foo:1)))),query:(language:kuery,query:''))",
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const benchmarksNavigation: Record<CspBenchmarksPage, CspPageNavigationIt
export const findingsNavigation = {
findings_default: {
name: NAV_ITEMS_NAMES.FINDINGS,
path: `${CLOUD_SECURITY_POSTURE_BASE_PATH}/findings/default`,
path: `${CLOUD_SECURITY_POSTURE_BASE_PATH}/findings/configurations`,
id: 'cloud_security_posture-findings-default',
},
findings_by_resource: {
Expand All @@ -75,6 +75,11 @@ export const findingsNavigation = {
path: `${CLOUD_SECURITY_POSTURE_BASE_PATH}/findings/resource/:resourceId`,
id: 'cloud_security_posture-findings-resourceId',
},
vulnerabilities: {
name: NAV_ITEMS_NAMES.FINDINGS,
path: `${CLOUD_SECURITY_POSTURE_BASE_PATH}/findings/vulnerabilities`,
id: 'cloud_security_posture-findings-vulnerabilities',
},
};

const ELASTIC_BASE_SHORT_URL = 'https://ela.st';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { KSPM_POLICY_TEMPLATE } from '../../../../common/constants';
import {
DASHBOARD_TABLE_COLUMN_SCORE_TEST_ID,
DASHBOARD_TABLE_HEADER_SCORE_TEST_ID,
} from '../../findings/test_subjects';
} from '../test_subjects';

describe('<BenchmarksSection />', () => {
const renderBenchmarks = (alterMockData = {}) =>
Expand Down
Loading

0 comments on commit 7edfcf4

Please sign in to comment.