-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
operator: Add namespace and tenantId labels to RecordingRules (#9971)
Co-authored-by: Periklis Tsirakidis <periklis@redhat.com>
- Loading branch information
Showing
12 changed files
with
293 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
195 changes: 195 additions & 0 deletions
195
operator/internal/manifests/openshift/recordingrule_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
| package openshift | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" | ||
| "github.com/stretchr/testify/require" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| func TestRecordingRuleTenantLabels(t *testing.T) { | ||
| tt := []struct { | ||
| rule *lokiv1.RecordingRule | ||
| want *lokiv1.RecordingRule | ||
| }{ | ||
| { | ||
| rule: &lokiv1.RecordingRule{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: "test-ns", | ||
| }, | ||
| Spec: lokiv1.RecordingRuleSpec{ | ||
| TenantID: tenantApplication, | ||
| Groups: []*lokiv1.RecordingRuleGroup{ | ||
| { | ||
| Name: "test-group", | ||
| Rules: []*lokiv1.RecordingRuleGroupSpec{ | ||
| { | ||
| Record: "record", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| want: &lokiv1.RecordingRule{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: "test-ns", | ||
| }, | ||
| Spec: lokiv1.RecordingRuleSpec{ | ||
| TenantID: tenantApplication, | ||
| Groups: []*lokiv1.RecordingRuleGroup{ | ||
| { | ||
| Name: "test-group", | ||
| Rules: []*lokiv1.RecordingRuleGroupSpec{ | ||
| { | ||
| Record: "record", | ||
| Labels: map[string]string{ | ||
| opaDefaultLabelMatcher: "test-ns", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| rule: &lokiv1.RecordingRule{ | ||
| Spec: lokiv1.RecordingRuleSpec{ | ||
| TenantID: tenantInfrastructure, | ||
| Groups: []*lokiv1.RecordingRuleGroup{ | ||
| { | ||
| Name: "test-group", | ||
| Rules: []*lokiv1.RecordingRuleGroupSpec{ | ||
| { | ||
| Record: "record", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| want: &lokiv1.RecordingRule{ | ||
| Spec: lokiv1.RecordingRuleSpec{ | ||
| TenantID: tenantInfrastructure, | ||
| Groups: []*lokiv1.RecordingRuleGroup{ | ||
| { | ||
| Name: "test-group", | ||
| Rules: []*lokiv1.RecordingRuleGroupSpec{ | ||
| { | ||
| Record: "record", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| rule: &lokiv1.RecordingRule{ | ||
| Spec: lokiv1.RecordingRuleSpec{ | ||
| TenantID: tenantAudit, | ||
| Groups: []*lokiv1.RecordingRuleGroup{ | ||
| { | ||
| Name: "test-group", | ||
| Rules: []*lokiv1.RecordingRuleGroupSpec{ | ||
| { | ||
| Record: "record", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| want: &lokiv1.RecordingRule{ | ||
| Spec: lokiv1.RecordingRuleSpec{ | ||
| TenantID: tenantAudit, | ||
| Groups: []*lokiv1.RecordingRuleGroup{ | ||
| { | ||
| Name: "test-group", | ||
| Rules: []*lokiv1.RecordingRuleGroupSpec{ | ||
| { | ||
| Record: "record", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| rule: &lokiv1.RecordingRule{ | ||
| Spec: lokiv1.RecordingRuleSpec{ | ||
| TenantID: tenantNetwork, | ||
| Groups: []*lokiv1.RecordingRuleGroup{ | ||
| { | ||
| Name: "test-group", | ||
| Rules: []*lokiv1.RecordingRuleGroupSpec{ | ||
| { | ||
| Record: "record", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| want: &lokiv1.RecordingRule{ | ||
| Spec: lokiv1.RecordingRuleSpec{ | ||
| TenantID: tenantNetwork, | ||
| Groups: []*lokiv1.RecordingRuleGroup{ | ||
| { | ||
| Name: "test-group", | ||
| Rules: []*lokiv1.RecordingRuleGroupSpec{ | ||
| { | ||
| Record: "record", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| rule: &lokiv1.RecordingRule{ | ||
| Spec: lokiv1.RecordingRuleSpec{ | ||
| TenantID: "unknown", | ||
| Groups: []*lokiv1.RecordingRuleGroup{ | ||
| { | ||
| Name: "test-group", | ||
| Rules: []*lokiv1.RecordingRuleGroupSpec{ | ||
| { | ||
| Record: "record", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| want: &lokiv1.RecordingRule{ | ||
| Spec: lokiv1.RecordingRuleSpec{ | ||
| TenantID: "unknown", | ||
| Groups: []*lokiv1.RecordingRuleGroup{ | ||
| { | ||
| Name: "test-group", | ||
| Rules: []*lokiv1.RecordingRuleGroupSpec{ | ||
| { | ||
| Record: "record", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| for _, tc := range tt { | ||
| tc := tc | ||
| t.Run(tc.rule.Spec.TenantID, func(t *testing.T) { | ||
| t.Parallel() | ||
| RecordingRuleTenantLabels(tc.rule) | ||
|
|
||
| require.Equal(t, tc.want, tc.rule) | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package openshift | ||
|
|
||
| import lokiv1 "github.com/grafana/loki/operator/apis/loki/v1" | ||
|
|
||
| func RecordingRuleTenantLabels(r *lokiv1.RecordingRule) { | ||
| switch r.Spec.TenantID { | ||
| case tenantApplication: | ||
| for groupIdx, group := range r.Spec.Groups { | ||
| group := group | ||
| for ruleIdx, rule := range group.Rules { | ||
| rule := rule | ||
| if rule.Labels == nil { | ||
| rule.Labels = map[string]string{} | ||
| } | ||
| rule.Labels[opaDefaultLabelMatcher] = r.Namespace | ||
| group.Rules[ruleIdx] = rule | ||
| } | ||
| r.Spec.Groups[groupIdx] = group | ||
| } | ||
| case tenantInfrastructure, tenantAudit: | ||
| // Do nothing | ||
| case tenantNetwork: | ||
| // Do nothing | ||
| default: | ||
| // Do nothing | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters