Merge pull request #429 from vyzigold/fix_scrapeinterval

[OSPRH-8074] Fix panic when missing ScrapeInterval
openstack-k8s-operators · Jul 5, 2024 · a5011b4 · a5011b4
2 parents 3c3fb82 + 22ea660
commit a5011b4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/metricstorage/service_monitor.go b/pkg/metricstorage/service_monitor.go
@@ -36,7 +36,10 @@ func ServiceMonitor(
 	var scrapeInterval monv1.Duration
 	if instance.Spec.MonitoringStack != nil && instance.Spec.MonitoringStack.ScrapeInterval != "" {
 		scrapeInterval = monv1.Duration(instance.Spec.MonitoringStack.ScrapeInterval)
-	} else if instance.Spec.CustomMonitoringStack != nil && *instance.Spec.CustomMonitoringStack.PrometheusConfig.ScrapeInterval != monv1.Duration("") {
+	} else if instance.Spec.CustomMonitoringStack != nil &&
+		instance.Spec.CustomMonitoringStack.PrometheusConfig != nil &&
+		instance.Spec.CustomMonitoringStack.PrometheusConfig.ScrapeInterval != nil &&
+		*instance.Spec.CustomMonitoringStack.PrometheusConfig.ScrapeInterval != monv1.Duration("") {
 		scrapeInterval = *instance.Spec.CustomMonitoringStack.PrometheusConfig.ScrapeInterval
 	} else {
 		scrapeInterval = telemetryv1.DefaultScrapeInterval