Skip to content

Commit

Permalink
Merge branch 'main' into fix/prefill-all-fields-slo-form
Browse files Browse the repository at this point in the history
  • Loading branch information
kdelemme authored Oct 17, 2023
2 parents 1330c10 + bdf064e commit c49a1c7
Show file tree
Hide file tree
Showing 58 changed files with 845 additions and 480 deletions.
7 changes: 0 additions & 7 deletions .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,6 @@ steps:
automatic: false
soft_fail: true

- command: .buildkite/scripts/steps/code_generation/security_solution_codegen.sh
label: 'Security Solution OpenAPI codegen'
agents:
queue: n2-2-spot
timeout_in_minutes: 60
parallelism: 1

- command: .buildkite/scripts/steps/functional/osquery_cypress_burn.sh
label: 'Osquery Cypress Tests, burning changed specs'
agents:
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
# Incorporate any necessary additional logic to validate the service's integrity.
# A failure in this pipeline build will prevent further progression to the subsequent stage.

# DEPRECATION NOTICE:
# PRODUCTION WILL SOON BE SPLIT INTO "CANARY" AND "NONCANARY" AND THIS FILE WILL BE DELETED.
# ENSURE ANY CHANGE MADE TO THIS FILE IS REFLECTED IN THOSE FILES AS WELL.

steps:
- label: ":pipeline::kibana::seedling: Trigger SLO check"
trigger: "serverless-quality-gates" # https://buildkite.com/elastic/serverless-quality-gates
Expand All @@ -18,9 +14,14 @@ steps:
soft_fail: true

- label: ":pipeline::rocket::seedling: Trigger control-plane e2e tests"
if: build.env("ENVIRONMENT") == "production-canary"
trigger: "ess-k8s-production-e2e-tests" # https://buildkite.com/elastic/ess-k8s-production-e2e-tests
build:
env:
REGION_ID: aws-us-east-1
NAME_PREFIX: ci_test_kibana-promotion_
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-production.yaml)"

- label: ":cookie: 24h bake time before continuing promotion"
if: build.env("ENVIRONMENT") == "production-canary"
command: "sleep 86400"
1 change: 1 addition & 0 deletions .buildkite/scripts/steps/checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ export DISABLE_BOOTSTRAP_VALIDATION=false
.buildkite/scripts/steps/checks/test_hardening.sh
.buildkite/scripts/steps/checks/ftr_configs.sh
.buildkite/scripts/steps/checks/saved_objects_compat_changes.sh
.buildkite/scripts/steps/code_generation/security_solution_codegen.sh
2 changes: 2 additions & 0 deletions catalog-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ spec:
teams:
kibana-operations:
access_level: MANAGE_BUILD_AND_READ
appex-qa:
access_level: BUILD_AND_READ
security-engineering-productivity:
access_level: BUILD_AND_READ
fleet:
Expand Down
Binary file modified docs/management/connectors/images/bedrock-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/bedrock-params.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 1 addition & 15 deletions packages/kbn-es/src/serverless_resources/operator_users.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
operator:
- usernames:
[
'elastic_serverless',
'system_indices_superuser',
't1_analyst',
't2_analyst',
't3_analyst',
'threat_intelligence_analyst',
'rule_author',
'soc_manager',
'detections_admin',
'platform_engineer',
'endpoint_operations_analyst',
'endpoint_policy_manager',
]
- usernames: ['elastic_serverless', 'system_indices_superuser']
realm_type: 'file'
auth_type: 'realm'
- usernames: ['elastic/kibana']
Expand Down
15 changes: 14 additions & 1 deletion packages/kbn-es/src/serverless_resources/roles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ t1_analyst:
- metrics-endpoint.metadata_current_*
- ".fleet-agents*"
- ".fleet-actions*"
- "risk-score.risk-score-*"
privileges:
- read
applications:
Expand Down Expand Up @@ -157,6 +158,7 @@ t2_analyst:
- metrics-endpoint.metadata_current_*
- .fleet-agents*
- .fleet-actions*
- "risk-score.risk-score-*"
privileges:
- read
applications:
Expand Down Expand Up @@ -204,6 +206,7 @@ t3_analyst:
- metrics-endpoint.metadata_current_*
- .fleet-agents*
- .fleet-actions*
- "risk-score.risk-score-*"
privileges:
- read
applications:
Expand Down Expand Up @@ -256,6 +259,7 @@ threat_intelligence_analyst:
- metrics-endpoint.metadata_current_*
- .fleet-agents*
- .fleet-actions*
- "risk-score.risk-score-*"
privileges:
- read
applications:
Expand Down Expand Up @@ -307,6 +311,7 @@ rule_author:
- metrics-endpoint.metadata_current_*
- .fleet-agents*
- .fleet-actions*
- "risk-score.risk-score-*"
privileges:
- read
applications:
Expand Down Expand Up @@ -363,6 +368,7 @@ soc_manager:
- metrics-endpoint.metadata_current_*
- .fleet-agents*
- .fleet-actions*
- risk-score.risk-score-*
privileges:
- read
applications:
Expand Down Expand Up @@ -391,7 +397,7 @@ soc_manager:
resources: "*"

