Skip to content

Add allowed cookies field in druid datasource settings #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 8, 2024
Merged

Add allowed cookies field in druid datasource settings #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions public/app/plugins/datasource/grafadruid-druid-datasource/ConfigEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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 || [] },
};
};

Expand Down
15 changes: 14 additions & 1 deletion ...source/grafadruid-druid-datasource/configuration/ConnectionSettings/DruidHttpSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -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>
);
};
3 changes: 3 additions & 0 deletions .../plugins/datasource/grafadruid-druid-datasource/configuration/ConnectionSettings/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ export interface ConnectionSettingsOptions {
settings: ConnectionSettings;
secretSettings: ConnectionSecretSettings;
secretSettingsFields: KeyValue<boolean>;
jsonData?: {
keepCookies?: string[];
},
}

export interface ConnectionSettingsProps {
Expand Down