Skip to content

Commit 27aed48

Browse files
authored
Merge branch '9.0' into backport/9.0/pr-236161
2 parents b8496c3 + c715018 commit 27aed48

8 files changed

Lines changed: 36 additions & 21 deletions

File tree

docs/reference/kibana-accessibility-statement.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ products:
77
- id: kibana
88
mapped_pages:
99
- https://www.elastic.co/guide/en/kibana/current/accessibility.html
10+
navigation_title: Accessibility
1011
---
1112

1213
# {{kib}} accessibility statement

x-pack/solutions/observability/plugins/synthetics/server/synthetics_service/get_api_key.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ export const getAPIKeyForSyntheticsService = async ({
4343
server,
4444
}: {
4545
server: SyntheticsServerSetup;
46-
}): Promise<{ apiKey?: SyntheticsServiceApiKey; isValid: boolean }> => {
46+
}): Promise<{
47+
apiKey?: SyntheticsServiceApiKey;
48+
isValid: boolean;
49+
}> => {
4750
try {
4851
const apiKey = await syntheticsServiceAPIKeySavedObject.get(server);
4952

@@ -67,11 +70,6 @@ export const getAPIKeyForSyntheticsService = async ({
6770
if (!hasPermissions) {
6871
return { isValid: false, apiKey };
6972
}
70-
71-
if (!isValid) {
72-
server.logger.info('Synthetics api is no longer valid');
73-
}
74-
7573
return { apiKey, isValid };
7674
}
7775
} catch (err) {

x-pack/solutions/observability/plugins/synthetics/server/synthetics_service/synthetics_service.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ describe('SyntheticsService', () => {
275275

276276
await service.pushConfigs();
277277

278-
expect(serverMock.logger.error).toBeCalledWith(
278+
expect(serverMock.logger.debug).toBeCalledWith(
279279
'API key is not valid. Cannot push monitor configuration to synthetics public testing locations'
280280
);
281281
});

x-pack/solutions/observability/plugins/synthetics/server/synthetics_service/synthetics_service.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,7 @@ export class SyntheticsService {
191191
await service.pushConfigs();
192192
} else {
193193
if (!service.isAllowed) {
194-
service.logger.error(
195-
'User is not allowed to access Synthetics service. Please contact support.'
196-
);
194+
service.logger.debug('User is not allowed to access Synthetics service.');
197195
}
198196
}
199197
} catch (e) {
@@ -310,10 +308,12 @@ export class SyntheticsService {
310308
}
311309

312310
async getOutput({ inspect }: { inspect: boolean } = { inspect: false }) {
313-
const { apiKey, isValid } = await getAPIKeyForSyntheticsService({ server: this.server });
311+
const { apiKey, isValid } = await getAPIKeyForSyntheticsService({
312+
server: this.server,
313+
});
314314
// do not check for api key validity if inspecting
315315
if (!isValid && !inspect) {
316-
this.server.logger.error(
316+
this.server.logger.debug(
317317
'API key is not valid. Cannot push monitor configuration to synthetics public testing locations'
318318
);
319319
this.invalidApiKeyError = true;

x-pack/solutions/search/plugins/search_playground/public/components/summarization_panel/instructions_field.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ export const InstructionsField: React.FC<InstructionsFieldProps> = ({ value, onC
5353
</span>
5454
}
5555
fullWidth
56+
isInvalid={isEmpty(value)}
57+
error={
58+
isEmpty(value)
59+
? i18n.translate('xpack.searchPlayground.sidebar.instructionsField.errorMessage', {
60+
defaultMessage: 'Instructions cannot be empty',
61+
})
62+
: undefined
63+
}
5664
>
5765
<EuiTextArea
5866
data-test-subj="instructionsPrompt"

x-pack/solutions/security/plugins/security_solution/public/common/lib/telemetry/events/rule_upgrade/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const ruleUpgradeFlyoutButtonClickEvent: RuleUpgradeTelemetryEvent = {
1818
optional: false,
1919
},
2020
},
21-
hasMissingBaseVersion: {
21+
hasBaseVersion: {
2222
type: 'boolean',
2323
_meta: {
2424
description: 'Indicates if the rule has a missing base version',
@@ -44,7 +44,7 @@ export const ruleUpgradeSingleButtonClickEvent: RuleUpgradeTelemetryEvent = {
4444
export const ruleUpgradeOpenFlyoutEvent: RuleUpgradeTelemetryEvent = {
4545
eventType: RuleUpgradeEventTypes.RuleUpgradeFlyoutOpen,
4646
schema: {
47-
hasMissingBaseVersion: {
47+
hasBaseVersion: {
4848
type: 'boolean',
4949
_meta: {
5050
description: 'Indicates if the rule has a missing base version',

x-pack/solutions/security/plugins/security_solution/public/common/lib/telemetry/events/rule_upgrade/types.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@ export enum RuleUpgradeEventTypes {
1313
}
1414
interface ReportRuleUpgradeFlyoutButtonClickParams {
1515
type: 'update' | 'dismiss';
16-
hasMissingBaseVersion: boolean;
16+
hasBaseVersion: boolean;
17+
eventVersion: number;
1718
}
1819

1920
interface ReportRuleUpgradeSingleButtonClickParams {
2021
hasBaseVersion: boolean;
2122
}
2223

2324
interface ReportRuleUpgradeFlyoutOpenParams {
24-
hasMissingBaseVersion: boolean;
25+
hasBaseVersion: boolean;
26+
eventVersion: number;
2527
}
2628

2729
export interface RuleUpgradeTelemetryEventsMap {

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management/hooks/use_prebuilt_rules_upgrade.tsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ import type { RulesConflictStats } from '../../rule_management_ui/components/rul
4848
import { useKibana } from '../../../common/lib/kibana';
4949

5050
const REVIEW_PREBUILT_RULES_UPGRADE_REFRESH_INTERVAL = 5 * 60 * 1000;
51+
const RULE_UPGRADE_FLYOUT_BUTTON_EVENT_VERSION = 2;
52+
const RULE_UPGRADE_FLYOUT_OPEN_EVENT_VERSION = 2;
5153

5254
export const PREBUILT_RULE_UPDATE_FLYOUT_ANCHOR = 'updatePrebuiltRulePreview';
5355

@@ -353,16 +355,18 @@ export function usePrebuiltRulesUpgrade({
353355
);
354356
const closeRulePreviewAction = (rule: RuleResponse, reason: RulePreviewFlyoutCloseReason) => {
355357
const ruleUpgradeState = rulesUpgradeState[rule.rule_id];
356-
const hasMissingBaseVersion = ruleUpgradeState.has_base_version === false;
358+
const hasBaseVersion = ruleUpgradeState.has_base_version === true;
357359
if (reason === 'dismiss') {
358360
telemetry.reportEvent(RuleUpgradeEventTypes.RuleUpgradeFlyoutButtonClick, {
359361
type: 'dismiss',
360-
hasMissingBaseVersion,
362+
hasBaseVersion,
363+
eventVersion: RULE_UPGRADE_FLYOUT_BUTTON_EVENT_VERSION,
361364
});
362365
} else {
363366
telemetry.reportEvent(RuleUpgradeEventTypes.RuleUpgradeFlyoutButtonClick, {
364367
type: 'update',
365-
hasMissingBaseVersion,
368+
hasBaseVersion,
369+
eventVersion: RULE_UPGRADE_FLYOUT_BUTTON_EVENT_VERSION,
366370
});
367371
}
368372
};
@@ -382,9 +386,11 @@ export function usePrebuiltRulesUpgrade({
382386
(ruleId: string) => {
383387
openRulePreviewDefault(ruleId);
384388
const ruleUpgradeState = rulesUpgradeState[ruleId];
385-
const hasMissingBaseVersion = ruleUpgradeState.has_base_version === false;
389+
const hasBaseVersion = ruleUpgradeState.has_base_version === true;
390+
386391
telemetry.reportEvent(RuleUpgradeEventTypes.RuleUpgradeFlyoutOpen, {
387-
hasMissingBaseVersion,
392+
hasBaseVersion,
393+
eventVersion: RULE_UPGRADE_FLYOUT_OPEN_EVENT_VERSION,
388394
});
389395
},
390396
[openRulePreviewDefault, rulesUpgradeState, telemetry]

0 commit comments

Comments
 (0)