detections_admin:
cluster:
cluster: ["manage_index_templates", "manage_transform"]
indices:
- names:
- apm-*-transaction*
Expand All @@ -418,6 +424,10 @@ detections_admin:
- .fleet-actions*
privileges:
- read
- names:
- risk-score.risk-score-*
privileges:
- all
applications:
- application: "kibana-.kibana"
privileges:
Expand Down Expand Up @@ -450,6 +460,7 @@ platform_engineer:
- .siem-signals-*
- .preview.alerts-security*
- .internal.preview.alerts-security*
- risk-score.risk-score-*
privileges:
- all
applications:
Expand Down Expand Up @@ -482,6 +493,7 @@ endpoint_operations_analyst:
- metrics-endpoint.metadata_current_*
- .fleet-agents*
- .fleet-actions*
- risk-score.risk-score-*
privileges:
- read
- names:
Expand Down Expand Up @@ -537,6 +549,7 @@ endpoint_policy_manager:
- metrics-endpoint.metadata_current_*
- .fleet-agents*
- .fleet-actions*
- risk-score.risk-score-*
privileges:
- read
- names:
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-search-connectors/types/native_connectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
sensitive: false,
tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
type: FieldType.BOOLEAN,
ui_restrictions: [],
ui_restrictions: ['advanced'],
validations: [],
value: false,
},
Expand Down Expand Up @@ -963,7 +963,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
sensitive: false,
tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
type: FieldType.BOOLEAN,
ui_restrictions: [],
ui_restrictions: ['advanced'],
validations: [],
value: false,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,24 @@ import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';
interface Props {
inline?: boolean;
children: React.ReactNode;
'data-test-subj'?: string;
[key: string]: any;
}

