Skip to content

Commit 01fcd5f

Browse files
jotakjotak
committed
Use existing workload family for network labels
1 parent 491e670 commit 01fcd5f

File tree

6 files changed

+25
-131
lines changed

6 files changed

+25
-131
lines changed

‎api/flowcollector/v1beta2/flowcollector_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ type MetricsServerConfig struct {
564564
}
565565

566566
// Metric name. More information in https://github.com/netobserv/network-observability-operator/blob/main/docs/Metrics.md.
567-
// +kubebuilder:validation:Enum:="namespace_egress_bytes_total";"namespace_egress_packets_total";"namespace_ingress_bytes_total";"namespace_ingress_packets_total";"namespace_flows_total";"node_egress_bytes_total";"node_egress_packets_total";"node_ingress_bytes_total";"node_ingress_packets_total";"node_flows_total";"workload_egress_bytes_total";"workload_egress_packets_total";"workload_ingress_bytes_total";"workload_ingress_packets_total";"workload_flows_total";"network_egress_bytes_total";"network_egress_packets_total";"network_ingress_bytes_total";"network_ingress_packets_total";"network_flows_total";"namespace_drop_bytes_total";"namespace_drop_packets_total";"node_drop_bytes_total";"node_drop_packets_total";"workload_drop_bytes_total";"workload_drop_packets_total";"network_drop_bytes_total";"network_drop_packets_total";"namespace_rtt_seconds";"node_rtt_seconds";"workload_rtt_seconds";"network_rtt_seconds";"namespace_dns_latency_seconds";"node_dns_latency_seconds";"workload_dns_latency_seconds";"network_dns_latency_seconds";"node_network_policy_events_total";"namespace_network_policy_events_total";"workload_network_policy_events_total";"node_ipsec_flows_total";"workload_ipsec_flows_total";"network_ipsec_flows_total";"node_to_node_ingress_flows_total"
567+
// +kubebuilder:validation:Enum:="namespace_egress_bytes_total";"namespace_egress_packets_total";"namespace_ingress_bytes_total";"namespace_ingress_packets_total";"namespace_flows_total";"node_egress_bytes_total";"node_egress_packets_total";"node_ingress_bytes_total";"node_ingress_packets_total";"node_flows_total";"workload_egress_bytes_total";"workload_egress_packets_total";"workload_ingress_bytes_total";"workload_ingress_packets_total";"workload_flows_total";"namespace_drop_bytes_total";"namespace_drop_packets_total";"node_drop_bytes_total";"node_drop_packets_total";"workload_drop_bytes_total";"workload_drop_packets_total";"namespace_rtt_seconds";"node_rtt_seconds";"workload_rtt_seconds";"namespace_dns_latency_seconds";"node_dns_latency_seconds";"workload_dns_latency_seconds";"node_network_policy_events_total";"namespace_network_policy_events_total";"workload_network_policy_events_total";"node_ipsec_flows_total";"namespace_ipsec_flows_total";"workload_ipsec_flows_total";"node_to_node_ingress_flows_total"
568568
type FLPMetric string
569569

570570
// `FLPMetrics` define the desired FLP configuration regarding metrics

‎bundle/manifests/flows.netobserv.io_flowcollectors.yaml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5978,33 +5978,24 @@ spec:
59785978
- workload_ingress_bytes_total
59795979
- workload_ingress_packets_total
59805980
- workload_flows_total
5981-
- network_egress_bytes_total
5982-
- network_egress_packets_total
5983-
- network_ingress_bytes_total
5984-
- network_ingress_packets_total
5985-
- network_flows_total
59865981
- namespace_drop_bytes_total
59875982
- namespace_drop_packets_total
59885983
- node_drop_bytes_total
59895984
- node_drop_packets_total
59905985
- workload_drop_bytes_total
59915986
- workload_drop_packets_total
5992-
- network_drop_bytes_total
5993-
- network_drop_packets_total
59945987
- namespace_rtt_seconds
59955988
- node_rtt_seconds
59965989
- workload_rtt_seconds
5997-
- network_rtt_seconds
59985990
- namespace_dns_latency_seconds
59995991
- node_dns_latency_seconds
60005992
- workload_dns_latency_seconds
6001-
- network_dns_latency_seconds
60025993
- node_network_policy_events_total
60035994
- namespace_network_policy_events_total
60045995
- workload_network_policy_events_total
60055996
- node_ipsec_flows_total
5997+
- namespace_ipsec_flows_total
60065998
- workload_ipsec_flows_total
6007-
- network_ipsec_flows_total
60085999
- node_to_node_ingress_flows_total
60096000
type: string
60106001
type: array

