diff --git a/docs/settings/reporting-settings.asciidoc b/docs/settings/reporting-settings.asciidoc index 49aa22de9fd35..b43f3b268e438 100644 --- a/docs/settings/reporting-settings.asciidoc +++ b/docs/settings/reporting-settings.asciidoc @@ -302,11 +302,5 @@ Enables a check that warns you when there's a potential formula included in the `xpack.reporting.csv.escapeFormulaValues`:: Escape formula values in cells with a `'`. See OWASP: https://www.owasp.org/index.php/CSV_Injection. Defaults to `true`. -`xpack.reporting.csv.enablePanelActionDownload`:: -deprecated:[8.14.0,This setting will be removed in an upcoming version of {kib}.] When `true`, this -setting enables a deprecated feature which allows users to download a CSV export from a saved search -panel on a dashboard. When `false`, users can generate regular CSV reports from a saved search panel on a -dashboard and later download them in *Stack Management > Reporting*. Defaults to `false`. - `xpack.reporting.csv.useByteOrderMarkEncoding`:: Adds a byte order mark (`\ufeff`) at the beginning of the CSV file. Defaults to `false`. diff --git a/packages/kbn-generate-csv/src/generate_csv.test.ts b/packages/kbn-generate-csv/src/generate_csv.test.ts index f39cf51352a58..e2999b63088d3 100644 --- a/packages/kbn-generate-csv/src/generate_csv.test.ts +++ b/packages/kbn-generate-csv/src/generate_csv.test.ts @@ -47,7 +47,6 @@ const getMockConfig = (opts: Partial = {}): CsvConfigType => ({ maxSizeBytes: 180000, useByteOrderMarkEncoding: false, scroll: { size: 500, duration: '30s', strategy: 'pit' }, - enablePanelActionDownload: false, maxConcurrentShardRequests: 5, ...opts, }); diff --git a/packages/kbn-generate-csv/src/generate_csv_esql.test.ts b/packages/kbn-generate-csv/src/generate_csv_esql.test.ts index 9ae0b2b711c19..d2ee8e8345438 100644 --- a/packages/kbn-generate-csv/src/generate_csv_esql.test.ts +++ b/packages/kbn-generate-csv/src/generate_csv_esql.test.ts @@ -98,7 +98,6 @@ describe('CsvESQLGenerator', () => { maxSizeBytes: 180000, useByteOrderMarkEncoding: false, scroll: { size: 500, duration: '30s', strategy: 'pit' }, - enablePanelActionDownload: false, maxConcurrentShardRequests: 5, }; @@ -569,7 +568,6 @@ describe('CsvESQLGenerator', () => { maxSizeBytes: 180000, useByteOrderMarkEncoding: false, scroll: { size: 500, duration: '30s', strategy: 'pit' }, - enablePanelActionDownload: false, maxConcurrentShardRequests: 5, }; mockSearchResponse({ diff --git a/packages/kbn-generate-csv/src/lib/get_export_settings.test.ts b/packages/kbn-generate-csv/src/lib/get_export_settings.test.ts index 05a321aa1a255..f1c73680a8b9d 100644 --- a/packages/kbn-generate-csv/src/lib/get_export_settings.test.ts +++ b/packages/kbn-generate-csv/src/lib/get_export_settings.test.ts @@ -39,7 +39,6 @@ describe('getExportSettings', () => { scroll: { size: 500, duration: '30s', strategy: 'pit' }, useByteOrderMarkEncoding: false, maxConcurrentShardRequests: 5, - enablePanelActionDownload: false, }; taskInstanceFields = { startedAt: null, retryAt: null }; diff --git a/packages/kbn-reporting/server/__snapshots__/config_schema.test.ts.snap b/packages/kbn-reporting/server/__snapshots__/config_schema.test.ts.snap index fecc985c76f34..d52630ab6820c 100644 --- a/packages/kbn-reporting/server/__snapshots__/config_schema.test.ts.snap +++ b/packages/kbn-reporting/server/__snapshots__/config_schema.test.ts.snap @@ -7,7 +7,6 @@ Object { }, "csv": Object { "checkForFormulas": true, - "enablePanelActionDownload": false, "escapeFormulaValues": false, "maxConcurrentShardRequests": 5, "maxSizeBytes": ByteSizeValue { @@ -70,7 +69,6 @@ Object { }, "csv": Object { "checkForFormulas": true, - "enablePanelActionDownload": false, "escapeFormulaValues": false, "maxConcurrentShardRequests": 5, "maxSizeBytes": ByteSizeValue { diff --git a/packages/kbn-reporting/server/config_schema.ts b/packages/kbn-reporting/server/config_schema.ts index a4117341d27ca..e14bc30ab56f7 100644 --- a/packages/kbn-reporting/server/config_schema.ts +++ b/packages/kbn-reporting/server/config_schema.ts @@ -60,7 +60,7 @@ const CaptureSchema = schema.object({ const CsvSchema = schema.object({ checkForFormulas: schema.boolean({ defaultValue: true }), escapeFormulaValues: schema.boolean({ defaultValue: false }), - enablePanelActionDownload: schema.boolean({ defaultValue: false }), // unused as of 9.0 + enablePanelActionDownload: schema.maybe(schema.boolean({ defaultValue: false })), // unused as of 9.0 maxSizeBytes: schema.oneOf([schema.number(), schema.byteSize()], { defaultValue: ByteSizeValue.parse('250mb'), }), diff --git a/x-pack/plugins/reporting/server/config/index.test.ts b/x-pack/plugins/reporting/server/config/index.test.ts index a517affac54e6..d6b0f31ddc5f3 100644 --- a/x-pack/plugins/reporting/server/config/index.test.ts +++ b/x-pack/plugins/reporting/server/config/index.test.ts @@ -54,19 +54,8 @@ describe('deprecations', () => { `); }); - it('logs a warning if csv.enablePanelActionDownload: true is set', () => { - const { messages } = applyReportingDeprecations({ csv: { enablePanelActionDownload: true } }); - expect(messages).toMatchInlineSnapshot(` - Array [ - "The default mechanism for Reporting privileges will work differently in future versions, which will affect the behavior of this cluster. Set \\"xpack.reporting.roles.enabled\\" to \\"false\\" to adopt the future behavior before upgrading.", - "The \\"xpack.reporting.csv.enablePanelActionDownload\\" setting is deprecated.", - ] - `); - }); - it('does not log a warning recommended settings are used', () => { const { messages } = applyReportingDeprecations({ - csv: { enablePanelActionDownload: false }, roles: { enabled: false }, }); expect(messages).toMatchInlineSnapshot(`Array []`); diff --git a/x-pack/plugins/reporting/server/config/index.ts b/x-pack/plugins/reporting/server/config/index.ts index 709d072a9035a..c99e2667eb6df 100644 --- a/x-pack/plugins/reporting/server/config/index.ts +++ b/x-pack/plugins/reporting/server/config/index.ts @@ -13,10 +13,7 @@ import { ConfigSchema, ReportingConfigType } from '@kbn/reporting-server'; export const config: PluginConfigDescriptor = { exposeToBrowser: { - csv: { - enablePanelActionDownload: true, - scroll: true, - }, + csv: { scroll: true }, poll: true, roles: true, export_types: true, @@ -69,44 +66,11 @@ export const config: PluginConfigDescriptor = { }, }); } - - if (reporting?.csv?.enablePanelActionDownload === true) { - addDeprecation({ - configPath: `${fromPath}.csv.enablePanelActionDownload`, - title: i18n.translate('xpack.reporting.deprecations.csvPanelActionDownload.title', { - defaultMessage: - 'The setting to enable CSV Download from saved search panels in dashboards is deprecated.', - }), - level: 'warning', - message: i18n.translate('xpack.reporting.deprecations.csvPanelActionDownload.message', { - defaultMessage: `The "{enablePanelActionDownload}" setting is deprecated.`, - values: { - enablePanelActionDownload: `${fromPath}.csv.enablePanelActionDownload`, - }, - }), - correctiveActions: { - manualSteps: [ - i18n.translate('xpack.reporting.deprecations.csvPanelActionDownload.manualStep1', { - defaultMessage: - 'Remove "{enablePanelActionDownload}" from `kibana.yml` or change the setting to `false`.', - values: { - enablePanelActionDownload: `${fromPath}.csv.enablePanelActionDownload`, - }, - }), - i18n.translate('xpack.reporting.deprecations.csvPanelActionDownload.manualStep2', { - defaultMessage: - 'Use the replacement panel action to generate CSV reports from saved search panels in the Dashboard application.', - }), - ], - }, - }); - } }, ], exposeToUsage: { capture: { maxAttempts: true }, csv: { - enablePanelActionDownload: true, maxSizeBytes: true, scroll: { size: true, duration: true }, },