Skip to content

Commit add24ff

Browse files
committed
Addressed code feedback
1 parent 6f3e35f commit add24ff

File tree

2 files changed

+42
-30
lines changed

2 files changed

+42
-30
lines changed

x-pack/plugins/monitoring/server/alerts/alerts_common.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66

77
import { i18n } from '@kbn/i18n';
8+
import { AlertMessageDocLinkToken } from './types';
9+
import { AlertMessageTokenType } from '../../common/enums';
810

911
export class AlertingDefaults {
1012
public static readonly ALERT_STATE = {
@@ -59,3 +61,19 @@ export class AlertingDefaults {
5961
},
6062
};
6163
}
64+
65+
export const createDocLink = (translateStr: string, linkText: string, linkURL: string) => {
66+
return {
67+
text: i18n.translate(translateStr, {
68+
defaultMessage: `#start_link${linkText}#end_link`,
69+
}),
70+
tokens: [
71+
{
72+
startToken: '#start_link',
73+
endToken: '#end_link',
74+
type: AlertMessageTokenType.DocLink,
75+
partialUrl: linkURL,
76+
} as AlertMessageDocLinkToken,
77+
],
78+
};
79+
};

x-pack/plugins/monitoring/server/alerts/disk_usage_alert.ts

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
2424
import { AlertMessageTokenType, AlertSeverity, AlertParamType } from '../../common/enums';
2525
import { RawAlertInstance } from '../../../alerts/common';
2626
import { CommonAlertFilter, CommonAlertParams, CommonAlertParamDetail } from '../../common/types';
27-
import { AlertingDefaults } from './alerts_common';
27+
import { AlertingDefaults, createDocLink } from './alerts_common';
2828

2929
interface ParamDetails {
3030
[key: string]: CommonAlertParamDetail;
@@ -110,7 +110,7 @@ export class DiskUsageAlert extends BaseAlert {
110110

111111
protected filterAlertInstance(alertInstance: RawAlertInstance, filters: CommonAlertFilter[]) {
112112
const alertInstanceStates = alertInstance.state?.alertStates as AlertDiskUsageState[];
113-
const nodeUuid = filters.find((filter) => filter.nodeUuid);
113+
const nodeUuid = filters?.find((filter) => filter.nodeUuid);
114114

115115
if (!filters || !filters.length || !alertInstanceStates?.length || !nodeUuid) {
116116
return true;
@@ -153,36 +153,30 @@ export class DiskUsageAlert extends BaseAlert {
153153
defaultMessage: `Node #start_link{nodeName}#end_link is reporting disk usage of {diskUsage}% at #absolute`,
154154
values: {
155155
nodeName: stat.nodeName,
156-
diskUsage: stat.diskUsage.toFixed(2),
156+
diskUsage: stat.diskUsage,
157157
},
158158
}),
159159
nextSteps: [
160-
{
161-
text: i18n.translate('xpack.monitoring.alerts.diskUsage.ui.nextSteps.hotThreads', {
162-
defaultMessage: `#start_linkCheck hot threads#end_link`,
163-
}),
164-
tokens: [
165-
{
166-
startToken: '#start_link',
167-
endToken: '#end_link',
168-
type: AlertMessageTokenType.DocLink,
169-
partialUrl: `{elasticWebsiteUrl}/guide/en/elasticsearch/reference/{docLinkVersion}/cluster-nodes-hot-threads.html`,
170-
} as AlertMessageDocLinkToken,
171-
],
172-
},
173-
{
174-
text: i18n.translate('xpack.monitoring.alerts.diskUsage.ui.nextSteps.runningTasks', {
175-
defaultMessage: `#start_linkCheck long running tasks#end_link`,
176-
}),
177-
tokens: [
178-
{
179-
startToken: '#start_link',
180-
endToken: '#end_link',
181-
type: AlertMessageTokenType.DocLink,
182-
partialUrl: `{elasticWebsiteUrl}/guide/en/elasticsearch/reference/{docLinkVersion}/tasks.html`,
183-
} as AlertMessageDocLinkToken,
184-
],
185-
},
160+
createDocLink(
161+
'xpack.monitoring.alerts.diskUsage.ui.nextSteps.tuneDisk',
162+
'Tune for disk usage',
163+
`{elasticWebsiteUrl}/guide/en/elasticsearch/reference/{docLinkVersion}/tune-for-disk-usage.html`
164+
),
165+
createDocLink(
166+
'xpack.monitoring.alerts.diskUsage.ui.nextSteps.ilmPolicies',
167+
'Implement ILM policies',
168+
`{elasticWebsiteUrl}/guide/en/elasticsearch/reference/{docLinkVersion}/index-lifecycle-management.html`
169+
),
170+
createDocLink(
171+
'xpack.monitoring.alerts.diskUsage.ui.nextSteps.addMoreNodes',
172+
'Add more data nodes',
173+
`{elasticWebsiteUrl}/guide/en/elasticsearch/reference/{docLinkVersion}/add-elasticsearch-nodes.html`
174+
),
175+
createDocLink(
176+
'xpack.monitoring.alerts.diskUsage.ui.nextSteps.resizeYourDeployment',
177+
'Resize your deployment (ECE)',
178+
`{elasticWebsiteUrl}/guide/en/cloud-enterprise/{docLinkVersion}/ece-resize-deployment.html`
179+
),
186180
],
187181
tokens: [
188182
{
@@ -354,7 +348,7 @@ export class DiskUsageAlert extends BaseAlert {
354348
if (indexInState < 0) {
355349
alertInstanceState.alertStates.push(nodeState);
356350
} else {
357-
alertInstanceState.alertStates.splice(indexInState, 0, nodeState);
351+
alertInstanceState.alertStates[indexInState] = nodeState;
358352
}
359353
}
360354

0 commit comments

Comments
 (0)