Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUG] Change time format to UTC in notification message preview #1183

Merged
merged 9 commits into from
Jan 7, 2025
Merged

[BUG] Change time format to UTC in notification message preview #1183

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e02770d
fix: change notification preview message to have time in UTC format. …
vikhy-aws Jan 3, 2025
2baec50
fix: add unit tests. change timezone to UTC
vikhy-aws Jan 6, 2025
4e88be8
fix: remove log statements
vikhy-aws Jan 6, 2025
b392550
fix: update timeout for loadSampleEcommerceData to 60secs to handle f…
vikhy-aws Jan 7, 2025
ee9897c
fix: update timeout for monitor creation to 60secs to handle failing …
vikhy-aws Jan 7, 2025
90e8c60
fix: update timeout for monitor creation to 60secs to handle failing …
vikhy-aws Jan 7, 2025
49ed545
fix: revert timeout increases. Handle monitors page load properly.
vikhy-aws Jan 7, 2025
dc739fe
fix: revert changes to timeouts
vikhy-aws Jan 7, 2025
7914769
fix: increase timeouts to ensure proper loading of pages
vikhy-aws Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cypress/fixtures/sample_composite_level_monitor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"name": "sample_channel",
"destination_id": "6dYFw4gB2qeAWe54NgyL",
"message_template": {
"source": "Monitor {{ctx.monitor.name}} just entered alert status. Please investigate the issue.\n - Trigger: {{ctx.trigger.name}}\n - Severity: {{ctx.trigger.severity}}\n - Period start: {{ctx.periodStart}}\n - Period end: {{ctx.periodEnd}}",
"source": "Monitor {{ctx.monitor.name}} just entered alert status. Please investigate the issue.\n - Trigger: {{ctx.trigger.name}}\n - Severity: {{ctx.trigger.severity}}\n - Period start: {{ctx.periodStart}} UTC\n - Period end: {{ctx.periodEnd}} UTC",
"lang": "mustache"
},
"throttle_enabled": false,
Expand Down
2 changes: 1 addition & 1 deletion public/pages/CreateTrigger/components/Action/actions/Message.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function getRenderWrapper(customProps = {}) {
action={{
message_template: {
source:
'Monitor {{ctx.monitor.name}} just entered alert status. Please investigate the issue.\n- Trigger: {{ctx.trigger.name}}\n- Severity: {{ctx.trigger.severity}}\n- Period start: {{ctx.periodStart}}\n- Period end: {{ctx.periodEnd}}',
'Monitor {{ctx.monitor.name}} just entered alert status. Please investigate the issue.\n- Trigger: {{ctx.trigger.name}}\n- Severity: {{ctx.trigger.severity}}\n- Period start: {{ctx.periodStart}} UTC\n- Period end: {{ctx.periodEnd}} UTC',
lang: 'mustache',
},
}}
Expand Down
8 changes: 4 additions & 4 deletions public/pages/CreateTrigger/utils/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export const DEFAULT_MESSAGE_SOURCE = {
Monitor {{ctx.monitor.name}} just entered alert status. Please investigate the issue.
- Trigger: {{ctx.trigger.name}}
- Severity: {{ctx.trigger.severity}}
- Period start: {{ctx.periodStart}}
- Period end: {{ctx.periodEnd}}
- Period start: {{ctx.periodStart}} UTC
- Period end: {{ctx.periodEnd}} UTC

- Deduped Alerts:
{{#ctx.dedupedAlerts}}
Expand All @@ -33,8 +33,8 @@ export const DEFAULT_MESSAGE_SOURCE = {
Monitor {{ctx.monitor.name}} just entered alert status. Please investigate the issue.
- Trigger: {{ctx.trigger.name}}
- Severity: {{ctx.trigger.severity}}
- Period start: {{ctx.periodStart}}
- Period end: {{ctx.periodEnd}}
- Period start: {{ctx.periodStart}} UTC
- Period end: {{ctx.periodEnd}} UTC
`.trim(),
};

Expand Down
6 changes: 4 additions & 2 deletions public/pages/CreateTrigger/utils/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,10 @@ export const getTriggerContext = (executeResponse, monitor, values, triggerIndex
if (_.isArray(trigger) && triggerIndex >= 0) trigger = trigger[triggerIndex];

return {
periodStart: moment.utc(_.get(executeResponse, 'period_start', Date.now())).tz(getTimeZone()).format(),
periodEnd: moment.utc(_.get(executeResponse, 'period_end', Date.now())).tz(getTimeZone()).format(),
// Backend only supports, UTC timezone.
// Don't use user's local timezone.
periodStart: moment.utc(_.get(executeResponse, 'period_start', Date.now())).format(),
periodEnd: moment.utc(_.get(executeResponse, 'period_end', Date.now())).format(),
results: [_.get(executeResponse, 'input_results.results[0]')].filter((result) => !!result),
trigger: trigger,
alert: null,
Expand Down
4 changes: 2 additions & 2 deletions public/pages/Dashboard/components/AcknowledgeAlertsModal/AcknowledgeAlertsModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ import { MAX_ALERT_COUNT } from '../../utils/constants';
import { DEFAULT_PAGE_SIZE_OPTIONS } from '../../../Monitors/containers/Monitors/utils/constants';
import DashboardControls from '../DashboardControls';
import ContentPanel from '../../../../components/ContentPanel';
import { appendCommentsAction, queryColumns } from '../../utils/tableUtils';
import { queryColumns } from '../../utils/tableUtils';
import DashboardEmptyPrompt from '../DashboardEmptyPrompt';
import { getAlertsFindingColumn } from '../FindingsDashboard/findingsUtils';
import { getDataSourceId, getIsCommentsEnabled } from '../../../utils/helpers';
import { appendCommentsAction, getDataSourceId, getIsCommentsEnabled } from '../../../utils/helpers';

export const DEFAULT_NUM_MODAL_ROWS = 10;

Expand Down
Loading