Cluster name & zone features (#546)

netobserv · Feb 6, 2024 · 389354e · 389354e
1 parent 6d3f3c7
commit 389354e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/controllers/consoleplugin/config/config.go b/controllers/consoleplugin/config/config.go
@@ -47,6 +47,7 @@ type ColumnConfig struct {
 	Filter     string   `yaml:"filter,omitempty" json:"filter,omitempty"`
 	Default    bool     `yaml:"default,omitempty" json:"default,omitempty"`
 	Width      int      `yaml:"width,omitempty" json:"width,omitempty"`
+	Feature    string   `yaml:"feature" json:"feature"`
 }
 
 type FilterConfig struct {

diff --git a/controllers/consoleplugin/config/static-frontend-config.yaml b/controllers/consoleplugin/config/static-frontend-config.yaml
@@ -29,6 +29,14 @@ columns:
     filter: id
     default: true
     width: 15
+  - id: ClusterName
+    name: Cluster
+    tooltip: The cluster ID or Name.
+    field: K8S_ClusterName
+    filter: cluster_name
+    default: false
+    width: 15
+    feature: multiCluster
   - id: SrcK8S_Name
     group: Source
     name: Name
@@ -148,6 +156,7 @@ columns:
     filter: src_zone
     default: false
     width: 15
+    feature: zones
   - id: DstK8S_Name
     group: Destination
     name: Name
@@ -267,6 +276,7 @@ columns:
     filter: dst_zone
     default: false
     width: 15
+    feature: zones
   - id: K8S_Name
     name: Names
     calculated: getSrcOrDstValue(SrcK8S_Name,DstK8S_Name)
@@ -434,6 +444,7 @@ columns:
     filter: dns_id
     default: false
     width: 5
+    feature: dnsTracking
   - id: DNSLatency
     group: DNS
     name: DNS Latency
@@ -442,6 +453,7 @@ columns:
     filter: dns_latency
     default: true
     width: 5
+    feature: dnsTracking
   - id: DNSResponseCode
     group: DNS
     name: DNS Response Code
@@ -450,6 +462,7 @@ columns:
     filter: dns_flag_response_code
     default: true
     width: 5
+    feature: dnsTracking
   - id: DNSErrNo
     group: DNS
     name: DNS Error
@@ -458,14 +471,20 @@ columns:
     filter: dns_errno
     default: false
     width: 5
+    feature: dnsTracking
   - id: TimeFlowRttMs
     name: Flow RTT
     tooltip: TCP Smoothed Round Trip Time (SRTT)
     field: TimeFlowRttNs
     filter: time_flow_rtt
     default: true
     width: 5
+    feature: flowRTT
 filters:
+  - id: cluster_name
+    name: Cluster
+    component: autocomplete
+    hint: Specify a cluster ID or name.
   - id: src_namespace
     name: Namespace
     component: autocomplete
@@ -571,13 +590,13 @@ filters:
           - Ending text like "*-registry"
           - Pattern like "cluster-*-registry", "c*-*-r*y", -i*e-
   - id: src_zone
-    name: Zone Name
-    component: text
+    name: Zone
+    component: autocomplete
     category: source
     hint: Specify a single zone.
   - id: dst_zone
-    name: Zone Name
-    component: text
+    name: Zone
+    component: autocomplete
     category: destination
     hint: Specify a single zone.
   - id: src_resource

diff --git a/controllers/consoleplugin/consoleplugin_objects.go b/controllers/consoleplugin/consoleplugin_objects.go
@@ -397,6 +397,12 @@ func (b *builder) setFrontendConfig(fconf *config.FrontendConfig) error {
 		Mark:  dedupJustMark,
 		Merge: dedupMerge,
 	}
+	if helper.IsMultiClusterEnabled(&b.desired.Processor) {
+		fconf.Features = append(fconf.Features, "multiCluster")
+	}
+	if helper.IsZoneEnabled(&b.desired.Processor) {
+		fconf.Features = append(fconf.Features, "zones")
+	}
 	return nil
 }
 

diff --git a/controllers/constants/constants.go b/controllers/constants/constants.go
@@ -50,6 +50,7 @@ const (
 var LokiIndexFields = []string{"SrcK8S_Namespace", "SrcK8S_OwnerName", "SrcK8S_Type", "DstK8S_Namespace", "DstK8S_OwnerName", "DstK8S_Type", "K8S_FlowLayer"}
 var LokiConnectionIndexFields = []string{"_RecordType"}
 var LokiDeduperMarkIndexFields = []string{"FlowDirection"}
+var LokiZoneIndexFields = []string{"SrcK8S_Zone", "DstK8S_Zone"}
 var FlowCollectorName = types.NamespacedName{Name: "cluster"}
 var EnvNoHTTP2 = corev1.EnvVar{
 	Name:  "GODEBUG",

diff --git a/pkg/loki/labels.go b/pkg/loki/labels.go
@@ -20,6 +20,10 @@ func GetLokiLabels(desired *flowslatest.FlowCollectorSpec) []string {
 		indexFields = append(indexFields, constants.ClusterNameLabelName)
 	}
 
+	if helper.IsZoneEnabled(&desired.Processor) {
+		indexFields = append(indexFields, constants.LokiZoneIndexFields...)
+	}
+
 	if helper.UseEBPF(desired) {
 		dedupJustMark, _ := strconv.ParseBool(ebpf.DedupeJustMarkDefault)
 		if desired.Agent.EBPF.Advanced != nil {