Merge pull request #4833 from jijotj/main

opsgenie-config: optimise warning log message during sanitize
prometheus-operator · Jun 3, 2022 · c98a043 · c98a043
2 parents 5db6996 + 4b855ea
commit c98a043
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/alertmanager/amcfg.go b/pkg/alertmanager/amcfg.go
@@ -1463,7 +1463,7 @@ func (ogc *opsgenieConfig) sanitize(amVersion semver.Version, logger log.Logger)
 		}
 	}
 
-	if ogc.APIKey != "" {
+	if ogc.APIKey != "" && ogc.APIKeyFile != "" {
 		level.Warn(logger).Log("msg", "'api_key' and 'api_key_file' are mutually exclusive for OpsGenie receiver config - 'api_key' has taken precedence")
 		ogc.APIKeyFile = ""
 	}