NETOBSERV-1214 & NETOBSERV-1399 Cluster name & zone features #546

jpinsonneau · 2024-01-29T13:08:13Z

Description

Filter unecessary columns from operator
Specify MultiClusterDeployment and AddZone states to frontend features array

Dependencies

netobserv/network-observability-console-plugin#462

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.

github-actions · 2024-01-30T08:17:01Z

New images:

quay.io/netobserv/network-observability-operator:9a7812f
quay.io/netobserv/network-observability-operator-bundle:v0.0.0-9a7812f
quay.io/netobserv/network-observability-operator-catalog:v0.0.0-9a7812f

They will expire after two weeks.

To deploy this build:

# Direct deployment, from operator repo
IMAGE=quay.io/netobserv/network-observability-operator:9a7812f make deploy

# Or using operator-sdk
operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:v0.0.0-9a7812f

Or as a Catalog Source:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: netobserv-dev
  namespace: openshift-marketplace
spec:
  sourceType: grpc
  image: quay.io/netobserv/network-observability-operator-catalog:v0.0.0-9a7812f
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

jotak · 2024-01-30T08:20:40Z

pkg/loki/labels.go

@@ -20,6 +20,10 @@ func GetLokiLabels(desired *flowslatest.FlowCollectorSpec) []string {
 		indexFields = append(indexFields, constants.ClusterNameLabelName)
 	}

