Merge pull request #489 from agrare/fix_prometheus_proxy_host

Fryguy · Fryguy · commit 16e6bf3a7f70 · 2024-03-05T16:32:04.000-05:00
Fix prometheus http_proxy_uri host (cherry picked from commit 769fc9b)
diff --git a/app/models/manageiq/providers/ibm_cloud/container_manager.rb b/app/models/manageiq/providers/ibm_cloud/container_manager.rb
@@ -101,8 +101,9 @@ def self.prometheus_connect(hostname, port, options)
     }
     ssl_options = options[:ssl_options] || {:verify_ssl => OpenSSL::SSL::VERIFY_NONE}
 
+    http_proxy_uri = options[:http_proxy] || VMDB::Util.http_proxy_uri.to_s
     prometheus_options = {
-      :http_proxy_uri => options[:http_proxy] || VMDB::Util.http_proxy_uri.to_s,
+      :http_proxy_uri => http_proxy_uri.presence,
       :verify_ssl     => ssl_options[:verify_ssl],
       :ssl_cert_store => ssl_options[:ca_file],
     }

Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,9 @@ def self.prometheus_connect(hostname, port, options)`
`101`	`101`	`}`
`102`	`102`	`ssl_options = options[:ssl_options] \|\| {:verify_ssl => OpenSSL::SSL::VERIFY_NONE}`
`103`	`103`
	`104`	`+ http_proxy_uri = options[:http_proxy] \|\| VMDB::Util.http_proxy_uri.to_s`
`104`	`105`	`prometheus_options = {`
`105`		`- :http_proxy_uri => options[:http_proxy] \|\| VMDB::Util.http_proxy_uri.to_s,`
	`106`	`+ :http_proxy_uri => http_proxy_uri.presence,`
`106`	`107`	`:verify_ssl => ssl_options[:verify_ssl],`
`107`	`108`	`:ssl_cert_store => ssl_options[:ca_file],`
`108`	`109`	`}`