Fix ScrapeConfigs for CustomMonitoringStack

openstack-k8s-operators · Jul 15, 2024 · 2683248 · 2683248
1 parent 5331c64
commit 2683248
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/metricstorage/scrape_config.go b/pkg/metricstorage/scrape_config.go
@@ -37,7 +37,10 @@ func ScrapeConfig(
 	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