Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/elastic/kibana into alert…
Browse files Browse the repository at this point in the history
…ing/doc-template
  • Loading branch information
ymao1 committed Mar 2, 2021
2 parents a0874ea + 6be9ada commit 1f70e58
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 19 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@
"@cypress/webpack-preprocessor": "^5.5.0",
"@elastic/apm-rum": "^5.6.1",
"@elastic/apm-rum-react": "^1.2.5",
"@elastic/charts": "25.0.1",
"@elastic/charts": "25.1.0",
"@elastic/eslint-config-kibana": "link:packages/elastic-eslint-config-kibana",
"@elastic/eslint-plugin-eui": "0.0.2",
"@elastic/github-checks-reporter": "0.0.20b3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,6 @@ export function ServiceProfilingFlamegraph({
config={{
fillLabel: {
fontFamily: theme.eui.euiCodeFontFamily,
// @ts-expect-error (coming soon in Elastic charts)
clipText: true,
},
drilldown: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,17 @@ describe('Kuery field suggestions', () => {
expect(suggestions.find(({ text }) => text === 'machine.os ')).toBeDefined();
});

test('should field names that match the search', async () => {
const prefix = 'machi';
const suffix = 'ne.os';
const suggestions = await getSuggestions(
querySuggestionsArgs,
mockKueryNode({ prefix, suffix })
);

expect(suggestions.find(({ text }) => text === 'machine.os ')).toBeDefined();
});

test('should return field names that start with the query first', async () => {
const prefix = 'e';
const suffix = '';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ export const setupGetFieldSuggestions: KqlQuerySuggestionProvider<QuerySuggestio
field.subType &&
field.subType.nested &&
field.subType.nested.path.includes(nestedPath))) &&
field.name.toLowerCase().includes(search) &&
field.name !== search
field.name.toLowerCase().includes(search)
);
});
const sortedFields = sortPrefixFirst(matchingFields.sort(keywordComparator), search, 'name');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
const pkgPoliciesWithMatchingNames = (agentPolicy.package_policies as PackagePolicy[])
.filter((ds) => Boolean(ds.name.match(pkgPoliciesNamePattern)))
.map((ds) => parseInt(ds.name.match(pkgPoliciesNamePattern)![1], 10))
.sort();
.sort((a, b) => a - b);

