Add latest changes from gitlab-org/gitlab@master

2 files changed, 70 insertions, 0 deletions

diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb
index eaf94708282..9085835dee6 100644
--- a/lib/google_api/cloud_platform/client.rb
+++ b/lib/google_api/cloud_platform/client.rb
@@ -96,6 +96,9 @@ module GoogleApi
             legacy_abac: {
               enabled: legacy_abac
             },
+            ip_allocation_policy: {
+              use_ip_aliases: true
+            },
             addons_config: enable_addons.each_with_object({}) do |addon, hash|
               hash[addon] = { disabled: false }
             end
diff --git a/lib/grafana/client.rb b/lib/grafana/client.rb
new file mode 100644
index 00000000000..0765630f9bb
--- /dev/null
+++ b/lib/grafana/client.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Grafana
+  class Client
+    Error = Class.new(StandardError)
+
+    # @param api_url [String] Base URL of the Grafana instance
+    # @param token [String] Admin-level API token for instance
+    def initialize(api_url:, token:)
+      @api_url = api_url
+      @token = token
+    end
+
+    # @param datasource_id [String] Grafana ID for the datasource
+    # @param proxy_path [String] Path to proxy - ex) 'api/v1/query_range'
+    def proxy_datasource(datasource_id:, proxy_path:, query: {})
+      http_get("#{@api_url}/api/datasources/proxy/#{datasource_id}/#{proxy_path}", query: query)
+    end
+
+    private
+
+    def http_get(url, params = {})
+      response = handle_request_exceptions do
+        Gitlab::HTTP.get(url, **request_params.merge(params))
+      end
+
+      handle_response(response)
+    end
+
+    def request_params
+      {
+        headers: {
+          'Authorization' => "Bearer #{@token}",
+          'Accept' => 'application/json',
+          'Content-Type' => 'application/json'
+        },
+        follow_redirects: false
+      }
+    end
+
+    def handle_request_exceptions
+      yield
+    rescue Gitlab::HTTP::Error
+      raise_error 'Error when connecting to Grafana'
+    rescue Net::OpenTimeout
+      raise_error 'Connection to Grafana timed out'
+    rescue SocketError
+      raise_error 'Received SocketError when trying to connect to Grafana'
+    rescue OpenSSL::SSL::SSLError
+      raise_error 'Grafana returned invalid SSL data'
+    rescue Errno::ECONNREFUSED
+      raise_error 'Connection refused'
+    rescue => e
+      raise_error "Grafana request failed due to #{e.class}"
+    end
+
+    def handle_response(response)
+      return response if response.code == 200
+
+      raise_error "Grafana response status code: #{response.code}"
+    end
+
+    def raise_error(message)
+      raise Client::Error, message
+    end
+  end
+end