MetalK8s UI: Replace the node metrics by the new chart component #3526

ChengYanJin · 2021-09-07T13:26:43Z

Component: UI, montoring

Context:

Summary:

embed with the core-ui v0.21.2

Acceptance criteria:

Closes: #ISSUE_NUMBER

bert-e · 2021-09-07T13:26:44Z

Hello chengyanjin,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2021-09-07T13:26:48Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component with contents from improvement/replace-the-node-volume-metrics-by-the-new-chart-component
and development/2.11.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component origin/development/2.11
 $ git merge origin/improvement/replace-the-node-volume-metrics-by-the-new-chart-component
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component

ui/src/containers/NodePageMetricsTab.js

ui/src/services/graphUtils.js

ui/src/components/NodeCPBandwidthChart.js

JBWatenbergScality · 2021-09-07T15:54:26Z

ui/src/components/NodeCPBandwidthChart.js

+  );
+
+  // in
+  const cpBandWidthInPrometheusQuery = `sum(irate(node_network_receive_bytes_total{instance=~"${instanceIP}:${PORT_NODE_EXPORTER}",device="${controlPlaneInterface}"}[5m]))`;


can be factorized with the previous ones

JBWatenbergScality · 2021-09-07T16:46:05Z

ui/src/components/NodeCPBandwidthChart.js

