Skip to content

Commit

Permalink
Merge branch 'main' into geo_containment_form_refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Sep 5, 2023
2 parents eb361fe + 49153fc commit 70f0b1f
Show file tree
Hide file tree
Showing 157 changed files with 1,090 additions and 584 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ steps:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 40
parallelism: 16
parallelism: 12
soft_fail: true
retry:
automatic:
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ steps:
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 40
parallelism: 16
parallelism: 12
retry:
automatic:
- exit_status: '*'
Expand Down
10 changes: 7 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -909,11 +909,15 @@ module.exports = {
{
files: [
'x-pack/plugins/apm/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/observability/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/exploratory_view/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/ux/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/synthetics/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/infra/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/observability/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/observability_ai_assistant/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/observability_onboarding/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/observability_shared/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/profiling/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/synthetics/**/*.{js,mjs,ts,tsx}',
'x-pack/plugins/ux/**/*.{js,mjs,ts,tsx}',
],
rules: {
'@kbn/telemetry/event_generating_elements_should_be_instrumented': 'error',
Expand Down
2 changes: 2 additions & 0 deletions docs/management/connectors/action-types/pagerduty.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ or as needed when you're creating a rule. For example:

[role="screenshot"]
image::management/connectors/images/pagerduty-connector.png[PagerDuty connector]
// NOTE: This is an autogenerated screenshot. Do not edit it directly.

[float]
[[pagerduty-connector-configuration]]
Expand Down Expand Up @@ -63,6 +64,7 @@ as you're creating or editing the connector in {kib}. For example:

[role="screenshot"]
image::management/connectors/images/pagerduty-params-test.png[PagerDuty params test]
// NOTE: This is an autogenerated screenshot. Do not edit it directly.

PagerDuty actions have the following properties.

Expand Down
Binary file modified docs/management/connectors/images/pagerduty-connector.png
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 docs/management/connectors/images/pagerduty-params-test.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"@elastic/datemath": "5.0.3",
"@elastic/elasticsearch": "npm:@elastic/[email protected]",
"@elastic/ems-client": "8.4.0",
"@elastic/eui": "87.2.0",
"@elastic/eui": "88.1.0",
"@elastic/filesaver": "1.1.2",
"@elastic/node-crypto": "1.2.1",
"@elastic/numeral": "^2.5.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export function checkNodeForExistingDataTestSubjProp(
const variable = getScope().variables.find((v) => v.name === name); // the variable definition of the spreaded variable

return variable && variable.defs.length > 0
? variable.defs[0].node.init.properties.find((property: TSESTree.Property) => {
? variable.defs[0].node.init?.properties.find((property: TSESTree.Property) => {
if ('value' in property.key) {
return property.key.value === 'data-test-subj';
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ for (const [name, tester] of [tsTester, babelTester]) {
],
output: `<${element} data-test-subj="Value${element
.replace('Eui', '')
.replace('Empty', '')}">Value</${element}>`,
.replace('Empty', '')
.replace('Icon', '')}">Value</${element}>`,
})),
}
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { getFunctionName } from '../helpers/get_function_name';
export const EVENT_GENERATING_ELEMENTS = [
'EuiButton',
'EuiButtonEmpty',
'EuiButtonIcon',
'EuiLink',
'EuiFieldText',
'EuiFieldSearch',
Expand Down Expand Up @@ -74,7 +75,7 @@ export const EventGeneratingElementsShouldBeInstrumented: Rule.RuleModule = {
const intent = getIntentFromNode(parent);

// 4. The element name that generates the events
const element = name.replace('Eui', '').replace('Empty', '');
const element = name.replace('Eui', '').replace('Empty', '').replace('Icon', '');

const suggestion = `${appName}${componentName}${intent}${element}`; // 'o11yHeaderActionsSubmitButton'

Expand Down
2 changes: 1 addition & 1 deletion src/dev/license_checker/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const LICENSE_OVERRIDES = {
'[email protected]': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
'@mapbox/[email protected]': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
'@elastic/[email protected]': ['Elastic License 2.0'],
'@elastic/eui@87.2.0': ['SSPL-1.0 OR Elastic License 2.0'],
'@elastic/eui@88.1.0': ['SSPL-1.0 OR Elastic License 2.0'],
'[email protected]': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
'[email protected]': ['MIT'], // license in importing module https://www.npmjs.com/package/binary
};

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 @@ -19,21 +19,3 @@
// could be much higher than the available screenspace
max-width: 686px;
}

.shardFailureModal__descTitle {
width: 12% !important;
}

.shardFailureModal__descValue {
width: 88% !important;
}

@include euiBreakpoint('xs','s') {
.shardFailureModal__descTitle {
width: 100% !important;
}

.shardFailureModal__descValue {
width: 100% !important;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export function ShardFailureDescription(props: ShardFailure) {
<EuiFlexItem grow={false}>
<EuiDescriptionList
type="responsiveColumn"
gutterSize="s"
columnWidths={[1, 6]}
listItems={items}
compressed
className="shardFailureModal__desc"
Expand Down
3 changes: 2 additions & 1 deletion test/functional/apps/discover/group1/_discover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
defaultIndex: 'logstash-*',
};

describe('discover test', function describeIndexTests() {
// FLAKY: https://github.com/elastic/kibana/issues/146223
describe.skip('discover test', function describeIndexTests() {
before(async function () {
log.debug('load kibana index with default index pattern');
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
Expand Down
10 changes: 10 additions & 0 deletions x-pack/packages/kbn-slo-schema/src/rest_specs/slo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@ const findSLOResponseSchema = t.type({
results: t.array(sloWithSummaryResponseSchema),
});

const deleteSLOInstancesParamsSchema = t.type({
body: t.type({ list: t.array(t.type({ sloId: sloIdSchema, instanceId: t.string })) }),
});

const fetchHistoricalSummaryParamsSchema = t.type({
body: t.type({ list: t.array(t.type({ sloId: sloIdSchema, instanceId: allOrAnyString })) }),
});
Expand Down Expand Up @@ -239,6 +243,9 @@ type UpdateSLOResponse = t.OutputOf<typeof updateSLOResponseSchema>;
type FindSLOParams = t.TypeOf<typeof findSLOParamsSchema.props.query>;
type FindSLOResponse = t.OutputOf<typeof findSLOResponseSchema>;

type DeleteSLOInstancesInput = t.OutputOf<typeof deleteSLOInstancesParamsSchema.props.body>;
type DeleteSLOInstancesParams = t.TypeOf<typeof deleteSLOInstancesParamsSchema.props.body>;

type FetchHistoricalSummaryParams = t.TypeOf<typeof fetchHistoricalSummaryParamsSchema.props.body>;
type FetchHistoricalSummaryResponse = t.OutputOf<typeof fetchHistoricalSummaryResponseSchema>;
type HistoricalSummaryResponse = t.OutputOf<typeof historicalSummarySchema>;
Expand Down Expand Up @@ -269,6 +276,7 @@ type KQLCustomIndicator = t.OutputOf<typeof kqlCustomIndicatorSchema>;
export {
createSLOParamsSchema,
deleteSLOParamsSchema,
deleteSLOInstancesParamsSchema,
findSLOParamsSchema,
findSLOResponseSchema,
getPreviewDataParamsSchema,
Expand All @@ -294,6 +302,8 @@ export type {
CreateSLOInput,
CreateSLOParams,
CreateSLOResponse,
DeleteSLOInstancesInput,
DeleteSLOInstancesParams,
FindSLOParams,
FindSLOResponse,
GetPreviewDataParams,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export function HelpPopoverButton({

return (
<EuiButtonIcon
data-test-subj="apmHelpPopoverButtonButton"
className="apmHelpPopover__buttonIcon"
size="s"
iconType="help"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ function ConfigurationValueColumn({
</EuiText>
{value && (
<EuiButtonIcon
data-test-subj="apmConfigurationValueColumnButton"
aria-label={i18n.translate(
'xpack.apm.onboarding.column.value.copyIconText',
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ function ConfigurationValueColumn({
</EuiText>
{value && (
<EuiButtonIcon
data-test-subj="apmConfigurationValueColumnButton"
aria-label={i18n.translate(
'xpack.apm.onboarding.otel.column.value.copyIconText',
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ export function AgentConfigurationList({
name: '',
render: (config: Config) => (
<EuiButtonIcon
data-test-subj="apmColumnsButton"
aria-label="Edit"
iconType="pencil"
href={apmRouter.link('/settings/agent-configuration/edit', {
Expand All @@ -218,6 +219,7 @@ export function AgentConfigurationList({
name: '',
render: (config: Config) => (
<EuiButtonIcon
data-test-subj="apmColumnsButton"
aria-label="Delete"
iconType="trash"
onClick={() => setConfigToBeDeleted(config)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export function AgentKeyCallOut({ name, token }: Props) {
<EuiCopy textToCopy={token}>
{(copy) => (
<EuiButtonIcon
data-test-subj="apmAgentKeyCallOutButton"
iconType="copyClipboard"
onClick={copy}
color="success"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ export function DiscoveryRule({
<EuiFlexGroup>
<EuiFlexItem grow={false}>
<EuiButtonIcon
data-test-subj="apmDiscoveryRuleButton"
iconType="pencil"
color="primary"
onClick={() => {
Expand All @@ -108,6 +109,7 @@ export function DiscoveryRule({
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonIcon
data-test-subj="apmDiscoveryRuleButton"
iconType="trash"
color="danger"
onClick={() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export function PopoverTooltip({
closePopover={() => setIsPopoverOpen(false)}
button={
<EuiButtonIcon
data-test-subj="apmPopoverTooltipButton"
aria-label={ariaLabel}
onClick={(event: React.MouseEvent<HTMLButtonElement>) => {
setIsPopoverOpen(!isPopoverOpen);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ export function SpanLinksTable({ items }: Props) {
<EuiPopover
button={
<EuiButtonIcon
data-test-subj="apmColumnsButton"
aria-label="Edit"
iconType="boxesHorizontal"
onClick={() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export function OpenTelemetryInstructions({
</EuiText>
{value && (
<EuiButtonIcon
data-test-subj="apmColumnsButton"
aria-label={i18n.translate(
'xpack.apm.tutorial.config_otel.column.value.copyIconText',
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ interface Props {

type CustomComponentProps = Omit<Props, 'filter'> & { value: string };

const titleStyle = {
width: '30%',
};

const descriptionStyle = {
width: '70%',
};

const renderElement = (
Component: FC<
Omit<CustomComponentProps, 'updateFilter'> & { onChange?: CustomComponentProps['updateFilter'] }
Expand Down Expand Up @@ -53,11 +45,12 @@ export const Filter: FC<Props> = ({ filter, ...restProps }) => {
<EuiPanel grow={false} hasShadow={false} paddingSize="m">
<EuiDescriptionList
type="column"
columnWidths={[3, 7]}
className="workpadFilter"
compressed
listItems={filterView}
titleProps={{ style: titleStyle, className: 'eui-textBreakWord' }}
descriptionProps={{ style: descriptionStyle, className: 'eui-textBreakWord' }}
titleProps={{ className: 'eui-textBreakWord' }}
descriptionProps={{ className: 'eui-textBreakWord' }}
/>
</EuiPanel>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
EuiFlexItem,
EuiText,
} from '@elastic/eui';
import { ColorStop } from '@elastic/eui/src/components/color_picker/color_stops';
import { PaletteColorStop } from '@elastic/eui/src/components/color_picker/color_palette_picker';
import { i18n } from '@kbn/i18n';
import { getSeverityStatusColor } from '../../../common/utils/get_vulnerability_colors';
import { VulnSeverity } from '../../../../common/types';
Expand Down Expand Up @@ -53,7 +53,7 @@ const formatPercentage = (percentage: number) => {
export const SeverityMap = ({ severityMap, total }: Props) => {
const { euiTheme } = useEuiTheme();

const severityMapPallet: ColorStop[] = [];
const severityMapPallet: PaletteColorStop[] = [];
const severityMapTooltip: SeverityMapTooltip[] = [];

if (total > 0) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import 'analysis_summary/index';
@import 'edit_flyout/index';
@import 'file_contents/index';
@import 'import_summary/index';
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ export const AnalysisSummary: FC<{ results: FindFileStructureResponse }> = ({ re

<EuiSpacer size="m" />

<EuiDescriptionList type="column" listItems={items} className="analysis-summary-list" />
<EuiDescriptionList
type="column"
columnWidths={[15, 85]}
listItems={items}
className="analysis-summary-list"
/>
</React.Fragment>
);
};
Expand Down
Loading

0 comments on commit 70f0b1f

Please sign in to comment.