export const SectionLoading: React.FunctionComponent<Props> = ({ inline, children, ...rest }) => {
export const SectionLoading: React.FunctionComponent<Props> = ({
inline,
'data-test-subj': dataTestSubj,
children,
...rest
}) => {
if (inline) {
return (
<EuiFlexGroup justifyContent="flexStart" alignItems="center" gutterSize="s">
<EuiFlexGroup
justifyContent="flexStart"
alignItems="center"
gutterSize="s"
data-test-subj={dataTestSubj}
>
<EuiFlexItem grow={false}>
<EuiLoadingSpinner size="m" />
</EuiFlexItem>
Expand All @@ -38,7 +49,7 @@ export const SectionLoading: React.FunctionComponent<Props> = ({ inline, childre
<KibanaPageTemplate.EmptyPrompt
title={<EuiLoadingSpinner size="xl" />}
body={<EuiText color="subdued">{children}</EuiText>}
data-test-subj="sectionLoading"
data-test-subj={dataTestSubj ?? 'sectionLoading'}
/>
);
};
2 changes: 1 addition & 1 deletion versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"previousMinor": true
},
{
"version": "8.10.4",
"version": "8.10.5",
"branch": "8.10",
"currentMajor": true,
"previousMinor": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
} from '@elastic/eui';
import { ActionType } from '@kbn/actions-plugin/common';
import { ActionTypeRegistryContract } from '@kbn/triggers-actions-ui-plugin/public';
import { css } from '@emotion/css/dist/emotion-css.cjs';
import * as i18n from '../translations';

interface Props {
Expand All @@ -26,6 +27,12 @@ interface Props {
onClose: () => void;
onSelect: (actionType: ActionType) => void;
}
const itemClassName = css`
.euiKeyPadMenuItem__label {
white-space: nowrap;
overflow: hidden;
}
`;

export const ActionTypeSelectorModal = ({
actionTypes,
Expand All @@ -46,6 +53,7 @@ export const ActionTypeSelectorModal = ({
return (
<EuiFlexItem data-test-subj="action-option" key={actionType.id} grow={false}>
<EuiKeyPadMenuItem
className={itemClassName}
key={actionType.id}
isDisabled={!actionType.enabled}
label={actionType.name}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const WELCOME_GENERAL_2 = i18n.translate(
'xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneral2Prompt',
{
defaultMessage:
"First things first, we'll need to set up a Generative AI Connector to get this chat experience going! With the Generative AI Connector, you'll be able to configure access to either an OpenAI service or an AWS Bedrock service, but you better believe you'll be able to deploy your own models within your Elastic Cloud instance and use those here in the future... 😉",
"First things first, we'll need to set up a Generative AI Connector to get this chat experience going! With the Generative AI Connector, you'll be able to configure access to either an OpenAI service or an Amazon Bedrock service, but you better believe you'll be able to deploy your own models within your Elastic Cloud instance and use those here in the future... 😉",
}
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import type {
} from './types';

const EMPTY_INDEX_NAMES: string[] = [];
export const INTERNAL_API_VERSION = '1';

export const getIndexNames = ({
ilmExplain,
Expand Down Expand Up @@ -282,7 +283,7 @@ export const getSizeInBytes = ({
}: {
indexName: string;
stats: Record<string, IndicesStatsIndicesStats> | null;
}): number => (stats && stats[indexName]?.primaries?.store?.size_in_bytes) ?? 0;
}): number => (stats && stats[indexName]?.primaries?.store?.total_data_set_size_in_bytes) ?? 0;

export const getTotalDocsCount = ({
indexNames,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export const auditbeatNoResults: PatternRollup = {
primaries: {
store: {
size_in_bytes: 18791790,
total_data_set_size_in_bytes: 18791790,
reserved_in_bytes: 0,
},
},
Expand All @@ -70,6 +71,7 @@ export const auditbeatNoResults: PatternRollup = {
primaries: {
store: {
size_in_bytes: 247,
total_data_set_size_in_bytes: 247,
reserved_in_bytes: 0,
},
},
Expand All @@ -87,6 +89,7 @@ export const auditbeatNoResults: PatternRollup = {
primaries: {
store: {
size_in_bytes: 28409,
total_data_set_size_in_bytes: 28409,
reserved_in_bytes: 0,
},
},
Expand Down Expand Up @@ -182,6 +185,7 @@ export const auditbeatWithAllResults: PatternRollup = {
primaries: {
store: {
size_in_bytes: 18791790,
total_data_set_size_in_bytes: 18791790,
reserved_in_bytes: 0,
},
},
Expand All @@ -199,6 +203,7 @@ export const auditbeatWithAllResults: PatternRollup = {
primaries: {
store: {
size_in_bytes: 247,
total_data_set_size_in_bytes: 247,
reserved_in_bytes: 0,
},
},
Expand All @@ -216,6 +221,7 @@ export const auditbeatWithAllResults: PatternRollup = {
primaries: {
store: {
size_in_bytes: 28409,
total_data_set_size_in_bytes: 28409,
reserved_in_bytes: 0,
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export const packetbeatNoResults: PatternRollup = {
primaries: {
store: {
size_in_bytes: 512194751,
total_data_set_size_in_bytes: 512194751,
reserved_in_bytes: 0,
},
},
Expand All @@ -68,6 +69,7 @@ export const packetbeatNoResults: PatternRollup = {
primaries: {
store: {
size_in_bytes: 584326147,
total_data_set_size_in_bytes: 584326147,
reserved_in_bytes: 0,
},
},
Expand Down
Loading

0 comments on commit c49a1c7

Please sign in to comment.