public API | Number of teams | |--------------|----------|------------------------| -| 796 | 684 | 42 | +| 796 | 684 | 43 | ### Public API health stats | API Count | Any Count | Missing comments | Missing exports | |--------------|----------|-----------------|--------| -| 48147 | 241 | 36732 | 1856 | +| 48165 | 241 | 36749 | 1856 | ## Plugin Directory @@ -98,7 +98,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] |
+ {
)}
/>
+
{
flowSearch={integrationSearch}
setSearchQuery={setIntegrationSearch}
flowCategory={searchParams.get('category')}
- ref={packageListRef}
customCards={customCards
?.filter(
// Filter out collection cards and regular integrations that show up via search anyway
@@ -244,8 +227,8 @@ export const OnboardingFlowForm: FunctionComponent = () => {
.concat(virtualSearchResults)}
joinCardLists
/>
-
- )}
+
+
);
};
@@ -282,3 +265,16 @@ const TitleWithIcon: FunctionComponent
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/shared/back_button.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/shared/back_button.tsx
deleted file mode 100644
index fb9fcb0293deb..0000000000000
--- a/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/shared/back_button.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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 { EuiButtonEmpty } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import React from 'react';
-
-export function BackButton({ onBack }: { onBack: () => void }) {
- return (
-
- {i18n.translate('xpack.observability_onboarding.steps.back', {
- defaultMessage: 'Back',
- })}
-
- );
-}
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/application/shared/back_button.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/application/shared/back_button.tsx
new file mode 100644
index 0000000000000..6b868ef99f7d4
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/application/shared/back_button.tsx
@@ -0,0 +1,33 @@
+/*
+ * 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 React from 'react';
+import { useNavigate, useLocation } from 'react-router-dom-v5-compat';
+import { EuiButtonEmpty, EuiSpacer } from '@elastic/eui';
+
+export const BackButton = () => {
+ const navigate = useNavigate();
+ const location = useLocation();
+
+ return (
+ <>
+ navigate(`../${location.search}`)}
+ >
+ {i18n.translate(
+ 'xpack.observability_onboarding.experimentalOnboardingFlow.button.backToSelectionLabel',
+ { defaultMessage: 'Back to selection' }
+ )}
+
+
Date: Wed, 15 May 2024 09:42:42 +0200
Subject: [PATCH 13/50] [CI] Fix issues related to publish (#183393)
## Summary
On the new infra, the publish step will still require legacy vault
credentials and login.
(https://buildkite.com/elastic/kibana-artifacts-staging/builds/3513#018f7691-73c8-4e6f-862b-328b05d9de3b)
As a fix: this PR digs up the credentials from the vault instead of
gcloud secrets on the new infra.
Also, other usages of role-id/secret-id is used are moved in the
legacy-vault usages, plus minor code re-org, to reduce branching, and
future cleanup.
---
.buildkite/scripts/common/vault_fns.sh | 20 +++++++++++++++++++
.buildkite/scripts/steps/artifacts/publish.sh | 4 ++--
.../scripts/steps/cloud/build_and_deploy.sh | 14 ++++++-------
.buildkite/scripts/steps/serverless/deploy.sh | 10 +++++-----
4 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/.buildkite/scripts/common/vault_fns.sh b/.buildkite/scripts/common/vault_fns.sh
index a7b92a4b05d6d..022a22541d6bf 100644
--- a/.buildkite/scripts/common/vault_fns.sh
+++ b/.buildkite/scripts/common/vault_fns.sh
@@ -65,3 +65,23 @@ vault_kv_set() {
vault kv put "$VAULT_KV_PREFIX/$kv_path" "${fields[@]}"
}
+
+function get_vault_role_id() {
+ if [[ "$IS_LEGACY_VAULT_ADDR" == "true" ]]; then
+ VAULT_ROLE_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-role-id)"
+ else
+ VAULT_ROLE_ID="$(vault_get kibana-buildkite-vault-credentials role-id)"
+ fi
+
+ echo "$VAULT_ROLE_ID"
+}
+
+function get_vault_secret_id() {
+ if [[ "$IS_LEGACY_VAULT_ADDR" == "true" ]]; then
+ VAULT_SECRET_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-secret-id)"
+ else
+ VAULT_SECRET_ID="$(vault_get kibana-buildkite-vault-credentials secret-id)"
+ fi
+
+ echo "$VAULT_SECRET_ID"
+}
diff --git a/.buildkite/scripts/steps/artifacts/publish.sh b/.buildkite/scripts/steps/artifacts/publish.sh
index 8aba9e941e3c0..40ea04fc33fea 100644
--- a/.buildkite/scripts/steps/artifacts/publish.sh
+++ b/.buildkite/scripts/steps/artifacts/publish.sh
@@ -53,8 +53,8 @@ docker pull docker.elastic.co/infra/release-manager:latest
echo "--- Publish artifacts"
if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]]; then
- export VAULT_ROLE_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-role-id)"
- export VAULT_SECRET_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-secret-id)"
+ export VAULT_ROLE_ID="$(get_vault_role_id)"
+ export VAULT_SECRET_ID="$(get_vault_secret_id)"
export VAULT_ADDR="https://secrets.elastic.co:8200"
download_artifact beats_manifest.json /tmp --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
diff --git a/.buildkite/scripts/steps/cloud/build_and_deploy.sh b/.buildkite/scripts/steps/cloud/build_and_deploy.sh
index 267e986f85cd7..8c5e0a0d2c635 100755
--- a/.buildkite/scripts/steps/cloud/build_and_deploy.sh
+++ b/.buildkite/scripts/steps/cloud/build_and_deploy.sh
@@ -81,13 +81,13 @@ if [ -z "${CLOUD_DEPLOYMENT_ID}" ] || [ "${CLOUD_DEPLOYMENT_ID}" = 'null' ]; the
CLOUD_DEPLOYMENT_STATUS_MESSAGES=$(jq --slurp '[.[]|select(.resources == null)]' "$ECCTL_LOGS")
echo "Writing to vault..."
- VAULT_ROLE_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-role-id)"
- VAULT_SECRET_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-secret-id)"
- VAULT_TOKEN=$(retry 5 30 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
- retry 5 30 vault login -no-print "$VAULT_TOKEN"
# TODO: remove after https://github.com/elastic/kibana-operations/issues/15 is done
if [[ "$IS_LEGACY_VAULT_ADDR" == "true" ]]; then
+ VAULT_ROLE_ID="$(get_vault_role_id)"
+ VAULT_SECRET_ID="$(get_vault_secret_id)"
+ VAULT_TOKEN=$(retry 5 30 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
+ retry 5 30 vault login -no-print "$VAULT_TOKEN"
vault_set "cloud-deploy/$CLOUD_DEPLOYMENT_NAME" username="$CLOUD_DEPLOYMENT_USERNAME" password="$CLOUD_DEPLOYMENT_PASSWORD"
else
vault_kv_set "cloud-deploy/$CLOUD_DEPLOYMENT_NAME" username="$CLOUD_DEPLOYMENT_USERNAME" password="$CLOUD_DEPLOYMENT_PASSWORD"
@@ -123,9 +123,6 @@ else
ecctl deployment update "$CLOUD_DEPLOYMENT_ID" --track --output json --file /tmp/deploy.json > "$ECCTL_LOGS"
fi
-CLOUD_DEPLOYMENT_KIBANA_URL=$(ecctl deployment show "$CLOUD_DEPLOYMENT_ID" | jq -r '.resources.kibana[0].info.metadata.aliased_url')
-CLOUD_DEPLOYMENT_ELASTICSEARCH_URL=$(ecctl deployment show "$CLOUD_DEPLOYMENT_ID" | jq -r '.resources.elasticsearch[0].info.metadata.aliased_url')
-
# TODO: remove after https://github.com/elastic/kibana-operations/issues/15 is done
if [[ "$IS_LEGACY_VAULT_ADDR" == "true" ]]; then
VAULT_READ_COMMAND="vault read $VAULT_PATH_PREFIX/cloud-deploy/$CLOUD_DEPLOYMENT_NAME"
@@ -133,6 +130,9 @@ else
VAULT_READ_COMMAND="vault kv get $VAULT_KV_PREFIX/cloud-deploy/$CLOUD_DEPLOYMENT_NAME"
fi
+CLOUD_DEPLOYMENT_KIBANA_URL=$(ecctl deployment show "$CLOUD_DEPLOYMENT_ID" | jq -r '.resources.kibana[0].info.metadata.aliased_url')
+CLOUD_DEPLOYMENT_ELASTICSEARCH_URL=$(ecctl deployment show "$CLOUD_DEPLOYMENT_ID" | jq -r '.resources.elasticsearch[0].info.metadata.aliased_url')
+
cat << EOF | buildkite-agent annotate --style "info" --context cloud
### Cloud Deployment
diff --git a/.buildkite/scripts/steps/serverless/deploy.sh b/.buildkite/scripts/steps/serverless/deploy.sh
index 11191e803509c..ad9c661540ffb 100644
--- a/.buildkite/scripts/steps/serverless/deploy.sh
+++ b/.buildkite/scripts/steps/serverless/deploy.sh
@@ -89,13 +89,13 @@ deploy() {
PROJECT_PASSWORD=$(jq -r --slurp '.[2].password' $DEPLOY_LOGS)
echo "Write to vault..."
- VAULT_ROLE_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-role-id)"
- VAULT_SECRET_ID="$(retry 5 15 gcloud secrets versions access latest --secret=kibana-buildkite-vault-secret-id)"
- VAULT_TOKEN=$(retry 5 30 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
- retry 5 30 vault login -no-print "$VAULT_TOKEN"
# TODO: remove after https://github.com/elastic/kibana-operations/issues/15 is done
if [[ "$IS_LEGACY_VAULT_ADDR" == "true" ]]; then
+ VAULT_ROLE_ID="$(get_vault_role_id)"
+ VAULT_SECRET_ID="$(get_vault_secret_id)"
+ VAULT_TOKEN=$(retry 5 30 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
+ retry 5 30 vault login -no-print "$VAULT_TOKEN"
vault_set "cloud-deploy/$VAULT_KEY_NAME" username="$PROJECT_USERNAME" password="$PROJECT_PASSWORD" id="$PROJECT_ID"
else
vault_kv_set "cloud-deploy/$VAULT_KEY_NAME" username="$PROJECT_USERNAME" password="$PROJECT_PASSWORD" id="$PROJECT_ID"
@@ -142,7 +142,7 @@ create_github_issue_oblt_test_environments() {
echo "--- Create GitHub issue for deploying in the oblt test env"
-GITHUB_ISSUE=$(mktemp --suffix ".md")
+GITHUB_ISSUE=$(mktemp --suffix ".md")
cat < "$GITHUB_ISSUE"
### Kibana image
From 2786fb1a3a6f8dd5302ad5bad7912f39056eaad3 Mon Sep 17 00:00:00 2001
From: mohamedhamed-ahmed
Date: Wed, 15 May 2024 11:21:00 +0300
Subject: [PATCH 14/50] [Dataset Quality] Fix Sorting on size column (#183459)
closes https://github.com/elastic/kibana/issues/183458
---
.../public/hooks/use_dataset_quality_table.tsx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_table.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_table.tsx
index 566d6dac5c0e7..d9c936943cf0b 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_table.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_table.tsx
@@ -8,6 +8,7 @@
import { useSelector } from '@xstate/react';
import { orderBy } from 'lodash';
import React, { useCallback, useMemo } from 'react';
+import type { Primitive } from '@elastic/eui/src/services/sort/comparators';
import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD, NONE } from '../../common/constants';
import { DataStreamStat } from '../../common/data_streams_stats/data_stream_stat';
import { tableSummaryAllText, tableSummaryOfText } from '../../common/translations';
@@ -20,9 +21,11 @@ import { filterInactiveDatasets, isActiveDataset } from '../utils/filter_inactiv
export type Direction = 'asc' | 'desc';
export type SortField = keyof DataStreamStat;
-const sortingOverrides: Partial<{ [key in SortField]: SortField }> = {
+const sortingOverrides: Partial<{
+ [key in SortField]: SortField | ((item: DataStreamStat) => Primitive);
+}> = {
['title']: 'name',
- ['size']: 'sizeBytes',
+ ['size']: DataStreamStat.calculateFilteredSize,
};
export const useDatasetQualityTable = () => {
From 61e408c963c3bc0a26375ccb3007c0701a3240fa Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet
Date: Wed, 15 May 2024 11:02:32 +0200
Subject: [PATCH 15/50] SOR: Add attr override option for `update` and
`bulkUpdate` (#183267)
## Summary
Fix https://github.com/elastic/kibana/issues/183112
Add a new `mergeAttributes` option for both `update` and `bulkUpdate`,
which, when set to `false`, allows to perform a "full" update (fully
replacing the current attributes of the document) instead of a "partial"
one (merging the attributes).
Technically, ES doesn't really support it, so it was only made possible
due to the "client-side" update we implemented for ZDT / SO version BWC.
---
.../src/lib/apis/bulk_update.test.ts | 76 +++++++++++++++++--
.../src/lib/apis/bulk_update.ts | 52 +++++++++----
.../src/lib/apis/update.test.ts | 51 +++++++++++++
.../src/lib/apis/update.ts | 30 +++++---
.../src/apis/bulk_update.ts | 7 ++
.../src/apis/update.ts | 7 ++
.../service/lib/bulk_update.test.ts | 75 ++++++++++++++++--
.../saved_objects/service/lib/update.test.ts | 66 +++++++++++++++-
8 files changed, 319 insertions(+), 45 deletions(-)
diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.test.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.test.ts
index 983021d99005c..cdb8be191b405 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.test.ts
@@ -132,6 +132,22 @@ describe('#bulkUpdate', () => {
const originId = 'some-origin-id';
const namespace = 'foo-namespace';
+ const getBulkIndexEntry = (
+ method: string,
+ { type, id }: TypeIdTuple,
+ _index = expect.any(String),
+ getId: (type: string, id: string) => string = () => expect.any(String),
+ overrides: Record = {}
+ ) => {
+ return {
+ [method]: {
+ _index,
+ _id: getId(type, id),
+ ...overrides,
+ },
+ };
+ };
+
// bulk index calls have two objects for each source -- the action, and the source
const expectClientCallArgsAction = (
objects: TypeIdTuple[],
@@ -148,14 +164,8 @@ describe('#bulkUpdate', () => {
}
) => {
const body = [];
- for (const { type, id } of objects) {
- body.push({
- [method]: {
- _index,
- _id: getId(type, id),
- ...overrides,
- },
- });
+ for (const object of objects) {
+ body.push(getBulkIndexEntry(method, object, _index, getId, overrides));
body.push(expect.any(Object));
}
expect(client.bulk).toHaveBeenCalledWith(
@@ -220,6 +230,55 @@ describe('#bulkUpdate', () => {
expectClientCallArgsAction([obj1, _obj2], { method: 'index' });
});
+ it('should use the ES bulk action with the merged attributes when mergeAttributes is not false', async () => {
+ const _obj1 = { ...obj1, attributes: { foo: 'bar' } };
+ const _obj2 = { ...obj2, attributes: { hello: 'dolly' }, mergeAttributes: true };
+ await bulkUpdateSuccess(client, repository, registry, [_obj1, _obj2]);
+
+ expect(client.bulk).toHaveBeenCalledTimes(1);
+ expect(client.bulk).toHaveBeenCalledWith(
+ expect.objectContaining({
+ body: [
+ getBulkIndexEntry('index', _obj1),
+ expect.objectContaining({
+ [obj1.type]: {
+ title: 'Testing',
+ foo: 'bar',
+ },
+ }),
+ getBulkIndexEntry('index', _obj2),
+ expect.objectContaining({
+ [obj2.type]: {
+ title: 'Testing',
+ hello: 'dolly',
+ },
+ }),
+ ],
+ }),
+ expect.any(Object)
+ );
+ });
+
+ it('should use the ES bulk action only with the provided attributes when mergeAttributes is false', async () => {
+ const _obj1 = { ...obj1, attributes: { hello: 'dolly' }, mergeAttributes: false };
+ await bulkUpdateSuccess(client, repository, registry, [_obj1]);
+
+ expect(client.bulk).toHaveBeenCalledTimes(1);
+ expect(client.bulk).toHaveBeenCalledWith(
+ expect.objectContaining({
+ body: [
+ getBulkIndexEntry('index', _obj1),
+ expect.objectContaining({
+ [obj1.type]: {
+ hello: 'dolly',
+ },
+ }),
+ ],
+ }),
+ expect.any(Object)
+ );
+ });
+
it(`doesnt call Elasticsearch if there are no valid objects to update`, async () => {
const objects = [obj1, obj2].map((x) => ({ ...x, type: 'unknownType' }));
await repository.bulkUpdate(objects);
@@ -507,6 +566,7 @@ describe('#bulkUpdate', () => {
await bulkUpdateError(obj, true, expectedErrorResult);
});
});
+
describe('migration', () => {
it('migrates the fetched documents from Mget', async () => {
const modifiedObj2 = { ...obj2, coreMigrationVersion: '8.0.0' };
diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.ts
index 7b8163107ac6b..d618bf7a2c82f 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.ts
@@ -58,6 +58,7 @@ type ExpectedBulkGetResult = Either<
objectNamespace?: string;
esRequestIndex: number;
migrationVersionCompatibility?: 'raw' | 'compatible';
+ mergeAttributes: boolean;
}
>;
@@ -89,7 +90,15 @@ export const performBulkUpdate = async (
let bulkGetRequestIndexCounter = 0;
const expectedBulkGetResults = objects.map((object) => {
- const { type, id, attributes, references, version, namespace: objectNamespace } = object;
+ const {
+ type,
+ id,
+ attributes,
+ references,
+ version,
+ namespace: objectNamespace,
+ mergeAttributes = true,
+ } = object;
let error: DecoratedError | undefined;
if (!allowedTypes.includes(type)) {
@@ -122,6 +131,7 @@ export const performBulkUpdate = async (
objectNamespace,
esRequestIndex: bulkGetRequestIndexCounter++,
migrationVersionCompatibility,
+ mergeAttributes,
});
});
@@ -205,8 +215,15 @@ export const performBulkUpdate = async (
return expectedBulkGetResult;
}
- const { esRequestIndex, id, type, version, documentToSave, objectNamespace } =
- expectedBulkGetResult.value;
+ const {
+ esRequestIndex,
+ id,
+ type,
+ version,
+ documentToSave,
+ objectNamespace,
+ mergeAttributes,
+ } = expectedBulkGetResult.value;
let namespaces: string[] | undefined;
const versionProperties = getExpectedVersionProperties(version);
@@ -261,18 +278,23 @@ export const performBulkUpdate = async (
}
const typeDefinition = registry.getType(type)!;
- const updatedAttributes = mergeForUpdate({
- targetAttributes: {
- ...(migrated!.attributes as Record),
- },
- updatedAttributes: await encryptionHelper.optionallyEncryptAttributes(
- type,
- id,
- objectNamespace || namespace,
- documentToSave[type]
- ),
- typeMappings: typeDefinition.mappings,
- });
+
+ const encryptedUpdatedAttributes = await encryptionHelper.optionallyEncryptAttributes(
+ type,
+ id,
+ objectNamespace || namespace,
+ documentToSave[type]
+ );
+
+ const updatedAttributes = mergeAttributes
+ ? mergeForUpdate({
+ targetAttributes: {
+ ...(migrated!.attributes as Record),
+ },
+ updatedAttributes: encryptedUpdatedAttributes,
+ typeMappings: typeDefinition.mappings,
+ })
+ : encryptedUpdatedAttributes;
const migratedUpdatedSavedObjectDoc = migrationHelper.migrateInputDocument({
...migrated!,
diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.test.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.test.ts
index 67076f912973a..a5a2d82e2ac18 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.test.ts
@@ -178,6 +178,55 @@ describe('#update', () => {
expect(client.index).toHaveBeenCalledTimes(1);
});
+ it(`should use the ES index action with the merged attributes when mergeAttributes is not false`, async () => {
+ migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+
+ await updateSuccess(client, repository, registry, NAMESPACE_AGNOSTIC_TYPE, id, {
+ foo: 'bar',
+ });
+
+ expect(client.index).toHaveBeenCalledTimes(1);
+ expect(client.index).toHaveBeenCalledWith(
+ expect.objectContaining({
+ body: expect.objectContaining({
+ globalType: {
+ foo: 'bar',
+ title: 'Testing',
+ },
+ }),
+ }),
+ expect.any(Object)
+ );
+ });
+
+ it(`should use the ES index action only with the provided attributes when mergeAttributes is false`, async () => {
+ migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+
+ await updateSuccess(
+ client,
+ repository,
+ registry,
+ NAMESPACE_AGNOSTIC_TYPE,
+ id,
+ {
+ foo: 'bar',
+ },
+ { mergeAttributes: false }
+ );
+
+ expect(client.index).toHaveBeenCalledTimes(1);
+ expect(client.index).toHaveBeenCalledWith(
+ expect.objectContaining({
+ body: expect.objectContaining({
+ globalType: {
+ foo: 'bar',
+ },
+ }),
+ }),
+ expect.any(Object)
+ );
+ });
+
it(`should check for alias conflicts if a new multi-namespace object before create action would be created then create action to create the object`, async () => {
migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
await updateSuccess(
@@ -218,6 +267,7 @@ describe('#update', () => {
};
await test(references);
});
+
it(`accepts custom references array 2`, async () => {
const test = async (references: SavedObjectReference[]) => {
migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
@@ -232,6 +282,7 @@ describe('#update', () => {
};
await test([{ type: 'foo', id: '42', name: 'some ref' }]);
});
+
it(`accepts custom references array 3`, async () => {
const test = async (references: SavedObjectReference[]) => {
migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.ts
index ee76a0243b3eb..5c7eb11786db5 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.ts
@@ -246,18 +246,24 @@ export const executeUpdate = async (
// at this point, we already know 1. the document exists 2. we're not doing an upsert
// therefor we can safely process with the "standard" update sequence.
- const updatedAttributes = mergeForUpdate({
- targetAttributes: {
- ...(migrated!.attributes as Record),
- },
- updatedAttributes: await encryptionHelper.optionallyEncryptAttributes(
- type,
- id,
- namespace,
- attributes
- ),
- typeMappings: typeDefinition.mappings,
- });
+ const mergeAttributes = options.mergeAttributes ?? true;
+ const encryptedUpdatedAttributes = await encryptionHelper.optionallyEncryptAttributes(
+ type,
+ id,
+ namespace,
+ attributes
+ );
+
+ const updatedAttributes = mergeAttributes
+ ? mergeForUpdate({
+ targetAttributes: {
+ ...(migrated!.attributes as Record),
+ },
+ updatedAttributes: encryptedUpdatedAttributes,
+ typeMappings: typeDefinition.mappings,
+ })
+ : encryptedUpdatedAttributes;
+
const migratedUpdatedSavedObjectDoc = migrationHelper.migrateInputDocument({
...migrated!,
id,
diff --git a/packages/core/saved-objects/core-saved-objects-api-server/src/apis/bulk_update.ts b/packages/core/saved-objects/core-saved-objects-api-server/src/apis/bulk_update.ts
index 49bc8d769a1d6..9b45816abb53a 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server/src/apis/bulk_update.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server/src/apis/bulk_update.ts
@@ -29,6 +29,13 @@ export interface SavedObjectsBulkUpdateObject
* Note: the default namespace's string representation is `'default'`, and its ID representation is `undefined`.
**/
namespace?: string;
+ /**
+ * By default, update will merge the provided attributes with the ones present on the document
+ * (performing a standard partial update). Setting this option to `false` will change the behavior, performing
+ * a "full" update instead, where the provided attributes will fully replace the existing ones.
+ * Defaults to `true`.
+ */
+ mergeAttributes?: boolean;
}
/**
diff --git a/packages/core/saved-objects/core-saved-objects-api-server/src/apis/update.ts b/packages/core/saved-objects/core-saved-objects-api-server/src/apis/update.ts
index e830b32601c5b..29fe906846baa 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server/src/apis/update.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server/src/apis/update.ts
@@ -34,6 +34,13 @@ export interface SavedObjectsUpdateOptions extends SavedOb
retryOnConflict?: number;
/** {@link SavedObjectsRawDocParseOptions.migrationVersionCompatibility} */
migrationVersionCompatibility?: 'compatible' | 'raw';
+ /**
+ * By default, update will merge the provided attributes with the ones present on the document
+ * (performing a standard partial update). Setting this option to `false` will change the behavior, performing
+ * a "full" update instead, where the provided attributes will fully replace the existing ones.
+ * Defaults to `true`.
+ */
+ mergeAttributes?: boolean;
}
/**
diff --git a/src/core/server/integration_tests/saved_objects/service/lib/bulk_update.test.ts b/src/core/server/integration_tests/saved_objects/service/lib/bulk_update.test.ts
index dc620f87ea55b..98af19ec5c9d0 100644
--- a/src/core/server/integration_tests/saved_objects/service/lib/bulk_update.test.ts
+++ b/src/core/server/integration_tests/saved_objects/service/lib/bulk_update.test.ts
@@ -30,7 +30,12 @@ describe('SOR - bulk_update API', () => {
esServer = await startElasticsearch();
});
- const getType = (version: 'v1' | 'v2'): SavedObjectsType => {
+ afterAll(async () => {
+ await esServer?.stop();
+ await delay(10);
+ });
+
+ const getCrossVersionType = (version: 'v1' | 'v2'): SavedObjectsType => {
const versionMap: SavedObjectsModelVersionMap = {
1: {
changes: [],
@@ -117,16 +122,29 @@ describe('SOR - bulk_update API', () => {
modelVersions: versionOtherMap,
};
};
- afterAll(async () => {
- await esServer?.stop();
- await delay(10);
- });
+
+ const getFullUpdateType = (): SavedObjectsType => {
+ return {
+ name: 'update-test-type',
+ hidden: false,
+ namespaceType: 'single',
+ mappings: {
+ dynamic: false,
+ properties: {},
+ },
+ management: {
+ importableAndExportable: true,
+ },
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {},
+ };
+ };
const setup = async () => {
const { runMigrations: runMigrationV1, savedObjectsRepository: repositoryV1 } =
await getKibanaMigratorTestKit({
...getBaseMigratorParams(),
- types: [getType('v1'), getOtherType('v1')],
+ types: [getCrossVersionType('v1'), getOtherType('v1')],
});
await runMigrationV1();
@@ -136,7 +154,7 @@ describe('SOR - bulk_update API', () => {
client: esClient,
} = await getKibanaMigratorTestKit({
...getBaseMigratorParams(),
- types: [getType('v2'), getOtherType('v2')],
+ types: [getCrossVersionType('v2'), getOtherType('v2'), getFullUpdateType()],
});
await runMigrationV2();
@@ -225,6 +243,49 @@ describe('SOR - bulk_update API', () => {
);
});
+ it('supports update with attributes override', async () => {
+ const { repositoryV2: repository } = await setup();
+
+ await repository.create('update-test-type', { foo: 'bar' }, { id: 'my-id' });
+
+ let docs = await repository.bulkGet([{ type: 'update-test-type', id: 'my-id' }]);
+ const [doc] = docs.saved_objects;
+
+ expect(doc.attributes).toEqual({
+ foo: 'bar',
+ });
+
+ await repository.bulkUpdate([
+ { type: 'update-test-type', id: doc.id, attributes: { hello: 'dolly' } },
+ ]);
+
+ docs = await repository.bulkGet([{ type: 'update-test-type', id: 'my-id' }]);
+ const [doc1] = docs.saved_objects;
+
+ expect(doc1.attributes).toEqual({
+ foo: 'bar',
+ hello: 'dolly',
+ });
+
+ await repository.bulkUpdate([
+ {
+ type: 'update-test-type',
+ id: doc1.id,
+ attributes: {
+ over: '9000',
+ },
+ mergeAttributes: false,
+ },
+ ]);
+
+ docs = await repository.bulkGet([{ type: 'update-test-type', id: 'my-id' }]);
+ const [doc2] = docs.saved_objects;
+
+ expect(doc2.attributes).toEqual({
+ over: '9000',
+ });
+ });
+
const fetchDoc = async (client: ElasticsearchClient, type: string, id: string) => {
return await client.get({
index: '.kibana',
diff --git a/src/core/server/integration_tests/saved_objects/service/lib/update.test.ts b/src/core/server/integration_tests/saved_objects/service/lib/update.test.ts
index e2b7d91355d81..f9205086ceb2e 100644
--- a/src/core/server/integration_tests/saved_objects/service/lib/update.test.ts
+++ b/src/core/server/integration_tests/saved_objects/service/lib/update.test.ts
@@ -30,7 +30,7 @@ describe('SOR - update API', () => {
esServer = await startElasticsearch();
});
- const getType = (version: 'v1' | 'v2'): SavedObjectsType => {
+ const getCrossVersionType = (version: 'v1' | 'v2'): SavedObjectsType => {
const versionMap: SavedObjectsModelVersionMap = {
1: {
changes: [],
@@ -74,6 +74,23 @@ describe('SOR - update API', () => {
};
};
+ const getFullUpdateType = (): SavedObjectsType => {
+ return {
+ name: 'update-test-type',
+ hidden: false,
+ namespaceType: 'single',
+ mappings: {
+ dynamic: false,
+ properties: {},
+ },
+ management: {
+ importableAndExportable: true,
+ },
+ switchToModelVersionAt: '8.10.0',
+ modelVersions: {},
+ };
+ };
+
afterAll(async () => {
await esServer?.stop();
await delay(10);
@@ -83,7 +100,7 @@ describe('SOR - update API', () => {
const { runMigrations: runMigrationV1, savedObjectsRepository: repositoryV1 } =
await getKibanaMigratorTestKit({
...getBaseMigratorParams(),
- types: [getType('v1')],
+ types: [getCrossVersionType('v1'), getFullUpdateType()],
});
await runMigrationV1();
@@ -93,7 +110,7 @@ describe('SOR - update API', () => {
client: esClient,
} = await getKibanaMigratorTestKit({
...getBaseMigratorParams(),
- types: [getType('v2')],
+ types: [getCrossVersionType('v2'), getFullUpdateType()],
});
await runMigrationV2();
@@ -145,6 +162,49 @@ describe('SOR - update API', () => {
);
});
+ it('supports update with attributes override', async () => {
+ const { repositoryV2: repository } = await setup();
+
+ await repository.create('update-test-type', { foo: 'bar' }, { id: 'my-id' });
+
+ let document = await repository.get('update-test-type', 'my-id');
+
+ expect(document.attributes).toEqual({
+ foo: 'bar',
+ });
+
+ await repository.update(
+ 'update-test-type',
+ 'my-id',
+ {
+ hello: 'dolly',
+ },
+ { mergeAttributes: true }
+ );
+
+ document = await repository.get('update-test-type', 'my-id');
+
+ expect(document.attributes).toEqual({
+ foo: 'bar',
+ hello: 'dolly',
+ });
+
+ await repository.update(
+ 'update-test-type',
+ 'my-id',
+ {
+ over: '9000',
+ },
+ { mergeAttributes: false }
+ );
+
+ document = await repository.get('update-test-type', 'my-id');
+
+ expect(document.attributes).toEqual({
+ over: '9000',
+ });
+ });
+
const fetchDoc = async (client: ElasticsearchClient, type: string, id: string) => {
return await client.get({
index: '.kibana',
From f9460d19f939ab299ffd0420867c56e2f2de72be Mon Sep 17 00:00:00 2001
From: Vitalii Dmyterko <92328789+vitaliidm@users.noreply.github.com>
Date: Wed, 15 May 2024 10:35:02 +0100
Subject: [PATCH 16/50] [Security Solution][Detection Engine] enable xMatters,
Server Log connectors for Security (#172933)
## Summary
- addresses https://github.com/elastic/kibana/issues/124764
- enables xMatters, Server Log connectors for Security
### Before
### After
### Checklist
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
---
.../server/connector_types/server_log/index.ts | 7 ++++++-
.../server/connector_types/xmatters/index.ts | 7 +++++--
.../rule_actions/rule_actions_pli_complete.cy.ts | 4 ++++
.../rule_actions/rule_actions_pli_essentials.cy.ts | 6 +++++-
.../cypress/screens/common/rule_actions.ts | 4 ++++
5 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/x-pack/plugins/stack_connectors/server/connector_types/server_log/index.ts b/x-pack/plugins/stack_connectors/server/connector_types/server_log/index.ts
index 4d404369ba11d..0275b2bdc2f3f 100644
--- a/x-pack/plugins/stack_connectors/server/connector_types/server_log/index.ts
+++ b/x-pack/plugins/stack_connectors/server/connector_types/server_log/index.ts
@@ -17,6 +17,7 @@ import type {
import {
AlertingConnectorFeatureId,
UptimeConnectorFeatureId,
+ SecurityConnectorFeatureId,
} from '@kbn/actions-plugin/common/connector_feature_config';
import { withoutControlCharacters } from '../lib/string_utils';
@@ -55,7 +56,11 @@ export function getConnectorType(): ServerLogConnectorType {
name: i18n.translate('xpack.stackConnectors.serverLog.title', {
defaultMessage: 'Server log',
}),
- supportedFeatureIds: [AlertingConnectorFeatureId, UptimeConnectorFeatureId],
+ supportedFeatureIds: [
+ AlertingConnectorFeatureId,
+ UptimeConnectorFeatureId,
+ SecurityConnectorFeatureId,
+ ],
validate: {
config: { schema: schema.object({}, { defaultValue: {} }) },
secrets: { schema: schema.object({}, { defaultValue: {} }) },
diff --git a/x-pack/plugins/stack_connectors/server/connector_types/xmatters/index.ts b/x-pack/plugins/stack_connectors/server/connector_types/xmatters/index.ts
index 7a3d701b96242..1be6e9f71c0c7 100644
--- a/x-pack/plugins/stack_connectors/server/connector_types/xmatters/index.ts
+++ b/x-pack/plugins/stack_connectors/server/connector_types/xmatters/index.ts
@@ -14,7 +14,10 @@ import type {
ActionTypeExecutorResult as ConnectorTypeExecutorResult,
ValidatorServices,
} from '@kbn/actions-plugin/server/types';
-import { AlertingConnectorFeatureId } from '@kbn/actions-plugin/common/types';
+import {
+ AlertingConnectorFeatureId,
+ SecurityConnectorFeatureId,
+} from '@kbn/actions-plugin/common/types';
import { postXmatters } from './post_xmatters';
export type XmattersConnectorType = ConnectorType<
@@ -66,7 +69,7 @@ export function getConnectorType(): XmattersConnectorType {
name: i18n.translate('xpack.stackConnectors.xmatters.title', {
defaultMessage: 'xMatters',
}),
- supportedFeatureIds: [AlertingConnectorFeatureId],
+ supportedFeatureIds: [AlertingConnectorFeatureId, SecurityConnectorFeatureId],
validate: {
config: {
schema: ConfigSchema,
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_actions/rule_actions_pli_complete.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_actions/rule_actions_pli_complete.cy.ts
index 6afa38bf81f6c..94c53cb6e3f13 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_actions/rule_actions_pli_complete.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_actions/rule_actions_pli_complete.cy.ts
@@ -12,6 +12,8 @@ import {
SLACK_ACTION_BTN,
WEBHOOK_ACTION_BTN,
EMAIL_ACTION_BTN,
+ SERVER_LOG_ACTION_BTN,
+ XMATTERS_ACTION_BTN,
ACTION_BTN,
} from '../../../../screens/common/rule_actions';
@@ -62,6 +64,8 @@ describe(
cy.get(SLACK_ACTION_BTN).should('be.visible');
cy.get(EMAIL_ACTION_BTN).should('be.visible');
cy.get(WEBHOOK_ACTION_BTN).should('be.visible');
+ cy.get(SERVER_LOG_ACTION_BTN).should('be.visible');
+ cy.get(XMATTERS_ACTION_BTN).should('be.visible');
});
}
);
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_actions/rule_actions_pli_essentials.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_actions/rule_actions_pli_essentials.cy.ts
index 71212f6819a69..8e53f3c96657a 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_actions/rule_actions_pli_essentials.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_actions/rule_actions_pli_essentials.cy.ts
@@ -12,6 +12,8 @@ import {
SLACK_ACTION_BTN,
WEBHOOK_ACTION_BTN,
EMAIL_ACTION_BTN,
+ XMATTERS_ACTION_BTN,
+ SERVER_LOG_ACTION_BTN,
ACTION_BTN,
} from '../../../../screens/common/rule_actions';
@@ -62,8 +64,10 @@ describe(
cy.get(SLACK_ACTION_BTN).should('be.visible');
cy.get(EMAIL_ACTION_BTN).should('be.visible');
- // webhook is not available
+ // complete tier actions are not available
cy.get(WEBHOOK_ACTION_BTN).should('not.exist');
+ cy.get(XMATTERS_ACTION_BTN).should('not.exist');
+ cy.get(SERVER_LOG_ACTION_BTN).should('not.exist');
});
}
);
diff --git a/x-pack/test/security_solution_cypress/cypress/screens/common/rule_actions.ts b/x-pack/test/security_solution_cypress/cypress/screens/common/rule_actions.ts
index 0c0994af2759e..a5c35406fb1ed 100644
--- a/x-pack/test/security_solution_cypress/cypress/screens/common/rule_actions.ts
+++ b/x-pack/test/security_solution_cypress/cypress/screens/common/rule_actions.ts
@@ -9,6 +9,10 @@ export const EMAIL_ACTION_BTN = '[data-test-subj=".email-siem-ActionTypeSelectOp
export const WEBHOOK_ACTION_BTN = '[data-test-subj=".webhook-siem-ActionTypeSelectOption"]';
+export const SERVER_LOG_ACTION_BTN = '[data-test-subj=".server-log-siem-ActionTypeSelectOption"]';
+
+export const XMATTERS_ACTION_BTN = '[data-test-subj=".xmatters-siem-ActionTypeSelectOption"]';
+
/**
* all rule actions buttons, elements which data-test-subj attribute ends with '-siem-ActionTypeSelectOption'
*/
From ed2e59fea95b39dcc853f948ce122544515370f0 Mon Sep 17 00:00:00 2001
From: Gerard Soldevila
Date: Wed, 15 May 2024 11:37:42 +0200
Subject: [PATCH 17/50] Kbn 176803 cleanup 8.14 md5 check (#183416)
## Summary
Follow-up of #176803
Now that `8.14` has been branched and it is about to be released, we can
remove the test that ensures the `HASH_TO_VERSION_MAP` is aligned.
This PR also rolls back a few changes on the map that shouldn't have
been performed, as they belong to `8.15.0`.
---
.../src/constants.ts | 5 +-
.../group4/check_hash_to_version_map.test.ts | 79 -------------------
2 files changed, 2 insertions(+), 82 deletions(-)
delete mode 100644 src/core/server/integration_tests/saved_objects/migrations/group4/check_hash_to_version_map.test.ts
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/constants.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/constants.ts
index d4861ae5808ad..a04e762eaf67d 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/constants.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/constants.ts
@@ -130,7 +130,6 @@ export const DEFAULT_INDEX_TYPES_MAP: IndexTypesMap = {
export const HASH_TO_VERSION_MAP = {
'action_task_params|3d1b76c39bfb2cc8296b024d73854724': '10.0.0',
'action|0be88ebcc8560a075b6898236a202eb1': '10.0.0',
- 'ad_hoc_run_params|6aa8806a2e27d3be492a1da0d7721845': '10.0.0',
'alert|96a5a144778243a9f4fece0e71c2197f': '10.0.0',
'api_key_pending_invalidation|16f515278a295f6245149ad7c5ddedb7': '10.0.0',
'apm-custom-dashboards|561810b957ac3c09fcfc08f32f168e97': '10.0.0',
@@ -182,10 +181,10 @@ export const HASH_TO_VERSION_MAP = {
'infrastructure-monitoring-log-view|c50526fc6040c5355ed027d34d05b35c': '10.0.0',
'infrastructure-ui-source|3d1b76c39bfb2cc8296b024d73854724': '10.0.0',
'ingest_manager_settings|b91ffb075799c78ffd7dbd51a279c8c9': '10.1.0',
- 'ingest-agent-policies|0ab9774bc7728d0c0f37d841570f2872': '10.2.0',
+ 'ingest-agent-policies|0fd93cd11c019b118e93a9157c22057b': '10.1.0',
'ingest-download-sources|0b0f6828e59805bd07a650d80817c342': '10.0.0',
'ingest-outputs|b1237f7fdc0967709e75d65d208ace05': '10.6.0',
- 'ingest-package-policies|ca63c4c5a946704f045803a6b975dbc6': '10.9.0',
+ 'ingest-package-policies|a1a074bad36e68d54f98d2158d60f879': '10.0.0',
'inventory-view|3d1b76c39bfb2cc8296b024d73854724': '10.0.0',
'kql-telemetry|3d1b76c39bfb2cc8296b024d73854724': '10.0.0',
'legacy-url-alias|0750774cf16475f88f2361e99cc5c8f0': '8.2.0',
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group4/check_hash_to_version_map.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group4/check_hash_to_version_map.test.ts
deleted file mode 100644
index 278d108b830f9..0000000000000
--- a/src/core/server/integration_tests/saved_objects/migrations/group4/check_hash_to_version_map.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-/*
- * This file contains logic to build and diff the index mappings for a migration.
- */
-
-import crypto from 'crypto';
-import { mapValues } from 'lodash';
-import {
- getLatestMappingsVirtualVersionMap,
- HASH_TO_VERSION_MAP,
-} from '@kbn/core-saved-objects-base-server-internal';
-import { buildTypesMappings } from '@kbn/core-saved-objects-migration-server-internal';
-import { getCurrentVersionTypeRegistry } from '../kibana_migrator_test_kit';
-
-describe('transition from md5 hashes to model versions', () => {
- // this short-lived test is here to ensure no changes are introduced after the creation of the HASH_TO_VERSION_MAP
- it('ensures the hashToVersionMap does not miss any mappings changes', async () => {
- const typeRegistry = await getCurrentVersionTypeRegistry({ oss: false });
- const mappingProperties = buildTypesMappings(typeRegistry.getAllTypes());
- const hashes = md5Values(mappingProperties);
- const versions = getLatestMappingsVirtualVersionMap(typeRegistry.getAllTypes());
-
- const currentHashToVersionMap = Object.entries(hashes).reduce>(
- (acc, [type, hash]) => {
- acc[`${type}|${hash}`] = versions[type];
- return acc;
- },
- {}
- );
-
- expect(currentHashToVersionMap).toEqual(HASH_TO_VERSION_MAP);
- });
-});
-
-// Convert an object to an md5 hash string, using a stable serialization (canonicalStringify)
-function md5Object(obj: any) {
- return crypto.createHash('md5').update(canonicalStringify(obj)).digest('hex');
-}
-
-// JSON.stringify is non-canonical, meaning the same object may produce slightly
-// different JSON, depending on compiler optimizations (e.g. object keys
-// are not guaranteed to be sorted). This function consistently produces the same
-// string, if passed an object of the same shape. If the outpuf of this function
-// changes from one release to another, migrations will run, so it's important
-// that this function remains stable across releases.
-function canonicalStringify(obj: any): string {
- if (Array.isArray(obj)) {
- return `[${obj.map(canonicalStringify)}]`;
- }
-
- if (!obj || typeof obj !== 'object') {
- return JSON.stringify(obj);
- }
-
- const keys = Object.keys(obj);
-
- // This is important for properly handling Date
- if (!keys.length) {
- return JSON.stringify(obj);
- }
-
- const sortedObj = keys
- .sort((a, b) => a.localeCompare(b))
- .map((k) => `${k}: ${canonicalStringify(obj[k])}`);
-
- return `{${sortedObj}}`;
-}
-
-// Convert an object's values to md5 hash strings
-function md5Values(obj: any) {
- return mapValues(obj, md5Object);
-}
From 834ea8810cc092951977b647e9e0e77402a0be0d Mon Sep 17 00:00:00 2001
From: Alex Szabo
Date: Wed, 15 May 2024 12:28:58 +0200
Subject: [PATCH 18/50] [CI] Increase artifact build timeout (#183482)
## Summary
Increases step timeout for building the whole artifact collection by
15m.
With some recent additions ([chainguard
build](https://github.com/elastic/kibana/pull/183200) adds ~7m) and the
new infra overhead, we've gone from ~50-52 minutes to ~57-60 minutes
(this one timed out exactly on the last bit:
https://buildkite.com/elastic/kibana-artifacts-snapshot/builds/4295#018f7b4c-3629-4c4f-8d80-85b2552a43c4)
---
.buildkite/pipelines/artifacts.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.buildkite/pipelines/artifacts.yml b/.buildkite/pipelines/artifacts.yml
index 8f7f37eb67385..93dcc2eaec976 100644
--- a/.buildkite/pipelines/artifacts.yml
+++ b/.buildkite/pipelines/artifacts.yml
@@ -6,7 +6,7 @@ steps:
imageProject: elastic-images-qa
provider: gcp
machineType: c2-standard-16
- timeout_in_minutes: 60
+ timeout_in_minutes: 75
retry:
automatic:
- exit_status: '*'
From eb4eabc080b007ba5e00e1bb9bb2ce08ae97b343 Mon Sep 17 00:00:00 2001
From: Mark Hopkin
Date: Wed, 15 May 2024 11:34:33 +0100
Subject: [PATCH 19/50] [Entity Analytics] Wait for loader to disappear in
flaky cypress test (#182799)
## Summary
closes #179234
Serverless 200
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/5904
ESS 100 (ignore serverless failing in this one)
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/5867
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
.../entity_analytics_risk_score/index.test.tsx | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_analytics_risk_score/index.test.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_analytics_risk_score/index.test.tsx
index 5893fb803342c..057e250e339d6 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_analytics_risk_score/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_analytics_risk_score/index.test.tsx
@@ -232,8 +232,7 @@ describe.each([RiskScoreEntity.host, RiskScoreEntity.user])(
});
});
- // FLAKY: https://github.com/elastic/kibana/issues/179234
- it.skip('opens the expandable flyout when entity name is clicked', async () => {
+ it('opens the expandable flyout when entity name is clicked', async () => {
mockUseQueryToggle.mockReturnValue({ toggleStatus: true, setToggleStatus: jest.fn() });
mockUseRiskScoreKpi.mockReturnValue({
severityCount: mockSeverityCount,
@@ -257,18 +256,22 @@ describe.each([RiskScoreEntity.host, RiskScoreEntity.user])(
];
mockUseRiskScore.mockReturnValue({ ...defaultProps, data });
- const { getByTestId } = render(
+ const { getByTestId, queryByTestId } = render(
);
- fireEvent.click(
- getByTestId(
- riskEntity === RiskScoreEntity.host ? `host-details-button` : `users-link-anchor`
- )
+ await waitFor(() => {
+ expect(queryByTestId('loadingPanelRiskScore')).not.toBeInTheDocument();
+ });
+
+ const detailsButton = getByTestId(
+ riskEntity === RiskScoreEntity.host ? `host-details-button` : `users-link-anchor`
);
+ fireEvent.click(detailsButton);
+
await waitFor(() => {
expect(mockOpenRightPanel).toHaveBeenCalledWith({
id: `${riskEntity}-panel`,
From 994b8c2beab211e15facff3eec3676d8e96bcbea Mon Sep 17 00:00:00 2001
From: Julia Rechkunova
Date: Wed, 15 May 2024 13:06:24 +0200
Subject: [PATCH 20/50] [Discover] Fix JSON view height in DocViewer (#183468)
- A fix after
https://github.com/elastic/kibana/pull/180370/files#diff-ed350967c6564d64f0123a2d55700b1ddc7f5d6fcb3786384fb7ae25334fe9eaL672
## Summary
This PR fixes the height of JSON block in DocViewer. ~Also it reduces
the available height as the flyout now has a footer with Close button.~
---
.../public/components/doc_viewer_source/source.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/unified_doc_viewer/public/components/doc_viewer_source/source.tsx b/src/plugins/unified_doc_viewer/public/components/doc_viewer_source/source.tsx
index 26ac6cb01b71e..13f2ee065f504 100644
--- a/src/plugins/unified_doc_viewer/public/components/doc_viewer_source/source.tsx
+++ b/src/plugins/unified_doc_viewer/public/components/doc_viewer_source/source.tsx
@@ -54,7 +54,7 @@ export const DocViewerSource = ({
const [jsonValue, setJsonValue] = useState('');
const { uiSettings } = getUnifiedDocViewerServices();
const useNewFieldsApi = !uiSettings.get(SEARCH_FIELDS_FROM_SOURCE);
- const useDocExplorer = isLegacyTableEnabled({
+ const useDocExplorer = !isLegacyTableEnabled({
uiSettings,
isTextBasedQueryMode: Array.isArray(textBasedHits),
});
From 433b67d1120bd5a0b8f2ced8d353f2f5a8a6914b Mon Sep 17 00:00:00 2001
From: Ido Cohen <90558359+CohenIdo@users.noreply.github.com>
Date: Wed, 15 May 2024 14:14:33 +0300
Subject: [PATCH 21/50] [Cloud Security] Fix flaky test (#183262)
---
.../security/cloud_security_posture/status/status_indexed.ts | 3 +--
.../security/cloud_security_posture/status/status_indexing.ts | 3 +--
.../api_integration/test_suites/security/config.ts | 4 ++++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/status/status_indexed.ts b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/status/status_indexed.ts
index fcfa461197d77..ec3216971ec35 100644
--- a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/status/status_indexed.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/status/status_indexed.ts
@@ -47,8 +47,7 @@ export default function (providerContext: FtrProviderContext) {
let agentPolicyId: string;
- // FLAKY: https://github.com/elastic/kibana/issues/178027
- describe.skip('STATUS = INDEXED TEST', () => {
+ describe('STATUS = INDEXED TEST', () => {
beforeEach(async () => {
await kibanaServer.savedObjects.cleanStandardList();
await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/status/status_indexing.ts b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/status/status_indexing.ts
index 8069cdd98bb22..17e1e6458edaa 100644
--- a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/status/status_indexing.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/status/status_indexing.ts
@@ -47,8 +47,7 @@ export default function (providerContext: FtrProviderContext) {
let agentPolicyId: string;
- // FLAKY: https://github.com/elastic/kibana/issues/181777
- describe.skip('STATUS = INDEXING TEST', () => {
+ describe('STATUS = INDEXING TEST', () => {
beforeEach(async () => {
await kibanaServer.savedObjects.cleanStandardList();
await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/config.ts b/x-pack/test_serverless/api_integration/test_suites/security/config.ts
index 7a127bc0de322..45ef3c5d63d8e 100644
--- a/x-pack/test_serverless/api_integration/test_suites/security/config.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/security/config.ts
@@ -18,4 +18,8 @@ export default createTestConfig({
// include settings from project controller
// https://github.com/elastic/project-controller/blob/main/internal/project/security/config/elasticsearch.yml
esServerArgs: ['xpack.ml.nlp.enabled=true'],
+ kbnServerArgs: [
+ // disable fleet task that writes to metrics.fleet_server.* data streams, impacting functional tests
+ `--xpack.task_manager.unsafe.exclude_task_types=${JSON.stringify(['Fleet-Metrics-Task'])}`,
+ ],
});
From 3965bb631307292244d47a921f78d76f38e4819e Mon Sep 17 00:00:00 2001
From: Jedr Blaszyk
Date: Wed, 15 May 2024 13:15:46 +0200
Subject: [PATCH 22/50] [Connector] Use Connector API to update configuration
(#183470)
## Summary
Use Connector API to handle configuration updates for connectors. Update
unit tests.
---
.../update_connector_configuration.test.ts | 65 ++++++++++++-------
.../lib/update_connector_configuration.ts | 51 +++------------
.../translations/translations/fr-FR.json | 1 -
.../translations/translations/ja-JP.json | 1 -
.../translations/translations/zh-CN.json | 1 -
5 files changed, 52 insertions(+), 67 deletions(-)
diff --git a/packages/kbn-search-connectors/lib/update_connector_configuration.test.ts b/packages/kbn-search-connectors/lib/update_connector_configuration.test.ts
index 9f6d0b188e535..7ed0bae6cf53e 100644
--- a/packages/kbn-search-connectors/lib/update_connector_configuration.test.ts
+++ b/packages/kbn-search-connectors/lib/update_connector_configuration.test.ts
@@ -8,52 +8,73 @@
import { ElasticsearchClient } from '@kbn/core/server';
-import { CONNECTORS_INDEX } from '..';
-import { fetchConnectorById } from './fetch_connectors';
-import { ConnectorStatus } from '../types/connectors';
+import { errors } from '@elastic/elasticsearch';
import { updateConnectorConfiguration } from './update_connector_configuration';
+import { fetchConnectorById } from './fetch_connectors';
jest.mock('./fetch_connectors', () => ({ fetchConnectorById: jest.fn() }));
describe('updateConnectorConfiguration lib function', () => {
const mockClient = {
- update: jest.fn(),
+ transport: {
+ request: jest.fn(),
+ },
};
beforeEach(() => {
jest.clearAllMocks();
- (fetchConnectorById as jest.Mock).mockResolvedValue({
- configuration: { test: { label: 'haha', value: 'this' } },
- id: 'connectorId',
- status: ConnectorStatus.NEEDS_CONFIGURATION,
- });
});
it('should update configuration', async () => {
+ (fetchConnectorById as jest.Mock).mockResolvedValue({
+ configuration: { test: { value: 'haha' } },
+ });
+
+ mockClient.transport.request.mockResolvedValueOnce({ result: 'updated' });
+
await expect(
updateConnectorConfiguration(mockClient as unknown as ElasticsearchClient, 'connectorId', {
- test: 'newValue',
+ test: 'haha',
})
- ).resolves.toEqual({ test: { label: 'haha', value: 'newValue' } });
- expect(mockClient.update).toHaveBeenCalledWith({
- doc: {
- configuration: { test: { label: 'haha', value: 'newValue' } },
- status: ConnectorStatus.CONFIGURED,
+ ).resolves.toEqual({ test: { value: 'haha' } });
+ expect(mockClient.transport.request).toHaveBeenCalledWith({
+ body: {
+ values: {
+ test: 'haha',
+ },
},
- id: 'connectorId',
- index: CONNECTORS_INDEX,
+ method: 'PUT',
+ path: '/_connector/connectorId/_configuration',
});
});
it('should reject if connector does not exist', async () => {
- (fetchConnectorById as jest.Mock).mockImplementation(() => undefined);
-
+ mockClient.transport.request.mockImplementationOnce(() => {
+ return Promise.reject(
+ new errors.ResponseError({
+ statusCode: 404,
+ body: {
+ error: {
+ type: `document_missing_exception`,
+ },
+ },
+ } as any)
+ );
+ });
await expect(
updateConnectorConfiguration(mockClient as unknown as ElasticsearchClient, 'connectorId', {
- test: 'newValue',
+ test: 'haha',
})
- ).rejects.toEqual(new Error('Could not find connector'));
- expect(mockClient.update).not.toHaveBeenCalled();
+ ).rejects.toEqual(
+ new errors.ResponseError({
+ statusCode: 404,
+ body: {
+ error: {
+ type: `document_missing_exception`,
+ },
+ },
+ } as any)
+ );
});
});
diff --git a/packages/kbn-search-connectors/lib/update_connector_configuration.ts b/packages/kbn-search-connectors/lib/update_connector_configuration.ts
index f9588b984409f..c05c4ba4f6049 100644
--- a/packages/kbn-search-connectors/lib/update_connector_configuration.ts
+++ b/packages/kbn-search-connectors/lib/update_connector_configuration.ts
@@ -8,54 +8,21 @@
import { ElasticsearchClient } from '@kbn/core/server';
-import { i18n } from '@kbn/i18n';
-
-import { CONNECTORS_INDEX } from '..';
-
+import { Result } from '@elastic/elasticsearch/lib/api/types';
import { fetchConnectorById } from './fetch_connectors';
-import { ConnectorConfiguration, ConnectorDocument, ConnectorStatus } from '../types/connectors';
-import { isConfigEntry } from '../utils/is_category_entry';
-import { isNotNullish } from '../utils/is_not_nullish';
export const updateConnectorConfiguration = async (
client: ElasticsearchClient,
connectorId: string,
configuration: Record
) => {
+ await client.transport.request({
+ method: 'PUT',
+ path: `/_connector/${connectorId}/_configuration`,
+ body: {
+ values: configuration,
+ },
+ });
const connector = await fetchConnectorById(client, connectorId);
- if (connector) {
- const status =
- connector.status === ConnectorStatus.NEEDS_CONFIGURATION ||
- connector.status === ConnectorStatus.CREATED
- ? ConnectorStatus.CONFIGURED
- : connector.status;
- const updatedConfig: ConnectorConfiguration = Object.keys(connector.configuration)
- .map((key) => {
- const configEntry = connector.configuration[key];
- return isConfigEntry(configEntry)
- ? {
- ...configEntry, // ugly but needed because typescript refuses to believe this is defined
- key,
- value: configuration[key] ?? configEntry.value,
- }
- : undefined;
- })
- .filter(isNotNullish)
- .reduce((prev: ConnectorConfiguration, curr) => {
- const { key, ...config } = curr;
- return { ...prev, [curr.key]: config };
- }, {});
- await client.update({
- doc: { configuration: updatedConfig, status },
- id: connectorId,
- index: CONNECTORS_INDEX,
- });
- return updatedConfig;
- } else {
- throw new Error(
- i18n.translate('searchConnectors.server.connectors.configuration.error', {
- defaultMessage: 'Could not find connector',
- })
- );
- }
+ return connector?.configuration;
};
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 8bd6ce65f5f70..00db92de8fb88 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -5777,7 +5777,6 @@
"searchConnectors.searchIndices.identitySync.columnTitle": "Identités synchronisées",
"searchConnectors.searchIndices.syncJobType.columnTitle": "Type de synchronisation de contenu",
"searchConnectors.searchIndices.syncStatus.columnTitle": "Statut",
- "searchConnectors.server.connectors.configuration.error": "Connecteur introuvable",
"searchConnectors.server.connectors.scheduling.error": "Document introuvable",
"searchConnectors.syncJobs.flyout.canceledTitle": "Synchronisation annulée",
"searchConnectors.syncJobs.flyout.completedTitle": "Synchronisation terminée",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index fec4486e201f2..44c9d24e178e7 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -5770,7 +5770,6 @@
"searchConnectors.searchIndices.identitySync.columnTitle": "IDが同期されました",
"searchConnectors.searchIndices.syncJobType.columnTitle": "コンテンツ同期タイプ",
"searchConnectors.searchIndices.syncStatus.columnTitle": "ステータス",
- "searchConnectors.server.connectors.configuration.error": "コネクターが見つかりませんでした",
"searchConnectors.server.connectors.scheduling.error": "ドキュメントが見つかりませんでした",
"searchConnectors.syncJobs.flyout.canceledTitle": "同期がキャンセルされました",
"searchConnectors.syncJobs.flyout.completedTitle": "同期完了",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 116bbcd3152d7..26974aebbaf97 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -5781,7 +5781,6 @@
"searchConnectors.searchIndices.identitySync.columnTitle": "身份已同步",
"searchConnectors.searchIndices.syncJobType.columnTitle": "内容同步类型",
"searchConnectors.searchIndices.syncStatus.columnTitle": "状态",
- "searchConnectors.server.connectors.configuration.error": "找不到连接器",
"searchConnectors.server.connectors.scheduling.error": "无法找到文档",
"searchConnectors.syncJobs.flyout.canceledTitle": "同步已取消",
"searchConnectors.syncJobs.flyout.completedTitle": "同步已完成",
From 5a01049b5ce35f2bd1d6fbba17c92c1b66b171a2 Mon Sep 17 00:00:00 2001
From: Faisal Kanout
Date: Wed, 15 May 2024 13:34:38 +0200
Subject: [PATCH 23/50] [Observability] [Alert detail pages] Untracked status
is not reflected in tabs when using "Mark as untracked" (#181339)
## Summary
it fixed #180783
https://github.com/elastic/kibana/assets/6838659/db9f1e90-9876-4a5d-96c0-e074d211c02c
---
.../alert_overview/alert_overview.tsx | 320 +++++++++---------
.../pages/alert_details/alert_details.tsx | 2 +-
2 files changed, 167 insertions(+), 155 deletions(-)
diff --git a/x-pack/plugins/observability_solution/observability/public/components/alert_overview/alert_overview.tsx b/x-pack/plugins/observability_solution/observability/public/components/alert_overview/alert_overview.tsx
index a4cc5b30c3d53..95e043dd3da1c 100644
--- a/x-pack/plugins/observability_solution/observability/public/components/alert_overview/alert_overview.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/components/alert_overview/alert_overview.tsx
@@ -15,6 +15,7 @@ import {
EuiInMemoryTable,
} from '@elastic/eui';
import {
+ AlertStatus,
ALERT_CASE_IDS,
ALERT_DURATION,
ALERT_END,
@@ -46,168 +47,179 @@ import { ColumnIDs, overviewColumns } from './overview_columns';
import { getSources } from './helpers/get_sources';
import { RULE_DETAILS_PAGE_ID } from '../../pages/rule_details/constants';
-export const AlertOverview = memo(({ alert, pageId }: { alert: TopAlert; pageId?: string }) => {
- const {
- http: {
- basePath: { prepend },
- },
- } = useKibana().services;
- const { cases, isLoading } = useFetchBulkCases({ ids: alert.fields[ALERT_CASE_IDS] || [] });
- const dateFormat = useUiSetting('dateFormat');
- const [timeRange, setTimeRange] = useState({ from: 'now-15m', to: 'now' });
- const [ruleCriteria, setRuleCriteria] = useState([]);
- const alertStart = alert.fields[ALERT_START];
- const alertEnd = alert.fields[ALERT_END];
- const ruleId = get(alert.fields, ALERT_RULE_UUID) ?? null;
- const linkToRule =
- pageId !== RULE_DETAILS_PAGE_ID && ruleId
- ? prepend(paths.observability.ruleDetails(ruleId))
- : null;
+export const AlertOverview = memo(
+ ({
+ alert,
+ pageId,
+ alertStatus,
+ }: {
+ alert: TopAlert;
+ pageId?: string;
+ alertStatus?: AlertStatus;
+ }) => {
+ const {
+ http: {
+ basePath: { prepend },
+ },
+ } = useKibana().services;
+ const { cases, isLoading } = useFetchBulkCases({ ids: alert.fields[ALERT_CASE_IDS] || [] });
+ const dateFormat = useUiSetting('dateFormat');
+ const [timeRange, setTimeRange] = useState({ from: 'now-15m', to: 'now' });
+ const [ruleCriteria, setRuleCriteria] = useState([]);
+ const alertStart = alert.fields[ALERT_START];
+ const alertEnd = alert.fields[ALERT_END];
+ const ruleId = get(alert.fields, ALERT_RULE_UUID) ?? null;
+ const linkToRule =
+ pageId !== RULE_DETAILS_PAGE_ID && ruleId
+ ? prepend(paths.observability.ruleDetails(ruleId))
+ : null;
- useEffect(() => {
- const mappedRuleParams = mapRuleParamsWithFlyout(alert);
- setRuleCriteria(mappedRuleParams);
- }, [alert]);
+ useEffect(() => {
+ const mappedRuleParams = mapRuleParamsWithFlyout(alert);
+ setRuleCriteria(mappedRuleParams);
+ }, [alert]);
- useEffect(() => {
- setTimeRange(getPaddedAlertTimeRange(alertStart!, alertEnd));
- }, [alertStart, alertEnd]);
+ useEffect(() => {
+ setTimeRange(getPaddedAlertTimeRange(alertStart!, alertEnd));
+ }, [alertStart, alertEnd]);
- const { navigateToCaseView } = useCaseViewNavigation();
- const items = useMemo(() => {
- return [
- {
- id: ColumnIDs.STATUS,
- key: i18n.translate('xpack.observability.alertFlyout.overviewTab.status', {
- defaultMessage: 'Status',
- }),
- value: alert.fields[ALERT_STATUS],
- meta: {
- flapping: alert.fields[ALERT_FLAPPING],
+ const { navigateToCaseView } = useCaseViewNavigation();
+ const items = useMemo(() => {
+ return [
+ {
+ id: ColumnIDs.STATUS,
+ key: i18n.translate('xpack.observability.alertFlyout.overviewTab.status', {
+ defaultMessage: 'Status',
+ }),
+ value: alertStatus || alert.fields[ALERT_STATUS],
+ meta: {
+ flapping: alert.fields[ALERT_FLAPPING],
+ },
},
- },
- {
- id: ColumnIDs.SOURCE,
- key: i18n.translate('xpack.observability.alertFlyout.overviewTab.sources', {
- defaultMessage: 'Affected entity / source',
- }),
- value: [],
- meta: {
- alertEnd,
- timeRange,
- groups: getSources(alert) || [],
+ {
+ id: ColumnIDs.SOURCE,
+ key: i18n.translate('xpack.observability.alertFlyout.overviewTab.sources', {
+ defaultMessage: 'Affected entity / source',
+ }),
+ value: [],
+ meta: {
+ alertEnd,
+ timeRange,
+ groups: getSources(alert) || [],
+ },
},
- },
- {
- id: ColumnIDs.TRIGGERED,
- key: i18n.translate('xpack.observability.alertFlyout.overviewTab.triggered', {
- defaultMessage: 'Triggered',
- }),
- value: alert.fields[ALERT_START],
- meta: {
- dateFormat,
+ {
+ id: ColumnIDs.TRIGGERED,
+ key: i18n.translate('xpack.observability.alertFlyout.overviewTab.triggered', {
+ defaultMessage: 'Triggered',
+ }),
+ value: alert.fields[ALERT_START],
+ meta: {
+ dateFormat,
+ },
},
- },
- {
- id: ColumnIDs.DURATION,
- key: i18n.translate('xpack.observability.alertFlyout.overviewTab.duration', {
- defaultMessage: 'Duration',
- }),
- value: alert.fields[ALERT_DURATION],
- },
- {
- id: ColumnIDs.OBSERVED_VALUE,
- key: i18n.translate('xpack.observability.alertFlyout.overviewTab.observedValue', {
- defaultMessage: 'Observed value',
- }),
- value: alert.fields[ALERT_EVALUATION_VALUES] || [alert.fields[ALERT_EVALUATION_VALUE]],
- meta: {
- ruleCriteria,
+ {
+ id: ColumnIDs.DURATION,
+ key: i18n.translate('xpack.observability.alertFlyout.overviewTab.duration', {
+ defaultMessage: 'Duration',
+ }),
+ value: alert.fields[ALERT_DURATION],
},
- },
- {
- id: ColumnIDs.THRESHOLD,
- key: i18n.translate('xpack.observability.alertFlyout.overviewTab.threshold', {
- defaultMessage: 'Threshold',
- }),
- value: [],
- meta: {
- ruleCriteria,
+ {
+ id: ColumnIDs.OBSERVED_VALUE,
+ key: i18n.translate('xpack.observability.alertFlyout.overviewTab.observedValue', {
+ defaultMessage: 'Observed value',
+ }),
+ value: alert.fields[ALERT_EVALUATION_VALUES] || [alert.fields[ALERT_EVALUATION_VALUE]],
+ meta: {
+ ruleCriteria,
+ },
},
- },
- {
- id: ColumnIDs.RULE_NAME,
- key: i18n.translate('xpack.observability.alertFlyout.overviewTab.ruleName', {
- defaultMessage: 'Rule name',
- }),
- value: alert.fields[ALERT_RULE_NAME],
- meta: {
- ruleLink:
- alert.fields[ALERT_RULE_UUID] &&
- prepend(paths.observability.ruleDetails(alert.fields[ALERT_RULE_UUID])),
+ {
+ id: ColumnIDs.THRESHOLD,
+ key: i18n.translate('xpack.observability.alertFlyout.overviewTab.threshold', {
+ defaultMessage: 'Threshold',
+ }),
+ value: [],
+ meta: {
+ ruleCriteria,
+ },
},
- },
- {
- id: ColumnIDs.RULE_TYPE,
- key: i18n.translate('xpack.observability.alertFlyout.overviewTab.ruleType', {
- defaultMessage: 'Rule type',
- }),
- value: alert.fields[ALERT_RULE_CATEGORY],
- },
- {
- id: ColumnIDs.CASES,
- key: i18n.translate('xpack.observability.alertFlyout.overviewTab.cases', {
- defaultMessage: 'Cases',
- }),
- value: [],
- meta: {
- cases,
- navigateToCaseView,
- isLoading,
+ {
+ id: ColumnIDs.RULE_NAME,
+ key: i18n.translate('xpack.observability.alertFlyout.overviewTab.ruleName', {
+ defaultMessage: 'Rule name',
+ }),
+ value: alert.fields[ALERT_RULE_NAME],
+ meta: {
+ ruleLink:
+ alert.fields[ALERT_RULE_UUID] &&
+ prepend(paths.observability.ruleDetails(alert.fields[ALERT_RULE_UUID])),
+ },
},
- },
- ];
- }, [
- alert,
- alertEnd,
- cases,
- dateFormat,
- prepend,
- isLoading,
- navigateToCaseView,
- ruleCriteria,
- timeRange,
- ]);
+ {
+ id: ColumnIDs.RULE_TYPE,
+ key: i18n.translate('xpack.observability.alertFlyout.overviewTab.ruleType', {
+ defaultMessage: 'Rule type',
+ }),
+ value: alert.fields[ALERT_RULE_CATEGORY],
+ },
+ {
+ id: ColumnIDs.CASES,
+ key: i18n.translate('xpack.observability.alertFlyout.overviewTab.cases', {
+ defaultMessage: 'Cases',
+ }),
+ value: [],
+ meta: {
+ cases,
+ navigateToCaseView,
+ isLoading,
+ },
+ },
+ ];
+ }, [
+ alertStatus,
+ alert,
+ alertEnd,
+ timeRange,
+ dateFormat,
+ ruleCriteria,
+ prepend,
+ cases,
+ navigateToCaseView,
+ isLoading,
+ ]);
- return (
- <>
-
-
- {i18n.translate('xpack.observability.alertsFlyout.reasonTitle', {
- defaultMessage: 'Reason',
- })}
-
-
- {alert.reason}
-
- {i18n.translate('xpack.observability.alertsFlyout.viewRulesDetailsLinkText', {
- defaultMessage: 'View rule details',
- })}
-
- )}
-
-
- {i18n.translate('xpack.observability.alertsFlyout.documentSummaryTitle', {
- defaultMessage: 'Document Summary',
- })}
-
-
-
+
+ {i18n.translate('xpack.observability.alertsFlyout.reasonTitle', {
+ defaultMessage: 'Reason',
+ })}
+
+
+ {alert.reason}
+
+ {i18n.translate('xpack.observability.alertsFlyout.viewRulesDetailsLinkText', {
+ defaultMessage: 'View rule details',
+ })}
+
+ )}
+
+
+ {i18n.translate('xpack.observability.alertsFlyout.documentSummaryTitle', {
+ defaultMessage: 'Document Summary',
+ })}
+
+
+
Date: Wed, 15 May 2024 14:05:39 +0100
Subject: [PATCH 26/50] [Fleet] Provide license info in telemetry (#182150)
### Summary
Relates https://github.com/elastic/ingest-dev/issues/2866
This PR adds license information to Fleet telemetry events stored in the
`fleet-usages*` index. The `license. issued_to` field provides the
customer name.
### Testing locally
In a local setup, only the new `license_issued_to` field is defined.
Fleet usage logger:
1. Change the
[interval](https://github.com/elastic/kibana/blob/de755234957b8df5bb773587150014b076fe5551/x-pack/plugins/fleet/server/services/fleet_usage_logger.ts#L59C46-L59C48)
of the `FleetUsageLogger` to e.g. `1m`.
2. Wait for the log line to show up:
```
Fleet Usage: {"agents_enabled":true,"agents":{"total_enrolled":3,"healthy":3,"unhealthy":0,"offline":0,"inactive":0,"unenrolled":0,"total_all_statuses":3,"updating":0},"fleet_server":{"total_enrolled":1,"healthy":1,"unhealthy":0,"offline":0,"updating":0,"total_all_statuses":1,"num_host_urls":1},"license_issued_to":"elasticsearch"}
```
Fleet usage sender:
1. Change the interval of the `FleetUsageSender` to e.g. `1m`.
2. Wait for the following log line:
```
[2024-05-03T15:24:11.843+02:00][DEBUG][plugins.fleet] Fleet usage telemetry: {"agents_enabled":true,"agents":{"total_enrolled":3,"healthy":3,"unhealthy":0,"offline":0,"inactive":0,"unenrolled":0,"total_all_statuses":3,"updating":0},"fleet_server":{"total_enrolled":1,"healthy":1,"unhealthy":0,"offline":0,"updating":0,"total_all_statuses":1,"num_host_urls":1},"packages":[{"name":"system","version":"1.55.2","enabled":true},{"name":"synthetics","version":"1.2.1","enabled":false},{"name":"fleet_server","version":"1.5.0","enabled":true},{"name":"elastic_agent","version":"1.18.0","enabled":false},{"name":"nginx","version":"1.20.0","enabled":false}],"agent_checkin_status":{"error":0,"degraded":0},"agents_per_policy":[2,1],"agents_per_os":[{"name":"Ubuntu","version":"20.04.6 LTS (Focal Fossa)","count":3}],"fleet_server_config":{"policies":[{"input_config":{}}]},"agent_policies":{"count":3,"output_types":["elasticsearch"]},"agent_logs_panics_last_hour":[],"agent_logs_top_errors":[],"fleet_server_logs_top_errors":[],"license_issued_to":"elasticsearch"}
```
Upgrade sender:
1. Change the
[interval](https://github.com/elastic/kibana/blob/b8d8c737e6cc7889c19a6e7984d618bf378ee617/x-pack/plugins/fleet/server/services/telemetry/fleet_usage_sender.ts#L30)
of the `FleetUsageSender` to e.g. `1m`.
4. (Re)install a package and wait for the telemetry log (DEBUG level),
which should contain license information:
```
[2024-05-03T15:20:41.087+02:00][DEBUG][plugins.fleet.telemetry_events] [{"packageName":"nginx","currentVersion":"1.20.0","newVersion":"1.20.0","status":"success","dryRun":false,"eventType":"package-install","installType":"reinstall","errorMessage":[],"license_issued_to":"elasticsearch"}]
```
### Checklist
- [ ] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
---------
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
---
.../fleet/server/collectors/register.ts | 6 +++++
.../services/telemetry/fleet_usage_sender.ts | 6 +++--
.../services/telemetry/fleet_usages_schema.ts | 8 ++++++
.../fleet/server/services/upgrade_sender.ts | 2 +-
.../plugins/fleet/server/telemetry/sender.ts | 27 ++++++++++++++++---
5 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/x-pack/plugins/fleet/server/collectors/register.ts b/x-pack/plugins/fleet/server/collectors/register.ts
index 01d0a65f2cf08..b350723f62696 100644
--- a/x-pack/plugins/fleet/server/collectors/register.ts
+++ b/x-pack/plugins/fleet/server/collectors/register.ts
@@ -10,6 +10,8 @@ import type { CoreSetup } from '@kbn/core/server';
import type { FleetConfigType } from '..';
+import { appContextService } from '../services';
+
import { getIsAgentsEnabled } from './config_collectors';
import { getAgentUsage, getAgentData } from './agent_collectors';
import type { AgentUsage, AgentData } from './agent_collectors';
@@ -61,6 +63,8 @@ export const fetchFleetUsage = async (
...(await getPanicLogsLastHour(esClient)),
...(await getAgentLogsTopErrors(esClient)),
agents_per_output_type: await getAgentsPerOutput(soClient, esClient),
+ license_issued_to: (await esClient.license.get()).license.issued_to,
+ deployment_id: appContextService.getCloud()?.deploymentId,
};
return usage;
};
@@ -83,6 +87,8 @@ export const fetchAgentsUsage = async (core: CoreSetup, config: FleetConfigType)
agents_enabled: getIsAgentsEnabled(config),
agents: await getAgentUsage(soClient, esClient),
fleet_server: await getFleetServerUsage(soClient, esClient),
+ license_issued_to: (await esClient.license.get()).license.issued_to,
+ deployment_id: appContextService.getCloud()?.deploymentId,
};
return usage;
};
diff --git a/x-pack/plugins/fleet/server/services/telemetry/fleet_usage_sender.ts b/x-pack/plugins/fleet/server/services/telemetry/fleet_usage_sender.ts
index 1b90fe6d01e0b..f0a79a2633036 100644
--- a/x-pack/plugins/fleet/server/services/telemetry/fleet_usage_sender.ts
+++ b/x-pack/plugins/fleet/server/services/telemetry/fleet_usage_sender.ts
@@ -24,7 +24,7 @@ const FLEET_AGENTS_EVENT_TYPE = 'fleet_agents';
export class FleetUsageSender {
private taskManager?: TaskManagerStartContract;
- private taskVersion = '1.1.4';
+ private taskVersion = '1.1.5';
private taskType = 'Fleet-Usage-Sender';
private wasStarted: boolean = false;
private interval = '1h';
@@ -136,7 +136,9 @@ export class FleetUsageSender {
this.wasStarted = true;
try {
- appContextService.getLogger().info(`Task ${this.taskId} scheduled with interval 1h`);
+ appContextService
+ .getLogger()
+ .info(`Task ${this.taskId} scheduled with interval ${this.interval}`);
await this.taskManager.ensureScheduled({
id: this.taskId,
diff --git a/x-pack/plugins/fleet/server/services/telemetry/fleet_usages_schema.ts b/x-pack/plugins/fleet/server/services/telemetry/fleet_usages_schema.ts
index 6bfbf1c794b52..5deaa97b02f3f 100644
--- a/x-pack/plugins/fleet/server/services/telemetry/fleet_usages_schema.ts
+++ b/x-pack/plugins/fleet/server/services/telemetry/fleet_usages_schema.ts
@@ -393,4 +393,12 @@ export const fleetUsagesSchema: RootSchema = {
},
},
},
+ license_issued_to: {
+ type: 'text',
+ _meta: { description: 'The name of the user the license is issued to' },
+ },
+ deployment_id: {
+ type: 'keyword',
+ _meta: { description: 'id of the deployment', optional: true },
+ },
};
diff --git a/x-pack/plugins/fleet/server/services/upgrade_sender.ts b/x-pack/plugins/fleet/server/services/upgrade_sender.ts
index c125bf145d0f3..c429f97566dac 100644
--- a/x-pack/plugins/fleet/server/services/upgrade_sender.ts
+++ b/x-pack/plugins/fleet/server/services/upgrade_sender.ts
@@ -54,7 +54,7 @@ export function sendTelemetryEvents(
},
]);
} catch (exc) {
- logger.error(`queing telemetry events failed ${exc}`);
+ logger.error(`queuing telemetry events failed ${exc}`);
}
}
diff --git a/x-pack/plugins/fleet/server/telemetry/sender.ts b/x-pack/plugins/fleet/server/telemetry/sender.ts
index d50464b1a34e1..a31f97b57fbd5 100644
--- a/x-pack/plugins/fleet/server/telemetry/sender.ts
+++ b/x-pack/plugins/fleet/server/telemetry/sender.ts
@@ -12,7 +12,9 @@ import { cloneDeep } from 'lodash';
import axios from 'axios';
-import type { InfoResponse } from '@elastic/elasticsearch/lib/api/types';
+import type { InfoResponse, LicenseGetResponse } from '@elastic/elasticsearch/lib/api/types';
+
+import { appContextService } from '../services';
import { exhaustMap, Subject, takeUntil, timer } from 'rxjs';
@@ -37,6 +39,7 @@ export class TelemetryEventsSender {
private isOptedIn?: boolean = true; // Assume true until the first check
private esClient?: ElasticsearchClient;
private clusterInfo?: InfoResponse;
+ private licenseInfo?: LicenseGetResponse;
constructor(logger: Logger) {
this.logger = logger;
@@ -50,6 +53,7 @@ export class TelemetryEventsSender {
this.telemetryStart = telemetryStart;
this.esClient = core?.elasticsearch.client.asInternalUser;
this.clusterInfo = await this.fetchClusterInfo();
+ this.licenseInfo = await this.fetchLicenseInfo();
this.logger.debug(`Starting local task`);
timer(this.initialCheckDelayMs, this.checkIntervalMs)
@@ -118,6 +122,17 @@ export class TelemetryEventsSender {
}
}
+ private async fetchLicenseInfo() {
+ try {
+ if (this.esClient === undefined || this.esClient === null) {
+ throw Error('elasticsearch client is unavailable: cannot retrieve license infomation');
+ }
+ return await this.esClient.license.get();
+ } catch (e) {
+ this.logger.debug(`Error fetching license information: ${e}`);
+ }
+ }
+
public async sendEvents(
telemetryUrl: string,
clusterInfo: InfoResponse | undefined,
@@ -133,10 +148,16 @@ export class TelemetryEventsSender {
queue.clearEvents();
- this.logger.debug(JSON.stringify(events));
+ const toSend = events.map((event) => ({
+ ...event,
+ license_issued_to: this.licenseInfo?.license.issued_to,
+ deployment_id: appContextService.getCloud()?.deploymentId,
+ }));
+
+ this.logger.debug(JSON.stringify(toSend));
await this.send(
- events,
+ toSend,
telemetryUrl,
clusterInfo?.cluster_uuid,
clusterInfo?.version?.number
From f50b82992c573c34a950ac2a2ca44c8ce6253c50 Mon Sep 17 00:00:00 2001
From: Tre
Date: Wed, 15 May 2024 14:30:35 +0100
Subject: [PATCH 27/50] [FTR](combined) update common serverless api tests to
use api keys (#181741)
## Summary
Contributes to: https://github.com/elastic/kibana/issues/180834
Update the below common tests, and figure out the minimum required role.
### More Info
- Add type for `InternalRequestHeader`
- Add type for `SupertestWithoutAuth`
- Add shortcut method: `createApiKeyForDefaultRole` to `Serverless User
Manager` service
- Change all calls of `await supertest` to `await supertestWithoutAuth`
- Add Internal Request and Role Credential headers to every `await
supertestWithoutAuth` http call
- Use the lowest role credential possible for all calls, whether
`viewer`, `editor`, `developer`, or `admin`
### Covers these folders:
`x-pack/test_serverless/api_integration/test_suites/common/console`
`x-pack/test_serverless/api_integration/test_suites/common/core`
`x-pack/test_serverless/api_integration/test_suites/common/data_view_field_editor`
`x-pack/test_serverless/api_integration/test_suites/common/elasticsearch_api`
`x-pack/test_serverless/api_integration/test_suites/common/grok_debugger`
`x-pack/test_serverless/api_integration/test_suites/common/kql_telemetry`
`x-pack/test_serverless/api_integration/test_suites/common/scripts_tests`
`x-pack/test_serverless/api_integration/test_suites/common/search_profiler`
`x-pack/test_serverless/api_integration/test_suites/common/search_xpack`
---------
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
.../common/console/autocomplete_entities.ts | 21 ++++++--
.../test_suites/common/console/es_config.ts | 19 +++++--
.../test_suites/common/console/proxy_route.ts | 31 +++++------
.../common/console/spec_definitions.ts | 9 ++++
.../test_suites/common/core/capabilities.ts | 14 ++++-
.../test_suites/common/core/compression.ts | 17 ++++--
.../test_suites/common/core/ui_settings.ts | 52 +++++++++++++------
.../data_view_field_editor/field_preview.ts | 33 ++++++++----
.../common/grok_debugger/grok_debugger.ts | 20 +++++--
.../common/kql_telemetry/kql_telemetry.ts | 34 ++++++++----
.../common/scripts_tests/languages.js | 16 ++++--
.../common/search_profiler/search_profiler.ts | 18 +++++--
.../test_suites/common/search_xpack/search.ts | 12 ++++-
.../test_serverless/shared/services/index.ts | 2 +
.../shared/services/supertest.ts | 3 +-
.../shared/services/svl_common_api.ts | 4 +-
.../shared/services/svl_user_manager.ts | 5 ++
17 files changed, 230 insertions(+), 80 deletions(-)
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/console/autocomplete_entities.ts b/x-pack/test_serverless/api_integration/test_suites/common/console/autocomplete_entities.ts
index 677bb6b0b649e..b4db64cdc85b0 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/console/autocomplete_entities.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/console/autocomplete_entities.ts
@@ -7,16 +7,25 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
+import { InternalRequestHeader } from '../../../../shared/services/svl_common_api';
export default ({ getService }: FtrProviderContext) => {
const svlCommonApi = getService('svlCommonApi');
const consoleService = getService('console');
- const supertest = getService('supertest');
- const sendRequest = (query: object) =>
- supertest
+
+ const svlUserManager = getService('svlUserManager');
+ const supertestWithoutAuth = getService('supertestWithoutAuth');
+ let internalRequestHeader: InternalRequestHeader;
+ let roleAuthc: RoleCredentials;
+
+ const sendRequest = async (query: object) => {
+ return await supertestWithoutAuth
.get('/api/console/autocomplete_entities')
- .set(svlCommonApi.getInternalRequestHeader())
+ .set(internalRequestHeader)
+ .set(roleAuthc.apiKeyHeader)
.query(query);
+ };
describe('/api/console/autocomplete_entities', function () {
let createIndex: typeof consoleService['helpers']['createIndex'];
@@ -37,6 +46,8 @@ export default ({ getService }: FtrProviderContext) => {
const dataStreamName = 'test-data-stream-1';
before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+ internalRequestHeader = svlCommonApi.getInternalRequestHeader();
({
helpers: {
createIndex,
@@ -67,6 +78,8 @@ export default ({ getService }: FtrProviderContext) => {
await deleteDataStream(dataStreamName);
await deleteIndexTemplate(indexTemplateName);
await deleteComponentTemplate(componentTemplateName);
+
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
});
it('should not succeed if no settings are provided in query params', async () => {
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/console/es_config.ts b/x-pack/test_serverless/api_integration/test_suites/common/console/es_config.ts
index 86176e8aa5d51..cc638626201a5 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/console/es_config.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/console/es_config.ts
@@ -7,17 +7,28 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
+import { InternalRequestHeader, RoleCredentials } from '../../../../shared/services';
export default function ({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
const svlCommonApi = getService('svlCommonApi');
+ const svlUserManager = getService('svlUserManager');
+ const supertestWithoutAuth = getService('supertestWithoutAuth');
+ let roleAuthc: RoleCredentials;
+ let internalReqHeader: InternalRequestHeader;
describe('GET /api/console/es_config', () => {
+ before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+ internalReqHeader = svlCommonApi.getInternalRequestHeader();
+ });
+ after(async () => {
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
+ });
it('returns es host', async () => {
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.get('/api/console/es_config')
- .set('kbn-xsrf', 'true')
- .set(svlCommonApi.getInternalRequestHeader())
+ .set(internalReqHeader)
+ .set(roleAuthc.apiKeyHeader)
.expect(200);
expect(body.host).to.be.ok();
});
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/console/proxy_route.ts b/x-pack/test_serverless/api_integration/test_suites/common/console/proxy_route.ts
index e60ab8ac7cd0c..1c55a8461084c 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/console/proxy_route.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/console/proxy_route.ts
@@ -7,38 +7,31 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
export default function ({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
const svlCommonApi = getService('svlCommonApi');
+ const svlUserManager = getService('svlUserManager');
+ const supertestWithoutAuth = getService('supertestWithoutAuth');
+ let roleAuthc: RoleCredentials;
describe('POST /api/console/proxy', () => {
+ before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+ });
+ after(async () => {
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
+ });
describe('system indices behavior', () => {
- it('returns warning header when making requests to .kibana index', async () => {
- return await supertest
- .post('/api/console/proxy?method=GET&path=/.kibana/_settings')
- .set('kbn-xsrf', 'true')
- .set(svlCommonApi.getInternalRequestHeader())
- .then((response) => {
- expect(response.header).to.have.property('warning');
- const { warning } = response.header as { warning: string };
- expect(warning.startsWith('299')).to.be(true);
- expect(warning.includes('system indices')).to.be(true);
- });
- });
-
it('does not forward x-elastic-product-origin', async () => {
// If we pass the header and we still get the warning back, we assume that the header was not forwarded.
- return await supertest
+ return await supertestWithoutAuth
.post('/api/console/proxy?method=GET&path=/.kibana/_settings')
.set('kbn-xsrf', 'true')
.set(svlCommonApi.getInternalRequestHeader())
- .set('x-elastic-product-origin', 'kibana')
+ .set(roleAuthc.apiKeyHeader)
.then((response) => {
expect(response.header).to.have.property('warning');
- const { warning } = response.header as { warning: string };
- expect(warning.startsWith('299')).to.be(true);
- expect(warning.includes('system indices')).to.be(true);
});
});
});
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/console/spec_definitions.ts b/x-pack/test_serverless/api_integration/test_suites/common/console/spec_definitions.ts
index 89f116228746d..8f9108afe28ef 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/console/spec_definitions.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/console/spec_definitions.ts
@@ -7,12 +7,21 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
export default function ({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
+ const svlUserManager = getService('svlUserManager');
+ let roleAuthc: RoleCredentials;
const svlCommonApi = getService('svlCommonApi');
describe('GET /api/console/api_server', () => {
+ before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+ });
+ after(async () => {
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
+ });
it('returns autocomplete definitions', async () => {
const { body } = await supertest
.get('/api/console/api_server')
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/core/capabilities.ts b/x-pack/test_serverless/api_integration/test_suites/common/core/capabilities.ts
index a05c0d99bd331..0ee76d525ad76 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/core/capabilities.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/core/capabilities.ts
@@ -7,13 +7,23 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
export default function ({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
const svlCommonApi = getService('svlCommonApi');
+ const svlUserManager = getService('svlUserManager');
+ let roleAuthc: RoleCredentials;
+ const supertestWithoutAuth = getService('supertestWithoutAuth');
+
describe('/api/core/capabilities', () => {
+ before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+ });
+ after(async () => {
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
+ });
it(`returns a 400 when an invalid app id is provided`, async () => {
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.post('/api/core/capabilities')
.set(svlCommonApi.getInternalRequestHeader())
.send({
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/core/compression.ts b/x-pack/test_serverless/api_integration/test_suites/common/core/compression.ts
index 3284d065c9b60..0b045053da4dd 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/core/compression.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/core/compression.ts
@@ -7,28 +7,33 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
export default function ({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
const svlCommonApi = getService('svlCommonApi');
+ const svlUserManager = getService('svlUserManager');
+ let roleAuthc: RoleCredentials;
+ const supertestWithoutAuth = getService('supertestWithoutAuth');
const compressionSuite = (url: string) => {
it(`uses compression when there isn't a referer`, async () => {
- await supertest
+ await supertestWithoutAuth
.get(url)
.set('accept-encoding', 'gzip')
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.then((response) => {
expect(response.header).to.have.property('content-encoding', 'gzip');
});
});
it(`uses compression when there is a whitelisted referer`, async () => {
- await supertest
+ await supertestWithoutAuth
.get(url)
.set('accept-encoding', 'gzip')
.set(svlCommonApi.getInternalRequestHeader())
.set('referer', 'https://some-host.com')
+ .set(roleAuthc.apiKeyHeader)
.then((response) => {
expect(response.header).to.have.property('content-encoding', 'gzip');
});
@@ -36,6 +41,12 @@ export default function ({ getService }: FtrProviderContext) {
};
describe('compression', () => {
+ before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+ });
+ after(async () => {
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
+ });
describe('against an application page', () => {
compressionSuite('/app/kibana');
});
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/core/ui_settings.ts b/x-pack/test_serverless/api_integration/test_suites/common/core/ui_settings.ts
index 028b0ab69b438..e0cbe1c8e8399 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/core/ui_settings.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/core/ui_settings.ts
@@ -7,6 +7,7 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
// To test setting validations we are using the existing 'defaultColumns' setting that is available in all serverless projects
// (See list of common serverless settings in /packages/serverless/settings/common/index.ts)
@@ -17,25 +18,34 @@ const DEFAULT_COLUMNS_SETTING = 'defaultColumns';
const TEST_SETTING = 'testSetting';
export default function ({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
const svlCommonApi = getService('svlCommonApi');
+ const svlUserManager = getService('svlUserManager');
+ let roleAuthc: RoleCredentials;
+ const supertestWithoutAuth = getService('supertestWithoutAuth');
+
describe('ui settings service', () => {
before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
// Creating a test setting
- await supertest
+ await supertestWithoutAuth
.post(`/internal/kibana/settings/${TEST_SETTING}`)
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ value: 100 })
.expect(200);
});
+ after(async () => {
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
+ });
// We don't test the public routes as they are not available in serverless
describe('internal routes', () => {
describe('get', () => {
it('returns list of settings', async () => {
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.get('/internal/kibana/settings')
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.expect(200);
// The returned list of settings should contain the created test setting
@@ -46,9 +56,10 @@ export default function ({ getService }: FtrProviderContext) {
describe('set', () => {
it('validates value', async () => {
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.post(`/internal/kibana/settings/${DEFAULT_COLUMNS_SETTING}`)
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ value: 100 })
.expect(400);
@@ -61,16 +72,18 @@ export default function ({ getService }: FtrProviderContext) {
});
it('sets value of a setting', async () => {
- await supertest
+ await supertestWithoutAuth
.post(`/internal/kibana/settings/${TEST_SETTING}`)
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ value: 999 })
.expect(200);
// Verify that the setting has a new value
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.get('/internal/kibana/settings')
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.expect(200);
// The returned list of settings should contain the created test setting
@@ -80,9 +93,10 @@ export default function ({ getService }: FtrProviderContext) {
describe('set many', () => {
it('validates value', async () => {
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.post('/internal/kibana/settings')
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ changes: { [TEST_SETTING]: 100, [DEFAULT_COLUMNS_SETTING]: 100 } })
.expect(400);
@@ -95,16 +109,18 @@ export default function ({ getService }: FtrProviderContext) {
});
it('sets values of settings', async () => {
- await supertest
+ await supertestWithoutAuth
.post(`/internal/kibana/settings`)
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ changes: { [TEST_SETTING]: 500 } })
.expect(200);
// Verify that the setting has a new value
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.get('/internal/kibana/settings')
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.expect(200);
// The returned list of settings should contain the created test setting
@@ -114,9 +130,10 @@ export default function ({ getService }: FtrProviderContext) {
describe('validate', () => {
it('returns correct validation error message for invalid value', async () => {
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.post(`/internal/kibana/settings/${DEFAULT_COLUMNS_SETTING}/validate`)
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ value: 100 })
.expect(200);
@@ -127,9 +144,10 @@ export default function ({ getService }: FtrProviderContext) {
});
it('returns no validation error message for valid value', async () => {
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.post(`/internal/kibana/settings/${DEFAULT_COLUMNS_SETTING}/validate`)
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ value: ['test'] })
.expect(200);
@@ -139,9 +157,10 @@ export default function ({ getService }: FtrProviderContext) {
});
it('returns a 404 for non-existing key', async () => {
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.post(`/internal/kibana/settings/nonExisting/validate`)
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ value: ['test'] })
.expect(404);
@@ -153,9 +172,10 @@ export default function ({ getService }: FtrProviderContext) {
});
it('returns a 400 for a null value', async () => {
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.post(`/internal/kibana/settings/${DEFAULT_COLUMNS_SETTING}/validate`)
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ value: null })
.expect(400);
@@ -169,15 +189,17 @@ export default function ({ getService }: FtrProviderContext) {
describe('delete', () => {
it('deletes setting', async () => {
- await supertest
+ await supertestWithoutAuth
.delete(`/internal/kibana/settings/${TEST_SETTING}`)
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.expect(200);
// Verify that the setting is not returned in the Get response anymore
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.get('/internal/kibana/settings')
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.expect(200);
// The returned list of settings should contain the created test setting
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/data_view_field_editor/field_preview.ts b/x-pack/test_serverless/api_integration/test_suites/common/data_view_field_editor/field_preview.ts
index 9ed30298a9c3f..85c35632921ec 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/data_view_field_editor/field_preview.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/data_view_field_editor/field_preview.ts
@@ -14,14 +14,18 @@ import {
INITIAL_REST_VERSION,
} from '@kbn/data-view-field-editor-plugin/common/constants';
import type { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
const INDEX_NAME = 'api-integration-test-field-preview';
export default function ({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
const es = getService('es');
const svlCommonApi = getService('svlCommonApi');
+ const svlUserManager = getService('svlUserManager');
+ const supertestWithoutAuth = getService('supertestWithoutAuth');
+ let roleAuthc: RoleCredentials;
+
const document = { foo: 1, bar: 'hello' };
const createIndex = async () => {
@@ -49,8 +53,14 @@ export default function ({ getService }: FtrProviderContext) {
};
describe('Field preview', function () {
- before(async () => await createIndex());
- after(async () => await deleteIndex());
+ before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+ await createIndex();
+ });
+ after(async () => {
+ await deleteIndex();
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
+ });
describe('should return the script value', () => {
const tests = [
@@ -86,13 +96,14 @@ export default function ({ getService }: FtrProviderContext) {
index: INDEX_NAME,
};
- const { body: response } = await supertest
+ const { body: response } = await supertestWithoutAuth
.post(FIELD_PREVIEW_PATH)
.set(ELASTIC_HTTP_VERSION_HEADER, INITIAL_REST_VERSION)
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader())
.send(payload)
.set('kbn-xsrf', 'xxx')
+ .set(roleAuthc.apiKeyHeader)
.expect(200);
expect(response.values).eql([test.expected]);
@@ -102,7 +113,7 @@ export default function ({ getService }: FtrProviderContext) {
describe('payload validation', () => {
it('should require a script', async () => {
- await supertest
+ await supertestWithoutAuth
.post(FIELD_PREVIEW_PATH)
.set(ELASTIC_HTTP_VERSION_HEADER, INITIAL_REST_VERSION)
// TODO: API requests in Serverless require internal request headers
@@ -112,11 +123,12 @@ export default function ({ getService }: FtrProviderContext) {
index: INDEX_NAME,
})
.set('kbn-xsrf', 'xxx')
+ .set(roleAuthc.apiKeyHeader)
.expect(400);
});
it('should require a context', async () => {
- await supertest
+ await supertestWithoutAuth
.post(FIELD_PREVIEW_PATH)
.set(ELASTIC_HTTP_VERSION_HEADER, INITIAL_REST_VERSION)
// TODO: API requests in Serverless require internal request headers
@@ -126,11 +138,12 @@ export default function ({ getService }: FtrProviderContext) {
index: INDEX_NAME,
})
.set('kbn-xsrf', 'xxx')
+ .set(roleAuthc.apiKeyHeader)
.expect(400);
});
it('should require an index', async () => {
- await supertest
+ await supertestWithoutAuth
.post(FIELD_PREVIEW_PATH)
.set(ELASTIC_HTTP_VERSION_HEADER, INITIAL_REST_VERSION)
// TODO: API requests in Serverless require internal request headers
@@ -140,6 +153,7 @@ export default function ({ getService }: FtrProviderContext) {
context: 'keyword_field',
})
.set('kbn-xsrf', 'xxx')
+ .set(roleAuthc.apiKeyHeader)
.expect(400);
});
});
@@ -149,7 +163,7 @@ export default function ({ getService }: FtrProviderContext) {
// does not change overtime as we rely on it to extract our own error code.
// If this test fail we'll need to update the "getErrorCodeFromErrorReason()" handler
it('should detect a script casting error', async () => {
- const { body: response } = await supertest
+ const { body: response } = await supertestWithoutAuth
.post(FIELD_PREVIEW_PATH)
.set(ELASTIC_HTTP_VERSION_HEADER, INITIAL_REST_VERSION)
// TODO: API requests in Serverless require internal request headers
@@ -159,7 +173,8 @@ export default function ({ getService }: FtrProviderContext) {
context: 'keyword_field',
index: INDEX_NAME,
})
- .set('kbn-xsrf', 'xxx');
+ .set('kbn-xsrf', 'xxx')
+ .set(roleAuthc.apiKeyHeader);
const errorCode = getErrorCodeFromErrorReason(response.error?.caused_by?.reason);
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/grok_debugger/grok_debugger.ts b/x-pack/test_serverless/api_integration/test_suites/common/grok_debugger/grok_debugger.ts
index dd9176fb74feb..fdf9c73c86ca8 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/grok_debugger/grok_debugger.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/grok_debugger/grok_debugger.ts
@@ -7,14 +7,23 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
const API_BASE_PATH = '/api/grokdebugger';
export default function ({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
const svlCommonApi = getService('svlCommonApi');
+ const svlUserManager = getService('svlUserManager');
+ const supertestWithoutAuth = getService('supertestWithoutAuth');
+ let roleAuthc: RoleCredentials;
describe('Grok Debugger Routes', function () {
+ before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+ });
+ after(async () => {
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
+ });
describe('Simulate', () => {
it('should simulate a valid pattern', async () => {
const rawEvent = '55.3.244.1 GET /index.html 15824 0.043';
@@ -22,11 +31,12 @@ export default function ({ getService }: FtrProviderContext) {
'%{IP:client} %{WORD:method} %{URIPATHPARAM:request} %{NUMBER:bytes} %{NUMBER:duration}';
const requestBody = { rawEvent, pattern };
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.post(`${API_BASE_PATH}/simulate`)
.set(svlCommonApi.getInternalRequestHeader())
.set('Content-Type', 'application/json;charset=UTF-8')
.send(requestBody)
+ .set(roleAuthc.apiKeyHeader)
.expect(200);
const expectedStructuredEvent = {
@@ -46,11 +56,12 @@ export default function ({ getService }: FtrProviderContext) {
const invalidPattern = 'test';
const requestBody = { rawEvent, pattern: invalidPattern };
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.post(`${API_BASE_PATH}/simulate`)
.set(svlCommonApi.getInternalRequestHeader())
.set('Content-Type', 'application/json;charset=UTF-8')
.send(requestBody)
+ .set(roleAuthc.apiKeyHeader)
.expect(200);
expect(body.error).to.eql('Provided Grok patterns do not match data in the input');
@@ -67,11 +78,12 @@ export default function ({ getService }: FtrProviderContext) {
};
const requestBody = { rawEvent, pattern, customPatterns };
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.post(`${API_BASE_PATH}/simulate`)
.set(svlCommonApi.getInternalRequestHeader())
.set('Content-Type', 'application/json;charset=UTF-8')
.send(requestBody)
+ .set(roleAuthc.apiKeyHeader)
.expect(200);
const expectedStructuredEvent = {
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/kql_telemetry/kql_telemetry.ts b/x-pack/test_serverless/api_integration/test_suites/common/kql_telemetry/kql_telemetry.ts
index adbac6e89b548..e2071d741a90b 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/kql_telemetry/kql_telemetry.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/kql_telemetry/kql_telemetry.ts
@@ -11,15 +11,19 @@ import { ANALYTICS_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
import { KQL_TELEMETRY_ROUTE_LATEST_VERSION } from '@kbn/data-plugin/common';
import { ELASTIC_HTTP_VERSION_HEADER } from '@kbn/core-http-common';
import type { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
export default function ({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
const kibanaServer = getService('kibanaServer');
const es = getService('es');
const svlCommonApi = getService('svlCommonApi');
+ const svlUserManager = getService('svlUserManager');
+ const supertestWithoutAuth = getService('supertestWithoutAuth');
+ let roleAuthc: RoleCredentials;
describe('telemetry API', () => {
before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
// TODO: Clean `kql-telemetry` before running the tests
await kibanaServer.savedObjects.clean({ types: ['kql-telemetry'] });
await kibanaServer.importExport.load(
@@ -30,16 +34,18 @@ export default function ({ getService }: FtrProviderContext) {
await kibanaServer.importExport.unload(
'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
);
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
});
it('should increment the opt *in* counter in the .kibana_analytics/kql-telemetry document', async () => {
- await supertest
+ await supertestWithoutAuth
.post('/internal/kql_opt_in_stats')
.set('content-type', 'application/json')
.set(ELASTIC_HTTP_VERSION_HEADER, KQL_TELEMETRY_ROUTE_LATEST_VERSION)
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader())
.send({ opt_in: true })
+ .set(roleAuthc.apiKeyHeader)
.expect(200);
return es
@@ -54,13 +60,14 @@ export default function ({ getService }: FtrProviderContext) {
});
it('should increment the opt *out* counter in the .kibana_analytics/kql-telemetry document', async () => {
- await supertest
+ await supertestWithoutAuth
.post('/internal/kql_opt_in_stats')
.set('content-type', 'application/json')
.set(ELASTIC_HTTP_VERSION_HEADER, KQL_TELEMETRY_ROUTE_LATEST_VERSION)
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader())
.send({ opt_in: false })
+ .set(roleAuthc.apiKeyHeader)
.expect(200);
return es
@@ -76,7 +83,7 @@ export default function ({ getService }: FtrProviderContext) {
it('should report success when opt *in* is incremented successfully', () => {
return (
- supertest
+ supertestWithoutAuth
.post('/internal/kql_opt_in_stats')
.set('content-type', 'application/json')
.set(ELASTIC_HTTP_VERSION_HEADER, KQL_TELEMETRY_ROUTE_LATEST_VERSION)
@@ -84,6 +91,7 @@ export default function ({ getService }: FtrProviderContext) {
.set(svlCommonApi.getInternalRequestHeader())
.send({ opt_in: true })
.expect('Content-Type', /json/)
+ .set(roleAuthc.apiKeyHeader)
.expect(200)
.then(({ body }) => {
expect(body.success).to.be(true);
@@ -93,7 +101,7 @@ export default function ({ getService }: FtrProviderContext) {
it('should report success when opt *out* is incremented successfully', () => {
return (
- supertest
+ supertestWithoutAuth
.post('/internal/kql_opt_in_stats')
.set('content-type', 'application/json')
.set(ELASTIC_HTTP_VERSION_HEADER, KQL_TELEMETRY_ROUTE_LATEST_VERSION)
@@ -101,6 +109,7 @@ export default function ({ getService }: FtrProviderContext) {
.set(svlCommonApi.getInternalRequestHeader())
.send({ opt_in: false })
.expect('Content-Type', /json/)
+ .set(roleAuthc.apiKeyHeader)
.expect(200)
.then(({ body }) => {
expect(body.success).to.be(true);
@@ -110,44 +119,49 @@ export default function ({ getService }: FtrProviderContext) {
it('should only accept literal boolean values for the opt_in POST body param', function () {
return Promise.all([
- supertest
+ supertestWithoutAuth
.post('/internal/kql_opt_in_stats')
.set('content-type', 'application/json')
.set(ELASTIC_HTTP_VERSION_HEADER, KQL_TELEMETRY_ROUTE_LATEST_VERSION)
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ opt_in: 'notabool' })
.expect(400),
- supertest
+ supertestWithoutAuth
.post('/internal/kql_opt_in_stats')
.set('content-type', 'application/json')
.set(ELASTIC_HTTP_VERSION_HEADER, KQL_TELEMETRY_ROUTE_LATEST_VERSION)
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ opt_in: 0 })
.expect(400),
- supertest
+ supertestWithoutAuth
.post('/internal/kql_opt_in_stats')
.set('content-type', 'application/json')
.set(ELASTIC_HTTP_VERSION_HEADER, KQL_TELEMETRY_ROUTE_LATEST_VERSION)
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ opt_in: null })
.expect(400),
- supertest
+ supertestWithoutAuth
.post('/internal/kql_opt_in_stats')
.set('content-type', 'application/json')
.set(ELASTIC_HTTP_VERSION_HEADER, KQL_TELEMETRY_ROUTE_LATEST_VERSION)
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({ opt_in: undefined })
.expect(400),
- supertest
+ supertestWithoutAuth
.post('/internal/kql_opt_in_stats')
.set('content-type', 'application/json')
.set(ELASTIC_HTTP_VERSION_HEADER, KQL_TELEMETRY_ROUTE_LATEST_VERSION)
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.send({})
.expect(400),
]);
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/scripts_tests/languages.js b/x-pack/test_serverless/api_integration/test_suites/common/scripts_tests/languages.js
index 832bf6df49188..25bfd704e6a5e 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/scripts_tests/languages.js
+++ b/x-pack/test_serverless/api_integration/test_suites/common/scripts_tests/languages.js
@@ -11,16 +11,25 @@ import { ELASTIC_HTTP_VERSION_HEADER } from '@kbn/core-http-common';
import { SCRIPT_LANGUAGES_ROUTE_LATEST_VERSION } from '@kbn/data-plugin/common/constants';
export default function ({ getService }) {
- const supertest = getService('supertest');
const svlCommonApi = getService('svlCommonApi');
+ const svlUserManager = getService('svlUserManager');
+ let roleAuthc;
+ const supertestWithoutAuth = getService('supertestWithoutAuth');
describe('Script Languages API', function getLanguages() {
+ before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+ });
+ after(async () => {
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
+ });
it('should return 200 with an array of languages', () =>
- supertest
+ supertestWithoutAuth
.get('/internal/scripts/languages')
.set(ELASTIC_HTTP_VERSION_HEADER, SCRIPT_LANGUAGES_ROUTE_LATEST_VERSION)
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.expect(200)
.then((response) => {
expect(response.body).to.be.an('array');
@@ -28,11 +37,12 @@ export default function ({ getService }) {
// eslint-disable-next-line jest/no-disabled-tests
it.skip('should only return langs enabled for inline scripting', () =>
- supertest
+ supertestWithoutAuth
.get('/internal/scripts/languages')
.set(ELASTIC_HTTP_VERSION_HEADER, SCRIPT_LANGUAGES_ROUTE_LATEST_VERSION)
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader())
+ .set(roleAuthc.apiKeyHeader)
.expect(200)
.then((response) => {
expect(response.body).to.contain('expression');
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/search_profiler/search_profiler.ts b/x-pack/test_serverless/api_integration/test_suites/common/search_profiler/search_profiler.ts
index 45d515dff4883..f0fc4dffbdf5e 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/search_profiler/search_profiler.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/search_profiler/search_profiler.ts
@@ -8,14 +8,24 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
const API_BASE_PATH = '/api/searchprofiler';
export default function ({ getService }: FtrProviderContext) {
- const supertest = getService('supertest');
const svlCommonApi = getService('svlCommonApi');
+ const svlUserManager = getService('svlUserManager');
+ let roleAuthc: RoleCredentials;
+ const supertestWithoutAuth = getService('supertestWithoutAuth') as any;
describe('Profile', () => {
+ before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+ });
+ after(async () => {
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
+ });
+
it('should return profile results for a valid index', async () => {
const payload = {
index: '_all',
@@ -26,10 +36,11 @@ export default function ({ getService }: FtrProviderContext) {
},
};
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.post(`${API_BASE_PATH}/profile`)
.set(svlCommonApi.getInternalRequestHeader())
.set('Content-Type', 'application/json;charset=UTF-8')
+ .set(roleAuthc.apiKeyHeader)
.send(payload)
.expect(200);
@@ -46,10 +57,11 @@ export default function ({ getService }: FtrProviderContext) {
},
};
- const { body } = await supertest
+ const { body } = await supertestWithoutAuth
.post(`${API_BASE_PATH}/profile`)
.set(svlCommonApi.getInternalRequestHeader())
.set('Content-Type', 'application/json;charset=UTF-8')
+ .set(roleAuthc.apiKeyHeader)
.send(payloadWithInvalidIndex)
.expect(404);
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/search_xpack/search.ts b/x-pack/test_serverless/api_integration/test_suites/common/search_xpack/search.ts
index 477d3a518d164..3ad65d51d8821 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/search_xpack/search.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/search_xpack/search.ts
@@ -11,6 +11,7 @@ import { ELASTIC_HTTP_VERSION_HEADER } from '@kbn/core-http-common';
import { omit } from 'lodash';
import type { FtrProviderContext } from '../../../ftr_provider_context';
import { verifyErrorResponse } from '../search_oss/verify_error';
+import { RoleCredentials } from '../../../../shared/services';
export default function ({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
@@ -18,6 +19,9 @@ export default function ({ getService }: FtrProviderContext) {
const log = getService('log');
const retry = getService('retry');
const security = getService('security');
+
+ const svlUserManager = getService('svlUserManager');
+ let roleAuthc: RoleCredentials;
// TODO: `supertestWithoutAuth` is typed as `any` in `x-pack/test/api_integration/apis/search/search.ts`,
// but within Serverless tests it's typed as `supertest.SuperTest`. This causes TS errors
// when accessing `loginResponse.headers`, so we cast it as `any` here to match the original tests.
@@ -44,6 +48,7 @@ export default function ({ getService }: FtrProviderContext) {
describe('search', () => {
before(async () => {
+ roleAuthc = await svlUserManager.createApiKeyForRole('admin');
// ensure es not empty
await es.index({
index: 'search-api-test',
@@ -56,16 +61,18 @@ export default function ({ getService }: FtrProviderContext) {
await es.indices.delete({
index: 'search-api-test',
});
+ await svlUserManager.invalidateApiKeyForRole(roleAuthc);
});
describe('post', () => {
it('should return 200 with final response without search id if wait_for_completion_timeout is long enough', async function () {
- const resp = await supertest
+ const resp = await supertestNoAuth
.post(`/internal/search/ese`)
.set(ELASTIC_HTTP_VERSION_HEADER, '1')
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader())
.set('kbn-xsrf', 'foo')
+ .set(roleAuthc.apiKeyHeader)
.send({
params: {
body: {
@@ -88,12 +95,13 @@ export default function ({ getService }: FtrProviderContext) {
it('should return 200 with search id and partial response if wait_for_completion_timeout is not long enough', async function () {
await markRequiresShardDelayAgg(this);
- const resp = await supertest
+ const resp = await supertestNoAuth
.post(`/internal/search/ese`)
.set(ELASTIC_HTTP_VERSION_HEADER, '1')
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader())
.set('kbn-xsrf', 'foo')
+ .set(roleAuthc.apiKeyHeader)
.send({
params: {
body: {
diff --git a/x-pack/test_serverless/shared/services/index.ts b/x-pack/test_serverless/shared/services/index.ts
index 98a6eee96514b..1241c0c9aea37 100644
--- a/x-pack/test_serverless/shared/services/index.ts
+++ b/x-pack/test_serverless/shared/services/index.ts
@@ -12,6 +12,8 @@ import { SvlUserManagerProvider } from './svl_user_manager';
import { DataViewApiProvider } from './data_view_api';
export type { RoleCredentials } from './svl_user_manager';
+export type { InternalRequestHeader } from './svl_common_api';
+export type { SupertestWithoutAuthType } from './supertest';
export const services = {
supertest: SupertestProvider,
diff --git a/x-pack/test_serverless/shared/services/supertest.ts b/x-pack/test_serverless/shared/services/supertest.ts
index dec306dcb8f28..7159a85377626 100644
--- a/x-pack/test_serverless/shared/services/supertest.ts
+++ b/x-pack/test_serverless/shared/services/supertest.ts
@@ -7,8 +7,9 @@
import { format as formatUrl } from 'url';
import supertest from 'supertest';
+import { ProvidedType } from '@kbn/test';
import { FtrProviderContext } from '../../functional/ftr_provider_context';
-
+export type SupertestWithoutAuthType = ProvidedType;
/**
* Returns supertest.SuperTest instance that will not persist cookie between API requests.
*/
diff --git a/x-pack/test_serverless/shared/services/svl_common_api.ts b/x-pack/test_serverless/shared/services/svl_common_api.ts
index 74a6983913280..99ffe486dd4d7 100644
--- a/x-pack/test_serverless/shared/services/svl_common_api.ts
+++ b/x-pack/test_serverless/shared/services/svl_common_api.ts
@@ -18,13 +18,15 @@ const INTERNAL_REQUEST_HEADERS = {
'x-elastic-internal-origin': 'kibana',
};
+export type InternalRequestHeader = typeof INTERNAL_REQUEST_HEADERS;
+
export function SvlCommonApiServiceProvider({}: FtrProviderContext) {
return {
getCommonRequestHeader() {
return COMMON_REQUEST_HEADERS;
},
- getInternalRequestHeader() {
+ getInternalRequestHeader(): InternalRequestHeader {
return INTERNAL_REQUEST_HEADERS;
},
diff --git a/x-pack/test_serverless/shared/services/svl_user_manager.ts b/x-pack/test_serverless/shared/services/svl_user_manager.ts
index 54cffe1748ea0..3568da0c6b87b 100644
--- a/x-pack/test_serverless/shared/services/svl_user_manager.ts
+++ b/x-pack/test_serverless/shared/services/svl_user_manager.ts
@@ -81,6 +81,10 @@ export function SvlUserManagerProvider({ getService }: FtrProviderContext) {
async getUserData(role: string) {
return sessionManager.getUserData(role);
},
+ async createApiKeyForDefaultRole() {
+ log.debug(`Creating api key for default role: [${this.DEFAULT_ROLE}]`);
+ return this.createApiKeyForRole(this.DEFAULT_ROLE);
+ },
async createApiKeyForRole(role: string): Promise {
const cookieHeader = await this.getApiCredentialsForRole(role);
@@ -98,6 +102,7 @@ export function SvlUserManagerProvider({ getService }: FtrProviderContext) {
const apiKey = body;
const apiKeyHeader = { Authorization: 'ApiKey ' + apiKey.encoded };
+ log.debug(`Created api key for role: [${role}]`);
return { apiKey, apiKeyHeader, cookieHeader };
},
async invalidateApiKeyForRole(roleCredentials: RoleCredentials) {
From 19818f2c7f469924c8d52cab7c545b256e6f0b1b Mon Sep 17 00:00:00 2001
From: Elena Stoeva <59341489+ElenaStoeva@users.noreply.github.com>
Date: Wed, 15 May 2024 15:13:20 +0100
Subject: [PATCH 28/50] [Console Migration] Add action for auto indentation
(#181613)
Closes https://github.com/elastic/kibana/issues/180213
## Summary
This PR adds an action for applying indentation to the selected requests
in the Console Monaco editor.
https://github.com/elastic/kibana/assets/59341489/307af12b-6f65-4859-87bb-e1b4bf1cc331
Note: This PR doesn't auto-indent requests that contain comments. This
will be part of a follow-up work
(https://github.com/elastic/kibana/issues/182138).
---------
Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
.../editor/monaco/monaco_editor.tsx | 6 +-
.../monaco/monaco_editor_actions_provider.ts | 56 +++++
.../containers/editor/monaco/utils/index.ts | 1 +
.../monaco/utils/requests_utils.test.ts | 192 ++++++++++++++++++
.../editor/monaco/utils/requests_utils.ts | 62 ++++++
5 files changed, 316 insertions(+), 1 deletion(-)
diff --git a/src/plugins/console/public/application/containers/editor/monaco/monaco_editor.tsx b/src/plugins/console/public/application/containers/editor/monaco/monaco_editor.tsx
index 3a80742615ad2..09da187694989 100644
--- a/src/plugins/console/public/application/containers/editor/monaco/monaco_editor.tsx
+++ b/src/plugins/console/public/application/containers/editor/monaco/monaco_editor.tsx
@@ -74,6 +74,10 @@ export const MonacoEditor = ({ initialTextValue }: EditorProps) => {
return actionsProvider.current!.getDocumentationLink(docLinkVersion);
}, [docLinkVersion]);
+ const autoIndentCallback = useCallback(async () => {
+ return actionsProvider.current!.autoIndent();
+ }, []);
+
const sendRequestsCallback = useCallback(async () => {
await actionsProvider.current?.sendRequests(toasts, dispatch, trackUiMetric, http);
}, [dispatch, http, toasts, trackUiMetric]);
@@ -125,7 +129,7 @@ export const MonacoEditor = ({ initialTextValue }: EditorProps) => {
{}}
+ autoIndent={autoIndentCallback}
notifications={notifications}
/>
diff --git a/src/plugins/console/public/application/containers/editor/monaco/monaco_editor_actions_provider.ts b/src/plugins/console/public/application/containers/editor/monaco/monaco_editor_actions_provider.ts
index 38fa543b36323..de9c2289c8a29 100644
--- a/src/plugins/console/public/application/containers/editor/monaco/monaco_editor_actions_provider.ts
+++ b/src/plugins/console/public/application/containers/editor/monaco/monaco_editor_actions_provider.ts
@@ -34,10 +34,13 @@ import {
SELECTED_REQUESTS_CLASSNAME,
stringifyRequest,
trackSentRequests,
+ getAutoIndentedRequests,
} from './utils';
import type { AdjustedParsedRequest } from './types';
+const AUTO_INDENTATION_ACTION_LABEL = 'Apply indentations';
+
export class MonacoEditorActionsProvider {
private parsedRequestsProvider: ConsoleParsedRequestsProvider;
private highlightedLines: monaco.editor.IEditorDecorationsCollection;
@@ -343,4 +346,57 @@ export class MonacoEditorActionsProvider {
): monaco.languages.ProviderResult {
return this.getSuggestions(model, position, context);
}
+
+ /*
+ This function returns the text in the provided range.
+ If no range is provided, it returns all text in the editor.
+ */
+ private getTextInRange(selectionRange?: monaco.IRange): string {
+ const model = this.editor.getModel();
+ if (!model) {
+ return '';
+ }
+ if (selectionRange) {
+ const { startLineNumber, startColumn, endLineNumber, endColumn } = selectionRange;
+ return model.getValueInRange({
+ startLineNumber,
+ startColumn,
+ endLineNumber,
+ endColumn,
+ });
+ }
+ // If no range is provided, return all text in the editor
+ return model.getValue();
+ }
+
+ /**
+ * This function applies indentations to the request in the selected text.
+ */
+ public async autoIndent() {
+ const parsedRequests = await this.getSelectedParsedRequests();
+ const selectionStartLineNumber = parsedRequests[0].startLineNumber;
+ const selectionEndLineNumber = parsedRequests[parsedRequests.length - 1].endLineNumber;
+ const selectedRange = new monaco.Range(
+ selectionStartLineNumber,
+ 1,
+ selectionEndLineNumber,
+ this.editor.getModel()?.getLineMaxColumn(selectionEndLineNumber) ?? 1
+ );
+
+ if (parsedRequests.length < 1) {
+ return;
+ }
+
+ const selectedText = this.getTextInRange(selectedRange);
+ const allText = this.getTextInRange();
+
+ const autoIndentedText = getAutoIndentedRequests(parsedRequests, selectedText, allText);
+
+ this.editor.executeEdits(AUTO_INDENTATION_ACTION_LABEL, [
+ {
+ range: selectedRange,
+ text: autoIndentedText,
+ },
+ ]);
+ }
}
diff --git a/src/plugins/console/public/application/containers/editor/monaco/utils/index.ts b/src/plugins/console/public/application/containers/editor/monaco/utils/index.ts
index 2b117bcfd558d..a0de7b461e99a 100644
--- a/src/plugins/console/public/application/containers/editor/monaco/utils/index.ts
+++ b/src/plugins/console/public/application/containers/editor/monaco/utils/index.ts
@@ -14,6 +14,7 @@ export {
replaceRequestVariables,
getCurlRequest,
trackSentRequests,
+ getAutoIndentedRequests,
} from './requests_utils';
export {
getDocumentationLinkFromAutocomplete,
diff --git a/src/plugins/console/public/application/containers/editor/monaco/utils/requests_utils.test.ts b/src/plugins/console/public/application/containers/editor/monaco/utils/requests_utils.test.ts
index 14235e57c6f01..f07a6db3a6881 100644
--- a/src/plugins/console/public/application/containers/editor/monaco/utils/requests_utils.test.ts
+++ b/src/plugins/console/public/application/containers/editor/monaco/utils/requests_utils.test.ts
@@ -7,6 +7,7 @@
*/
import {
+ getAutoIndentedRequests,
getCurlRequest,
replaceRequestVariables,
stringifyRequest,
@@ -160,4 +161,195 @@ describe('requests_utils', () => {
expect(mockMetricsTracker.count).toHaveBeenNthCalledWith(2, 'POST__test');
});
});
+
+ describe('getAutoIndentedRequests', () => {
+ const sampleEditorTextLines = [
+ ' ', // line 1
+ 'GET _search ', // line 2
+ '{ ', // line 3
+ ' "query": { ', // line 4
+ ' "match_all": { } ', // line 5
+ ' } ', // line 6
+ ' } ', // line 7
+ ' ', // line 8
+ '// single comment before Request 2 ', // line 9
+ ' GET _all ', // line 10
+ ' ', // line 11
+ '/* ', // line 12
+ ' multi-line comment before Request 3', // line 13
+ '*/ ', // line 14
+ 'POST /_bulk ', // line 15
+ '{ ', // line 16
+ ' "index":{ ', // line 17
+ ' "_index":"books" ', // line 18
+ ' } ', // line 19
+ ' } ', // line 20
+ '{ ', // line 21
+ '"name":"1984" ', // line 22
+ '}{"name":"Atomic habits"} ', // line 23
+ ' ', // line 24
+ 'GET _search // test comment ', // line 25
+ '{ ', // line 26
+ ' "query": { ', // line 27
+ ' "match_all": { } // comment', // line 28
+ ' } ', // line 29
+ '} ', // line 30
+ ' // some comment ', // line 31
+ ' ', // line 32
+ ];
+
+ const TEST_REQUEST_1 = {
+ method: 'GET',
+ url: '_search',
+ data: [{ query: { match_all: {} } }],
+ // Offsets are with respect to the sample editor text
+ startLineNumber: 2,
+ endLineNumber: 7,
+ startOffset: 1,
+ endOffset: 36,
+ };
+
+ const TEST_REQUEST_2 = {
+ method: 'GET',
+ url: '_all',
+ data: [],
+ // Offsets are with respect to the sample editor text
+ startLineNumber: 10,
+ endLineNumber: 10,
+ startOffset: 1,
+ endOffset: 36,
+ };
+
+ const TEST_REQUEST_3 = {
+ method: 'POST',
+ url: '/_bulk',
+ // Multi-data
+ data: [{ index: { _index: 'books' } }, { name: '1984' }, { name: 'Atomic habits' }],
+ // Offsets are with respect to the sample editor text
+ startLineNumber: 15,
+ endLineNumber: 23,
+ startOffset: 1,
+ endOffset: 36,
+ };
+
+ const TEST_REQUEST_4 = {
+ method: 'GET',
+ url: '_search',
+ data: [{ query: { match_all: {} } }],
+ // Offsets are with respect to the sample editor text
+ startLineNumber: 24,
+ endLineNumber: 30,
+ startOffset: 1,
+ endOffset: 36,
+ };
+
+ it('correctly auto-indents a single request with data', () => {
+ const formattedData = getAutoIndentedRequests(
+ [TEST_REQUEST_1],
+ sampleEditorTextLines
+ .slice(TEST_REQUEST_1.startLineNumber - 1, TEST_REQUEST_1.endLineNumber)
+ .join('\n'),
+ sampleEditorTextLines.join('\n')
+ );
+ const expectedResultLines = [
+ 'GET _search',
+ '{',
+ ' "query": {',
+ ' "match_all": {}',
+ ' }',
+ '}',
+ ];
+
+ expect(formattedData).toBe(expectedResultLines.join('\n'));
+ });
+
+ it('correctly auto-indents a single request with no data', () => {
+ const formattedData = getAutoIndentedRequests(
+ [TEST_REQUEST_2],
+ sampleEditorTextLines
+ .slice(TEST_REQUEST_2.startLineNumber - 1, TEST_REQUEST_2.endLineNumber)
+ .join('\n'),
+ sampleEditorTextLines.join('\n')
+ );
+ const expectedResult = 'GET _all';
+
+ expect(formattedData).toBe(expectedResult);
+ });
+
+ it('correctly auto-indents a single request with multiple data', () => {
+ const formattedData = getAutoIndentedRequests(
+ [TEST_REQUEST_3],
+ sampleEditorTextLines
+ .slice(TEST_REQUEST_3.startLineNumber - 1, TEST_REQUEST_3.endLineNumber)
+ .join('\n'),
+ sampleEditorTextLines.join('\n')
+ );
+ const expectedResultLines = [
+ 'POST /_bulk',
+ '{',
+ ' "index": {',
+ ' "_index": "books"',
+ ' }',
+ '}',
+ '{',
+ ' "name": "1984"',
+ '}',
+ '{',
+ ' "name": "Atomic habits"',
+ '}',
+ ];
+
+ expect(formattedData).toBe(expectedResultLines.join('\n'));
+ });
+
+ it('auto-indents multiple request with comments in between', () => {
+ const formattedData = getAutoIndentedRequests(
+ [TEST_REQUEST_1, TEST_REQUEST_2, TEST_REQUEST_3],
+ sampleEditorTextLines.slice(1, 23).join('\n'),
+ sampleEditorTextLines.join('\n')
+ );
+ const expectedResultLines = [
+ 'GET _search',
+ '{',
+ ' "query": {',
+ ' "match_all": {}',
+ ' }',
+ '}',
+ '',
+ '// single comment before Request 2',
+ 'GET _all',
+ '',
+ '/*',
+ 'multi-line comment before Request 3',
+ '*/',
+ 'POST /_bulk',
+ '{',
+ ' "index": {',
+ ' "_index": "books"',
+ ' }',
+ '}',
+ '{',
+ ' "name": "1984"',
+ '}',
+ '{',
+ ' "name": "Atomic habits"',
+ '}',
+ ];
+
+ expect(formattedData).toBe(expectedResultLines.join('\n'));
+ });
+
+ it('does not auto-indent a request with comments', () => {
+ const requestText = sampleEditorTextLines
+ .slice(TEST_REQUEST_4.startLineNumber - 1, TEST_REQUEST_4.endLineNumber)
+ .join('\n');
+ const formattedData = getAutoIndentedRequests(
+ [TEST_REQUEST_4],
+ requestText,
+ sampleEditorTextLines.join('\n')
+ );
+
+ expect(formattedData).toBe(requestText);
+ });
+ });
});
diff --git a/src/plugins/console/public/application/containers/editor/monaco/utils/requests_utils.ts b/src/plugins/console/public/application/containers/editor/monaco/utils/requests_utils.ts
index 7f9babb333e89..bf9c6074bb20a 100644
--- a/src/plugins/console/public/application/containers/editor/monaco/utils/requests_utils.ts
+++ b/src/plugins/console/public/application/containers/editor/monaco/utils/requests_utils.ts
@@ -13,6 +13,7 @@ import type { DevToolsVariable } from '../../../../components';
import type { EditorRequest } from '../types';
import { variableTemplateRegex } from './constants';
import { removeTrailingWhitespaces } from './tokens_utils';
+import { AdjustedParsedRequest } from '../types';
/*
* This function stringifies and normalizes the parsed request:
@@ -130,3 +131,64 @@ const replaceVariables = (text: string, variables: DevToolsVariable[]): string =
}
return text;
};
+
+const containsComments = (text: string) => {
+ return text.indexOf('//') >= 0 || text.indexOf('/*') >= 0;
+};
+
+/**
+ * This function takes a string containing unformatted Console requests and
+ * returns a text in which the requests are auto-indented.
+ * @param requests The list of {@link AdjustedParsedRequest} that are in the selected text in the editor.
+ * @param selectedText The selected text in the editor.
+ * @param allText The whole text input in the editor.
+ */
+export const getAutoIndentedRequests = (
+ requests: AdjustedParsedRequest[],
+ selectedText: string,
+ allText: string
+): string => {
+ const selectedTextLines = selectedText.split(`\n`);
+ const allTextLines = allText.split(`\n`);
+ const formattedTextLines: string[] = [];
+
+ let currentLineIndex = 0;
+ let currentRequestIndex = 0;
+
+ while (currentLineIndex < selectedTextLines.length) {
+ const request = requests[currentRequestIndex];
+ // Check if the current line is the start of the next request
+ if (
+ request &&
+ selectedTextLines[currentLineIndex] === allTextLines[request.startLineNumber - 1]
+ ) {
+ // Start of a request
+ const requestLines = allTextLines.slice(request.startLineNumber - 1, request.endLineNumber);
+
+ if (requestLines.some((line) => containsComments(line))) {
+ // If request has comments, add it as it is - without formatting
+ // TODO: Format requests with comments
+ formattedTextLines.push(...requestLines);
+ } else {
+ // If no comments, add stringified parsed request
+ const stringifiedRequest = stringifyRequest(request);
+ const firstLine = stringifiedRequest.method + ' ' + stringifiedRequest.url;
+ formattedTextLines.push(firstLine);
+
+ if (stringifiedRequest.data && stringifiedRequest.data.length > 0) {
+ formattedTextLines.push(...stringifiedRequest.data);
+ }
+ }
+
+ currentLineIndex = currentLineIndex + requestLines.length;
+ currentRequestIndex++;
+ } else {
+ // Current line is a comment or whitespaces
+ // Trim white spaces and add it to the formatted text
+ formattedTextLines.push(selectedTextLines[currentLineIndex].trim());
+ currentLineIndex++;
+ }
+ }
+
+ return formattedTextLines.join('\n');
+};
From d1806c979599f7d18cd0e7a9a9766feeb3a41aab Mon Sep 17 00:00:00 2001
From: Christos Nasikas
Date: Wed, 15 May 2024 17:50:07 +0300
Subject: [PATCH 29/50] [Alerting] Change logger level to debug when delete a
rule without alerts produce an error or warn when untracking alerts (#183207)
## Summary
Fixes: https://github.com/elastic/kibana/issues/182754
### For maintainers
- [x] This was checked for breaking API changes and was [labeled
appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
---------
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
.../lib/set_alerts_to_untracked.test.ts | 97 +++++++++++++++++++
.../lib/set_alerts_to_untracked.ts | 12 ++-
.../bulk_untrack/bulk_untrack_alerts.test.ts | 59 +++++++++++
.../bulk_untrack/bulk_untrack_alerts.ts | 25 +++--
.../rules_client/lib/untrack_rule_alerts.ts | 2 +
x-pack/plugins/alerting/tsconfig.json | 1 +
6 files changed, 188 insertions(+), 8 deletions(-)
diff --git a/x-pack/plugins/alerting/server/alerts_service/lib/set_alerts_to_untracked.test.ts b/x-pack/plugins/alerting/server/alerts_service/lib/set_alerts_to_untracked.test.ts
index 691fc8548c098..49ece72c42f95 100644
--- a/x-pack/plugins/alerting/server/alerts_service/lib/set_alerts_to_untracked.test.ts
+++ b/x-pack/plugins/alerting/server/alerts_service/lib/set_alerts_to_untracked.test.ts
@@ -426,6 +426,8 @@ describe('setAlertsToUntracked()', () => {
},
});
+ clusterClient.updateByQuery.mockResponseOnce({ total: 2, updated: 2 });
+
const result = await setAlertsToUntracked({
isUsingQuery: true,
query: [
@@ -523,4 +525,99 @@ describe('setAlertsToUntracked()', () => {
},
]);
});
+
+ test('should return an empty array if the search returns zero results', async () => {
+ getAuthorizedRuleTypesMock.mockResolvedValue([
+ {
+ id: 'test-rule-type',
+ },
+ ]);
+ getAlertIndicesAliasMock.mockResolvedValue(['test-alert-index']);
+
+ clusterClient.search.mockResponseOnce({
+ took: 1,
+ timed_out: false,
+ _shards: {
+ total: 1,
+ successful: 1,
+ skipped: 0,
+ failed: 0,
+ },
+ hits: {
+ hits: [],
+ },
+ aggregations: {
+ ruleTypeIds: {
+ buckets: [
+ {
+ key: 'some rule type',
+ consumers: {
+ buckets: [{ key: 'o11y' }],
+ },
+ },
+ ],
+ },
+ },
+ });
+
+ clusterClient.updateByQuery.mockResponseOnce({ total: 0, updated: 0 });
+
+ const result = await setAlertsToUntracked({
+ isUsingQuery: true,
+ query: [
+ {
+ bool: {
+ must: {
+ term: {
+ 'kibana.alert.rule.name': 'test',
+ },
+ },
+ },
+ },
+ ],
+ featureIds: ['o11y'],
+ spaceId: 'default',
+ getAuthorizedRuleTypes: getAuthorizedRuleTypesMock,
+ getAlertIndicesAlias: getAlertIndicesAliasMock,
+ ensureAuthorized: ensureAuthorizedMock,
+ logger,
+ esClient: clusterClient,
+ });
+
+ expect(getAlertIndicesAliasMock).lastCalledWith(['test-rule-type'], 'default');
+
+ expect(clusterClient.updateByQuery).toHaveBeenCalledWith(
+ expect.objectContaining({
+ body: expect.objectContaining({
+ query: {
+ bool: {
+ must: [
+ {
+ term: {
+ 'kibana.alert.status': {
+ value: 'active', // This has to be active
+ },
+ },
+ },
+ ],
+ filter: [
+ {
+ bool: {
+ must: {
+ term: {
+ 'kibana.alert.rule.name': 'test',
+ },
+ },
+ },
+ },
+ ],
+ },
+ },
+ }),
+ })
+ );
+
+ expect(clusterClient.search).not.toHaveBeenCalledWith();
+ expect(result).toEqual([]);
+ });
});
diff --git a/x-pack/plugins/alerting/server/alerts_service/lib/set_alerts_to_untracked.ts b/x-pack/plugins/alerting/server/alerts_service/lib/set_alerts_to_untracked.ts
index c28a760853ba6..ed0c2cb21e06b 100644
--- a/x-pack/plugins/alerting/server/alerts_service/lib/set_alerts_to_untracked.ts
+++ b/x-pack/plugins/alerting/server/alerts_service/lib/set_alerts_to_untracked.ts
@@ -208,6 +208,7 @@ export async function setAlertsToUntracked(
// Retry this updateByQuery up to 3 times to make sure the number of documents
// updated equals the number of documents matched
let total = 0;
+
for (let retryCount = 0; retryCount < 3; retryCount++) {
const response = await esClient.updateByQuery({
index: indices,
@@ -224,14 +225,18 @@ export async function setAlertsToUntracked(
});
if (total === 0 && response.total === 0) {
- throw new Error('No active alerts matched the query');
+ logger.debug('No active alerts matched the query');
+ break;
}
+
if (response.total) {
total = response.total;
}
+
if (response.total === response.updated) {
break;
}
+
logger.warn(
`Attempt ${retryCount + 1}: Failed to untrack ${
(response.total ?? 0) - (response.updated ?? 0)
@@ -241,6 +246,10 @@ export async function setAlertsToUntracked(
);
}
+ if (total === 0) {
+ return [];
+ }
+
// Fetch and return updated rule and alert instance UUIDs
const searchResponse = await esClient.search({
index: indices,
@@ -251,6 +260,7 @@ export async function setAlertsToUntracked(
query: getUntrackQuery(params, ALERT_STATUS_UNTRACKED),
},
});
+
return searchResponse.hits.hits.map((hit) => hit._source) as UntrackedAlertsResult;
} catch (err) {
logger.error(
diff --git a/x-pack/plugins/alerting/server/application/rule/methods/bulk_untrack/bulk_untrack_alerts.test.ts b/x-pack/plugins/alerting/server/application/rule/methods/bulk_untrack/bulk_untrack_alerts.test.ts
index 4e2077f15a899..befd240286a06 100644
--- a/x-pack/plugins/alerting/server/application/rule/methods/bulk_untrack/bulk_untrack_alerts.test.ts
+++ b/x-pack/plugins/alerting/server/application/rule/methods/bulk_untrack/bulk_untrack_alerts.test.ts
@@ -70,7 +70,9 @@ const rulesClientParams: jest.Mocked = {
describe('bulkUntrackAlerts()', () => {
let rulesClient: RulesClient;
+
beforeEach(async () => {
+ jest.clearAllMocks();
rulesClient = new RulesClient(rulesClientParams);
});
@@ -241,4 +243,61 @@ describe('bulkUntrackAlerts()', () => {
}
`);
});
+
+ it('should not call bulkUpdateState with no taskIds', async () => {
+ alertsService.setAlertsToUntracked.mockResolvedValueOnce([]);
+
+ await rulesClient.bulkUntrackAlerts({
+ isUsingQuery: true,
+ indices: ['test-index'],
+ alertUuids: ['my-uuid'],
+ });
+
+ expect(alertsService.setAlertsToUntracked).toHaveBeenCalledTimes(1);
+ expect(taskManager.bulkUpdateState).not.toHaveBeenCalledWith();
+ });
+
+ it('filters out undefined rule uuids', async () => {
+ alertsService.setAlertsToUntracked.mockResolvedValueOnce([{}, { foo: 'bar' }]);
+
+ await rulesClient.bulkUntrackAlerts({
+ isUsingQuery: true,
+ indices: ['test-index'],
+ alertUuids: ['my-uuid'],
+ });
+
+ expect(alertsService.setAlertsToUntracked).toHaveBeenCalledTimes(1);
+ expect(taskManager.bulkUpdateState).not.toHaveBeenCalledWith();
+ });
+
+ it('should audit log success with no taskIds', async () => {
+ alertsService.setAlertsToUntracked.mockResolvedValueOnce([]);
+
+ await rulesClient.bulkUntrackAlerts({
+ isUsingQuery: true,
+ indices: ['test-index'],
+ alertUuids: ['my-uuid'],
+ });
+
+ expect(taskManager.bulkUpdateState).not.toHaveBeenCalledWith();
+ expect(auditLogger.log.mock.calls[0][0]).toMatchInlineSnapshot(`
+ Object {
+ "error": undefined,
+ "event": Object {
+ "action": "rule_alert_untrack",
+ "category": Array [
+ "database",
+ ],
+ "outcome": "success",
+ "type": Array [
+ "change",
+ ],
+ },
+ "kibana": Object {
+ "saved_object": undefined,
+ },
+ "message": "User has untracked a rule",
+ }
+ `);
+ });
});
diff --git a/x-pack/plugins/alerting/server/application/rule/methods/bulk_untrack/bulk_untrack_alerts.ts b/x-pack/plugins/alerting/server/application/rule/methods/bulk_untrack/bulk_untrack_alerts.ts
index d3a1badd0ab33..304037782f6d3 100644
--- a/x-pack/plugins/alerting/server/application/rule/methods/bulk_untrack/bulk_untrack_alerts.ts
+++ b/x-pack/plugins/alerting/server/application/rule/methods/bulk_untrack/bulk_untrack_alerts.ts
@@ -9,6 +9,7 @@ import { omitBy } from 'lodash';
import Boom from '@hapi/boom';
import { withSpan } from '@kbn/apm-utils';
import { ALERT_RULE_UUID, ALERT_UUID } from '@kbn/rule-data-utils';
+import { AuditLogger } from '@kbn/core-security-server';
import { bulkUntrackBodySchema } from './schemas';
import type { BulkUntrackBody } from './types';
import { WriteOperations, AlertingAuthorizationEntity } from '../../../../authorization';
@@ -64,7 +65,13 @@ async function bulkUntrackAlertsWithOCC(context: RulesClientContext, params: Bul
});
// Clear alert instances from their corresponding tasks so that they can remain untracked
- const taskIds = [...new Set(result.map((doc) => doc[ALERT_RULE_UUID]))];
+ const taskIds = [...new Set(result.map((doc) => doc[ALERT_RULE_UUID]).filter(Boolean))];
+
+ if (taskIds.length === 0) {
+ auditLogSuccess(context.auditLogger);
+ return;
+ }
+
await context.taskManager.bulkUpdateState(taskIds, (state, id) => {
try {
const uuidsToClear = result
@@ -90,12 +97,7 @@ async function bulkUntrackAlertsWithOCC(context: RulesClientContext, params: Bul
}
});
- context.auditLogger?.log(
- ruleAuditEvent({
- action: RuleAuditAction.UNTRACK_ALERT,
- outcome: 'success',
- })
- );
+ auditLogSuccess(context.auditLogger);
} catch (error) {
context.auditLogger?.log(
ruleAuditEvent({
@@ -106,3 +108,12 @@ async function bulkUntrackAlertsWithOCC(context: RulesClientContext, params: Bul
throw error;
}
}
+
+const auditLogSuccess = (auditLogger?: AuditLogger) => {
+ auditLogger?.log(
+ ruleAuditEvent({
+ action: RuleAuditAction.UNTRACK_ALERT,
+ outcome: 'success',
+ })
+ );
+};
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/untrack_rule_alerts.ts b/x-pack/plugins/alerting/server/rules_client/lib/untrack_rule_alerts.ts
index d69d84c7fd8c7..76dd34a7de68a 100644
--- a/x-pack/plugins/alerting/server/rules_client/lib/untrack_rule_alerts.ts
+++ b/x-pack/plugins/alerting/server/rules_client/lib/untrack_rule_alerts.ts
@@ -24,11 +24,13 @@ export const untrackRuleAlerts = async (
) => {
return withSpan({ name: 'untrackRuleAlerts', type: 'rules' }, async () => {
if (!context.eventLogger || !attributes.scheduledTaskId) return;
+
try {
const taskInstance = taskInstanceToAlertTaskInstance(
await context.taskManager.get(attributes.scheduledTaskId),
attributes as unknown as SanitizedRule
);
+
const { state } = taskInstance;
const untrackedAlerts = mapValues, Alert>(
diff --git a/x-pack/plugins/alerting/tsconfig.json b/x-pack/plugins/alerting/tsconfig.json
index f76c6d781ad83..1bc43c34e5aa8 100644
--- a/x-pack/plugins/alerting/tsconfig.json
+++ b/x-pack/plugins/alerting/tsconfig.json
@@ -70,6 +70,7 @@
"@kbn/core-execution-context-server-mocks",
"@kbn/react-kibana-context-render",
"@kbn/search-types",
+ "@kbn/core-security-server",
],
"exclude": [
"target/**/*"
From 47cdb1ae6ed5b605abf17952eeeed536b6e5b022 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 15 May 2024 10:54:04 -0400
Subject: [PATCH 30/50] skip failing test suite (#183529)
---
.../fleet_api_integration/apis/agent_policy/agent_policy.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts
index 5c64bec5623c7..ab6701b6cf2c4 100644
--- a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts
+++ b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts
@@ -35,7 +35,8 @@ export default function (providerContext: FtrProviderContext) {
return getPkgRes;
};
- describe('fleet_agent_policies', () => {
+ // Failing: See https://github.com/elastic/kibana/issues/183529
+ describe.skip('fleet_agent_policies', () => {
skipIfNoDockerRegistry(providerContext);
describe('GET /api/fleet/agent_policies', () => {
From 3e9a8086d7652f0e62a91de6dba7fed8f1a37671 Mon Sep 17 00:00:00 2001
From: Shahzad
Date: Wed, 15 May 2024 17:28:14 +0200
Subject: [PATCH 31/50] [SLOs] Filter out stale SLOs by default from overview
(#182745)
## Summary
Fixes https://github.com/elastic/kibana/issues/176712
Added a way to define threshold to declare SLOs stale state , for now i
have chosen if it hasn't been updated in 48 hours, need product feedback
on this
Added an overview panel to indicate how many SLOs are in stale state ,
user can click on each EuiState component to filter SLOs by
Also added Alerts overview , clicking will take user to alerts or rules
page, pref filtered with burn rate
---
.../src/rest_specs/routes/find.ts | 2 +
.../src/rest_specs/routes/get_overview.ts | 35 ++++
.../kbn-slo-schema/src/schema/common.ts | 15 +-
.../kbn-slo-schema/src/schema/settings.ts | 5 +-
.../slo/common/constants.ts | 3 +
.../slo/common/summary_indices.test.ts | 8 +-
.../slo/paths/s@{spaceid}@api@slos.yaml | 5 +
.../slo/public/hooks/query_key_factory.ts | 7 +
.../slo/public/hooks/use_alerts_url.ts | 24 +++
.../slo/public/hooks/use_fetch_slo_list.ts | 1 +
.../pages/slo_settings/settings_form.tsx | 53 +++++-
.../pages/slo_settings/use_get_settings.ts | 2 +
.../components/card_view/slo_card_item.tsx | 13 +-
.../pages/slos/components/slo_list_empty.tsx | 22 ++-
.../slos_overview/overview_item.tsx | 56 +++++++
.../slos_overview/slo_overview_alerts.tsx | 96 +++++++++++
.../slos_overview/slos_overview.tsx | 127 +++++++++++++++
.../slos/hooks/use_fetch_slos_overview.ts | 108 +++++++++++++
.../slo/public/pages/slos/slos.tsx | 6 +-
.../slo/server/plugin.ts | 10 +-
.../slo/server/routes/register_routes.ts | 8 +-
.../slo/server/routes/slo/route.ts | 34 ++++
.../summary_search_client.test.ts.snap | 6 +
.../slo/server/services/find_slo.test.ts | 2 +
.../slo/server/services/find_slo.ts | 3 +-
.../slo/server/services/find_slo_groups.ts | 6 +-
.../slo/server/services/get_slos_overview.ts | 153 ++++++++++++++++++
.../slo/server/services/slo_settings.ts | 19 ++-
.../services/summary_search_client.test.ts | 113 +++++++++++++
.../server/services/summary_search_client.ts | 43 ++++-
30 files changed, 952 insertions(+), 33 deletions(-)
create mode 100644 x-pack/packages/kbn-slo-schema/src/rest_specs/routes/get_overview.ts
create mode 100644 x-pack/plugins/observability_solution/slo/public/hooks/use_alerts_url.ts
create mode 100644 x-pack/plugins/observability_solution/slo/public/pages/slos/components/slos_overview/overview_item.tsx
create mode 100644 x-pack/plugins/observability_solution/slo/public/pages/slos/components/slos_overview/slo_overview_alerts.tsx
create mode 100644 x-pack/plugins/observability_solution/slo/public/pages/slos/components/slos_overview/slos_overview.tsx
create mode 100644 x-pack/plugins/observability_solution/slo/public/pages/slos/hooks/use_fetch_slos_overview.ts
create mode 100644 x-pack/plugins/observability_solution/slo/server/services/get_slos_overview.ts
diff --git a/x-pack/packages/kbn-slo-schema/src/rest_specs/routes/find.ts b/x-pack/packages/kbn-slo-schema/src/rest_specs/routes/find.ts
index 6d6ebf7b553b0..31e8c5852a1e1 100644
--- a/x-pack/packages/kbn-slo-schema/src/rest_specs/routes/find.ts
+++ b/x-pack/packages/kbn-slo-schema/src/rest_specs/routes/find.ts
@@ -5,6 +5,7 @@
* 2.0.
*/
import * as t from 'io-ts';
+import { toBooleanRt } from '@kbn/io-ts-utils';
import { sloWithDataResponseSchema } from '../slo';
const sortDirectionSchema = t.union([t.literal('asc'), t.literal('desc')]);
@@ -23,6 +24,7 @@ const findSLOParamsSchema = t.partial({
perPage: t.string,
sortBy: sortBySchema,
sortDirection: sortDirectionSchema,
+ hideStale: toBooleanRt,
}),
});
diff --git a/x-pack/packages/kbn-slo-schema/src/rest_specs/routes/get_overview.ts b/x-pack/packages/kbn-slo-schema/src/rest_specs/routes/get_overview.ts
new file mode 100644
index 0000000000000..9983bdee41e2d
--- /dev/null
+++ b/x-pack/packages/kbn-slo-schema/src/rest_specs/routes/get_overview.ts
@@ -0,0 +1,35 @@
+/*
+ * 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 * as t from 'io-ts';
+
+const getOverviewParamsSchema = t.partial({
+ query: t.partial({
+ kqlQuery: t.string,
+ filters: t.string,
+ }),
+});
+
+const getOverviewResponseSchema = t.type({
+ violated: t.number,
+ degrading: t.number,
+ stale: t.number,
+ healthy: t.number,
+ worst: t.type({
+ value: t.number,
+ id: t.string,
+ }),
+ noData: t.number,
+ burnRateRules: t.number,
+ burnRateActiveAlerts: t.number,
+ burnRateRecoveredAlerts: t.number,
+});
+
+type GetOverviewParams = t.TypeOf;
+type GetOverviewResponse = t.OutputOf;
+
+export { getOverviewParamsSchema, getOverviewResponseSchema };
+export type { GetOverviewParams, GetOverviewResponse };
diff --git a/x-pack/packages/kbn-slo-schema/src/schema/common.ts b/x-pack/packages/kbn-slo-schema/src/schema/common.ts
index 5346b9507e0b9..a803bcf735796 100644
--- a/x-pack/packages/kbn-slo-schema/src/schema/common.ts
+++ b/x-pack/packages/kbn-slo-schema/src/schema/common.ts
@@ -43,11 +43,16 @@ const statusSchema = t.union([
t.literal('VIOLATED'),
]);
-const summarySchema = t.type({
- status: statusSchema,
- sliValue: t.number,
- errorBudget: errorBudgetSchema,
-});
+const summarySchema = t.intersection([
+ t.type({
+ status: statusSchema,
+ sliValue: t.number,
+ errorBudget: errorBudgetSchema,
+ }),
+ t.partial({
+ summaryUpdatedAt: t.union([t.string, t.null]),
+ }),
+]);
const groupingsSchema = t.record(t.string, t.union([t.string, t.number]));
diff --git a/x-pack/packages/kbn-slo-schema/src/schema/settings.ts b/x-pack/packages/kbn-slo-schema/src/schema/settings.ts
index c4f797e427c48..dacf9aa08b476 100644
--- a/x-pack/packages/kbn-slo-schema/src/schema/settings.ts
+++ b/x-pack/packages/kbn-slo-schema/src/schema/settings.ts
@@ -10,6 +10,9 @@ import * as t from 'io-ts';
export const sloSettingsSchema = t.type({
useAllRemoteClusters: t.boolean,
selectedRemoteClusters: t.array(t.string),
+ staleThresholdInHours: t.number,
});
-export const sloServerlessSettingsSchema = t.type({});
+export const sloServerlessSettingsSchema = t.type({
+ staleThresholdInHours: t.number,
+});
diff --git a/x-pack/plugins/observability_solution/slo/common/constants.ts b/x-pack/plugins/observability_solution/slo/common/constants.ts
index 1cf872bd0a918..db0c91ab0ef4b 100644
--- a/x-pack/plugins/observability_solution/slo/common/constants.ts
+++ b/x-pack/plugins/observability_solution/slo/common/constants.ts
@@ -88,3 +88,6 @@ export const getSLOSummaryPipelineId = (sloId: string, sloRevision: number) =>
export const SYNTHETICS_INDEX_PATTERN = 'synthetics-*';
export const SYNTHETICS_DEFAULT_GROUPINGS = ['monitor.name', 'observer.geo.name', 'monitor.id'];
+
+// in hours
+export const DEFAULT_STALE_SLO_THRESHOLD_HOURS = 48;
diff --git a/x-pack/plugins/observability_solution/slo/common/summary_indices.test.ts b/x-pack/plugins/observability_solution/slo/common/summary_indices.test.ts
index d55107dfcd802..64f9ad0d44540 100644
--- a/x-pack/plugins/observability_solution/slo/common/summary_indices.test.ts
+++ b/x-pack/plugins/observability_solution/slo/common/summary_indices.test.ts
@@ -6,13 +6,17 @@
*/
import { getListOfSloSummaryIndices } from './summary_indices';
-import { SLO_SUMMARY_DESTINATION_INDEX_PATTERN } from './constants';
+import {
+ DEFAULT_STALE_SLO_THRESHOLD_HOURS,
+ SLO_SUMMARY_DESTINATION_INDEX_PATTERN,
+} from './constants';
describe('getListOfSloSummaryIndices', () => {
it('should return default index if disabled', function () {
const settings = {
useAllRemoteClusters: false,
selectedRemoteClusters: [],
+ staleThresholdInHours: DEFAULT_STALE_SLO_THRESHOLD_HOURS,
};
const result = getListOfSloSummaryIndices(settings, []);
expect(result).toBe(SLO_SUMMARY_DESTINATION_INDEX_PATTERN);
@@ -22,6 +26,7 @@ describe('getListOfSloSummaryIndices', () => {
const settings = {
useAllRemoteClusters: true,
selectedRemoteClusters: [],
+ staleThresholdInHours: DEFAULT_STALE_SLO_THRESHOLD_HOURS,
};
const clustersByName = [
{ name: 'cluster1', isConnected: true },
@@ -37,6 +42,7 @@ describe('getListOfSloSummaryIndices', () => {
const settings = {
useAllRemoteClusters: false,
selectedRemoteClusters: ['cluster1'],
+ staleThresholdInHours: DEFAULT_STALE_SLO_THRESHOLD_HOURS,
};
const clustersByName = [
{ name: 'cluster1', isConnected: true },
diff --git a/x-pack/plugins/observability_solution/slo/docs/openapi/slo/paths/s@{spaceid}@api@slos.yaml b/x-pack/plugins/observability_solution/slo/docs/openapi/slo/paths/s@{spaceid}@api@slos.yaml
index 782e8fb477f94..0b6cd584ed3f3 100644
--- a/x-pack/plugins/observability_solution/slo/docs/openapi/slo/paths/s@{spaceid}@api@slos.yaml
+++ b/x-pack/plugins/observability_solution/slo/docs/openapi/slo/paths/s@{spaceid}@api@slos.yaml
@@ -97,6 +97,11 @@ get:
enum: [asc, desc]
default: asc
example: asc
+ - name: hideStale
+ in: query
+ description: Hide stale SLOs from the list as defined by stale SLO threshold in SLO settings
+ schema:
+ type: boolean
responses:
'200':
description: Successful request
diff --git a/x-pack/plugins/observability_solution/slo/public/hooks/query_key_factory.ts b/x-pack/plugins/observability_solution/slo/public/hooks/query_key_factory.ts
index dd8f3c49a4b43..a493a9cc27066 100644
--- a/x-pack/plugins/observability_solution/slo/public/hooks/query_key_factory.ts
+++ b/x-pack/plugins/observability_solution/slo/public/hooks/query_key_factory.ts
@@ -27,12 +27,19 @@ interface SloGroupListFilter {
groupsFilter?: string[];
}
+interface SLOOverviewFilter {
+ kqlQuery: string;
+ filters: string;
+ lastRefresh?: number;
+}
+
export const sloKeys = {
all: ['slo'] as const,
lists: () => [...sloKeys.all, 'list'] as const,
list: (filters: SloListFilter) => [...sloKeys.lists(), filters] as const,
group: (filters: SloGroupListFilter) => [...sloKeys.groups(), filters] as const,
groups: () => [...sloKeys.all, 'group'] as const,
+ overview: (filters: SLOOverviewFilter) => ['overview', filters] as const,
details: () => [...sloKeys.all, 'details'] as const,
detail: (sloId?: string) => [...sloKeys.details(), sloId] as const,
rules: () => [...sloKeys.all, 'rules'] as const,
diff --git a/x-pack/plugins/observability_solution/slo/public/hooks/use_alerts_url.ts b/x-pack/plugins/observability_solution/slo/public/hooks/use_alerts_url.ts
new file mode 100644
index 0000000000000..fa97a22204372
--- /dev/null
+++ b/x-pack/plugins/observability_solution/slo/public/hooks/use_alerts_url.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 { observabilityPaths } from '@kbn/observability-plugin/common';
+import rison from '@kbn/rison';
+import { useKibana } from '../utils/kibana_react';
+
+export const useAlertsUrl = () => {
+ const { basePath } = useKibana().services.http;
+
+ const kuery = 'kibana.alert.rule.rule_type_id:("slo.rules.burnRate")';
+
+ return (status?: 'active' | 'recovered') =>
+ `${basePath.prepend(observabilityPaths.alerts)}?_a=${rison.encode({
+ kuery,
+ rangeFrom: 'now-24h',
+ rangeTo: 'now',
+ status,
+ })}`;
+};
diff --git a/x-pack/plugins/observability_solution/slo/public/hooks/use_fetch_slo_list.ts b/x-pack/plugins/observability_solution/slo/public/hooks/use_fetch_slo_list.ts
index 27bd77a869c86..289c8e5cbd418 100644
--- a/x-pack/plugins/observability_solution/slo/public/hooks/use_fetch_slo_list.ts
+++ b/x-pack/plugins/observability_solution/slo/public/hooks/use_fetch_slo_list.ts
@@ -103,6 +103,7 @@ export function useFetchSloList({
...(page !== undefined && { page }),
...(perPage !== undefined && { perPage }),
...(filters && { filters }),
+ hideStale: true,
},
signal,
});
diff --git a/x-pack/plugins/observability_solution/slo/public/pages/slo_settings/settings_form.tsx b/x-pack/plugins/observability_solution/slo/public/pages/slo_settings/settings_form.tsx
index 86a2597c2188a..895ca2c0f8e2b 100644
--- a/x-pack/plugins/observability_solution/slo/public/pages/slo_settings/settings_form.tsx
+++ b/x-pack/plugins/observability_solution/slo/public/pages/slo_settings/settings_form.tsx
@@ -17,22 +17,27 @@ import {
EuiButtonEmpty,
EuiButton,
EuiSpacer,
+ EuiFieldNumber,
} from '@elastic/eui';
import React, { useEffect, useState } from 'react';
import { useFetcher } from '@kbn/observability-shared-plugin/public';
import { useKibana } from '@kbn/kibana-react-plugin/public';
import { isEqual } from 'lodash';
+import { DEFAULT_STALE_SLO_THRESHOLD_HOURS } from '../../../common/constants';
import { useGetSettings } from './use_get_settings';
import { usePutSloSettings } from './use_put_slo_settings';
export function SettingsForm() {
const [useAllRemoteClusters, setUseAllRemoteClusters] = useState(false);
const [selectedRemoteClusters, setSelectedRemoteClusters] = useState([]);
+ const [staleThresholdInHours, setStaleThresholdInHours] = useState(
+ DEFAULT_STALE_SLO_THRESHOLD_HOURS
+ );
const { http } = useKibana().services;
const { data: currentSettings } = useGetSettings();
- const { mutateAsync: updateSettings } = usePutSloSettings();
+ const { mutateAsync: updateSettings, isLoading: isUpdating } = usePutSloSettings();
const { data, loading } = useFetcher(() => {
return http?.get>('/api/remote_clusters');
@@ -42,6 +47,7 @@ export function SettingsForm() {
if (currentSettings) {
setUseAllRemoteClusters(currentSettings.useAllRemoteClusters);
setSelectedRemoteClusters(currentSettings.selectedRemoteClusters);
+ setStaleThresholdInHours(currentSettings.staleThresholdInHours);
}
}, [currentSettings]);
@@ -50,6 +56,7 @@ export function SettingsForm() {
settings: {
useAllRemoteClusters,
selectedRemoteClusters,
+ staleThresholdInHours,
},
});
};
@@ -119,18 +126,57 @@ export function SettingsForm() {
/>
+ {i18n.translate('xpack.slo.settingsForm.h3.staleThresholdLabel', {
+ defaultMessage: 'Stale SLOs threshold',
+ })}
+
+ }
+ description={
+ - {i18n.translate('xpack.observability.alertsFlyout.reasonTitle', { - defaultMessage: 'Reason', - })} -
-- {i18n.translate('xpack.observability.alertsFlyout.documentSummaryTitle', { - defaultMessage: 'Document Summary', - })} -
-+ {i18n.translate('xpack.observability.alertsFlyout.reasonTitle', { + defaultMessage: 'Reason', + })} +
++ {i18n.translate('xpack.observability.alertsFlyout.documentSummaryTitle', { + defaultMessage: 'Document Summary', + })} +
++ {i18n.translate('xpack.slo.settingsForm.select.staleThresholdLabel', { + defaultMessage: + 'SLOs not updated within the defined stale threshold will be hidden by default from the overview list.', + })} +
+ } + > ++ {i18n.translate('xpack.slo.sLOsOverview.h3.burnRateLabel', { + defaultMessage: 'Burn rate', + })} +
++ {i18n.translate('xpack.slo.sLOsOverview.h3.overviewLabel', { + defaultMessage: 'Overview', + })} +
+
-
- {title}
- {children}
-
-
- );
-};
diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/components/virtual_columns/column_tooltips/actions_column_tooltip.tsx b/x-pack/plugins/observability_solution/logs_explorer/public/components/virtual_columns/column_tooltips/actions_column_tooltip.tsx
index 6ed03bf91b8ba..c33c514bf3789 100644
--- a/x-pack/plugins/observability_solution/logs_explorer/public/components/virtual_columns/column_tooltips/actions_column_tooltip.tsx
+++ b/x-pack/plugins/observability_solution/logs_explorer/public/components/virtual_columns/column_tooltips/actions_column_tooltip.tsx
@@ -17,8 +17,7 @@ import {
actionsLabel,
actionsLabelLowerCase,
} from '../../common/translations';
-import { HoverPopover } from '../../common/hover_popover';
-import { TooltipButtonComponent } from './tooltip_button';
+import { TooltipButton } from './tooltip_button';
import * as constants from '../../../../common/constants';
import { FieldWithToken } from './field_with_token';
@@ -28,10 +27,7 @@ const spacingCSS = css`
export const ActionsColumnTooltip = () => {
return (
- {actionsHeaderTooltipParagraph}
@@ -94,6 +90,6 @@ export const ActionsColumnTooltip = () => { ))}
-
-
+
+
+
+
);
}
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/tsconfig.json b/x-pack/plugins/observability_solution/observability_onboarding/tsconfig.json
index b03e6d6ffe6d5..eb31601928b87 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/tsconfig.json
+++ b/x-pack/plugins/observability_solution/observability_onboarding/tsconfig.json
@@ -36,7 +36,9 @@
"@kbn/shared-ux-link-redirect-app",
"@kbn/cloud-experiments-plugin",
"@kbn/home-sample-data-tab",
- "@kbn/analytics-client"
+ "@kbn/analytics-client",
+ "@kbn/react-kibana-context-render",
+ "@kbn/react-kibana-context-theme"
],
"exclude": ["target/**/*"]
}
diff --git a/x-pack/plugins/observability_solution/observability_shared/public/components/header_menu/header_menu_portal.tsx b/x-pack/plugins/observability_solution/observability_shared/public/components/header_menu/header_menu_portal.tsx
index 4f7c4bb817e3e..fcd71e1e75d42 100644
--- a/x-pack/plugins/observability_solution/observability_shared/public/components/header_menu/header_menu_portal.tsx
+++ b/x-pack/plugins/observability_solution/observability_shared/public/components/header_menu/header_menu_portal.tsx
@@ -7,6 +7,7 @@
import React, { useEffect, useMemo } from 'react';
import { createHtmlPortalNode, InPortal, OutPortal } from 'react-reverse-portal';
+// FIXME use import { toMountPoint } from '@kbn/react-kibana-mount';
import { toMountPoint } from '@kbn/kibana-react-plugin/public';
import type { HeaderMenuPortalProps } from '../../types';
diff --git a/x-pack/plugins/observability_solution/slo/public/application.tsx b/x-pack/plugins/observability_solution/slo/public/application.tsx
index 9cf739f5e543a..aedfba1b1eada 100644
--- a/x-pack/plugins/observability_solution/slo/public/application.tsx
+++ b/x-pack/plugins/observability_solution/slo/public/application.tsx
@@ -7,13 +7,13 @@
import React from 'react';
import ReactDOM from 'react-dom';
-import { EuiErrorBoundary } from '@elastic/eui';
import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
import { KibanaThemeProvider } from '@kbn/react-kibana-context-theme';
import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '@kbn/core/public';
import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-shared-plugin/public';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { Router, Routes, Route } from '@kbn/shared-ux-router';
+import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app';
import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
@@ -72,7 +72,6 @@ export const renderApp = ({
experimentalFeatures: ExperimentalFeatures;
}) => {
const { element, history, theme$ } = appMountParameters;
- const i18nCore = core.i18n;
const isDarkMode = core.theme.getTheme().darkMode;
// ensure all divs are .kbnAppWrappers
@@ -110,8 +109,8 @@ export const renderApp = ({
});
ReactDOM.render(
-
+
-
-
+
{renderFeedbackLinkAsPortal && (
@@ -90,11 +91,11 @@ export function ObservabilityOnboardingAppRoot({
-
-
-
-
-
+
+ Screenshots
1. Endpoint list
2. Endpoint details
3. Endpoint alert
3. SentinelOne Alert
4. Endpoint alert -> Timeline view -> details flyout
4. SentinelOne alert -> Timeline view -> details flyout
5. Endpoint responder
5. SentinelOne responder
6. Host Page -> Endpoint overview
+
+ {actionList.map(({ count, label }) => {
+ return (
+ {getEmptyValue()}
+{getEmptyValue()}
-
-
- {actionList.map(({ count, label }) => {
- return (
-
- panel content
-
,
"id": 3,
- "title": "AAA panel",
},
Object {
- "content":
- panel content
-
,
"id": 4,
- "title": "ZZZ panel",
},
Object {
"id": 5,
@@ -92,18 +84,10 @@ exports[`shareContextMenuExtensions should sort ascending on sort order first an
"title": "Get link",
},
Object {
- "content":
- panel content
-
,
"id": 2,
- "title": "AAA panel",
},
Object {
- "content":
- panel content
-
,
"id": 3,
- "title": "ZZZ panel",
},
Object {
"id": 4,
diff --git a/src/plugins/share/public/components/__snapshots__/url_panel_content.test.tsx.snap b/src/plugins/share/public/components/__snapshots__/url_panel_content.test.tsx.snap
deleted file mode 100644
index 1f6fec6b91b2d..0000000000000
--- a/src/plugins/share/public/components/__snapshots__/url_panel_content.test.tsx.snap
+++ /dev/null
@@ -1,690 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`share url panel content render 1`] = `
-