-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:elastic/kibana into logging-docs
- Loading branch information
Showing
63 changed files
with
2,051 additions
and
285 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+216 KB
(750%)
docs/user/alerting/images/alert-flyout-alert-type-selection.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
#!/usr/bin/env bash | ||
|
||
source test/scripts/jenkins_test_setup_xpack.sh | ||
|
||
echo " -> Running security solution cypress tests" | ||
cd "$XPACK_DIR" | ||
|
||
checks-reporter-with-killswitch "Security Solution Cypress Tests (Firefox)" \ | ||
node scripts/functional_tests \ | ||
--debug --bail \ | ||
--kibana-install-dir "$KIBANA_INSTALL_DIR" \ | ||
--config test/security_solution_cypress/config.firefox.ts | ||
|
||
echo "" | ||
echo "" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,112 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
import { i18n } from '@kbn/i18n'; | ||
import { | ||
PROFILE_ALLOC_OBJECTS, | ||
PROFILE_ALLOC_SPACE, | ||
PROFILE_CPU_NS, | ||
PROFILE_INUSE_OBJECTS, | ||
PROFILE_INUSE_SPACE, | ||
PROFILE_SAMPLES_COUNT, | ||
PROFILE_WALL_US, | ||
} from './elasticsearch_fieldnames'; | ||
|
||
export enum ProfilingValueType { | ||
wallTime = 'wall_time', | ||
cpuTime = 'cpu_time', | ||
samples = 'samples', | ||
allocObjects = 'alloc_objects', | ||
allocSpace = 'alloc_space', | ||
inuseObjects = 'inuse_objects', | ||
inuseSpace = 'inuse_space', | ||
} | ||
|
||
export enum ProfilingValueTypeUnit { | ||
ns = 'ns', | ||
us = 'us', | ||
count = 'count', | ||
bytes = 'bytes', | ||
} | ||
|
||
export interface ProfileNode { | ||
id: string; | ||
label: string; | ||
fqn: string; | ||
value: number; | ||
children: string[]; | ||
} | ||
|
||
const config = { | ||
[ProfilingValueType.wallTime]: { | ||
unit: ProfilingValueTypeUnit.us, | ||
label: i18n.translate( | ||
'xpack.apm.serviceProfiling.valueTypeLabel.wallTime', | ||
{ | ||
defaultMessage: 'Wall', | ||
} | ||
), | ||
field: PROFILE_WALL_US, | ||
}, | ||
[ProfilingValueType.cpuTime]: { | ||
unit: ProfilingValueTypeUnit.ns, | ||
label: i18n.translate('xpack.apm.serviceProfiling.valueTypeLabel.cpuTime', { | ||
defaultMessage: 'On-CPU', | ||
}), | ||
field: PROFILE_CPU_NS, | ||
}, | ||
[ProfilingValueType.samples]: { | ||
unit: ProfilingValueTypeUnit.count, | ||
label: i18n.translate('xpack.apm.serviceProfiling.valueTypeLabel.samples', { | ||
defaultMessage: 'Samples', | ||
}), | ||
field: PROFILE_SAMPLES_COUNT, | ||
}, | ||
[ProfilingValueType.allocObjects]: { | ||
unit: ProfilingValueTypeUnit.count, | ||
label: i18n.translate( | ||
'xpack.apm.serviceProfiling.valueTypeLabel.allocObjects', | ||
{ | ||
defaultMessage: 'Alloc. objects', | ||
} | ||
), | ||
field: PROFILE_ALLOC_OBJECTS, | ||
}, | ||
[ProfilingValueType.allocSpace]: { | ||
unit: ProfilingValueTypeUnit.bytes, | ||
label: i18n.translate( | ||
'xpack.apm.serviceProfiling.valueTypeLabel.allocSpace', | ||
{ | ||
defaultMessage: 'Alloc. space', | ||
} | ||
), | ||
field: PROFILE_ALLOC_SPACE, | ||
}, | ||
[ProfilingValueType.inuseObjects]: { | ||
unit: ProfilingValueTypeUnit.count, | ||
label: i18n.translate( | ||
'xpack.apm.serviceProfiling.valueTypeLabel.inuseObjects', | ||
{ | ||
defaultMessage: 'In-use objects', | ||
} | ||
), | ||
field: PROFILE_INUSE_OBJECTS, | ||
}, | ||
[ProfilingValueType.inuseSpace]: { | ||
unit: ProfilingValueTypeUnit.bytes, | ||
label: i18n.translate( | ||
'xpack.apm.serviceProfiling.valueTypeLabel.inuseSpace', | ||
{ | ||
defaultMessage: 'In-use space', | ||
} | ||
), | ||
field: PROFILE_INUSE_SPACE, | ||
}, | ||
}; | ||
|
||
export const getValueTypeConfig = (type: ProfilingValueType) => { | ||
return config[type]; | ||
}; |
2 changes: 2 additions & 0 deletions
2
x-pack/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.