‎config/crd/bases/flows.netobserv.io_flowcollectors.yaml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5530,33 +5530,24 @@ spec:
55305530
- workload_ingress_bytes_total
55315531
- workload_ingress_packets_total
55325532
- workload_flows_total
5533-
- network_egress_bytes_total
5534-
- network_egress_packets_total
5535-
- network_ingress_bytes_total
5536-
- network_ingress_packets_total
5537-
- network_flows_total
55385533
- namespace_drop_bytes_total
55395534
- namespace_drop_packets_total
55405535
- node_drop_bytes_total
55415536
- node_drop_packets_total
55425537
- workload_drop_bytes_total
55435538
- workload_drop_packets_total
5544-
- network_drop_bytes_total
5545-
- network_drop_packets_total
55465539
- namespace_rtt_seconds
55475540
- node_rtt_seconds
55485541
- workload_rtt_seconds
5549-
- network_rtt_seconds
55505542
- namespace_dns_latency_seconds
55515543
- node_dns_latency_seconds
55525544
- workload_dns_latency_seconds
5553-
- network_dns_latency_seconds
55545545
- node_network_policy_events_total
55555546
- namespace_network_policy_events_total
55565547
- workload_network_policy_events_total
55575548
- node_ipsec_flows_total
5549+
- namespace_ipsec_flows_total
55585550
- workload_ipsec_flows_total
5559-
- network_ipsec_flows_total
55605551
- node_to_node_ingress_flows_total
55615552
type: string
55625553
type: array

‎helm/crds/flows.netobserv.io_flowcollectors.yaml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5534,33 +5534,24 @@ spec:
55345534
- workload_ingress_bytes_total
55355535
- workload_ingress_packets_total
55365536
- workload_flows_total
5537-
- network_egress_bytes_total
5538-
- network_egress_packets_total
5539-
- network_ingress_bytes_total
5540-
- network_ingress_packets_total
5541-
- network_flows_total
55425537
- namespace_drop_bytes_total
55435538
- namespace_drop_packets_total
55445539
- node_drop_bytes_total
55455540
- node_drop_packets_total
55465541
- workload_drop_bytes_total
55475542
- workload_drop_packets_total
5548-
- network_drop_bytes_total
5549-
- network_drop_packets_total
55505543
- namespace_rtt_seconds
55515544
- node_rtt_seconds
55525545
- workload_rtt_seconds
5553-
- network_rtt_seconds
55545546
- namespace_dns_latency_seconds
55555547
- node_dns_latency_seconds
55565548
- workload_dns_latency_seconds
5557-
- network_dns_latency_seconds
55585549
- node_network_policy_events_total
55595550
- namespace_network_policy_events_total
55605551
- workload_network_policy_events_total
55615552
- node_ipsec_flows_total
5553+
- namespace_ipsec_flows_total
55625554
- workload_ipsec_flows_total
5563-
- network_ipsec_flows_total
55645555
- node_to_node_ingress_flows_total
55655556
type: string
55665557
type: array

