Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI : node average metrics #3078

Merged
merged 6 commits into from
Feb 17, 2021

Conversation

alexis-ld
Copy link
Contributor

Component:
nodes

Context:
We want to display cluster-wide metrics for each chart in the Node metrics tab.

We had to adapt core-ui LineChart component for this to work. To test this locally you might need to use : "@scality/core-ui": "github:scality/core-ui.git#improvement/linechart-config" in package.json to get the up-to-date core-ui version.

Summary:

Screen.Recording.2021-02-02.at.17.16.20.mov

Acceptance criteria:
Enabling average display adds a dashed line on each chart in the node metrics tab.
This show avg settings is stored in the URL
Avg metrics are refreshed at the same time than node specific metrics.


Closes: #2925

@alexis-ld alexis-ld requested a review from a team as a code owner February 2, 2021 16:25
@bert-e
Copy link
Contributor

bert-e commented Feb 2, 2021

Hello alexis-ld,

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
Copy link
Contributor

bert-e commented Feb 2, 2021

Branches have diverged

This pull request's source branch improvement/2925-node-average-metrics has diverged from
development/2.8 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/2.8 into improvement/2925-node-average-metrics
  • Rebase improvement/2925-node-average-metrics onto origin/development/2.8

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

@alexis-ld alexis-ld force-pushed the improvement/2925-node-average-metrics branch from f8df1bd to 46480f7 Compare February 2, 2021 17:04
@bert-e
Copy link
Contributor

bert-e commented Feb 2, 2021

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:

@alexis-ld
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Feb 2, 2021

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Feb 2, 2021

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
Copy link
Contributor

bert-e commented Feb 3, 2021

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:

@alexis-ld alexis-ld force-pushed the improvement/2925-node-average-metrics branch from 1894b77 to 5d07d09 Compare February 3, 2021 17:11
@bert-e
Copy link
Contributor

bert-e commented Feb 3, 2021

Conflict

There is a conflict between your branch improvement/2925-node-average-metrics and the
destination branch development/2.8.

Please resolve the conflict on the feature branch (improvement/2925-node-average-metrics).

 $ git fetch
 $ git checkout origin/improvement/2925-node-average-metrics
 $ git merge origin/development/2.8
 $ # <intense conflict resolution>
 $ git commit
 $ git push origin HEAD:improvement/2925-node-average-metrics

@bert-e
Copy link
Contributor

bert-e commented Feb 3, 2021

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:

@alexis-ld alexis-ld force-pushed the improvement/2925-node-average-metrics branch from fc300da to 5d07d09 Compare February 3, 2021 17:17
@bert-e
Copy link
Contributor

bert-e commented Feb 3, 2021

Conflict

There is a conflict between your branch improvement/2925-node-average-metrics and the
destination branch development/2.8.

Please resolve the conflict on the feature branch (improvement/2925-node-average-metrics).

 $ git fetch
 $ git checkout origin/improvement/2925-node-average-metrics
 $ git merge origin/development/2.8
 $ # <intense conflict resolution>
 $ git commit
 $ git push origin HEAD:improvement/2925-node-average-metrics

@alexis-ld alexis-ld force-pushed the improvement/2925-node-average-metrics branch from 5d07d09 to ac8b26f Compare February 3, 2021 17:19
@bert-e
Copy link
Contributor

bert-e commented Feb 3, 2021

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:

ui/src/translations/en.json Outdated Show resolved Hide resolved
ui/src/containers/NodePageMetricsTab.js Show resolved Hide resolved
ui/src/containers/NodePageMetricsTab.js Outdated Show resolved Hide resolved
ui/src/containers/NodePageMetricsTab.js Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
ui/src/containers/NodePageMetricsTab.js Outdated Show resolved Hide resolved
ui/src/containers/NodePageMetricsTab.js Outdated Show resolved Hide resolved
ui/src/components/style/CommonLayoutStyle.js Outdated Show resolved Hide resolved
ui/src/containers/NodePageMetricsTab.js Outdated Show resolved Hide resolved
ui/src/containers/NodePageMetricsTab.js Outdated Show resolved Hide resolved
@bert-e
Copy link
Contributor

bert-e commented Feb 4, 2021

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:

The following reviewers are expecting changes from the author, or must review again:

@alexis-ld
Copy link
Contributor Author

New preview after changes :

Screen.Recording.2021-02-05.at.12.19.20.mov

Copy link
Contributor

@ChengYanJin ChengYanJin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some details plus bump the core-ui version with tag(v0.8.0) then we are ready to go!

I still prefer to be able to see all the metrics without scrolling down.

But on my small laptop is not the case anymore, I guess it's because we add legends that take some spaces.

So I sugest to adapt the hook useDynamicChartSize with [graphWidth, window.innerHeight / 6 - 50];

ui/src/containers/NodePageMetricsTab.js Show resolved Hide resolved
ui/src/containers/NodePageMetricsTab.js Show resolved Hide resolved
ui/src/containers/NodePageMetricsTab.js Outdated Show resolved Hide resolved
ui/src/containers/NodePageMetricsTab.js Outdated Show resolved Hide resolved
@bert-e
Copy link
Contributor

bert-e commented Feb 8, 2021

Branches have diverged

This pull request's source branch improvement/2925-node-average-metrics has diverged from
development/2.8 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/2.8 into improvement/2925-node-average-metrics
  • Rebase improvement/2925-node-average-metrics onto origin/development/2.8

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

@alexis-ld alexis-ld force-pushed the improvement/2925-node-average-metrics branch from 8295dae to 23b6295 Compare February 8, 2021 11:02
@bert-e
Copy link
Contributor

bert-e commented Feb 8, 2021

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:

The following reviewers are expecting changes from the author, or must review again:

@alexis-ld alexis-ld force-pushed the improvement/2925-node-average-metrics branch from a87b254 to b4498fc Compare February 12, 2021 16:43
@alexis-ld
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Feb 12, 2021

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:

The following reviewers are expecting changes from the author, or must review again:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 15, 2021

Branches have diverged

This pull request's source branch improvement/2925-node-average-metrics has diverged from
development/2.8 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/2.8 into improvement/2925-node-average-metrics
  • Rebase improvement/2925-node-average-metrics onto origin/development/2.8

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

The following options are set: approve

@alexis-ld alexis-ld force-pushed the improvement/2925-node-average-metrics branch from b4498fc to e137c4b Compare February 16, 2021 09:53
@bert-e
Copy link
Contributor

bert-e commented Feb 16, 2021

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:

The following reviewers are expecting changes from the author, or must review again:

The following options are set: approve

In case showAvg is true we request the metrics average for the whole cluster aside from the regular metrics in monitoring duck

Refs: #2925
Switch to enable/disable cluster avg metrics (data lives in URL)
Display cluster avg as a dashed line in node metrics charts

Refs: #2925
Slightly adapt charts titles and charts dimensions to fit the new design

Refs: #2925
In order to make node cluster avg display work

Refs: #2925
@alexis-ld alexis-ld force-pushed the improvement/2925-node-average-metrics branch from e137c4b to a0103d1 Compare February 16, 2021 17:48
Copy link
Contributor

@ChengYanJin ChengYanJin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@bert-e
Copy link
Contributor

bert-e commented Feb 17, 2021

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.8

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 17, 2021

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.8

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

Please check the status of the associated issue None.

Goodbye alexis-ld.

@bert-e bert-e merged commit a0103d1 into development/2.8 Feb 17, 2021
@bert-e bert-e deleted the improvement/2925-node-average-metrics branch February 17, 2021 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[UI] Compare Node Metrics with Average
3 participants