+        nodeIPAddress,
+        metricPrefixes,
+      );
+    } else if (!isCPBandWidthAvgDataLoading && showAvg) {


Suggested change

} else if (!isCPBandWidthAvgDataLoading && showAvg) {

} else if (!isCPBandWidthDataLoading && !isCPBandWidthAvgDataLoading && showAvg) {

ui/src/components/NodeCPBandwidthChart.js

ui/src/services/platformlibrary/k8s.js

ChengYanJin · 2021-09-09T14:44:10Z

/status

bert-e · 2021-09-09T14:44:12Z

Status

Status report is not available.

bert-e · 2021-09-09T14:44:17Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component with contents from improvement/replace-the-node-volume-metrics-by-the-new-chart-component
and development/2.11.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component origin/development/2.11
 $ git merge origin/improvement/replace-the-node-volume-metrics-by-the-new-chart-component
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component

bert-e · 2021-09-09T15:33:41Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2021-09-10T16:02:12Z

History mismatch

Merge commit #ffa2d6664f6ff3675d77636fb794c17d4914d939 on the integration branch
w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component is merging a branch which is neither the current
branch improvement/replace-the-node-volume-metrics-by-the-new-chart-component nor the development branch
development/2.11.

It is likely due to a rebase of the branch improvement/replace-the-node-volume-metrics-by-the-new-chart-component and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

ChengYanJin · 2021-09-13T08:32:28Z

/reset

bert-e · 2021-09-13T08:32:32Z

Lossy reset warning

There seems to be manual commits on integration branches (e.g. conflict
resolutions) that will be lost if you chose to reset.

You can use the force_reset command if you still want me
to delete those branches.

bert-e · 2021-09-13T08:32:36Z

History mismatch

Merge commit #ffa2d6664f6ff3675d77636fb794c17d4914d939 on the integration branch
w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component is merging a branch which is neither the current
branch improvement/replace-the-node-volume-metrics-by-the-new-chart-component nor the development branch
development/2.11.

It is likely due to a rebase of the branch improvement/replace-the-node-volume-metrics-by-the-new-chart-component and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

ChengYanJin · 2021-09-13T08:37:02Z

/force_reset

bert-e · 2021-09-13T08:37:08Z

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e · 2021-09-13T08:37:14Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component with contents from improvement/replace-the-node-volume-metrics-by-the-new-chart-component
and development/2.11.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component origin/development/2.11
 $ git merge origin/improvement/replace-the-node-volume-metrics-by-the-new-chart-component
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component

bert-e · 2021-09-13T10:14:38Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2021-09-13T15:23:18Z

History mismatch

Merge commit #71d73011719a9e709246a414107a32d86854f4da on the integration branch
w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component is merging a branch which is neither the current
branch improvement/replace-the-node-volume-metrics-by-the-new-chart-component nor the development branch
development/2.11.

It is likely due to a rebase of the branch improvement/replace-the-node-volume-metrics-by-the-new-chart-component and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

ui/src/containers/NodePageMetricsTab.js

bert-e · 2021-09-14T09:04:42Z

History mismatch

Merge commit #7570279566672be050c0a873f9001db2efc2e8a9 on the integration branch
w/2.11/improvement/replace-the-node-volume-metrics-by-the-new-chart-component is merging a branch which is neither the current
branch improvement/replace-the-node-volume-metrics-by-the-new-chart-component nor the development branch
development/2.11.

It is likely due to a rebase of the branch improvement/replace-the-node-volume-metrics-by-the-new-chart-component and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

ChengYanJin · 2021-09-15T20:29:13Z

merged in #3529

ChengYanJin requested a review from JBWatenbergScality September 7, 2021 13:26

ChengYanJin requested a review from a team as a code owner September 7, 2021 13:26

ChengYanJin force-pushed the improvement/replace-the-node-volume-metrics-by-the-new-chart-component branch from 918c6b7 to 2d5b6d7 Compare September 7, 2021 13:46

JBWatenbergScality reviewed Sep 7, 2021

View reviewed changes

ChengYanJin changed the title ~~MetalK8s UI: Replace the node volume metrics by the new chart component~~ MetalK8s UI: Replace the node metrics by the new chart component Sep 8, 2021

JBWatenbergScality reviewed Sep 8, 2021

View reviewed changes

ui/src/services/platformlibrary/k8s.js Outdated Show resolved Hide resolved

ChengYanJin force-pushed the improvement/replace-the-node-volume-metrics-by-the-new-chart-component branch 3 times, most recently from d43ff10 to c78ff55 Compare September 8, 2021 16:30

ChengYanJin added 6 commits September 9, 2021 16:11

ui: Extract the two chart components

c878c99

ui: Add the StartTimeProvider

3516319

ui: Add services for the metric query

06e8ea9

ui: Add scroll ability for the tab content

786cb20

ui: Add constant value for graph

524aaec

ui: Remove the action triggered for chart since we use react-query

a0eac09

ChengYanJin force-pushed the improvement/replace-the-node-volume-metrics-by-the-new-chart-component branch from 95607f3 to a0eac09 Compare September 9, 2021 14:38

ChengYanJin added 3 commits September 9, 2021 16:38

ui/package: Update the package with vega-tooltip and new v0.21.1 core-ui

a7410a0

shell-ui/package: Add vega-tooltip and bump core-ui v0.21.1

90141db

ui: Bumb the max asset size for dev env

3312d74

JBWatenbergScality previously approved these changes Sep 9, 2021

View reviewed changes

ui/test: Remove the units for addMissingDataPoint and useMetricsTimeSpan

201291c

ChengYanJin dismissed JBWatenbergScality’s stale review via 201291c September 10, 2021 09:26

ChengYanJin force-pushed the improvement/replace-the-node-volume-metrics-by-the-new-chart-component branch from ffa2d66 to e60ca36 Compare September 10, 2021 16:02

ChengYanJin force-pushed the improvement/replace-the-node-volume-metrics-by-the-new-chart-component branch 2 times, most recently from 2ecd992 to 8e3af5d Compare September 10, 2021 16:21

ChengYanJin force-pushed the improvement/replace-the-node-volume-metrics-by-the-new-chart-component branch from 71d7301 to a4d5d06 Compare September 13, 2021 15:22

ChengYanJin force-pushed the improvement/replace-the-node-volume-metrics-by-the-new-chart-component branch from 4b178d9 to 57080f6 Compare September 14, 2021 08:47

JBWatenbergScality reviewed Sep 14, 2021

View reviewed changes

ui/src/containers/NodePageMetricsTab.js Outdated Show resolved Hide resolved

ChengYanJin force-pushed the improvement/replace-the-node-volume-metrics-by-the-new-chart-component branch from 57080f6 to 7d2dab7 Compare September 14, 2021 09:04

ChengYanJin added 2 commits September 14, 2021 11:04

ui/nodes: When the node is not available, no chart will be displayed

3a5c05c

ui/translation: Add translation for the text when no data is available

f6b531f

ChengYanJin force-pushed the improvement/replace-the-node-volume-metrics-by-the-new-chart-component branch from 7d2dab7 to ed9ab60 Compare September 14, 2021 12:40

shell-ui: Add canvas dependency used by vega-lite

ed9ab60

ChengYanJin closed this Sep 15, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MetalK8s UI: Replace the node metrics by the new chart component #3526

MetalK8s UI: Replace the node metrics by the new chart component #3526

ChengYanJin commented Sep 7, 2021 •

edited

Loading

bert-e commented Sep 7, 2021

bert-e commented Sep 7, 2021

JBWatenbergScality Sep 7, 2021

JBWatenbergScality Sep 7, 2021

ChengYanJin commented Sep 9, 2021

bert-e commented Sep 9, 2021

bert-e commented Sep 9, 2021

bert-e commented Sep 9, 2021

bert-e commented Sep 10, 2021

ChengYanJin commented Sep 13, 2021

bert-e commented Sep 13, 2021

bert-e commented Sep 13, 2021

ChengYanJin commented Sep 13, 2021

bert-e commented Sep 13, 2021

bert-e commented Sep 13, 2021

bert-e commented Sep 13, 2021

bert-e commented Sep 13, 2021

bert-e commented Sep 14, 2021

ChengYanJin commented Sep 15, 2021

	} else if (!isCPBandWidthAvgDataLoading && showAvg) {
	} else if (!isCPBandWidthDataLoading && !isCPBandWidthAvgDataLoading && showAvg) {

MetalK8s UI: Replace the node metrics by the new chart component #3526

MetalK8s UI: Replace the node metrics by the new chart component #3526

Conversation

ChengYanJin commented Sep 7, 2021 • edited Loading

bert-e commented Sep 7, 2021

Hello chengyanjin,

bert-e commented Sep 7, 2021

Conflict

JBWatenbergScality Sep 7, 2021

Choose a reason for hiding this comment

JBWatenbergScality Sep 7, 2021

Choose a reason for hiding this comment

ChengYanJin commented Sep 9, 2021

bert-e commented Sep 9, 2021

Status

bert-e commented Sep 9, 2021

Conflict

bert-e commented Sep 9, 2021

Waiting for approval

bert-e commented Sep 10, 2021

History mismatch

ChengYanJin commented Sep 13, 2021

bert-e commented Sep 13, 2021

Lossy reset warning

bert-e commented Sep 13, 2021

History mismatch

ChengYanJin commented Sep 13, 2021

bert-e commented Sep 13, 2021

Reset complete

bert-e commented Sep 13, 2021

Conflict

bert-e commented Sep 13, 2021

Waiting for approval

bert-e commented Sep 13, 2021

History mismatch

bert-e commented Sep 14, 2021

History mismatch

ChengYanJin commented Sep 15, 2021

ChengYanJin commented Sep 7, 2021 •

edited

Loading