‎internal/pkg/metrics/predefined_metrics.go‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ const (
1414
tagNamespaces = "namespaces"
1515
tagNodes = "nodes"
1616
tagWorkloads = "workloads"
17-
tagNetworks = "networks"
18-
tagIngress = "ingress"
19-
tagEgress = "egress"
2017
tagBytes = "bytes"
2118
tagPackets = "packets"
2219
)
@@ -26,8 +23,7 @@ var (
2623
mapLabels = map[string][]string{
2724
tagNodes: {"K8S_ClusterName", "SrcK8S_Zone", "DstK8S_Zone", "SrcK8S_HostName", "DstK8S_HostName"},
2825
tagNamespaces: {"K8S_ClusterName", "SrcK8S_Zone", "DstK8S_Zone", "SrcK8S_Namespace", "DstK8S_Namespace", "K8S_FlowLayer", "SrcSubnetLabel", "DstSubnetLabel"},
29-
tagWorkloads: {"K8S_ClusterName", "SrcK8S_Zone", "DstK8S_Zone", "SrcK8S_Namespace", "DstK8S_Namespace", "K8S_FlowLayer", "SrcSubnetLabel", "DstSubnetLabel", "SrcK8S_OwnerName", "DstK8S_OwnerName", "SrcK8S_OwnerType", "DstK8S_OwnerType", "SrcK8S_Type", "DstK8S_Type"},
30-
tagNetworks: {"K8S_ClusterName", "SrcK8S_Zone", "DstK8S_Zone", "SrcK8S_NetworkName", "DstK8S_NetworkName", "K8S_FlowLayer"},
26+
tagWorkloads: {"K8S_ClusterName", "SrcK8S_Zone", "DstK8S_Zone", "SrcK8S_Namespace", "DstK8S_Namespace", "K8S_FlowLayer", "SrcSubnetLabel", "DstSubnetLabel", "SrcK8S_NetworkName", "DstK8S_NetworkName", "SrcK8S_OwnerName", "DstK8S_OwnerName", "SrcK8S_OwnerType", "DstK8S_OwnerType", "SrcK8S_Type", "DstK8S_Type"},
3127
}
3228
mapValueFields = map[string]string{
3329
tagBytes: "Bytes",
@@ -46,7 +42,7 @@ type taggedMetricDefinition struct {
4642
}
4743

4844
func init() {
49-
for _, group := range []string{tagNodes, tagNamespaces, tagWorkloads, tagNetworks} {
45+
for _, group := range []string{tagNodes, tagNamespaces, tagWorkloads} {
5046
groupTrimmed := strings.TrimSuffix(group, "s")
5147
labels := mapLabels[group]
5248
// Bytes / packets metrics
@@ -90,7 +86,7 @@ func init() {
9086
tags: []string{group, group + "-flows", "flows"},
9187
})
9288
}
93-
for _, group := range []string{tagNodes, tagNamespaces, tagWorkloads, tagNetworks} {
89+
for _, group := range []string{tagNodes, tagNamespaces, tagWorkloads} {
9490
groupTrimmed := strings.TrimSuffix(group, "s")
9591
labels := mapLabels[group]
9692
// RTT metrics
@@ -111,7 +107,7 @@ func init() {
111107
tags: []string{group, "rtt"},
112108
})
113109
}
114-
for _, group := range []string{tagNodes, tagNamespaces, tagWorkloads, tagNetworks} {
110+
for _, group := range []string{tagNodes, tagNamespaces, tagWorkloads} {
115111
groupTrimmed := strings.TrimSuffix(group, "s")
116112
labels := mapLabels[group]
117113
// Drops metrics
@@ -146,7 +142,7 @@ func init() {
146142
tags: []string{group, tagBytes, "drop"},
147143
})
148144
}
149-
for _, group := range []string{tagNodes, tagNamespaces, tagWorkloads, tagNetworks} {
145+
for _, group := range []string{tagNodes, tagNamespaces, tagWorkloads} {
150146
groupTrimmed := strings.TrimSuffix(group, "s")
151147
labels := mapLabels[group]
152148
// DNS metrics
@@ -170,7 +166,7 @@ func init() {
170166
})
171167
}
172168

173-
for _, group := range []string{tagNodes, tagNamespaces, tagWorkloads, tagNetworks} {
169+
for _, group := range []string{tagNodes, tagNamespaces, tagWorkloads} {
174170
groupTrimmed := strings.TrimSuffix(group, "s")
175171
labels := mapLabels[group]
176172
// Netpol metrics
@@ -197,7 +193,7 @@ func init() {
197193
})
198194
}
199195

200-
for _, group := range []string{tagNodes, tagNamespaces, tagWorkloads, tagNetworks} {
196+
for _, group := range []string{tagNodes, tagNamespaces, tagWorkloads} {
201197
groupTrimmed := strings.TrimSuffix(group, "s")
202198
labels := mapLabels[group]
203199
// IPSEC

0 commit comments

Comments
 (0)