Feature: Support for remote Elasticsearch clusters

Author: Navaneeth-pk

app/services/elasticsearch_query_service.rb

@@ -13,10 +13,23 @@ def initialize(data_query, data_source, options, source_options, current_user)
   end
 
   def self.connection options
+
+    scheme = options.dig('scheme', 'value')
+    host = options.dig('host', 'value')
+    port = options.dig('port', 'value')
+    username = options.dig('username', 'value')
+    password = options.dig('password', 'value')
+
+    unless username.blank? || password.blank?
+      url = "#{scheme}://#{username}:#{password}@#{host}:#{port}"
+    else
+      url = "#{scheme}://#{host}:#{port}"
+    end
+    
     client = Elasticsearch::Client.new(
-        url: "#{options.dig('host', 'value')}:#{options.dig('port', 'value')}",
+        url: url,
         retry_on_failure: 5,
-        request_timeout: 30,
+        request_timeout: 15,
         adapter: :typhoeus
     )
 
@@ -71,10 +84,23 @@ def process
 
   private 
     def create_connection
+
+      scheme = source_options['scheme']
+      host = source_options['host']
+      port = source_options['port']
+      username = source_options['username']
+      password = source_options['password']
+
+      unless username.blank? || password.blank?
+        url = "#{scheme}://#{username}:#{password}@#{host}:#{port}"
+      else
+        url = "#{scheme}://#{host}:#{port}"
+      end
+
       connection = Elasticsearch::Client.new(
-        url: "#{source_options['host']}:#{source_options['port']}",
+        url: url,
         retry_on_failure: 5,
-        request_timeout: 30,
+        request_timeout: 15,
         adapter: :typhoeus
       )
 

frontend/src/Editor/DataSourceManager/DefaultOptions.js

@@ -30,6 +30,7 @@ export const defaultOptions = {
   },
 
   elasticsearch: {
+    scheme: { value: 'https' },
     host: { value: 'localhost' },
     port: { value: 9200 },
     username: { value: '' },

frontend/src/Editor/DataSourceManager/SourceComponents/Elasticsearch.jsx

@@ -1,12 +1,31 @@
 import React from 'react';
+import SelectSearch, { fuzzySearch } from 'react-select-search';
 
 export const Elasticsearch = ({
   optionchanged, options
 }) => {
   return (
     <div>
       <div className="row">
-        <div className="col-md-9">
+        <div className="col-md-2 mb-2">
+          <label className="form-label">
+            Scheme
+          </label>
+          <SelectSearch
+              options={[
+                {name: 'http', value: 'http'},
+                {name: 'https', value: 'https'}
+              ]}
+              value={options.scheme.value}
+              search={true}
+              onChange={(value) => {
+                optionchanged('scheme', value);
+              }}
+              filterOptions={fuzzySearch}
+              placeholder="Select.."
+            />
+        </div>
+        <div className="col-md-7">
           <label className="form-label">Host</label>
           <input
             type="text"
@@ -24,6 +43,26 @@ export const Elasticsearch = ({
             value={options.port.value}
           />
         </div>
+        <div className="row mt-3">
+          <div className="col-md-6">
+            <label className="form-label">Username</label>
+            <input
+              type="text"
+              className="form-control"
+              onChange={(e) => optionchanged('username', e.target.value)}
+              value={options.username.value}
+            />
+          </div>
+          <div className="col-md-6">
+            <label className="form-label">Password</label>
+            <input
+              type="text"
+              className="form-control"
+              onChange={(e) => optionchanged('password', e.target.value)}
+              value={options.password.value}
+            />
+          </div>
+        </div>
       </div>
     </div>
   );