Merge pull request #9246 from vikram-raj/bz-1972016

Bug 1972016: Fix time range issue for devconsole monitoring dashboard
openshift · Jun 15, 2021 · ade011a · ade011a
2 parents 694f412 + 31b7200
commit ade011a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/frontend/packages/dev-console/src/components/monitoring/dashboard/MonitoringDashboard.tsx b/frontend/packages/dev-console/src/components/monitoring/dashboard/MonitoringDashboard.tsx
@@ -33,11 +33,17 @@ type MonitoringDashboardProps = {
 type StateProps = {
   timespan: number;
   pollInterval: number;
+  endTime: number;
 };
 
 type Props = MonitoringDashboardProps & StateProps;
 
-export const MonitoringDashboard: React.FC<Props> = ({ match, timespan, pollInterval }) => {
+export const MonitoringDashboard: React.FC<Props> = ({
+  match,
+  timespan,
+  pollInterval,
+  endTime,
+}) => {
   const { t } = useTranslation();
   const namespace = match.params.ns;
   const params = getURLSearchParams();
@@ -104,6 +110,7 @@ export const MonitoringDashboard: React.FC<Props> = ({ match, timespan, pollInte
               key={q.title}
               timespan={timespan}
               pollInterval={pollInterval}
+              endTime={endTime}
             />
           ))}
         </Dashboard>
@@ -115,6 +122,7 @@ export const MonitoringDashboard: React.FC<Props> = ({ match, timespan, pollInte
 const mapStateToProps = (state: RootState): StateProps => ({
   timespan: state.UI.getIn(['monitoringDashboards', 'timespan']),
   pollInterval: state.UI.getIn(['monitoringDashboards', 'pollInterval']),
+  endTime: state.UI.getIn(['monitoringDashboards', 'endTime']),
 });
 
 export default connect<StateProps, MonitoringDashboardProps>(mapStateToProps)(MonitoringDashboard);
diff --git a/...end/packages/dev-console/src/components/monitoring/dashboard/MonitoringDashboardGraph.tsx b/...end/packages/dev-console/src/components/monitoring/dashboard/MonitoringDashboardGraph.tsx
@@ -24,6 +24,7 @@ type MonitoringDashboardGraphProps = {
   byteDataType: ByteDataTypes;
   timespan?: number;
   pollInterval?: number;
+  endTime?: number;
 };
 
 const DEFAULT_TIME_SPAN = 30 * 60 * 1000;
@@ -36,6 +37,7 @@ export const MonitoringDashboardGraph: React.FC<MonitoringDashboardGraphProps> =
   graphType = GraphTypes.area,
   timespan,
   pollInterval,
+  endTime,
 }) => {
   const { t } = useTranslation();
   return (
@@ -59,6 +61,7 @@ export const MonitoringDashboardGraph: React.FC<MonitoringDashboardGraphProps> =
             isStack={graphType === GraphTypes.area}
             timespan={timespan}
             pollInterval={pollInterval}
+            fixedEndTime={endTime}
             formatSeriesTitle={(labels) => labels.pod}
             showLegend
           />

diff --git a/...es/dev-console/src/components/monitoring/dashboard/__tests__/MonitoringDashboard.spec.tsx b/...es/dev-console/src/components/monitoring/dashboard/__tests__/MonitoringDashboard.spec.tsx
@@ -37,6 +37,7 @@ describe('Monitoring Dashboard Tab', () => {
     },
     timespan: 1800000,
     pollInterval: 90000,
+    endTime: 1900000,
   };
 
   it('should render Monitoring Dashboard tab', () => {