+ {this.state.createIndexError}
+
+ );
+ }
return (
Date: Wed, 1 Sep 2021 14:00:15 -0400
Subject: [PATCH 11/21] [Security Solution] Endpoint Exception status in
flayout is not aligned with alerts context menu (#110203) (#110831)
* unit test
* add isAlertFromEndpointAlert check
* update isAlertFromEndpointAlert
* unit test
* fix unit test
Co-authored-by: Angela Chuang <6295984+angorayc@users.noreply.github.com>
---
.../event_details/alert_summary_view.tsx | 4 +-
.../common/utils/endpoint_alert_check.test.ts | 42 ++++++++++++++++---
.../common/utils/endpoint_alert_check.ts | 24 ++++++++++-
.../timeline_actions/alert_context_menu.tsx | 16 ++-----
.../use_host_isolation_action.tsx | 4 +-
.../take_action_dropdown/index.test.tsx | 5 ++-
.../components/take_action_dropdown/index.tsx | 11 +----
7 files changed, 72 insertions(+), 34 deletions(-)
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/alert_summary_view.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/alert_summary_view.tsx
index da6c091ab069a..03c420914d170 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/alert_summary_view.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/alert_summary_view.tsx
@@ -36,7 +36,7 @@ import { AlertSummaryRow, getSummaryColumns, SummaryRow } from './helpers';
import { useRuleWithFallback } from '../../../detections/containers/detection_engine/rules/use_rule_with_fallback';
import { MarkdownRenderer } from '../markdown_editor';
import { LineClamp } from '../line_clamp';
-import { endpointAlertCheck } from '../../utils/endpoint_alert_check';
+import { isAlertFromEndpointEvent } from '../../utils/endpoint_alert_check';
import { getEmptyValue } from '../empty_value';
import { ActionCell } from './table/action_cell';
import { FieldValueCell } from './table/field_value_cell';
@@ -244,7 +244,7 @@ export const getSummaryRows = ({
fieldFromBrowserField: browserField,
};
- if (item.id === 'agent.id' && !endpointAlertCheck({ data })) {
+ if (item.id === 'agent.id' && !isAlertFromEndpointEvent({ data })) {
return acc;
}
diff --git a/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.test.ts b/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.test.ts
index e95f5c15d4ecb..d0a03d62a682b 100644
--- a/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.test.ts
+++ b/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.test.ts
@@ -6,10 +6,11 @@
*/
import _ from 'lodash';
+import { Ecs } from '../../../common/ecs';
import { generateMockDetailItemData } from '../mock';
-import { endpointAlertCheck } from './endpoint_alert_check';
+import { isAlertFromEndpointAlert, isAlertFromEndpointEvent } from './endpoint_alert_check';
-describe('Endpoint Alert Check Utility', () => {
+describe('isAlertFromEndpointEvent', () => {
let mockDetailItemData: ReturnType;
beforeEach(() => {
@@ -38,16 +39,47 @@ describe('Endpoint Alert Check Utility', () => {
});
it('should return true if detections data comes from an endpoint rule', () => {
- expect(endpointAlertCheck({ data: mockDetailItemData })).toBe(true);
+ expect(isAlertFromEndpointEvent({ data: mockDetailItemData })).toBe(true);
});
it('should return false if it is not an Alert (ex. maybe an event)', () => {
_.remove(mockDetailItemData, { field: 'signal.rule.id' });
- expect(endpointAlertCheck({ data: mockDetailItemData })).toBeFalsy();
+ expect(isAlertFromEndpointEvent({ data: mockDetailItemData })).toBeFalsy();
});
it('should return false if it is not an endpoint agent', () => {
_.remove(mockDetailItemData, { field: 'agent.type' });
- expect(endpointAlertCheck({ data: mockDetailItemData })).toBeFalsy();
+ expect(isAlertFromEndpointEvent({ data: mockDetailItemData })).toBeFalsy();
+ });
+});
+
+describe('isAlertFromEndpointAlert', () => {
+ it('should return true if detections data comes from an endpoint rule', () => {
+ const mockEcsData = {
+ _id: 'mockId',
+ 'signal.original_event.module': ['endpoint'],
+ 'signal.original_event.kind': ['alert'],
+ } as Ecs;
+ expect(isAlertFromEndpointAlert({ ecsData: mockEcsData })).toBe(true);
+ });
+
+ it('should return false if ecsData is undefined', () => {
+ expect(isAlertFromEndpointAlert({ ecsData: undefined })).toBeFalsy();
+ });
+
+ it('should return false if it is not an Alert', () => {
+ const mockEcsData = {
+ _id: 'mockId',
+ 'signal.original_event.module': ['endpoint'],
+ } as Ecs;
+ expect(isAlertFromEndpointAlert({ ecsData: mockEcsData })).toBeFalsy();
+ });
+
+ it('should return false if it is not an endpoint module', () => {
+ const mockEcsData = {
+ _id: 'mockId',
+ 'signal.original_event.kind': ['alert'],
+ } as Ecs;
+ expect(isAlertFromEndpointAlert({ ecsData: mockEcsData })).toBeFalsy();
});
});
diff --git a/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts b/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts
index 30c6e3fdeb672..7e7e7a6bcdd1f 100644
--- a/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts
+++ b/x-pack/plugins/security_solution/public/common/utils/endpoint_alert_check.ts
@@ -5,15 +5,20 @@
* 2.0.
*/
-import { find, some } from 'lodash/fp';
+import { find, getOr, some } from 'lodash/fp';
import { TimelineEventsDetailsItem } from '../../../../timelines/common';
+import { Ecs } from '../../../common/ecs';
/**
* Checks to see if the given set of Timeline event detail items includes data that indicates its
* an endpoint Alert. Note that it will NOT match on Events - only alerts
* @param data
*/
-export const endpointAlertCheck = ({ data }: { data: TimelineEventsDetailsItem[] }): boolean => {
+export const isAlertFromEndpointEvent = ({
+ data,
+}: {
+ data: TimelineEventsDetailsItem[];
+}): boolean => {
const isAlert = some({ category: 'signal', field: 'signal.rule.id' }, data);
if (!isAlert) {
@@ -23,3 +28,18 @@ export const endpointAlertCheck = ({ data }: { data: TimelineEventsDetailsItem[]
const findEndpointAlert = find({ field: 'agent.type' }, data)?.values;
return findEndpointAlert ? findEndpointAlert[0] === 'endpoint' : false;
};
+
+export const isAlertFromEndpointAlert = ({
+ ecsData,
+}: {
+ ecsData: Ecs | null | undefined;
+}): boolean => {
+ if (ecsData == null) {
+ return false;
+ }
+
+ const eventModules = getOr([], 'signal.original_event.module', ecsData);
+ const kinds = getOr([], 'signal.original_event.kind', ecsData);
+
+ return eventModules.includes('endpoint') && kinds.includes('alert');
+};
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
index cc719a9999383..f2297b7d567bc 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
@@ -11,7 +11,7 @@ import { EuiButtonIcon, EuiContextMenuPanel, EuiPopover, EuiToolTip } from '@ela
import { indexOf } from 'lodash';
import { ExceptionListType } from '@kbn/securitysolution-io-ts-list-types';
-import { get, getOr } from 'lodash/fp';
+import { get } from 'lodash/fp';
import { buildGetAlertByIdQuery } from '../../../../common/components/exceptions/helpers';
import { EventsTdContent } from '../../../../timelines/components/timeline/styles';
import { DEFAULT_ICON_BUTTON_WIDTH } from '../../../../timelines/components/timeline/helpers';
@@ -36,6 +36,7 @@ import { useInvestigateInResolverContextItem } from './investigate_in_resolver';
import { ATTACH_ALERT_TO_CASE_FOR_ROW } from '../../../../timelines/components/timeline/body/translations';
import { useEventFilterAction } from './use_event_filter_action';
import { useAddToCaseActions } from './use_add_to_case_actions';
+import { isAlertFromEndpointAlert } from '../../../../common/utils/endpoint_alert_check';
interface AlertContextMenuProps {
ariaLabel?: string;
@@ -78,17 +79,6 @@ const AlertContextMenuComponent: React.FC = ({
const isEvent = useMemo(() => indexOf(ecsRowData.event?.kind, 'event') !== -1, [ecsRowData]);
- const isEndpointAlert = useMemo((): boolean => {
- if (ecsRowData == null) {
- return false;
- }
-
- const eventModules = getOr([], 'signal.original_event.module', ecsRowData);
- const kinds = getOr([], 'signal.original_event.kind', ecsRowData);
-
- return eventModules.includes('endpoint') && kinds.includes('alert');
- }, [ecsRowData]);
-
const onButtonClick = useCallback(() => {
setPopover(!isPopoverOpen);
}, [isPopoverOpen]);
@@ -153,7 +143,7 @@ const AlertContextMenuComponent: React.FC = ({
}, [closePopover, onAddEventFilterClick]);
const { exceptionActionItems } = useExceptionActions({
- isEndpointAlert,
+ isEndpointAlert: isAlertFromEndpointAlert({ ecsData: ecsRowData }),
onAddExceptionTypeClick: handleOnAddExceptionTypeClick,
});
const investigateInResolverActionItems = useInvestigateInResolverContextItem({
diff --git a/x-pack/plugins/security_solution/public/detections/components/host_isolation/use_host_isolation_action.tsx b/x-pack/plugins/security_solution/public/detections/components/host_isolation/use_host_isolation_action.tsx
index e670c000d789a..24bc670a13ec4 100644
--- a/x-pack/plugins/security_solution/public/detections/components/host_isolation/use_host_isolation_action.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/host_isolation/use_host_isolation_action.tsx
@@ -10,7 +10,7 @@ import type { TimelineEventsDetailsItem } from '../../../../common';
import { isIsolationSupported } from '../../../../common/endpoint/service/host_isolation/utils';
import { HostStatus } from '../../../../common/endpoint/types';
import { useIsolationPrivileges } from '../../../common/hooks/endpoint/use_isolate_privileges';
-import { endpointAlertCheck } from '../../../common/utils/endpoint_alert_check';
+import { isAlertFromEndpointEvent } from '../../../common/utils/endpoint_alert_check';
import { useHostIsolationStatus } from '../../containers/detection_engine/alerts/use_host_isolation_status';
import { ISOLATE_HOST, UNISOLATE_HOST } from './translations';
import { getFieldValue } from './helpers';
@@ -29,7 +29,7 @@ export const useHostIsolationAction = ({
onAddIsolationStatusClick,
}: UseHostIsolationActionProps) => {
const isEndpointAlert = useMemo(() => {
- return endpointAlertCheck({ data: detailsData || [] });
+ return isAlertFromEndpointEvent({ data: detailsData || [] });
}, [detailsData]);
const agentId = useMemo(
diff --git a/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx
index bba652bcdd030..d98b168f209da 100644
--- a/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx
@@ -34,7 +34,10 @@ jest.mock('../../../common/hooks/use_experimental_features', () => ({
}));
jest.mock('../../../common/utils/endpoint_alert_check', () => {
- return { endpointAlertCheck: jest.fn().mockReturnValue(true) };
+ return {
+ isAlertFromEndpointAlert: jest.fn().mockReturnValue(true),
+ isAlertFromEndpointEvent: jest.fn().mockReturnValue(true),
+ };
});
jest.mock('../../../../common/endpoint/service/host_isolation/utils', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.tsx b/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.tsx
index a6114884b955d..0432e7d353086 100644
--- a/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.tsx
@@ -20,7 +20,7 @@ import { useHostIsolationAction } from '../host_isolation/use_host_isolation_act
import { getFieldValue } from '../host_isolation/helpers';
import type { Ecs } from '../../../../common/ecs';
import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
-import { endpointAlertCheck } from '../../../common/utils/endpoint_alert_check';
+import { isAlertFromEndpointAlert } from '../../../common/utils/endpoint_alert_check';
import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
import { useAddToCaseActions } from '../alerts_table/timeline_actions/use_add_to_case_actions';
@@ -87,13 +87,6 @@ export const TakeActionDropdown = React.memo(
]);
const isEvent = actionsData.eventKind === 'event';
- const isEndpointAlert = useMemo((): boolean => {
- if (detailsData == null) {
- return false;
- }
- return endpointAlertCheck({ data: detailsData });
- }, [detailsData]);
-
const togglePopoverHandler = useCallback(() => {
setIsPopoverOpen(!isPopoverOpen);
}, [isPopoverOpen]);
@@ -131,7 +124,7 @@ export const TakeActionDropdown = React.memo(
);
const { exceptionActionItems } = useExceptionActions({
- isEndpointAlert,
+ isEndpointAlert: isAlertFromEndpointAlert({ ecsData }),
onAddExceptionTypeClick: handleOnAddExceptionTypeClick,
});
From 3675b971a54e12a90a5d4fb60ecc3086a184310f Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 1 Sep 2021 14:22:50 -0400
Subject: [PATCH 12/21] [ci] Handle ci-stats HTTP errors a little better to
avoid accidentally printing credentials (#110858) (#110861)
Co-authored-by: Brian Seeders
---
.buildkite/scripts/lifecycle/build_status.js | 4 ++--
.buildkite/scripts/lifecycle/ci_stats_complete.js | 6 +++++-
.buildkite/scripts/lifecycle/ci_stats_start.js | 6 +++++-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/.buildkite/scripts/lifecycle/build_status.js b/.buildkite/scripts/lifecycle/build_status.js
index 2c1d51ecac0a7..f2a5024c96013 100644
--- a/.buildkite/scripts/lifecycle/build_status.js
+++ b/.buildkite/scripts/lifecycle/build_status.js
@@ -7,11 +7,11 @@ const { BuildkiteClient } = require('kibana-buildkite-library');
console.log(status.success ? 'true' : 'false');
process.exit(0);
} catch (ex) {
+ console.error('Buildkite API Error', ex.message);
if (ex.response) {
- console.error('HTTP Error Response Body', ex.response.data);
console.error('HTTP Error Response Status', ex.response.status);
+ console.error('HTTP Error Response Body', ex.response.data);
}
- console.error(ex);
process.exit(1);
}
})();
diff --git a/.buildkite/scripts/lifecycle/ci_stats_complete.js b/.buildkite/scripts/lifecycle/ci_stats_complete.js
index d86e2ec7efcae..d9411178799ab 100644
--- a/.buildkite/scripts/lifecycle/ci_stats_complete.js
+++ b/.buildkite/scripts/lifecycle/ci_stats_complete.js
@@ -4,7 +4,11 @@ const { CiStats } = require('kibana-buildkite-library');
try {
await CiStats.onComplete();
} catch (ex) {
- console.error(ex);
+ console.error('CI Stats Error', ex.message);
+ if (ex.response) {
+ console.error('HTTP Error Response Status', ex.response.status);
+ console.error('HTTP Error Response Body', ex.response.data);
+ }
process.exit(1);
}
})();
diff --git a/.buildkite/scripts/lifecycle/ci_stats_start.js b/.buildkite/scripts/lifecycle/ci_stats_start.js
index 115aa9bd23954..ec0e4c713499e 100644
--- a/.buildkite/scripts/lifecycle/ci_stats_start.js
+++ b/.buildkite/scripts/lifecycle/ci_stats_start.js
@@ -4,7 +4,11 @@ const { CiStats } = require('kibana-buildkite-library');
try {
await CiStats.onStart();
} catch (ex) {
- console.error(ex);
+ console.error('CI Stats Error', ex.message);
+ if (ex.response) {
+ console.error('HTTP Error Response Status', ex.response.status);
+ console.error('HTTP Error Response Body', ex.response.data);
+ }
process.exit(1);
}
})();
From 59022786e55912a92e7345cc76b9fee0e9e8ecf8 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 1 Sep 2021 14:29:02 -0400
Subject: [PATCH 13/21] [RAC] Add embeddable to o11y optionalPlugins (#110713)
(#110837)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Patryk Kopyciński
---
x-pack/plugins/observability/kibana.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/x-pack/plugins/observability/kibana.json b/x-pack/plugins/observability/kibana.json
index ac6389bff8a0b..45fe0258dd142 100644
--- a/x-pack/plugins/observability/kibana.json
+++ b/x-pack/plugins/observability/kibana.json
@@ -11,6 +11,7 @@
"observability"
],
"optionalPlugins": [
+ "embeddable",
"home",
"lens",
"licensing",
From 5a50b62075fb327309c9f0439da0a5291622df88 Mon Sep 17 00:00:00 2001
From: Christos Nasikas
Date: Wed, 1 Sep 2021 22:29:07 +0300
Subject: [PATCH 14/21] [Timeline] Show cases create flyout with timeline open
(#110811) (#110847)
---
.../actions/timeline/cases/create/flyout.tsx | 46 ++++++++++++++-----
1 file changed, 35 insertions(+), 11 deletions(-)
diff --git a/x-pack/plugins/timelines/public/components/actions/timeline/cases/create/flyout.tsx b/x-pack/plugins/timelines/public/components/actions/timeline/cases/create/flyout.tsx
index a817bae996aa0..4f189648634d0 100644
--- a/x-pack/plugins/timelines/public/components/actions/timeline/cases/create/flyout.tsx
+++ b/x-pack/plugins/timelines/public/components/actions/timeline/cases/create/flyout.tsx
@@ -6,7 +6,7 @@
*/
import React, { memo, useMemo } from 'react';
-import styled from 'styled-components';
+import styled, { createGlobalStyle } from 'styled-components';
import { EuiFlyout, EuiFlyoutHeader, EuiTitle, EuiFlyoutBody } from '@elastic/eui';
import * as i18n from '../translations';
@@ -28,6 +28,23 @@ const StyledFlyout = styled(EuiFlyout)`
z-index: ${theme.eui.euiZModal};
`}
`;
+
+const maskOverlayClassName = 'create-case-flyout-mask-overlay';
+
+/**
+ * We need to target the mask overlay which is a parent element
+ * of the flyout.
+ * A global style is needed to target a parent element.
+ */
+
+const GlobalStyle = createGlobalStyle<{ theme: { eui: { euiZModal: number } } }>`
+ .${maskOverlayClassName} {
+ ${({ theme }) => `
+ z-index: ${theme.eui.euiZModal};
+ `}
+ }
+`;
+
// Adding bottom padding because timeline's
// bottom bar gonna hide the submit button.
const StyledEuiFlyoutBody = styled(EuiFlyoutBody)`
@@ -68,16 +85,23 @@ const CreateCaseFlyoutComponent: React.FC = ({
};
}, [afterCaseCreated, onCloseFlyout, onSuccess, appId, disableAlerts]);
return (
-
-
-
- {i18n.CREATE_TITLE}
-
-
-
- {cases.getCreateCase(createCaseProps)}
-
-
+ <>
+
+
+
+
+ {i18n.CREATE_TITLE}
+
+
+
+ {cases.getCreateCase(createCaseProps)}
+
+
+
);
};
From cacb360b2697fa7ba2c330701fb001167a6e8617 Mon Sep 17 00:00:00 2001
From: Tim Sullivan
Date: Wed, 1 Sep 2021 13:06:09 -0700
Subject: [PATCH 15/21] Update reporting-settings.asciidoc (#110752) (#110883)
---
docs/settings/reporting-settings.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/settings/reporting-settings.asciidoc b/docs/settings/reporting-settings.asciidoc
index 0d33f80f1a136..2ea5e4f31bf1b 100644
--- a/docs/settings/reporting-settings.asciidoc
+++ b/docs/settings/reporting-settings.asciidoc
@@ -283,7 +283,7 @@ With Security enabled, Reporting has two forms of access control: each user can
[NOTE]
============================================================================
-The `xpack.reporting.roles` settings are for a deprecated system of access control in Reporting. It does not allow API Keys to generate reports, and it doesn't allow {kib} application privileges. We recommend you explicitly turn off reporting's deprecated access control feature by adding `xpack.reporting.roles.enabled: false` in kibana.yml. This will enable application privileges for reporting, as described in <>.
+The `xpack.reporting.roles` settings are for a deprecated system of access control in Reporting. It does not allow API Keys to generate reports, and it doesn't allow {kib} application privileges. We recommend you explicitly turn off reporting's deprecated access control feature by adding `xpack.reporting.roles.enabled: false` in kibana.yml. This will enable you to create custom roles that provide application privileges for reporting, as described in <>.
============================================================================
[[xpack-reporting-roles-enabled]] `xpack.reporting.roles.enabled`::
From 9ea797918d3a1989465725a47ee83f23daf0b0f3 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 1 Sep 2021 17:09:12 -0400
Subject: [PATCH 16/21] [Security Solution] Enable repositionOnScroll for
overflow popovers (#110584) (#110865)
* enable repositionOnScroll
* unit test
* update test case
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Angela Chuang <6295984+angorayc@users.noreply.github.com>
---
.../hover_actions/actions/overflow.test.tsx | 45 +++++++++++++++++++
.../hover_actions/actions/overflow.tsx | 1 +
2 files changed, 46 insertions(+)
create mode 100644 x-pack/plugins/timelines/public/components/hover_actions/actions/overflow.test.tsx
diff --git a/x-pack/plugins/timelines/public/components/hover_actions/actions/overflow.test.tsx b/x-pack/plugins/timelines/public/components/hover_actions/actions/overflow.test.tsx
new file mode 100644
index 0000000000000..e5d53df638829
--- /dev/null
+++ b/x-pack/plugins/timelines/public/components/hover_actions/actions/overflow.test.tsx
@@ -0,0 +1,45 @@
+/*
+ * 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 React from 'react';
+import { shallow } from 'enzyme';
+import OverflowButton from './overflow';
+
+describe('OverflowButton', () => {
+ const props = {
+ field: 'host.name',
+ ownFocus: false,
+ showTooltip: true,
+ value: 'mac',
+ closePopOver: jest.fn(),
+ items: [],
+ isOverflowPopoverOpen: false,
+ };
+ test('should render a popover', () => {
+ const wrapper = shallow();
+ expect(wrapper.find('EuiPopover').exists()).toBeTruthy();
+ });
+
+ test('the popover always contains a class that hides it when an overlay (e.g. the inspect modal) is displayed', () => {
+ const wrapper = shallow();
+ expect(wrapper.find('EuiPopover').prop('panelClassName')).toEqual('withHoverActions__popover');
+ });
+
+ test('should enable repositionOnScroll', () => {
+ const wrapper = shallow();
+ expect(wrapper.find('EuiPopover').prop('repositionOnScroll')).toEqual(true);
+ });
+
+ test('should render a tooltip if showTooltip is true', () => {
+ const testProps = {
+ ...props,
+ showTooltip: true,
+ };
+ const wrapper = shallow();
+ expect(wrapper.find('EuiToolTip').exists()).toBeTruthy();
+ });
+});
diff --git a/x-pack/plugins/timelines/public/components/hover_actions/actions/overflow.tsx b/x-pack/plugins/timelines/public/components/hover_actions/actions/overflow.tsx
index a10c96f3aa0ae..aa582504f4f71 100644
--- a/x-pack/plugins/timelines/public/components/hover_actions/actions/overflow.tsx
+++ b/x-pack/plugins/timelines/public/components/hover_actions/actions/overflow.tsx
@@ -97,6 +97,7 @@ const OverflowButton: React.FC = React.memo(
closePopover={closePopOver}
panelPaddingSize="none"
panelClassName="withHoverActions__popover"
+ repositionOnScroll={true}
anchorPosition="downLeft"
>
From 2c48a2fd9f7ca860c8fd64dc611fc52a41c50791 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 1 Sep 2021 17:13:02 -0400
Subject: [PATCH 17/21] [Uptime] [Synthetics Integration] browser functional
tests (#110648) (#110867)
* uptime - synthetics integration - add browser functional tests
* focus tests
* unfocus test
* Uptime - Synthetics Integration - adds stringToJsonFormatter
Co-authored-by: Dominique Clarke
---
.../fleet_package/browser/formatters.ts | 9 +-
.../fleet_package/browser/source_field.tsx | 7 +
.../fleet_package/common/formatters.test.ts | 19 +-
.../fleet_package/common/formatters.ts | 2 +
.../apps/uptime/synthetics_integration.ts | 188 ++++++++++++++++++
.../synthetics_integration_page.ts | 55 +++++
6 files changed, 277 insertions(+), 3 deletions(-)
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/formatters.ts b/x-pack/plugins/uptime/public/components/fleet_package/browser/formatters.ts
index fd90c53dac12a..183ffa53cc339 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/formatters.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/formatters.ts
@@ -6,7 +6,12 @@
*/
import { BrowserFields, ConfigKeys } from '../types';
-import { Formatter, commonFormatters, arrayToJsonFormatter } from '../common/formatters';
+import {
+ Formatter,
+ commonFormatters,
+ arrayToJsonFormatter,
+ stringToJsonFormatter,
+} from '../common/formatters';
export type BrowserFormatMap = Record;
@@ -15,7 +20,7 @@ export const browserFormatters: BrowserFormatMap = {
[ConfigKeys.SOURCE_ZIP_USERNAME]: null,
[ConfigKeys.SOURCE_ZIP_PASSWORD]: null,
[ConfigKeys.SOURCE_ZIP_FOLDER]: null,
- [ConfigKeys.SOURCE_INLINE]: (fields) => JSON.stringify(fields[ConfigKeys.SOURCE_INLINE]),
+ [ConfigKeys.SOURCE_INLINE]: (fields) => stringToJsonFormatter(fields[ConfigKeys.SOURCE_INLINE]),
[ConfigKeys.PARAMS]: null,
[ConfigKeys.SCREENSHOTS]: null,
[ConfigKeys.SYNTHETICS_ARGS]: (fields) =>
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.tsx b/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.tsx
index eca354f30c973..243d709d304ce 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/source_field.tsx
@@ -68,6 +68,7 @@ export const SourceField = ({ onChange, defaultConfig = defaultValues }: Props)
{
id: 'syntheticsBrowserZipURLConfig',
name: zipUrlLabel,
+ 'data-test-subj': `syntheticsSourceTab__zipUrl`,
content: (
<>
@@ -92,6 +93,7 @@ export const SourceField = ({ onChange, defaultConfig = defaultValues }: Props)
setConfig((prevConfig) => ({ ...prevConfig, zipUrl: value }))
}
value={config.zipUrl}
+ data-test-subj="syntheticsBrowserZipUrl"
/>
({ ...prevConfig, folder: value }))
}
value={config.folder}
+ data-test-subj="syntheticsBrowserZipUrlFolder"
/>
setConfig((prevConfig) => ({ ...prevConfig, params: code }))}
value={config.params}
+ data-test-subj="syntheticsBrowserZipUrlParams"
/>
({ ...prevConfig, username: value }))
}
value={config.username}
+ data-test-subj="syntheticsBrowserZipUrlUsername"
/>
({ ...prevConfig, password: value }))
}
value={config.password}
+ data-test-subj="syntheticsBrowserZipUrlPassword"
/>
@@ -199,6 +205,7 @@ export const SourceField = ({ onChange, defaultConfig = defaultValues }: Props)
defaultMessage="Inline script"
/>
),
+ 'data-test-subj': `syntheticsSourceTab__inline`,
content: (
{
describe('cronToSecondsNormalizer', () => {
@@ -33,4 +38,16 @@ describe('formatters', () => {
expect(objectToJsonFormatter({})).toEqual(null);
});
});
+
+ describe('stringToJsonFormatter', () => {
+ it('takes a string and returns an json string', () => {
+ expect(stringToJsonFormatter('step("test step", () => {})')).toEqual(
+ '"step(\\"test step\\", () => {})"'
+ );
+ });
+
+ it('returns null if the string is falsy', () => {
+ expect(stringToJsonFormatter('')).toEqual(null);
+ });
+ });
});
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/common/formatters.ts b/x-pack/plugins/uptime/public/components/fleet_package/common/formatters.ts
index 311fa7da13498..4b30f4b4f0484 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/common/formatters.ts
+++ b/x-pack/plugins/uptime/public/components/fleet_package/common/formatters.ts
@@ -30,3 +30,5 @@ export const secondsToCronFormatter = (value: string = '') => (value ? `${value}
export const objectToJsonFormatter = (value: Record = {}) =>
Object.keys(value).length ? JSON.stringify(value) : null;
+
+export const stringToJsonFormatter = (value: string = '') => (value ? JSON.stringify(value) : null);
diff --git a/x-pack/test/functional/apps/uptime/synthetics_integration.ts b/x-pack/test/functional/apps/uptime/synthetics_integration.ts
index 146584d138f22..1fe13227d2546 100644
--- a/x-pack/test/functional/apps/uptime/synthetics_integration.ts
+++ b/x-pack/test/functional/apps/uptime/synthetics_integration.ts
@@ -72,6 +72,58 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
],
...config,
},
+ ...(monitorType === 'browser'
+ ? [
+ {
+ data_stream: {
+ dataset: 'browser.network',
+ type: 'synthetics',
+ },
+ id: `${getSyntheticsPolicy(agentFullPolicy)?.streams?.[1]?.id}`,
+ processors: [
+ {
+ add_observer_metadata: {
+ geo: {
+ name: 'Fleet managed',
+ },
+ },
+ },
+ {
+ add_fields: {
+ fields: {
+ 'monitor.fleet_managed': true,
+ },
+ target: '',
+ },
+ },
+ ],
+ },
+ {
+ data_stream: {
+ dataset: 'browser.screenshot',
+ type: 'synthetics',
+ },
+ id: `${getSyntheticsPolicy(agentFullPolicy)?.streams?.[2]?.id}`,
+ processors: [
+ {
+ add_observer_metadata: {
+ geo: {
+ name: 'Fleet managed',
+ },
+ },
+ },
+ {
+ add_fields: {
+ fields: {
+ 'monitor.fleet_managed': true,
+ },
+ target: '',
+ },
+ },
+ ],
+ },
+ ]
+ : []),
],
type: `synthetics/${monitorType}`,
use_output: 'default',
@@ -95,6 +147,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
host,
});
+ const generateBrowserConfig = (config: Record): Record => ({
+ ...basicConfig,
+ ...config,
+ });
+
describe('displays custom UI', () => {
before(async () => {
const version = await uptimeService.syntheticsPackage.getSyntheticsPackageVersion();
@@ -439,6 +496,137 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
})
);
});
+
+ it('allows saving browser monitor', async () => {
+ // This test ensures that updates made to the Synthetics Policy are carried all the way through
+ // to the generated Agent Policy that is dispatch down to the Elastic Agent.
+ const config = generateBrowserConfig({
+ zipUrl: 'http://test.zip',
+ params: JSON.stringify({ url: 'http://localhost:8080' }),
+ folder: 'folder',
+ username: 'username',
+ password: 'password',
+ });
+
+ await uptimePage.syntheticsIntegration.createBasicBrowserMonitorDetails(config);
+ await uptimePage.syntheticsIntegration.confirmAndSave();
+
+ await uptimePage.syntheticsIntegration.isPolicyCreatedSuccessfully();
+
+ const [agentPolicy] = await uptimeService.syntheticsPackage.getAgentPolicyList();
+ const agentPolicyId = agentPolicy.id;
+ const agentFullPolicy = await uptimeService.syntheticsPackage.getFullAgentPolicy(
+ agentPolicyId
+ );
+
+ expect(getSyntheticsPolicy(agentFullPolicy)).to.eql(
+ generatePolicy({
+ agentFullPolicy,
+ version,
+ name: monitorName,
+ monitorType: 'browser',
+ config: {
+ screenshots: 'on',
+ schedule: '@every 3m',
+ timeout: '16s',
+ tags: [config.tags],
+ 'service.name': config.apmServiceName,
+ 'source.zip_url.url': config.zipUrl,
+ 'source.zip_url.folder': config.folder,
+ 'source.zip_url.username': config.username,
+ 'source.zip_url.password': config.password,
+ params: JSON.parse(config.params),
+ },
+ })
+ );
+ });
+
+ it('allows saving browser monitor with inline script', async () => {
+ // This test ensures that updates made to the Synthetics Policy are carried all the way through
+ // to the generated Agent Policy that is dispatch down to the Elastic Agent.
+ const config = generateBrowserConfig({
+ inlineScript:
+ 'step("load homepage", async () => { await page.goto(\'https://www.elastic.co\'); });',
+ });
+
+ await uptimePage.syntheticsIntegration.createBasicBrowserMonitorDetails(config, true);
+ await uptimePage.syntheticsIntegration.confirmAndSave();
+
+ await uptimePage.syntheticsIntegration.isPolicyCreatedSuccessfully();
+
+ const [agentPolicy] = await uptimeService.syntheticsPackage.getAgentPolicyList();
+ const agentPolicyId = agentPolicy.id;
+ const agentFullPolicy = await uptimeService.syntheticsPackage.getFullAgentPolicy(
+ agentPolicyId
+ );
+
+ expect(getSyntheticsPolicy(agentFullPolicy)).to.eql(
+ generatePolicy({
+ agentFullPolicy,
+ version,
+ name: monitorName,
+ monitorType: 'browser',
+ config: {
+ screenshots: 'on',
+ schedule: '@every 3m',
+ timeout: '16s',
+ tags: [config.tags],
+ 'service.name': config.apmServiceName,
+ 'source.inline.script': config.inlineScript,
+ },
+ })
+ );
+ });
+
+ it('allows saving browser monitor advanced options', async () => {
+ // This test ensures that updates made to the Synthetics Policy are carried all the way through
+ // to the generated Agent Policy that is dispatch down to the Elastic Agent.
+ const config = generateBrowserConfig({
+ zipUrl: 'http://test.zip',
+ params: JSON.stringify({ url: 'http://localhost:8080' }),
+ folder: 'folder',
+ username: 'username',
+ password: 'password',
+ });
+ const advancedConfig = {
+ screenshots: 'off',
+ syntheticsArgs: '-ssBlocks',
+ };
+
+ await uptimePage.syntheticsIntegration.createBasicBrowserMonitorDetails(config);
+ await uptimePage.syntheticsIntegration.configureBrowserAdvancedOptions(advancedConfig);
+ await uptimePage.syntheticsIntegration.confirmAndSave();
+
+ await uptimePage.syntheticsIntegration.isPolicyCreatedSuccessfully();
+
+ const [agentPolicy] = await uptimeService.syntheticsPackage.getAgentPolicyList();
+ const agentPolicyId = agentPolicy.id;
+ const agentFullPolicy = await uptimeService.syntheticsPackage.getFullAgentPolicy(
+ agentPolicyId
+ );
+
+ expect(getSyntheticsPolicy(agentFullPolicy)).to.eql(
+ generatePolicy({
+ agentFullPolicy,
+ version,
+ name: monitorName,
+ monitorType: 'browser',
+ config: {
+ screenshots: advancedConfig.screenshots,
+ schedule: '@every 3m',
+ timeout: '16s',
+ tags: [config.tags],
+ 'service.name': config.apmServiceName,
+ 'source.zip_url.url': config.zipUrl,
+ 'source.zip_url.folder': config.folder,
+ 'source.zip_url.username': config.username,
+ 'source.zip_url.password': config.password,
+ params: JSON.parse(config.params),
+ synthetics_args: [advancedConfig.syntheticsArgs],
+ },
+ })
+ );
+ });
});
});
}
diff --git a/x-pack/test/functional/page_objects/synthetics_integration_page.ts b/x-pack/test/functional/page_objects/synthetics_integration_page.ts
index daebb1d2a2f99..cfb6e1dac980e 100644
--- a/x-pack/test/functional/page_objects/synthetics_integration_page.ts
+++ b/x-pack/test/functional/page_objects/synthetics_integration_page.ts
@@ -205,6 +205,16 @@ export function SyntheticsIntegrationPageProvider({
*/
async configureRequestBody(testSubj: string, value: string) {
await testSubjects.click(`syntheticsRequestBodyTab__${testSubj}`);
+ await this.fillCodeEditor(value);
+ },
+
+ /**
+ *
+ * Fills the monaco code editor
+ * @params value {string} value of code input
+ *
+ */
+ async fillCodeEditor(value: string) {
const codeEditorContainer = await testSubjects.find('codeEditorContainer');
const textArea = await codeEditorContainer.findByCssSelector('textarea');
await textArea.clearValue();
@@ -273,6 +283,40 @@ export function SyntheticsIntegrationPageProvider({
await this.fillTextInputByTestSubj('syntheticsICMPHostField', host);
},
+ /**
+ * Creates a basic browser monitor
+ * @params name {string} the name of the monitor
+ * @params zipUrl {string} the zip url of the synthetics suites
+ */
+ async createBasicBrowserMonitorDetails(
+ {
+ name,
+ inlineScript,
+ zipUrl,
+ folder,
+ params,
+ username,
+ password,
+ apmServiceName,
+ tags,
+ }: Record,
+ isInline: boolean = false
+ ) {
+ await this.selectMonitorType('browser');
+ await this.fillTextInputByTestSubj('packagePolicyNameInput', name);
+ await this.createBasicMonitorDetails({ name, apmServiceName, tags });
+ if (isInline) {
+ await testSubjects.click('syntheticsSourceTab__inline');
+ await this.fillCodeEditor(inlineScript);
+ return;
+ }
+ await this.fillTextInputByTestSubj('syntheticsBrowserZipUrl', zipUrl);
+ await this.fillTextInputByTestSubj('syntheticsBrowserZipUrlFolder', folder);
+ await this.fillTextInputByTestSubj('syntheticsBrowserZipUrlUsername', username);
+ await this.fillTextInputByTestSubj('syntheticsBrowserZipUrlPassword', password);
+ await this.fillCodeEditor(params);
+ },
+
/**
* Enables TLS
*/
@@ -376,5 +420,16 @@ export function SyntheticsIntegrationPageProvider({
await label.click();
}
},
+
+ /**
+ * Configure browser advanced settings
+ * @params name {string} the name of the monitor
+ * @params zipUrl {string} the zip url of the synthetics suites
+ */
+ async configureBrowserAdvancedOptions({ screenshots, syntheticsArgs }: Record) {
+ await testSubjects.click('syntheticsBrowserAdvancedFieldsAccordion');
+ await testSubjects.selectValue('syntheticsBrowserScreenshots', screenshots);
+ await this.setComboBox('syntheticsBrowserSyntheticsArgs', syntheticsArgs);
+ },
};
}
From 680d45d39b6dab8dfa33a23af7d25ac6e71c481a Mon Sep 17 00:00:00 2001
From: Patrick Mueller
Date: Wed, 1 Sep 2021 17:32:22 -0400
Subject: [PATCH 18/21] [task manager] provide better diagnostics when task
manager performance is degraded (#109741) (#110870)
resolves #109095
resolves #106854
Changes the way task manager and alerting perform their health / status
checks:
- no longer sets an `unavailable` status; now uses `degraded` instead
- change task manager "hot stats freshness" calculation to allow for
staler data before signalling a problem
- Changed the "Detected potential performance issue" message to sound
less scary, include a doc link to task manager health monitoring, and
log a debug instead of warning level
- add additional debug logging when task manager sets a status that's
not `available`, indicating why it's setting that status (in the code,
it's when task manager uses HealthStatus.Warning or Error)
---
.../alerting/server/health/get_state.test.ts | 8 +--
.../alerting/server/health/get_state.ts | 10 ++--
x-pack/plugins/alerting/server/plugin.ts | 2 +-
.../server/lib/calculate_health_status.ts | 44 +++++++++------
.../server/lib/log_health_metrics.test.ts | 15 +++--
.../server/lib/log_health_metrics.ts | 10 ++--
.../monitoring/capacity_estimation.test.ts | 20 +++++++
.../server/monitoring/capacity_estimation.ts | 47 +++++++++++++---
.../monitoring/monitoring_stats_stream.ts | 5 +-
.../monitoring/task_run_statistics.test.ts | 16 ++++--
.../server/monitoring/task_run_statistics.ts | 34 +++++++++--
x-pack/plugins/task_manager/server/plugin.ts | 8 +++
.../task_manager/server/routes/health.test.ts | 56 +++++++++++--------
.../task_manager/server/routes/health.ts | 8 +--
14 files changed, 196 insertions(+), 87 deletions(-)
diff --git a/x-pack/plugins/alerting/server/health/get_state.test.ts b/x-pack/plugins/alerting/server/health/get_state.test.ts
index b58a127941880..9429dcc07d927 100644
--- a/x-pack/plugins/alerting/server/health/get_state.test.ts
+++ b/x-pack/plugins/alerting/server/health/get_state.test.ts
@@ -216,8 +216,8 @@ describe('getHealthServiceStatusWithRetryAndErrorHandling', () => {
})
).toPromise();
- expect(status.level).toEqual(ServiceStatusLevels.unavailable);
- expect(status.summary).toEqual('Alerting framework is unavailable');
+ expect(status.level).toEqual(ServiceStatusLevels.degraded);
+ expect(status.summary).toEqual('Alerting framework is degraded');
expect(status.meta).toBeUndefined();
});
@@ -275,8 +275,8 @@ describe('getHealthServiceStatusWithRetryAndErrorHandling', () => {
}),
retryDelay
).subscribe((status) => {
- expect(status.level).toEqual(ServiceStatusLevels.unavailable);
- expect(status.summary).toEqual('Alerting framework is unavailable');
+ expect(status.level).toEqual(ServiceStatusLevels.degraded);
+ expect(status.summary).toEqual('Alerting framework is degraded');
expect(status.meta).toEqual({ error: err });
});
diff --git a/x-pack/plugins/alerting/server/health/get_state.ts b/x-pack/plugins/alerting/server/health/get_state.ts
index 255037d7015a2..34f897ad5b73c 100644
--- a/x-pack/plugins/alerting/server/health/get_state.ts
+++ b/x-pack/plugins/alerting/server/health/get_state.ts
@@ -73,9 +73,7 @@ const getHealthServiceStatus = async (
const level =
doc.state?.health_status === HealthStatus.OK
? ServiceStatusLevels.available
- : doc.state?.health_status === HealthStatus.Warning
- ? ServiceStatusLevels.degraded
- : ServiceStatusLevels.unavailable;
+ : ServiceStatusLevels.degraded;
return {
level,
summary: LEVEL_SUMMARY[level.toString()],
@@ -102,10 +100,10 @@ export const getHealthServiceStatusWithRetryAndErrorHandling = (
);
}),
catchError((error) => {
- logger.warn(`Alerting framework is unavailable due to the error: ${error}`);
+ logger.warn(`Alerting framework is degraded due to the error: ${error}`);
return of({
- level: ServiceStatusLevels.unavailable,
- summary: LEVEL_SUMMARY[ServiceStatusLevels.unavailable.toString()],
+ level: ServiceStatusLevels.degraded,
+ summary: LEVEL_SUMMARY[ServiceStatusLevels.degraded.toString()],
meta: { error },
});
})
diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
index 29041af3b4671..bf3eecbb131e1 100644
--- a/x-pack/plugins/alerting/server/plugin.ts
+++ b/x-pack/plugins/alerting/server/plugin.ts
@@ -239,7 +239,7 @@ export class AlertingPlugin {
);
const serviceStatus$ = new BehaviorSubject({
- level: ServiceStatusLevels.unavailable,
+ level: ServiceStatusLevels.degraded,
summary: 'Alerting is initializing',
});
core.status.set(serviceStatus$);
diff --git a/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts b/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts
index d0e99690066dd..b544674d61c07 100644
--- a/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts
+++ b/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts
@@ -9,32 +9,42 @@ import { isString } from 'lodash';
import { JsonValue } from '@kbn/utility-types';
import { HealthStatus, RawMonitoringStats } from '../monitoring';
import { TaskManagerConfig } from '../config';
+import { Logger } from '../../../../../src/core/server';
export function calculateHealthStatus(
summarizedStats: RawMonitoringStats,
- config: TaskManagerConfig
+ config: TaskManagerConfig,
+ logger: Logger
): HealthStatus {
const now = Date.now();
- // if "hot" health stats are any more stale than monitored_stats_required_freshness (pollInterval +1s buffer by default)
- // consider the system unhealthy
- const requiredHotStatsFreshness: number = config.monitored_stats_required_freshness;
+ // if "hot" health stats are any more stale than monitored_stats_required_freshness
+ // times a multiplier, consider the system unhealthy
+ const requiredHotStatsFreshness: number = config.monitored_stats_required_freshness * 3;
- // if "cold" health stats are any more stale than the configured refresh (+ a buffer), consider the system unhealthy
+ // if "cold" health stats are any more stale than the configured refresh
+ // times a multiplier, consider the system unhealthy
const requiredColdStatsFreshness: number = config.monitored_aggregated_stats_refresh_rate * 1.5;
- /**
- * If the monitored stats aren't fresh, return a red status
- */
- const healthStatus =
- hasStatus(summarizedStats.stats, HealthStatus.Error) ||
- hasExpiredHotTimestamps(summarizedStats, now, requiredHotStatsFreshness) ||
- hasExpiredColdTimestamps(summarizedStats, now, requiredColdStatsFreshness)
- ? HealthStatus.Error
- : hasStatus(summarizedStats.stats, HealthStatus.Warning)
- ? HealthStatus.Warning
- : HealthStatus.OK;
- return healthStatus;
+ if (hasStatus(summarizedStats.stats, HealthStatus.Error)) {
+ return HealthStatus.Error;
+ }
+
+ if (hasExpiredHotTimestamps(summarizedStats, now, requiredHotStatsFreshness)) {
+ logger.debug('setting HealthStatus.Error because of expired hot timestamps');
+ return HealthStatus.Error;
+ }
+
+ if (hasExpiredColdTimestamps(summarizedStats, now, requiredColdStatsFreshness)) {
+ logger.debug('setting HealthStatus.Error because of expired cold timestamps');
+ return HealthStatus.Error;
+ }
+
+ if (hasStatus(summarizedStats.stats, HealthStatus.Warning)) {
+ return HealthStatus.Warning;
+ }
+
+ return HealthStatus.OK;
}
function hasStatus(stats: RawMonitoringStats['stats'], status: HealthStatus): boolean {
diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
index b8e3e78925df5..4e17d64870a39 100644
--- a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
@@ -50,12 +50,15 @@ describe('logHealthMetrics', () => {
(calculateHealthStatus as jest.Mock).mockImplementation(() => HealthStatus.Error);
logHealthMetrics(health, logger, config);
- expect((logger as jest.Mocked).warn.mock.calls[0][0] as string).toBe(
- `Detected potential performance issue with Task Manager. Set 'xpack.task_manager.monitored_stats_health_verbose_log.enabled: true' in your Kibana.yml to enable debug logging`
- );
- expect((logger as jest.Mocked).warn.mock.calls[1][0] as string).toBe(
- `Detected potential performance issue with Task Manager. Set 'xpack.task_manager.monitored_stats_health_verbose_log.enabled: true' in your Kibana.yml to enable debug logging`
- );
+ const debugCalls = (logger as jest.Mocked).debug.mock.calls;
+ const performanceMessage = /^Task Manager detected a degradation in performance/;
+ const lastStatsMessage = /^Latest Monitored Stats: \{.*\}$/;
+ expect(debugCalls[0][0] as string).toMatch(lastStatsMessage);
+ expect(debugCalls[1][0] as string).toMatch(lastStatsMessage);
+ expect(debugCalls[2][0] as string).toMatch(performanceMessage);
+ expect(debugCalls[3][0] as string).toMatch(lastStatsMessage);
+ expect(debugCalls[4][0] as string).toMatch(lastStatsMessage);
+ expect(debugCalls[5][0] as string).toMatch(performanceMessage);
});
it('should not log a warning message to enable verbose logging when the status goes from Warning to OK', () => {
diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
index e8511b1e8c71d..d541ffb5684da 100644
--- a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
+++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
@@ -5,6 +5,8 @@
* 2.0.
*/
+import { kibanaPackageJson } from '@kbn/utils';
+
import { isEmpty } from 'lodash';
import { Logger } from '../../../../../src/core/server';
import { HealthStatus } from '../monitoring';
@@ -36,7 +38,7 @@ export function logHealthMetrics(
capacity_estimation: undefined,
},
};
- const statusWithoutCapacity = calculateHealthStatus(healthWithoutCapacity, config);
+ const statusWithoutCapacity = calculateHealthStatus(healthWithoutCapacity, config, logger);
if (statusWithoutCapacity === HealthStatus.Warning) {
logLevel = LogLevel.Warn;
} else if (statusWithoutCapacity === HealthStatus.Error && !isEmpty(monitoredHealth.stats)) {
@@ -44,6 +46,8 @@ export function logHealthMetrics(
}
const message = `Latest Monitored Stats: ${JSON.stringify(monitoredHealth)}`;
+ const docLink = `https://www.elastic.co/guide/en/kibana/${kibanaPackageJson.branch}/task-manager-health-monitoring.html`;
+ const detectedProblemMessage = `Task Manager detected a degradation in performance. This is usually temporary, and Kibana can recover automatically. If the problem persists, check the docs for troubleshooting information: ${docLink} .`;
if (enabled) {
const driftInSeconds = (monitoredHealth.stats.runtime?.value.drift.p99 ?? 0) / 1000;
if (
@@ -80,9 +84,7 @@ export function logHealthMetrics(
// This is legacy support - we used to always show this
logger.debug(message);
if (logLevel !== LogLevel.Debug && lastLogLevel === LogLevel.Debug) {
- logger.warn(
- `Detected potential performance issue with Task Manager. Set 'xpack.task_manager.monitored_stats_health_verbose_log.enabled: true' in your Kibana.yml to enable debug logging`
- );
+ logger.debug(detectedProblemMessage);
}
}
diff --git a/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.test.ts b/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.test.ts
index 5e2b075415a10..d6ae8024b92f7 100644
--- a/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.test.ts
@@ -7,11 +7,19 @@
import { CapacityEstimationParams, estimateCapacity } from './capacity_estimation';
import { HealthStatus, RawMonitoringStats } from './monitoring_stats_stream';
+import { mockLogger } from '../test_utils';
describe('estimateCapacity', () => {
+ const logger = mockLogger();
+
+ beforeAll(() => {
+ jest.resetAllMocks();
+ });
+
test('estimates the max throughput per minute based on the workload and the assumed kibana instances', async () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
@@ -67,6 +75,7 @@ describe('estimateCapacity', () => {
test('reduces the available capacity per kibana when average task duration exceeds the poll interval', async () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
@@ -124,6 +133,7 @@ describe('estimateCapacity', () => {
test('estimates the max throughput per minute when duration by persistence is empty', async () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
@@ -160,6 +170,7 @@ describe('estimateCapacity', () => {
test('estimates the max throughput per minute based on the workload and the assumed kibana instances when there are tasks that repeat each hour or day', async () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
@@ -215,6 +226,7 @@ describe('estimateCapacity', () => {
test('estimates the max throughput available when there are no active Kibana', async () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
@@ -271,6 +283,7 @@ describe('estimateCapacity', () => {
test('estimates the max throughput available to handle the workload when there are multiple active kibana instances', async () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
@@ -332,6 +345,7 @@ describe('estimateCapacity', () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
@@ -412,6 +426,7 @@ describe('estimateCapacity', () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
@@ -493,6 +508,7 @@ describe('estimateCapacity', () => {
test('marks estimated capacity as OK state when workload and load suggest capacity is sufficient', async () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
@@ -557,6 +573,7 @@ describe('estimateCapacity', () => {
test('marks estimated capacity as Warning state when capacity is insufficient for recent spikes of non-recurring workload, but sufficient for the recurring workload', async () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
@@ -618,6 +635,7 @@ describe('estimateCapacity', () => {
test('marks estimated capacity as Error state when workload and load suggest capacity is insufficient', async () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
@@ -679,6 +697,7 @@ describe('estimateCapacity', () => {
test('recommmends a 20% increase in kibana when a spike in non-recurring tasks forces recurring task capacity to zero', async () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
@@ -754,6 +773,7 @@ describe('estimateCapacity', () => {
test('recommmends a 20% increase in kibana when a spike in non-recurring tasks in a system with insufficient capacity even for recurring tasks', async () => {
expect(
estimateCapacity(
+ logger,
mockStats(
{ max_workers: 10, poll_interval: 3000 },
{
diff --git a/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts b/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts
index 9cc223f63b196..49c593d77acec 100644
--- a/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts
@@ -12,6 +12,7 @@ import { RawMonitoringStats, RawMonitoredStat, HealthStatus } from './monitoring
import { AveragedStat } from './task_run_calcultors';
import { TaskPersistenceTypes } from './task_run_statistics';
import { asErr, asOk, map, Result } from '../lib/result_type';
+import { Logger } from '../../../../../src/core/server';
export interface CapacityEstimationStat extends JsonObject {
observed: {
@@ -44,6 +45,7 @@ function isCapacityEstimationParams(
}
export function estimateCapacity(
+ logger: Logger,
capacityStats: CapacityEstimationParams
): RawMonitoredStat {
const workload = capacityStats.workload.value;
@@ -183,13 +185,14 @@ export function estimateCapacity(
const assumedRequiredThroughputPerMinutePerKibana =
averageCapacityUsedByNonRecurringAndEphemeralTasksPerKibana +
averageRecurringRequiredPerMinute / assumedKibanaInstances;
+
+ const status = getHealthStatus(logger, {
+ assumedRequiredThroughputPerMinutePerKibana,
+ assumedAverageRecurringRequiredThroughputPerMinutePerKibana,
+ capacityPerMinutePerKibana,
+ });
return {
- status:
- assumedRequiredThroughputPerMinutePerKibana < capacityPerMinutePerKibana
- ? HealthStatus.OK
- : assumedAverageRecurringRequiredThroughputPerMinutePerKibana < capacityPerMinutePerKibana
- ? HealthStatus.Warning
- : HealthStatus.Error,
+ status,
timestamp: new Date().toISOString(),
value: {
observed: mapValues(
@@ -220,13 +223,43 @@ export function estimateCapacity(
};
}
+interface GetHealthStatusParams {
+ assumedRequiredThroughputPerMinutePerKibana: number;
+ assumedAverageRecurringRequiredThroughputPerMinutePerKibana: number;
+ capacityPerMinutePerKibana: number;
+}
+
+function getHealthStatus(logger: Logger, params: GetHealthStatusParams): HealthStatus {
+ const {
+ assumedRequiredThroughputPerMinutePerKibana,
+ assumedAverageRecurringRequiredThroughputPerMinutePerKibana,
+ capacityPerMinutePerKibana,
+ } = params;
+ if (assumedRequiredThroughputPerMinutePerKibana < capacityPerMinutePerKibana) {
+ return HealthStatus.OK;
+ }
+
+ if (assumedAverageRecurringRequiredThroughputPerMinutePerKibana < capacityPerMinutePerKibana) {
+ logger.debug(
+ `setting HealthStatus.Warning because assumedAverageRecurringRequiredThroughputPerMinutePerKibana (${assumedAverageRecurringRequiredThroughputPerMinutePerKibana}) < capacityPerMinutePerKibana (${capacityPerMinutePerKibana})`
+ );
+ return HealthStatus.Warning;
+ }
+
+ logger.debug(
+ `setting HealthStatus.Error because assumedRequiredThroughputPerMinutePerKibana (${assumedRequiredThroughputPerMinutePerKibana}) >= capacityPerMinutePerKibana (${capacityPerMinutePerKibana}) AND assumedAverageRecurringRequiredThroughputPerMinutePerKibana (${assumedAverageRecurringRequiredThroughputPerMinutePerKibana}) >= capacityPerMinutePerKibana (${capacityPerMinutePerKibana})`
+ );
+ return HealthStatus.Error;
+}
+
export function withCapacityEstimate(
+ logger: Logger,
monitoredStats: RawMonitoringStats['stats']
): RawMonitoringStats['stats'] {
if (isCapacityEstimationParams(monitoredStats)) {
return {
...monitoredStats,
- capacity_estimation: estimateCapacity(monitoredStats),
+ capacity_estimation: estimateCapacity(logger, monitoredStats),
};
}
return monitoredStats;
diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
index fdddfc41e590a..08badf8fe1c9d 100644
--- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
@@ -136,6 +136,7 @@ export function createMonitoringStatsStream(
}
export function summarizeMonitoringStats(
+ logger: Logger,
{
// eslint-disable-next-line @typescript-eslint/naming-convention
last_update,
@@ -143,7 +144,7 @@ export function summarizeMonitoringStats(
}: MonitoringStats,
config: TaskManagerConfig
): RawMonitoringStats {
- const summarizedStats = withCapacityEstimate({
+ const summarizedStats = withCapacityEstimate(logger, {
...(configuration
? {
configuration: {
@@ -156,7 +157,7 @@ export function summarizeMonitoringStats(
? {
runtime: {
timestamp: runtime.timestamp,
- ...summarizeTaskRunStat(runtime.value, config),
+ ...summarizeTaskRunStat(logger, runtime.value, config),
},
}
: {}),
diff --git a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.test.ts
index 46dc56b2bac4d..32fe9bf60466f 100644
--- a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.test.ts
@@ -10,6 +10,7 @@ import { Subject, Observable } from 'rxjs';
import stats from 'stats-lite';
import sinon from 'sinon';
import { take, tap, bufferCount, skip, map } from 'rxjs/operators';
+import { mockLogger } from '../test_utils';
import { ConcreteTaskInstance, TaskStatus } from '../task';
import {
@@ -36,9 +37,11 @@ import { configSchema } from '../config';
describe('Task Run Statistics', () => {
let fakeTimer: sinon.SinonFakeTimers;
+ const logger = mockLogger();
beforeAll(() => {
fakeTimer = sinon.useFakeTimers();
+ jest.resetAllMocks();
});
afterAll(() => fakeTimer.restore());
@@ -77,7 +80,7 @@ describe('Task Run Statistics', () => {
// Use 'summarizeTaskRunStat' to receive summarize stats
map(({ key, value }: AggregatedStat) => ({
key,
- value: summarizeTaskRunStat(value, getTaskManagerConfig()).value,
+ value: summarizeTaskRunStat(logger, value, getTaskManagerConfig()).value,
})),
take(runAtDrift.length),
bufferCount(runAtDrift.length)
@@ -145,7 +148,7 @@ describe('Task Run Statistics', () => {
// Use 'summarizeTaskRunStat' to receive summarize stats
map(({ key, value }: AggregatedStat) => ({
key,
- value: summarizeTaskRunStat(value, getTaskManagerConfig()).value,
+ value: summarizeTaskRunStat(logger, value, getTaskManagerConfig()).value,
})),
take(runDurations.length * 2),
bufferCount(runDurations.length * 2)
@@ -241,7 +244,7 @@ describe('Task Run Statistics', () => {
// Use 'summarizeTaskRunStat' to receive summarize stats
map(({ key, value }: AggregatedStat) => ({
key,
- value: summarizeTaskRunStat(value, getTaskManagerConfig()).value,
+ value: summarizeTaskRunStat(logger, value, getTaskManagerConfig()).value,
})),
take(10),
bufferCount(10)
@@ -321,6 +324,7 @@ describe('Task Run Statistics', () => {
map(({ key, value }: AggregatedStat) => ({
key,
value: summarizeTaskRunStat(
+ logger,
value,
getTaskManagerConfig({
monitored_task_execution_thresholds: {
@@ -449,7 +453,7 @@ describe('Task Run Statistics', () => {
// Use 'summarizeTaskRunStat' to receive summarize stats
map(({ key, value }: AggregatedStat) => ({
key,
- value: summarizeTaskRunStat(value, getTaskManagerConfig({})).value,
+ value: summarizeTaskRunStat(logger, value, getTaskManagerConfig({})).value,
})),
take(taskEvents.length),
bufferCount(taskEvents.length)
@@ -590,7 +594,7 @@ describe('Task Run Statistics', () => {
// Use 'summarizeTaskRunStat' to receive summarize stats
map(({ key, value }: AggregatedStat) => ({
key,
- value: summarizeTaskRunStat(value, getTaskManagerConfig({})).value,
+ value: summarizeTaskRunStat(logger, value, getTaskManagerConfig({})).value,
})),
take(taskEvents.length),
bufferCount(taskEvents.length)
@@ -707,7 +711,7 @@ describe('Task Run Statistics', () => {
// Use 'summarizeTaskRunStat' to receive summarize stats
map(({ key, value }: AggregatedStat) => ({
key,
- value: summarizeTaskRunStat(value, getTaskManagerConfig()).value,
+ value: summarizeTaskRunStat(logger, value, getTaskManagerConfig()).value,
})),
tap(() => {
expectedTimestamp.push(new Date().toISOString());
diff --git a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
index 3946827827fee..44908706aa6ec 100644
--- a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
@@ -38,6 +38,7 @@ import {
import { HealthStatus } from './monitoring_stats_stream';
import { TaskPollingLifecycle } from '../polling_lifecycle';
import { TaskExecutionFailureThreshold, TaskManagerConfig } from '../config';
+import { Logger } from '../../../../../src/core/server';
interface FillPoolStat extends JsonObject {
duration: number[];
@@ -337,6 +338,7 @@ const DEFAULT_POLLING_FREQUENCIES = {
};
export function summarizeTaskRunStat(
+ logger: Logger,
{
polling: {
// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -403,6 +405,7 @@ export function summarizeTaskRunStat(
executionResultFrequency,
(typedResultFrequencies, taskType) =>
summarizeTaskExecutionResultFrequencyStat(
+ logger,
{
...DEFAULT_TASK_RUN_FREQUENCIES,
...calculateFrequency(typedResultFrequencies),
@@ -418,16 +421,35 @@ export function summarizeTaskRunStat(
}
function summarizeTaskExecutionResultFrequencyStat(
+ logger: Logger,
resultFrequencySummary: ResultFrequency,
executionErrorThreshold: TaskExecutionFailureThreshold
): ResultFrequencySummary {
+ const status = getHealthStatus(logger, resultFrequencySummary, executionErrorThreshold);
return {
...resultFrequencySummary,
- status:
- resultFrequencySummary.Failed > executionErrorThreshold.warn_threshold
- ? resultFrequencySummary.Failed > executionErrorThreshold.error_threshold
- ? HealthStatus.Error
- : HealthStatus.Warning
- : HealthStatus.OK,
+ status,
};
}
+
+function getHealthStatus(
+ logger: Logger,
+ resultFrequencySummary: ResultFrequency,
+ executionErrorThreshold: TaskExecutionFailureThreshold
+): HealthStatus {
+ if (resultFrequencySummary.Failed > executionErrorThreshold.warn_threshold) {
+ if (resultFrequencySummary.Failed > executionErrorThreshold.error_threshold) {
+ logger.debug(
+ `setting HealthStatus.Error because resultFrequencySummary.Failed (${resultFrequencySummary.Failed}) > error_threshold (${executionErrorThreshold.error_threshold})`
+ );
+ return HealthStatus.Error;
+ } else {
+ logger.debug(
+ `setting HealthStatus.Warning because resultFrequencySummary.Failed (${resultFrequencySummary.Failed}) > warn_threshold (${executionErrorThreshold.warn_threshold})`
+ );
+ return HealthStatus.Warning;
+ }
+ }
+
+ return HealthStatus.OK;
+}
diff --git a/x-pack/plugins/task_manager/server/plugin.ts b/x-pack/plugins/task_manager/server/plugin.ts
index 11746e2da2847..35dec38b43df5 100644
--- a/x-pack/plugins/task_manager/server/plugin.ts
+++ b/x-pack/plugins/task_manager/server/plugin.ts
@@ -95,6 +95,14 @@ export class TaskManagerPlugin
this.config!
);
+ core.status.derivedStatus$.subscribe((status) =>
+ this.logger.debug(`status core.status.derivedStatus now set to ${status.level}`)
+ );
+ serviceStatus$.subscribe((status) =>
+ this.logger.debug(`status serviceStatus now set to ${status.level}`)
+ );
+
+ // here is where the system status is updated
core.status.set(
combineLatest([core.status.derivedStatus$, serviceStatus$]).pipe(
map(([derivedStatus, serviceStatus]) =>
diff --git a/x-pack/plugins/task_manager/server/routes/health.test.ts b/x-pack/plugins/task_manager/server/routes/health.test.ts
index 01c1d6a5f3983..f34728cd8ff3c 100644
--- a/x-pack/plugins/task_manager/server/routes/health.test.ts
+++ b/x-pack/plugins/task_manager/server/routes/health.test.ts
@@ -20,7 +20,7 @@ import {
RawMonitoringStats,
summarizeMonitoringStats,
} from '../monitoring';
-import { ServiceStatusLevels } from 'src/core/server';
+import { ServiceStatusLevels, Logger } from 'src/core/server';
import { configSchema, TaskManagerConfig } from '../config';
import { calculateHealthStatusMock } from '../lib/calculate_health_status.mock';
import { FillPoolResult } from '../lib/fill_pool';
@@ -30,14 +30,14 @@ jest.mock('../lib/log_health_metrics', () => ({
}));
describe('healthRoute', () => {
+ const logger = loggingSystemMock.create().get();
+
beforeEach(() => {
jest.resetAllMocks();
});
it('registers the route', async () => {
const router = httpServiceMock.createRouter();
-
- const logger = loggingSystemMock.create().get();
healthRoute(router, of(), logger, uuid.v4(), getTaskManagerConfig());
const [config] = router.get.mock.calls[0];
@@ -47,7 +47,6 @@ describe('healthRoute', () => {
it('logs the Task Manager stats at a fixed interval', async () => {
const router = httpServiceMock.createRouter();
- const logger = loggingSystemMock.create().get();
const calculateHealthStatus = calculateHealthStatusMock.create();
calculateHealthStatus.mockImplementation(() => HealthStatus.OK);
const { logHealthMetrics } = jest.requireMock('../lib/log_health_metrics');
@@ -87,19 +86,22 @@ describe('healthRoute', () => {
id,
timestamp: expect.any(String),
status: expect.any(String),
- ...ignoreCapacityEstimation(summarizeMonitoringStats(mockStat, getTaskManagerConfig({}))),
+ ...ignoreCapacityEstimation(
+ summarizeMonitoringStats(logger, mockStat, getTaskManagerConfig({}))
+ ),
});
expect(logHealthMetrics.mock.calls[1][0]).toMatchObject({
id,
timestamp: expect.any(String),
status: expect.any(String),
- ...ignoreCapacityEstimation(summarizeMonitoringStats(nextMockStat, getTaskManagerConfig({}))),
+ ...ignoreCapacityEstimation(
+ summarizeMonitoringStats(logger, nextMockStat, getTaskManagerConfig({}))
+ ),
});
});
it(`logs at a warn level if the status is warning`, async () => {
const router = httpServiceMock.createRouter();
- const logger = loggingSystemMock.create().get();
const calculateHealthStatus = calculateHealthStatusMock.create();
calculateHealthStatus.mockImplementation(() => HealthStatus.Warning);
const { logHealthMetrics } = jest.requireMock('../lib/log_health_metrics');
@@ -141,7 +143,7 @@ describe('healthRoute', () => {
timestamp: expect.any(String),
status: expect.any(String),
...ignoreCapacityEstimation(
- summarizeMonitoringStats(warnRuntimeStat, getTaskManagerConfig({}))
+ summarizeMonitoringStats(logger, warnRuntimeStat, getTaskManagerConfig({}))
),
});
expect(logHealthMetrics.mock.calls[1][0]).toMatchObject({
@@ -149,7 +151,7 @@ describe('healthRoute', () => {
timestamp: expect.any(String),
status: expect.any(String),
...ignoreCapacityEstimation(
- summarizeMonitoringStats(warnConfigurationStat, getTaskManagerConfig({}))
+ summarizeMonitoringStats(logger, warnConfigurationStat, getTaskManagerConfig({}))
),
});
expect(logHealthMetrics.mock.calls[2][0]).toMatchObject({
@@ -157,7 +159,7 @@ describe('healthRoute', () => {
timestamp: expect.any(String),
status: expect.any(String),
...ignoreCapacityEstimation(
- summarizeMonitoringStats(warnWorkloadStat, getTaskManagerConfig({}))
+ summarizeMonitoringStats(logger, warnWorkloadStat, getTaskManagerConfig({}))
),
});
expect(logHealthMetrics.mock.calls[3][0]).toMatchObject({
@@ -165,14 +167,13 @@ describe('healthRoute', () => {
timestamp: expect.any(String),
status: expect.any(String),
...ignoreCapacityEstimation(
- summarizeMonitoringStats(warnEphemeralStat, getTaskManagerConfig({}))
+ summarizeMonitoringStats(logger, warnEphemeralStat, getTaskManagerConfig({}))
),
});
});
it(`logs at an error level if the status is error`, async () => {
const router = httpServiceMock.createRouter();
- const logger = loggingSystemMock.create().get();
const calculateHealthStatus = calculateHealthStatusMock.create();
calculateHealthStatus.mockImplementation(() => HealthStatus.Error);
const { logHealthMetrics } = jest.requireMock('../lib/log_health_metrics');
@@ -214,7 +215,7 @@ describe('healthRoute', () => {
timestamp: expect.any(String),
status: expect.any(String),
...ignoreCapacityEstimation(
- summarizeMonitoringStats(errorRuntimeStat, getTaskManagerConfig({}))
+ summarizeMonitoringStats(logger, errorRuntimeStat, getTaskManagerConfig({}))
),
});
expect(logHealthMetrics.mock.calls[1][0]).toMatchObject({
@@ -222,7 +223,7 @@ describe('healthRoute', () => {
timestamp: expect.any(String),
status: expect.any(String),
...ignoreCapacityEstimation(
- summarizeMonitoringStats(errorConfigurationStat, getTaskManagerConfig({}))
+ summarizeMonitoringStats(logger, errorConfigurationStat, getTaskManagerConfig({}))
),
});
expect(logHealthMetrics.mock.calls[2][0]).toMatchObject({
@@ -230,7 +231,7 @@ describe('healthRoute', () => {
timestamp: expect.any(String),
status: expect.any(String),
...ignoreCapacityEstimation(
- summarizeMonitoringStats(errorWorkloadStat, getTaskManagerConfig({}))
+ summarizeMonitoringStats(logger, errorWorkloadStat, getTaskManagerConfig({}))
),
});
expect(logHealthMetrics.mock.calls[3][0]).toMatchObject({
@@ -238,7 +239,7 @@ describe('healthRoute', () => {
timestamp: expect.any(String),
status: expect.any(String),
...ignoreCapacityEstimation(
- summarizeMonitoringStats(errorEphemeralStat, getTaskManagerConfig({}))
+ summarizeMonitoringStats(logger, errorEphemeralStat, getTaskManagerConfig({}))
),
});
});
@@ -251,7 +252,7 @@ describe('healthRoute', () => {
const { serviceStatus$ } = healthRoute(
router,
stats$,
- loggingSystemMock.create().get(),
+ logger,
uuid.v4(),
getTaskManagerConfig({
monitored_stats_required_freshness: 1000,
@@ -269,7 +270,7 @@ describe('healthRoute', () => {
stats$.next(
mockHealthStats({
- last_update: new Date(Date.now() - 1500).toISOString(),
+ last_update: new Date(Date.now() - 3001).toISOString(),
})
);
@@ -278,6 +279,7 @@ describe('healthRoute', () => {
status: 'error',
...ignoreCapacityEstimation(
summarizeMonitoringStats(
+ logger,
mockHealthStats({
last_update: expect.any(String),
stats: {
@@ -307,9 +309,15 @@ describe('healthRoute', () => {
});
expect(await serviceStatus).toMatchObject({
- level: ServiceStatusLevels.unavailable,
- summary: 'Task Manager is unavailable',
+ level: ServiceStatusLevels.degraded,
+ summary: 'Task Manager is unhealthy',
});
+ const debugCalls = (logger as jest.Mocked).debug.mock.calls as string[][];
+ const warnMessage = /^setting HealthStatus.Warning because assumedAverageRecurringRequiredThroughputPerMinutePerKibana/;
+ const found = debugCalls
+ .map((arr) => arr[0])
+ .find((message) => message.match(warnMessage) != null);
+ expect(found).toMatch(warnMessage);
});
it('returns a error status if the workload stats have not been updated within the required cold freshness', async () => {
@@ -320,7 +328,7 @@ describe('healthRoute', () => {
healthRoute(
router,
stats$,
- loggingSystemMock.create().get(),
+ logger,
uuid.v4(),
getTaskManagerConfig({
monitored_stats_required_freshness: 5000,
@@ -352,6 +360,7 @@ describe('healthRoute', () => {
status: 'error',
...ignoreCapacityEstimation(
summarizeMonitoringStats(
+ logger,
mockHealthStats({
last_update: expect.any(String),
stats: {
@@ -388,7 +397,7 @@ describe('healthRoute', () => {
healthRoute(
router,
stats$,
- loggingSystemMock.create().get(),
+ logger,
uuid.v4(),
getTaskManagerConfig({
monitored_stats_required_freshness: 1000,
@@ -399,7 +408,7 @@ describe('healthRoute', () => {
await sleep(0);
// eslint-disable-next-line @typescript-eslint/naming-convention
- const last_successful_poll = new Date(Date.now() - 2000).toISOString();
+ const last_successful_poll = new Date(Date.now() - 3001).toISOString();
stats$.next(
mockHealthStats({
stats: {
@@ -423,6 +432,7 @@ describe('healthRoute', () => {
status: 'error',
...ignoreCapacityEstimation(
summarizeMonitoringStats(
+ logger,
mockHealthStats({
last_update: expect.any(String),
stats: {
diff --git a/x-pack/plugins/task_manager/server/routes/health.ts b/x-pack/plugins/task_manager/server/routes/health.ts
index fe58ee3490aff..4101662184430 100644
--- a/x-pack/plugins/task_manager/server/routes/health.ts
+++ b/x-pack/plugins/task_manager/server/routes/health.ts
@@ -62,8 +62,8 @@ export function healthRoute(
const requiredHotStatsFreshness: number = config.monitored_stats_required_freshness;
function getHealthStatus(monitoredStats: MonitoringStats) {
- const summarizedStats = summarizeMonitoringStats(monitoredStats, config);
- const status = calculateHealthStatus(summarizedStats, config);
+ const summarizedStats = summarizeMonitoringStats(logger, monitoredStats, config);
+ const status = calculateHealthStatus(summarizedStats, config, logger);
const now = Date.now();
const timestamp = new Date(now).toISOString();
return { id: taskManagerId, timestamp, status, ...summarizedStats };
@@ -118,9 +118,7 @@ export function withServiceStatus(
const level =
monitoredHealth.status === HealthStatus.OK
? ServiceStatusLevels.available
- : monitoredHealth.status === HealthStatus.Warning
- ? ServiceStatusLevels.degraded
- : ServiceStatusLevels.unavailable;
+ : ServiceStatusLevels.degraded;
return [
monitoredHealth,
{
From 4d8cc221a62c5019be4a9c325fdd06e62ab90507 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 1 Sep 2021 17:34:53 -0400
Subject: [PATCH 19/21] fix: do not show upgrade button on latest version of
package (#110764) (#110871)
Co-authored-by: Mark Hopkin
---
.../sections/epm/screens/detail/policies/package_policies.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
index bdcfb1ebb6534..677ca545029fe 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
@@ -220,7 +220,7 @@ export const PackagePoliciesPage = ({ name, version }: PackagePoliciesPanelProps
const hasUpgrade =
!!updatableIntegrationRecord &&
updatableIntegrationRecord.policiesToUpgrade.some(
- ({ id }) => id === packagePolicy.policy_id
+ ({ pkgPolicyId }) => pkgPolicyId === packagePolicy.id
);
return (
From 51801e783d72ec3a409ea462f12e0a08e387c2cd Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 1 Sep 2021 18:06:16 -0400
Subject: [PATCH 20/21] [ci-stats] retry calls to ci-stats slower (#110845)
(#110878)
Co-authored-by: spalger
Co-authored-by: Spencer
Co-authored-by: spalger
---
.../kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts | 5 +++--
packages/kbn-pm/dist/index.js | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts b/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts
index 7847cad0fd5e7..0584ee27aa5f6 100644
--- a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts
+++ b/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts
@@ -221,11 +221,12 @@ export class CiStatsReporter {
? `${error.response.status} response`
: 'no response';
+ const seconds = attempt * 10;
this.log.warning(
- `failed to reach ci-stats service [reason=${reason}], retrying in ${attempt} seconds`
+ `failed to reach ci-stats service, retrying in ${seconds} seconds, [reason=${reason}], [error=${error.message}]`
);
- await new Promise((resolve) => setTimeout(resolve, attempt * 1000));
+ await new Promise((resolve) => setTimeout(resolve, seconds * 1000));
}
}
}
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index e96d875f3f024..38e8b7a87296a 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -59522,8 +59522,9 @@ class CiStatsReporter {
const reason = error !== null && error !== void 0 && (_error$response = error.response) !== null && _error$response !== void 0 && _error$response.status ? `${error.response.status} response` : 'no response';
- this.log.warning(`failed to reach ci-stats service [reason=${reason}], retrying in ${attempt} seconds`);
- await new Promise(resolve => setTimeout(resolve, attempt * 1000));
+ const seconds = attempt * 10;
+ this.log.warning(`failed to reach ci-stats service, retrying in ${seconds} seconds, [reason=${reason}], [error=${error.message}]`);
+ await new Promise(resolve => setTimeout(resolve, seconds * 1000));
}
}
}
From ac208c75c589f9747cf6295ba4813fc7436ed75b Mon Sep 17 00:00:00 2001
From: Lisa Cawley
Date: Wed, 1 Sep 2021 15:35:41 -0700
Subject: [PATCH 21/21] [DOCS] Latency correlations (#110557) (#110888)
---
docs/apm/correlations.asciidoc | 25 +++++++++---------
docs/apm/images/correlations-hover.png | Bin 382313 -> 231211 bytes
.../latency_correlations_help_popover.tsx | 2 +-
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/docs/apm/correlations.asciidoc b/docs/apm/correlations.asciidoc
index 45781228cd200..c0c18433c9021 100644
--- a/docs/apm/correlations.asciidoc
+++ b/docs/apm/correlations.asciidoc
@@ -12,7 +12,7 @@ piece of hardware, like a host or pod. Or, perhaps a set of users, based on IP
address or region, is facing increased latency due to local data center issues.
To find correlations, select a service on the *Services* page in the {apm-app}
-and click **View correlations**.
+then select a transaction group from the *Transactions* tab.
NOTE: Queries within the {apm-app} are also applied to the correlations.
@@ -20,26 +20,25 @@ NOTE: Queries within the {apm-app} are also applied to the correlations.
[[correlations-latency]]
==== Find high transaction latency correlations
-The correlations on the *Latency* tab help you discover which attributes are
-contributing to increased transaction latency.
+The correlations on the *Latency correlations* tab help you discover which
+attributes are contributing to increased transaction latency.
[role="screenshot"]
image::apm/images/correlations-hover.png[Latency correlations]
The progress bar indicates the status of the asynchronous analysis, which
performs statistical searches across a large number of attributes. For large
-time ranges and services with high transaction throughput this might take some
-time. To improve performance, reduce the time range on the service overview
-page.
+time ranges and services with high transaction throughput, this might take some
+time. To improve performance, reduce the time range.
The latency distribution chart visualizes the overall latency of the
-transactions in the service. If there are attributes that have a statistically
-significant correlation with slow response times, they are listed in a table
-below the chart. The table is sorted by correlation coefficients that range from
-0 to 1. Attributes with higher correlation values are more likely to contribute
-to high latency transactions. By default, the attribute with the highest
-correlation value is added to the chart. To see the latency distribution for
-other attributes, hover over their row in the table.
+transactions in the transaction group. If there are attributes that have a
+statistically significant correlation with slow response times, they are listed
+in a table below the chart. The table is sorted by correlation coefficients that
+range from 0 to 1. Attributes with higher correlation values are more likely to
+contribute to high latency transactions. By default, the attribute with the
+highest correlation value is added to the chart. To see the latency distribution
+for other attributes, hover over their row in the table.
If a correlated attribute seems noteworthy, use the **Filter** quick links:
diff --git a/docs/apm/images/correlations-hover.png b/docs/apm/images/correlations-hover.png
index c8d5622156b4c79f7c8918825c1d034051a20212..80c1fa41adbdfbbac71b684ebd75c569eef6c5ae 100644
GIT binary patch
literal 231211
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