updatePackagePolicy({
// FIXME: Improve package policies name uniqueness - https://github.com/elastic/kibana/issues/72948
Expand Down
37 changes: 28 additions & 9 deletions x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
Original file line number Diff line number Diff line change
Expand Up @@ -395,27 +395,45 @@ const allowlistEventFields: AllowlistFields = {
Ext: {
call_stack: true,
start_address: true,
start_address_allocation_offset: true,
start_address_bytes: true,
start_address_bytes_disasm: true,
start_address_bytes_disasm_hash: true,
start_address_details: {
address_offset: true,
allocation_base: true,
allocation_protection: true,
allocation_size: true,
allocation_type: true,
base_address: true,
bytes_start_address: true,
compressed_bytes: true,
dest_bytes: true,
dest_bytes_disasm: true,
dest_bytes_disasm_hash: true,
pe: {
bytes_address: true,
bytes_allocation_offset: true,
bytes_compressed: true,
mapped_pe: {
Ext: {
code_signature: {
status: true,
subject_name: true,
trusted: true,
},
legal_copyright: true,
product_version: true,
},
company: true,
description: true,
file_version: true,
imphash: true,
original_file_name: true,
product: true,
},
mapped_pe_path: true,
memory_pe: {
Ext: {
code_signature: {
status: true,
subject_name: true,
trusted: true,
},
legal_copyright: true,
product_version: true,
},
company: true,
description: true,
Expand All @@ -424,7 +442,8 @@ const allowlistEventFields: AllowlistFields = {
original_file_name: true,
product: true,
},
pe_detected: true,
memory_pe_detected: true,
region_base: true,
region_protection: true,
region_size: true,
region_state: true,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/triggers_actions_ui/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "kibana",
"server": true,
"ui": true,
"optionalPlugins": ["alerts", "features", "home"],
"optionalPlugins": ["alerts", "features", "home", "spaces"],
"requiredPlugins": ["management", "charts", "data", "kibanaReact", "kibanaUtils", "savedObjects"],
"configPath": ["xpack", "trigger_actions_ui"],
"extraPublicDirs": ["public/common", "public/common/constants"],
Expand Down
3 changes: 3 additions & 0 deletions x-pack/plugins/triggers_actions_ui/public/application/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import { ActionTypeRegistryContract, AlertTypeRegistryContract } from '../types'
import { ChartsPluginStart } from '../../../../../src/plugins/charts/public';
import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
import { PluginStartContract as AlertingStart } from '../../../alerts/public';
import type { SpacesPluginStart } from '../../../spaces/public';

import { suspendedComponentWithProps } from './lib/suspended_component_with_props';
import { Storage } from '../../../../../src/plugins/kibana_utils/public';
import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common';
Expand All @@ -33,6 +35,7 @@ export interface TriggersAndActionsUiServices extends CoreStart {
data: DataPublicPluginStart;
charts: ChartsPluginStart;
alerts?: AlertingStart;
spaces?: SpacesPluginStart;
storage?: Storage;
setBreadcrumbs: (crumbs: ChromeBreadcrumb[]) => void;
actionTypeRegistry: ActionTypeRegistryContract;
Expand Down
3 changes: 3 additions & 0 deletions x-pack/plugins/triggers_actions_ui/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { ChartsPluginStart } from '../../../../src/plugins/charts/public';
import { PluginStartContract as AlertingStart } from '../../alerts/public';
import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
import { Storage } from '../../../../src/plugins/kibana_utils/public';
import type { SpacesPluginStart } from '../../spaces/public';

import { getAddConnectorFlyoutLazy } from './common/get_add_connector_flyout';
import { getEditConnectorFlyoutLazy } from './common/get_edit_connector_flyout';
Expand Down Expand Up @@ -68,6 +69,7 @@ interface PluginsStart {
data: DataPublicPluginStart;
charts: ChartsPluginStart;
alerts?: AlertingStart;
spaces?: SpacesPluginStart;
navigateToApp: CoreStart['application']['navigateToApp'];
features: FeaturesPluginStart;
}
Expand Down Expand Up @@ -142,6 +144,7 @@ export class Plugin
data: pluginsStart.data,
charts: pluginsStart.charts,
alerts: pluginsStart.alerts,
spaces: pluginsStart.spaces,
element: params.element,
storage: new Storage(window.localStorage),
setBreadcrumbs: params.setBreadcrumbs,
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2146,10 +2146,10 @@
dependencies:
object-hash "^1.3.0"

"@elastic/charts@25.0.1":
version "25.0.1"
resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-25.0.1.tgz#7c61fc22887b7b1feba3e52fc1b44f21a9c1d0bc"
integrity sha512-UYGO9Yg2+cdJOOs9DjlYeB2Oy/3UMXTtF6/yWZt2iXh7mmW9jI5DqfjgG/9BFSCwQZHUKBZ58d5ZCQfe72maGA==
"@elastic/charts@25.1.0":
version "25.1.0"
resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-25.1.0.tgz#8859e07c9822696b3f9b12ae46a18e3316f623fd"
integrity sha512-4IFmyhg3dG7VjP0C9DbMBBAxAtai/HPdG/4Z5UMdGYGoZiJwS+fo50irQtvD3H5Lm6OSS8Xk9hmCVPx8KmdiUg==
dependencies:
"@popperjs/core" "^2.4.0"
chroma-js "^2.1.0"
Expand Down

0 comments on commit 1f70e58

Please sign in to comment.