@@ -5,15 +5,14 @@ import { Typography } from '@mui/material';
55import { AwsContext } from '../../context/AwsContext' ;
66import './styles.scss' ;
77import { useLocation } from 'react-router-dom' ;
8- import EC2GraphsComponent from './EC2GraphsComponent ' ;
9- import ECSGraphsComponent from './ECSGraphsComponent ' ;
10- import EKSGraphsComponent from './EKSGraphsComponent ' ;
8+ import AwsEC2Graphs from '../../components/AwsEC2Graphs ' ;
9+ import ClusterTable from '../../components/ClusterTable ' ;
10+ import AwsECSClusterGraphs from '../../components/AwsECSClusterGraphs ' ;
1111
1212const AwsGraphsContainer = ( ) => {
1313 const { app, appIndex, setIntervalID, intervalID } = useContext ( ApplicationContext ) ;
1414 const { user } = useContext ( DashboardContext ) ;
15- const { awsAppInfo, fetchAwsData, fetchAwsEcsData, fetchAwsEksData, fetchAwsAppInfo } =
16- useContext ( AwsContext ) ;
15+ const { awsAppInfo, fetchAwsData, fetchAwsEcsData, fetchAwsEksData, fetchAwsAppInfo } = useContext ( AwsContext ) ;
1716 const { state } = useLocation ( ) ;
1817 const { typeOfService } = state ;
1918 const [ awsLive , setAwsLive ] = React . useState ( false ) ;
@@ -59,18 +58,44 @@ const AwsGraphsContainer = () => {
5958
6059 return (
6160 < div className = "AWS-container" >
61+
6262 < div className = "AWS-header" >
63- < Typography variant = "h3" > { app } </ Typography >
63+ < Typography
64+ variant = "h3"
65+ >
66+ { app }
67+ </ Typography >
6468 < p > Metrics for AWS Service</ p >
65- < button onClick = { ( ) => setAwsLive ( ! awsLive ) } >
69+ < button
70+ onClick = { ( ) => setAwsLive ( ! awsLive ) }
71+ >
6672 { awsLive ? 'Stop Live Update' : 'Start Live Update' }
6773 </ button >
6874 </ div >
75+
6976 { typeOfService === 'AWS/ECS' && (
70- < ECSGraphsComponent region = { awsAppInfo . region } typeOfService = { typeOfService } />
77+ < div className = "cluster-table" >
78+ < ClusterTable
79+ typeOfService = { typeOfService }
80+ region = { awsAppInfo . region }
81+ />
82+ < AwsECSClusterGraphs />
83+ </ div >
7184 ) }
72- { typeOfService === 'AWS/EC2' && < EC2GraphsComponent /> }
73- { typeOfService === 'AWS/EKS' && < EKSGraphsComponent awsEksData = { awsAppInfo . awsUrl } /> }
85+
86+ { typeOfService === 'AWS/EC2' &&
87+ < div className = "cluster-table" >
88+ < AwsEC2Graphs />
89+ </ div >
90+ }
91+
92+ { typeOfService === 'AWS/EKS' &&
93+ < iframe
94+ src = { `${ awsAppInfo . awsUrl } ?orgId=1&refresh=10s&theme=light&kiosk` }
95+ width = "1300"
96+ height = "1300"
97+ > </ iframe >
98+ }
7499 </ div >
75100 ) ;
76101} ;
0 commit comments