Add support for PDC (#437)

grafana · Oct 31, 2024 · 6cf0ffd · 6cf0ffd
1 parent 926190a
commit 6cf0ffd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/pkg/opensearch/client/client.go b/pkg/opensearch/client/client.go
@@ -606,9 +606,6 @@ func (c *baseClientImpl) ExecutePPLQuery(ctx context.Context, r *PPLRequest) (*P
 			},
 		}
 	}
-	if err != nil {
-		return nil, err
-	}
 	return &pr, nil
 }
 

diff --git a/src/configuration/ConfigEditor.tsx b/src/configuration/ConfigEditor.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { DataSourceHttpSettings } from '@grafana/ui';
+import { DataSourceHttpSettings, SecureSocksProxySettings } from '@grafana/ui';
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
 import { OpenSearchOptions } from '../types';
 import { OpenSearchDetails } from './OpenSearchDetails';
@@ -58,14 +58,18 @@ export const ConfigEditor = (props: Props) => {
         showAccessOptions={true}
         onChange={onOptionsChange}
         sigV4AuthToggleEnabled={config.sigV4AuthEnabled}
-        renderSigV4Editor={<SIGV4ConnectionConfig {...props}/>}
+        renderSigV4Editor={<SIGV4ConnectionConfig {...props} />}
       />
 
+      {config.secureSocksDSProxyEnabled && (
+        <SecureSocksProxySettings options={options} onOptionsChange={onOptionsChange} />
+      )}
+
       <OpenSearchDetails value={options} onChange={onOptionsChange} saveOptions={saveOptions} datasource={datasource} />
 
       <LogsConfig
         value={options.jsonData}
-        onChange={newValue =>
+        onChange={(newValue) =>
           onOptionsChange({
             ...options,
             jsonData: newValue,
@@ -75,7 +79,7 @@ export const ConfigEditor = (props: Props) => {
 
       <DataLinks
         value={options.jsonData.dataLinks}
-        onChange={newValue => {
+        onChange={(newValue) => {
           onOptionsChange({
             ...options,
             jsonData: {
@@ -96,7 +100,7 @@ function useDatasource(props: Props) {
     if (props.options.version) {
       getDataSourceSrv()
         .get(props.options.uid)
-        .then(datasource => {
+        .then((datasource) => {
           if (datasource instanceof OpenSearchDatasource) {
             setDatasource(datasource);
           }

diff --git a/src/types.ts b/src/types.ts
@@ -24,6 +24,7 @@ export interface OpenSearchOptions extends DataSourceJsonData {
   pplEnabled?: boolean;
   sigV4Auth?: boolean;
   serverless?: boolean;
+  enableSecureSocksProxy?: boolean;
 }
 
 interface MetricConfiguration<T extends MetricAggregationType> {
-Original file line number
+Diff line change
@@ Expand Up @@
     			},
     		}
     	}
-    	if err != nil {
-    		return nil, err
-    	}
     	return &pr, nil
     }
@@ Expand Down @@