Skip to content

Commit dc664ce

Browse files
Finished the initial layout of the sidebar and connected user input to state to be sent along to the server upon data fetch
1 parent aa077b8 commit dc664ce

File tree

4 files changed

+105
-231
lines changed

4 files changed

+105
-231
lines changed

ksqLight/server/server.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ const RootQueryType = new GraphQLObjectType({
5353
},
5454
resolve: (parent, {start, end, resolution, metric, prometheusURL}) => {
5555
if (prometheusURL[prometheusURL.length] === '/') prometheusURL = prometheusURL.slice(0, prometheusURL.length);
56-
console.log(prometheusURL);
5756

5857
return axios.get(`${prometheusURL}/api/v1/query_range?step=${resolution}s&end=${end}&start=${start}&query=${queryTypes[metric]}`)
5958
.then(res => res.data.data.result[0].values)

ksqLight/src/components/Homepage.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ export const Homepage = ({ metricsState }) => {
99

1010
const queryTypes = [
1111
["runningQueries", "Number of Running Queries"],
12-
// ["rebalancingQueries", "Number of Rebalancing Queries"],
13-
// ["pendingShutdownQueries", "Number of Pending Shutdown Queries"],
14-
// ["pendingErrorQueries", "Number of Pending Error Queries"],
12+
["rebalancingQueries", "Number of Rebalancing Queries"],
13+
["pendingShutdownQueries", "Number of Pending Shutdown Queries"],
14+
["pendingErrorQueries", "Number of Pending Error Queries"],
1515
// ["numPersistentQueries", "Number of Persistent Queries"],
1616
// ["numIdleQueries", "Number of Idle Queries"],
1717
// ["numActiveQueries", "Number of Active Queries"],
@@ -34,7 +34,7 @@ export const Homepage = ({ metricsState }) => {
3434
<Toolbar></Toolbar>
3535
<Typography color="primary">Homepage</Typography>
3636
<Grid container spacing={2} justifyContent="flex-start" alignItems="flex-start" sx={{ pl: 28 }}>
37-
{queryTypes.map(([query, description], index) => <LineChart description={description} metric={query} metricsState={metricsState} key={index}/>)}
37+
{queryTypes.map(([query, description], index) => <LineChart description={description} metric={query} metricsState={metricsState} key={index} />)}
3838
</Grid>
3939
</div>
4040

ksqLight/src/components/LineChart.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ export default function LineChart({ metric, description, metricsState }) {
5959
scales: {
6060
x: {
6161
type: 'realtime', // x axis will auto-scroll from right to left
62+
ticks: {
63+
// minTicksLimit: 24
64+
autoskip: true,
65+
autoSkipPadding: 30,
66+
maxRotation: 0,
67+
steps: 10
68+
},
6269
realtime: { // per-axis options
6370
duration: getDuration(metricsState.duration.days, metricsState.duration.hours, metricsState.duration.minutes), // data in the past duration # of ms will be displayed
6471
refresh: metricsState.refreshRate * 1000, // onRefresh callback will be called every refresh # ms
@@ -163,11 +170,9 @@ export default function LineChart({ metric, description, metricsState }) {
163170

164171
return (
165172
<>
166-
<Grid item xs={2}>
173+
<Grid item xs={3}>
167174
<canvas id={metric} width="100%" height="100%"></canvas>
168175
</Grid>
169-
<Grid item xs={10}>
170-
</Grid>
171176
</>
172177
);
173178
}

0 commit comments

Comments
 (0)