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

NETOBSERV-1214 & NETOBSERV-1399 Manage cluster name and zones #462

Merged
merged 2 commits into from
Feb 6, 2024

Conversation

jpinsonneau
Copy link
Contributor

@jpinsonneau jpinsonneau commented Jan 29, 2024

Description

Manage cluster name: K8S_ClusterName

  • Column
  • Filter with autocomplete
  • Topology aggregation and groups

Manage zone: SrcK8S_Zone / DstK8S_Zone

  • Columns
  • Filters with autocomplete
  • Topology aggregation and groups

image

Dependencies

netobserv/network-observability-operator#546

Checklist

If you are not familiar with our processes or don't know what to answer in the list below, let us know in a comment: the maintainers will take care of that.

  • Is this PR backed with a JIRA ticket? If so, make sure it is written as a title prefix (in general, PRs affecting the NetObserv/Network Observability product should be backed with a JIRA ticket - especially if they bring user facing changes).
  • Does this PR require product documentation?
    • If so, make sure the JIRA epic is labelled with "documentation" and provides a description relevant for doc writers, such as use cases or scenarios. Any required step to activate or configure the feature should be documented there, such as new CRD knobs.
  • Does this PR require a product release notes entry?
    • If so, fill in "Release Note Text" in the JIRA.
  • Is there anything else the QE team should know before testing? E.g: configuration changes, environment setup, etc.
    • If so, make sure it is described in the JIRA ticket.
  • QE requirements (check 1 from the list):
    • Standard QE validation, with pre-merge tests unless stated otherwise.
    • Regression tests only (e.g. refactoring with no user-facing change).
    • No QE (e.g. trivial change with high reviewer's confidence, or per agreement with the QE team).

Copy link

codecov bot commented Jan 29, 2024

Codecov Report

Attention: 185 lines in your changes are missing coverage. Please review.

Comparison is base (958be65) 58.23% compared to head (a52607a) 57.40%.
Report is 4 commits behind head on main.

Files Patch % Lines
pkg/handler/resources.go 4.76% 38 Missing and 2 partials ⚠️
web/src/model/topology.ts 37.50% 33 Missing and 2 partials ⚠️
pkg/loki/topology_query.go 23.52% 26 Missing ⚠️
web/src/utils/filter-options.ts 20.00% 12 Missing ⚠️
web/src/components/dropdowns/group-dropdown.tsx 52.63% 9 Missing ⚠️
web/src/components/dropdowns/scope-dropdown.tsx 10.00% 9 Missing ⚠️
...omponents/netflow-topology/2d/topology-content.tsx 0.00% 8 Missing ⚠️
web/src/utils/autocomplete-cache.ts 20.00% 8 Missing ⚠️
...nts/netflow-topology/2d/styles/styleDecorators.tsx 0.00% 6 Missing ⚠️
...src/components/netflow-topology/element-fields.tsx 0.00% 6 Missing ⚠️
... and 8 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #462      +/-   ##
==========================================
- Coverage   58.23%   57.40%   -0.84%     
==========================================
  Files         167      167              
  Lines        8467     8661     +194     
  Branches     1086     1114      +28     
==========================================
+ Hits         4931     4972      +41     
- Misses       3224     3368     +144     
- Partials      312      321       +9     
Flag Coverage Δ
uitests 58.27% <33.90%> (-0.68%) ⬇️
unittests 54.93% <14.63%> (-1.27%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jpinsonneau jpinsonneau marked this pull request as ready for review January 29, 2024 14:51
@jotak jotak added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Jan 30, 2024
Copy link

New image:
quay.io/netobserv/network-observability-console-plugin:684a3b4

It will expire after two weeks.

To deploy this build, run from the operator repo, assuming the operator is running:

USER=netobserv VERSION=684a3b4 make set-plugin-image

@github-actions github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Jan 30, 2024
@jpinsonneau
Copy link
Contributor Author

Following to this feedback I've adapted columns to be filtered using a new feature optionnal column.

See a52607a

We'll need to do the same for panels in #431

Copy link
Collaborator

@OlivierCazade OlivierCazade left a comment

Choose a reason for hiding this comment

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

LGTM

@OlivierCazade
Copy link
Collaborator

I did not test it, but if both zone and multi cluster enabled, there is the possibility to have nodes from different clusters in the same zone.

Is it going to work?

@jotak jotak added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Jan 30, 2024
Copy link

New image:
quay.io/netobserv/network-observability-console-plugin:ac6ae2a

It will expire after two weeks.

To deploy this build, run from the operator repo, assuming the operator is running:

USER=netobserv VERSION=ac6ae2a make set-plugin-image

@jpinsonneau
Copy link
Contributor Author

I did not test it, but if both zone and multi cluster enabled, there is the possibility to have nodes from different clusters in the same zone.

Is it going to work?

Yes however, zones from different clusters will be mixed into the same metric in overview, if you don't filter on a specific cluster. There is no possibility to show per cluster + zone in the overview section yet.

In the table you will see both clusters but I guess that's good as is.

On topology side, the groups will be separated only if you set Cluster + Zones. See addPossibleGroups function:
https://github.com/jpinsonneau/network-observability-console-plugin/blob/8f2df29d1a3f76f4645501bf15e71cf2b17675ee/web/src/model/topology.ts#L496-L524

@jotak
Copy link
Member

jotak commented Jan 30, 2024

That's awesome to see traffic across zones
Love it :-)

image

/lgtm

Copy link

openshift-ci bot commented Feb 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by:

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit c70d29b into netobserv:main Feb 6, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm ok-to-test To set manually when a PR is safe to test. Triggers image build on PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants