Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NETOBSERV-927 Improve servicemonitor/prometheusrule checking changes … #302

Merged
merged 2 commits into from
Mar 22, 2023
Merged

NETOBSERV-927 Improve servicemonitor/prometheusrule checking changes … #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e946c01
NETOBSERV-927 Improve servicemonitor/prometheusrule checking changes …
jotak Mar 15, 2023
12a5ac4
Check labels change, add labels to SM
jotak Mar 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions controllers/flowlogspipeline/flp_common_objects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,7 @@ func (b *builder) serviceMonitor() *monitoringv1.ServiceMonitor {
ObjectMeta: metav1.ObjectMeta{
Name: b.serviceMonitorName(),
Namespace: b.namespace,
Labels: b.labels,
},
Spec: monitoringv1.ServiceMonitorSpec{
Endpoints: []monitoringv1.Endpoint{
Expand Down
29 changes: 22 additions & 7 deletions controllers/flowlogspipeline/flp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ var resources = corev1.ResourceRequirements{
},
}
var image = "quay.io/netobserv/flowlogs-pipeline:dev"
var image2 = "quay.io/netobserv/flowlogs-pipeline:dev2"
var pullPolicy = corev1.PullIfNotPresent
var minReplicas = int32(1)
var maxReplicas = int32(5)
Expand Down Expand Up @@ -494,13 +495,20 @@ func TestServiceMonitorChanged(t *testing.T) {
first := b.generic.serviceMonitor()

// Check namespace change
cfg.Processor.Metrics.Server.Port = 9999
b = newMonolithBuilder("namespace2", image, &cfg, true, &certWatcher)
second := b.generic.serviceMonitor()

report := helper.NewChangeReport("")
assert.True(helper.ServiceMonitorChanged(first, second, &report))
assert.Contains(report.String(), "ServiceMonitor meta changed")
assert.Contains(report.String(), "ServiceMonitor spec changed")

// Check labels change
b = newMonolithBuilder("namespace2", image2, &cfg, true, &certWatcher)
third := b.generic.serviceMonitor()

report = helper.NewChangeReport("")
assert.True(helper.ServiceMonitorChanged(second, third, &report))
assert.Contains(report.String(), "ServiceMonitor labels changed")
}

func TestPrometheusRuleNoChange(t *testing.T) {
Expand All @@ -524,19 +532,26 @@ func TestPrometheusRuleChanged(t *testing.T) {
assert := assert.New(t)

// Get first
ns := "namespace"
cfg := getConfig()
b := newMonolithBuilder(ns, image, &cfg, true, &certWatcher)
b := newMonolithBuilder("namespace", image, &cfg, true, &certWatcher)
first := b.generic.prometheusRule()

// Check namespace change
cfg.Processor.Metrics.Server.Port = 9999
b = newMonolithBuilder("namespace2", image, &cfg, true, &certWatcher)
cfg.Processor.Metrics.DisableAlerts = []flowslatest.FLPAlert{flowslatest.AlertNoFlows}
b = newMonolithBuilder("namespace", image, &cfg, true, &certWatcher)
second := b.generic.prometheusRule()

report := helper.NewChangeReport("")
assert.True(helper.PrometheusRuleChanged(first, second, &report))
assert.Contains(report.String(), "PrometheusRule meta changed")
assert.Contains(report.String(), "PrometheusRule spec changed")

// Check labels change
b = newMonolithBuilder("namespace2", image2, &cfg, true, &certWatcher)
third := b.generic.prometheusRule()

report = helper.NewChangeReport("")
assert.True(helper.PrometheusRuleChanged(second, third, &report))
assert.Contains(report.String(), "PrometheusRule labels changed")
}

func TestConfigMapShouldDeserializeAsJSON(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions pkg/helper/comparators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ func ServiceChanged(old, new *corev1.Service, report *ChangeReport) bool {
}

func ServiceMonitorChanged(old, new *monitoringv1.ServiceMonitor, report *ChangeReport) bool {
return report.Check("ServiceMonitor meta changed", !equality.Semantic.DeepDerivative(new.ObjectMeta, old.ObjectMeta)) ||
report.Check("ServiceMonitor spec changed", !equality.Semantic.DeepDerivative(new.Spec, old.Spec))
return report.Check("ServiceMonitor spec changed", !equality.Semantic.DeepDerivative(new.Spec, old.Spec)) ||
report.Check("ServiceMonitor labels changed", !IsSubSet(old.Labels, new.Labels))
}

func PrometheusRuleChanged(old, new *monitoringv1.PrometheusRule, report *ChangeReport) bool {
return report.Check("PrometheusRule meta changed", !equality.Semantic.DeepDerivative(new.ObjectMeta, old.ObjectMeta)) ||
report.Check("PrometheusRule spec changed", !equality.Semantic.DeepDerivative(new.Spec, old.Spec))
return report.Check("PrometheusRule spec changed", !equality.Semantic.DeepDerivative(new.Spec, old.Spec)) ||
report.Check("PrometheusRule labels changed", !IsSubSet(old.Labels, new.Labels))
}

// FindContainer searches in pod containers one that matches the provided name
Expand Down