Skip to content

Commit 60985dc

Browse files
authored
Merge pull request #2388 from devtron-labs/fix/app-metrics-time-range
fix: time range selector issue in app metrics
2 parents 9c680c0 + a6f33dd commit 60985dc

File tree

1 file changed

+17
-2
lines changed
  • src/components/app/details/appDetails

1 file changed

+17
-2
lines changed

src/components/app/details/appDetails/utils.tsx

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,21 @@ export function addChartNameExtensionToBaseURL(
330330
return url
331331
}
332332

333+
// Need to send either the relative time like: now-5m or the timestamp to grafana
334+
// Assuming format is 'DD-MM-YYYY hh:mm:ss'
335+
const getTimestampFromDateIfAvailable = (dateString: string): string => {
336+
try {
337+
const [day, month, yearAndTime] = dateString.split('-')
338+
const [year, time] = yearAndTime.split(' ')
339+
const formattedDate = `${year}-${month}-${day}T${time}`
340+
const parsedDate = new Date(formattedDate).getTime()
341+
342+
return isNaN(parsedDate) ? dateString : parsedDate.toString()
343+
} catch {
344+
return dateString
345+
}
346+
}
347+
333348
export function addQueryParamToGrafanaURL(
334349
url: string,
335350
appId: string | number,
@@ -343,8 +358,8 @@ export function addQueryParamToGrafanaURL(
343358
statusCode?: StatusTypes,
344359
latency?: number,
345360
): string {
346-
const startTime: string = calendarInputs.startDate
347-
const endTime: string = calendarInputs.endDate
361+
const startTime: string = getTimestampFromDateIfAvailable(calendarInputs.startDate)
362+
const endTime: string = getTimestampFromDateIfAvailable(calendarInputs.endDate)
348363
url += `?orgId=${window.__GRAFANA_ORG_ID__}`
349364
url += `&refresh=10s`
350365
url += `&var-app=${appId}`

0 commit comments

Comments
 (0)