Add allowed cookies field in the druid datasource

Spikatrix · Spikatrix · commit 8b9b400412ec · 2024-01-08T12:18:58.000Z
diff --git a/public/app/plugins/datasource/grafadruid-druid-datasource/ConfigEditor.tsx b/public/app/plugins/datasource/grafadruid-druid-datasource/ConfigEditor.tsx
@@ -57,9 +57,9 @@ export class ConfigEditor extends PureComponent<Props, State> {
 
   onConnectionOptionsChange = (connectionSettingsOptions: ConnectionSettingsOptions) => {
     const { options, onOptionsChange } = this.props;
-    const { settings, secretSettings, secretSettingsFields } = connectionSettingsOptions;
+    const { settings, secretSettings, secretSettingsFields, jsonData: connectionJsonData } = connectionSettingsOptions;
     const connectionSettings = this.normalizeData(settings, true, 'connection');
-    const jsonData = { ...options.jsonData, ...connectionSettings };
+    const jsonData = { ...options.jsonData, ...connectionSettings, ...connectionJsonData };
     const connectionSecretSettings = this.normalizeData(secretSettings, true, 'connection');
     const secureJsonData = { ...options.secureJsonData, ...connectionSecretSettings };
     const connectionSecretSettingsFields = this.normalizeData(
@@ -85,6 +85,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
       settings: this.normalizeData(jsonData, false, 'connection'),
       secretSettings: this.normalizeData(secureJsonData || {}, false, 'connection'),
       secretSettingsFields: this.normalizeData(secureJsonFields || {}, false, 'connection') as KeyValue<boolean>,
+      jsonData: { keepCookies: (jsonData as ConnectionSettingsOptions['jsonData'])?.keepCookies || [] },
     };
   };
 
diff --git a/public/app/plugins/datasource/grafadruid-druid-datasource/configuration/ConnectionSettings/DruidHttpSettings.tsx b/public/app/plugins/datasource/grafadruid-druid-datasource/configuration/ConnectionSettings/DruidHttpSettings.tsx
@@ -1,7 +1,7 @@
 import { css } from '@emotion/css';
 import React, { ChangeEvent } from 'react';
 
-import { LegacyForms, FieldSet, Field, Switch } from '@grafana/ui';
+import { LegacyForms, FieldSet, Field, Switch, TagsInput, InlineFormLabel } from '@grafana/ui';
 
 import { ConnectionSettingsProps } from './types';
 
@@ -92,6 +92,19 @@ export const DruidHttpSettings = (props: ConnectionSettingsProps) => {
           <Switch value={settings.skipTls} name="skipTls" onChange={onSettingChange} />
         </Field>
       )}
+      <div className="gf-form">
+        <InlineFormLabel
+          width={11}
+          tooltip="Grafana proxy deletes forwarded cookies by default. Specify cookies by name that should be forwarded to the data source."
+        >
+          Allowed cookies
+        </InlineFormLabel>
+        <TagsInput
+          tags={options.jsonData?.keepCookies || []}
+          width={40}
+          onChange={(cookies) => onOptionsChange({ ...options, jsonData: { keepCookies: cookies } })}
+        />
+      </div>
     </FieldSet>
   );
 };
diff --git a/public/app/plugins/datasource/grafadruid-druid-datasource/configuration/ConnectionSettings/types.ts b/public/app/plugins/datasource/grafadruid-druid-datasource/configuration/ConnectionSettings/types.ts
@@ -16,6 +16,9 @@ export interface ConnectionSettingsOptions {
   settings: ConnectionSettings;
   secretSettings: ConnectionSecretSettings;
   secretSettingsFields: KeyValue<boolean>;
+  jsonData?: {
+    keepCookies?: string[];
+  },
 }
 
 export interface ConnectionSettingsProps {

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ export interface ConnectionSettingsOptions {`
`16`	`16`	`settings: ConnectionSettings;`
`17`	`17`	`secretSettings: ConnectionSecretSettings;`
`18`	`18`	`secretSettingsFields: KeyValue<boolean>;`
	`19`	`+ jsonData?: {`
	`20`	`+ keepCookies?: string[];`
	`21`	`+ },`
`19`	`22`	`}`
`20`	`23`
`21`	`24`	`export interface ConnectionSettingsProps {`