+	if desired.Processor.AddZone != nil && *desired.Processor.AddZone {


after rebasing you could use that:

Suggested change

if desired.Processor.AddZone != nil && *desired.Processor.AddZone {

if helper.IsZoneEnabled(&desired.Processor) {

jotak · 2024-01-30T08:28:35Z

controllers/consoleplugin/consoleplugin_objects.go

+	if b.desired.Processor.MultiClusterDeployment != nil && *b.desired.Processor.MultiClusterDeployment {
+		fconf.Features = append(fconf.Features, "multiCluster")
+	} else {
+		skipColumns = append(skipColumns, "cluster")
+	}
+	if b.desired.Processor.AddZone != nil && *b.desired.Processor.AddZone {
+		fconf.Features = append(fconf.Features, "zones")
+	} else {
+		skipColumns = append(skipColumns, "zone")
+	}


we could also add to columns config something like a feature field, that could be managed either here or on the frontend, to avoid having specific code for each feature here to skip columns.
E.g:

- id: ClusterName name: Cluster tooltip: The cluster ID or Name. field: K8S_ClusterName filter: cluster_name default: false width: 15 feature: multiCluster

Yes I'm fine with that

jpinsonneau · 2024-01-30T09:47:14Z

@jotak I rebased and addressed your comments. I'm updating the console plugin accordingly

codecov · 2024-01-30T11:00:05Z

Codecov Report

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

Comparison is base (5d91297) 57.87% compared to head (b1b8da0) 57.75%.
Report is 5 commits behind head on main.

Files	Patch %	Lines
controllers/consoleplugin/consoleplugin_objects.go	0.00%	4 Missing and 2 partials ⚠️
pkg/loki/labels.go	0.00%	2 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #546      +/-   ##
==========================================
- Coverage   57.87%   57.75%   -0.12%     
==========================================
  Files          73       73              
  Lines        9543     9552       +9     
==========================================
- Hits         5523     5517       -6     
- Misses       3684     3696      +12     
- Partials      336      339       +3

Flag	Coverage Δ
unittests	`57.75% <0.00%> (-0.12%)`	⬇️

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.

OlivierCazade

LGTM

jotak · 2024-01-30T13:40:04Z

/lgtm

github-actions · 2024-01-30T13:44:45Z

New images:

quay.io/netobserv/network-observability-operator:4494cc9
quay.io/netobserv/network-observability-operator-bundle:v0.0.0-4494cc9
quay.io/netobserv/network-observability-operator-catalog:v0.0.0-4494cc9

They will expire after two weeks.

To deploy this build:

# Direct deployment, from operator repo
IMAGE=quay.io/netobserv/network-observability-operator:4494cc9 make deploy

# Or using operator-sdk
operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:v0.0.0-4494cc9

Or as a Catalog Source:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: netobserv-dev
  namespace: openshift-marketplace
spec:
  sourceType: grpc
  image: quay.io/netobserv/network-observability-operator-catalog:v0.0.0-4494cc9
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

jotak · 2024-01-31T11:27:07Z

@jpinsonneau I guess we can merge it?

jpinsonneau · 2024-01-31T12:12:45Z

@jpinsonneau I guess we can merge it?

I'm waiting for QE review before merging, just in case I need to update backports and so on.
Is it blocking us on something else ?

openshift-ci · 2024-02-05T09:41:33Z

New changes are detected. LGTM label has been removed.

jpinsonneau · 2024-02-05T09:47:23Z

Resolved conflict b1b8da0

github-actions · 2024-02-05T09:51:03Z

New images:

quay.io/netobserv/network-observability-operator:3e6fb20
quay.io/netobserv/network-observability-operator-bundle:v0.0.0-3e6fb20
quay.io/netobserv/network-observability-operator-catalog:v0.0.0-3e6fb20

They will expire after two weeks.

To deploy this build:

# Direct deployment, from operator repo
IMAGE=quay.io/netobserv/network-observability-operator:3e6fb20 make deploy

# Or using operator-sdk
operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:v0.0.0-3e6fb20

Or as a Catalog Source:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: netobserv-dev
  namespace: openshift-marketplace
spec:
  sourceType: grpc
  image: quay.io/netobserv/network-observability-operator-catalog:v0.0.0-3e6fb20
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

openshift-ci · 2024-02-06T09:14:15Z

[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:

OWNERS

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

jpinsonneau marked this pull request as draft January 29, 2024 13:08

openshift-ci bot added the do-not-merge/work-in-progress label Jan 29, 2024

jpinsonneau mentioned this pull request Jan 29, 2024

NETOBSERV-1214 & NETOBSERV-1399 Manage cluster name and zones netobserv/network-observability-console-plugin#462

Merged

16 tasks

jpinsonneau force-pushed the 1214_1399 branch from 5f17fd5 to 6d7166b Compare January 29, 2024 14:44

jpinsonneau marked this pull request as ready for review January 29, 2024 14:51

jpinsonneau requested review from jotak, msherif1234 and OlivierCazade January 29, 2024 14:52

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

jotak reviewed Jan 30, 2024

View reviewed changes

Cluster name & zone features

97de7e3

jpinsonneau force-pushed the 1214_1399 branch from 6d7166b to 97de7e3 Compare January 30, 2024 09:46

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

OlivierCazade approved these changes Jan 30, 2024

View reviewed changes

openshift-ci bot assigned OlivierCazade Jan 30, 2024

openshift-ci bot added the lgtm label Jan 30, 2024

openshift-ci bot assigned jotak Jan 30, 2024

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

jpinsonneau mentioned this pull request Jan 30, 2024

NETOBSERV-1214 & NETOBSERV-1399 Backport #551

Merged

openshift-ci bot removed the do-not-merge/work-in-progress label Jan 31, 2024

openshift-merge-robot added the needs-rebase label Feb 3, 2024

Merge branch 'main' into 1214_1399

b1b8da0

openshift-ci bot removed the lgtm label Feb 5, 2024

openshift-merge-robot removed the needs-rebase label Feb 5, 2024

github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Feb 5, 2024

jpinsonneau added lgtm ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. labels Feb 5, 2024

jpinsonneau added the approved label Feb 6, 2024

openshift-merge-bot bot merged commit 389354e into netobserv:main Feb 6, 2024
13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NETOBSERV-1214 & NETOBSERV-1399 Cluster name & zone features #546

NETOBSERV-1214 & NETOBSERV-1399 Cluster name & zone features #546

jpinsonneau commented Jan 29, 2024 •

edited

Loading

github-actions bot commented Jan 30, 2024

jotak Jan 30, 2024

jotak Jan 30, 2024 •

edited

Loading

jpinsonneau Jan 30, 2024

jpinsonneau commented Jan 30, 2024

codecov bot commented Jan 30, 2024 •

edited

Loading

OlivierCazade left a comment

jotak commented Jan 30, 2024

github-actions bot commented Jan 30, 2024

jotak commented Jan 31, 2024

jpinsonneau commented Jan 31, 2024

openshift-ci bot commented Feb 5, 2024

jpinsonneau commented Feb 5, 2024

github-actions bot commented Feb 5, 2024

openshift-ci bot commented Feb 6, 2024

	if desired.Processor.AddZone != nil && *desired.Processor.AddZone {
	if helper.IsZoneEnabled(&desired.Processor) {

NETOBSERV-1214 & NETOBSERV-1399 Cluster name & zone features #546

NETOBSERV-1214 & NETOBSERV-1399 Cluster name & zone features #546

Conversation

jpinsonneau commented Jan 29, 2024 • edited Loading

Description

Dependencies

Checklist

github-actions bot commented Jan 30, 2024

jotak Jan 30, 2024

Choose a reason for hiding this comment

jotak Jan 30, 2024 • edited Loading

Choose a reason for hiding this comment

jpinsonneau Jan 30, 2024

Choose a reason for hiding this comment

jpinsonneau commented Jan 30, 2024

codecov bot commented Jan 30, 2024 • edited Loading

Codecov Report

OlivierCazade left a comment

Choose a reason for hiding this comment

jotak commented Jan 30, 2024

github-actions bot commented Jan 30, 2024

jotak commented Jan 31, 2024

jpinsonneau commented Jan 31, 2024

openshift-ci bot commented Feb 5, 2024

jpinsonneau commented Feb 5, 2024

github-actions bot commented Feb 5, 2024

openshift-ci bot commented Feb 6, 2024

jpinsonneau commented Jan 29, 2024 •

edited

Loading

jotak Jan 30, 2024 •

edited

Loading

codecov bot commented Jan 30, 2024 •

edited

Loading