Add kind label to metadata; rename owner->workload for user-exposed api

Since these annotations are a user-exposed API, it is preferable to use
a more k8s-standard terminology, ie "workload" instead of "owner".

Author: jotak

internal/pkg/metrics/alerts/builder_test.go

@@ -195,35 +195,37 @@ func TestHealthAnnotationMetadata(t *testing.T) {
 		groupBy                 flowslatest.HealthRuleGroupBy
 		expectedNodeLabels      []string
 		expectedNamespaceLabels []string
-		expectedOwnerLabels     []string
+		expectedWorkloadLabels  []string
+		expectedKindLabels      []string
 	}{
 		{
 			name:                    "Global (no grouping)",
 			groupBy:                 "",
 			expectedNodeLabels:      nil,
 			expectedNamespaceLabels: nil,
-			expectedOwnerLabels:     nil,
+			expectedWorkloadLabels:  nil,
 		},
 		{
 			name:                    "GroupBy Node",
 			groupBy:                 flowslatest.GroupByNode,
 			expectedNodeLabels:      []string{"node"},
 			expectedNamespaceLabels: nil,
-			expectedOwnerLabels:     nil,
+			expectedWorkloadLabels:  nil,
 		},
 		{
 			name:                    "GroupBy Namespace",
 			groupBy:                 flowslatest.GroupByNamespace,
 			expectedNodeLabels:      nil,
 			expectedNamespaceLabels: []string{"namespace"},
-			expectedOwnerLabels:     nil,
+			expectedWorkloadLabels:  nil,
 		},
 		{
 			name:                    "GroupBy Workload",
 			groupBy:                 flowslatest.GroupByWorkload,
 			expectedNodeLabels:      nil,
 			expectedNamespaceLabels: []string{"namespace"},
-			expectedOwnerLabels:     []string{"workload"},
+			expectedWorkloadLabels:  []string{"workload"},
+			expectedKindLabels:      []string{"kind"},
 		},
 	}
 
@@ -247,7 +249,8 @@ func TestHealthAnnotationMetadata(t *testing.T) {
 
 			assert.Equal(t, tt.expectedNodeLabels, ha.NodeLabels, "Expected nodeLabels=%s in annotation for %s", tt.expectedNodeLabels, tt.name)
 			assert.Equal(t, tt.expectedNamespaceLabels, ha.NamespaceLabels, "Expected namespaceLabels=%s in annotation for %s", tt.expectedNamespaceLabels, tt.name)
-			assert.Equal(t, tt.expectedOwnerLabels, ha.OwnerLabels, "Expected ownerLabels=%s in annotation for %s", tt.expectedOwnerLabels, tt.name)
+			assert.Equal(t, tt.expectedWorkloadLabels, ha.WorkloadLabels, "Expected workloadLabels=%s in annotation for %s", tt.expectedWorkloadLabels, tt.name)
+			assert.Equal(t, tt.expectedKindLabels, ha.KindLabels, "Expected kindLabels=%s in annotation for %s", tt.expectedKindLabels, tt.name)
 		})
 	}
 }

internal/pkg/metrics/alerts/context.go

@@ -36,7 +36,8 @@ type healthAnnotation struct {
 	Unit                string               `json:"unit,omitempty"`
 	NodeLabels          []string             `json:"nodeLabels,omitempty"`
 	NamespaceLabels     []string             `json:"namespaceLabels,omitempty"`
-	OwnerLabels         []string             `json:"ownerLabels,omitempty"`
+	WorkloadLabels      []string             `json:"workloadLabels,omitempty"`
+	KindLabels          []string             `json:"kindLabels,omitempty"`
 	TrafficLink         *trafficLink         `json:"trafficLink,omitempty"`
 }
 
@@ -98,7 +99,8 @@ func newHealthAnnotation(ctx *ruleContext) *healthAnnotation {
 		annotation.NamespaceLabels = []string{"namespace"}
 	case flowslatest.GroupByWorkload:
 		annotation.NamespaceLabels = []string{"namespace"}
-		annotation.OwnerLabels = []string{"workload"}
+		annotation.WorkloadLabels = []string{"workload"}
+		annotation.KindLabels = []string{"kind"}
 	}
 	return &annotation
 }