Skip to content

Commit fe50495

Browse files
committed
further trying to get kubes metrics to render on graph with console logs sprinkled
1 parent f7c2fe2 commit fe50495

File tree

5 files changed

+25
-6
lines changed

5 files changed

+25
-6
lines changed

app/components/TransferColumns.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { QueryContext } from '../context/QueryContext';
88
import { HealthContext } from '../context/HealthContext';
99
import { EventContext } from '../context/EventContext';
1010
import AvQueuePlayNext from 'material-ui/svg-icons/av/queue-play-next';
11+
import CommunicationPhonelinkSetup from 'material-ui/svg-icons/communication/phonelink-setup';
1112

1213
const TableTransfer = ({ leftColumns, rightColumns, ...restProps }) => (
1314
<Transfer {...restProps}>
@@ -111,13 +112,20 @@ const TransferColumns = React.memo(() => {
111112
}
112113
}
113114
// JJ-ADDITION (CAN ALSO JUST ADD OR OPERATOR TO ABOVE CONDITIONAL)
115+
else if (service === 'kubernetesmetrics') {
116+
if (healthDataList && healthDataList.length > 0) {
117+
setMetricsPool(getMetrics('health', healthDataList));
118+
} else if (healthMetricsReady) {
119+
setMetricsPool(healthMetrics);
120+
}
121+
}
114122
// else if (service === 'kubernetesmetrics') {
115123
// if (eventDataList && eventDataList.length > 0) {
116124
// setMetricsPool(getMetrics('event', eventDataList));
117125
// } else if (eventMetricsReady) {
118126
// setMetricsPool(eventMetrics);
119127
// }
120-
// }
128+
// }
121129
else if (!service.includes('kafkametrics')) {
122130
if (healthDataList && healthDataList.length > 0) {
123131
setMetricsPool(getMetrics('health', healthDataList));
@@ -202,11 +210,11 @@ const TransferColumns = React.memo(() => {
202210
setShowSearch(checked);
203211
};
204212
const handleClick = () => {
205-
//setSelectedMetrics
213+
// setSelectedMetrics
206214
const temp: any[] = [];
207215
const categorySet = new Set();
208216
for (let i = 0; i < targetKeys.length; i++) {
209-
let str: string = targetKeys[i];
217+
const str: string = targetKeys[i];
210218
const strArr: string[] = str.split(' | ');
211219
const categoryName = strArr[0];
212220
const metricName = strArr[1];

app/containers/EventContainer.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ interface EventContainerProps {
1010
}
1111

1212
const EventContainer: React.FC<EventContainerProps> = React.memo(props => {
13+
// eslint-disable-next-line no-console
14+
console.log(`PROPS ${props}`);
1315
const { eventData } = useContext(EventContext);
1416
const [eventChartsArr, setEventChartsArr] = useState<JSX.Element[]>([]);
1517
const { selectedMetrics } = useContext(QueryContext);
@@ -28,6 +30,8 @@ const EventContainer: React.FC<EventContainerProps> = React.memo(props => {
2830
});
2931

3032
eventDataList.forEach((element, id) => {
33+
// eslint-disable-next-line no-console
34+
console.log(`EVENTDATALIST ELEMENT ${element}`);
3135
const metric: string = Object.keys(element)[0];
3236
const valueList: any = Object.values(element)[0];
3337
if (selectedMetricsList.includes(metric)) {

app/containers/GraphsContainer.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ const GraphsContainer: React.FC<GraphsContainerProps> = React.memo(props => {
5757
const healthServiceArray = serviceArray.filter(
5858
(value: string) => value !== 'kafkametrics' || 'kubernetesmetrics'
5959
);
60+
// eslint-disable-next-line no-console
61+
console.log(`HEALTH SERVICES ARRAY ${healthServiceArray}`);
6062
if (live) {
6163
setIntervalID(
6264
setInterval(() => {
@@ -97,6 +99,8 @@ const GraphsContainer: React.FC<GraphsContainerProps> = React.memo(props => {
9799
if (prevRoute === '') history.replace(`${servicesData[0].microservice}`);
98100
else history.replace(prevRoute);
99101
}
102+
// eslint-disable-next-line no-console
103+
console.log(`ROUTE ${route}`);
100104
setChart(route);
101105
};
102106

@@ -132,6 +136,8 @@ const GraphsContainer: React.FC<GraphsContainerProps> = React.memo(props => {
132136
selectedMetrics.forEach((element, id) => {
133137
const categoryName = Object.keys(element)[0];
134138
const prefix = categoryName === 'Event' ? 'event_' : 'health_';
139+
// eslint-disable-next-line no-console
140+
console.log(`PREFIX ${prefix} categoryName is ${categoryName}`);
135141
buttonList.push(
136142
<button
137143
id={`${prefix}${categoryName}-button`}

app/containers/HealthContainer.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@ const HealthContainer: React.FC<HealthContainerProps> = React.memo(props => {
6868
}
6969
}, [healthData, category]);
7070

71-
return <div>{service !== 'kafkametrics' ? healthChartsArr : []}</div>;
71+
// return <div>{service !== 'kafkametrics' ? healthChartsArr : []}</div>;
7272
// JJ-ADDITION
73-
// return <div>{service.includes('kafkametrics' || 'kubernetesmetrics') ? eventChartsArr : []}</div>;
73+
return (
74+
<div>{service.includes('kafkametrics' || 'kubernetesmetrics') ? healthChartsArr : []}</div>
75+
);
7476
});
7577

7678
export default HealthContainer;

electron/routes/dashboard.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ ipcMain.on('getApps', message => {
5454
// "",
5555
// "Dec 13, 2022 10:16 AM"]
5656
// Sync event - return new applications list w/ user settings: Mode
57-
console.log(dashboardList);
5857
message.returnValue = [dashboardList, temp.mode];
5958
});
6059

0 commit comments

Comments
 (0)