Skip to content

Commit 4308398

Browse files
azasypkinazasypkin
committed
Improve session timeout deprecation messages.
1 parent 6e4a22d commit 4308398

4 files changed

Lines changed: 33 additions & 37 deletions

File tree

‎x-pack/plugins/security/server/config_deprecations.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ describe('Config Deprecations', () => {
4848
expect(migrated).toEqual(defaultConfig);
4949
expect(messages).toMatchInlineSnapshot(`
5050
Array [
51-
"The session idle timeout will default to 1 hour in 8.0.",
52-
"The session lifespan will default to 30 days in 8.0.",
51+
"User sessions will automatically time out after 1 hour of inactivity starting in 8.0. Override this value to change the timeout.",
52+
"Users are automatically required to log in again after 30 days starting in 8.0. Override this value to change the timeout.",
5353
]
5454
`);
5555
});
@@ -60,7 +60,7 @@ describe('Config Deprecations', () => {
6060
expect(migrated).toEqual(defaultConfig);
6161
expect(messages).toMatchInlineSnapshot(`
6262
Array [
63-
"The session idle timeout will default to 1 hour in 8.0.",
63+
"User sessions will automatically time out after 1 hour of inactivity starting in 8.0. Override this value to change the timeout.",
6464
]
6565
`);
6666
});
@@ -71,7 +71,7 @@ describe('Config Deprecations', () => {
7171
expect(migrated).toEqual(defaultConfig);
7272
expect(messages).toMatchInlineSnapshot(`
7373
Array [
74-
"The session lifespan will default to 30 days in 8.0.",
74+
"Users are automatically required to log in again after 30 days starting in 8.0. Override this value to change the timeout.",
7575
]
7676
`);
7777
});
@@ -90,7 +90,7 @@ describe('Config Deprecations', () => {
9090
expect(messages).toMatchInlineSnapshot(`
9191
Array [
9292
"Setting \\"xpack.security.sessionTimeout\\" has been replaced by \\"xpack.security.session.idleTimeout\\"",
93-
"The session lifespan will default to 30 days in 8.0.",
93+
"Users are automatically required to log in again after 30 days starting in 8.0. Override this value to change the timeout.",
9494
]
9595
`);
9696
});

‎x-pack/plugins/security/server/config_deprecations.ts‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -171,19 +171,17 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
171171
addDeprecation({
172172
level: 'warning',
173173
title: i18n.translate('xpack.security.deprecations.idleTimeoutTitle', {
174-
defaultMessage: 'The "xpack.security.session.idleTimeout" default is changing',
174+
defaultMessage: '"xpack.security.session.idleTimeout" is now 1 hour',
175175
}),
176176
message: i18n.translate('xpack.security.deprecations.idleTimeoutMessage', {
177-
defaultMessage: 'The session idle timeout will default to 1 hour in 8.0.',
177+
defaultMessage:
178+
'User sessions will automatically time out after 1 hour of inactivity starting in 8.0. Override this value to change the timeout.',
178179
}),
179180
documentationUrl: `https://www.elastic.co/guide/en/kibana/${branch}/xpack-security-session-management.html#session-idle-timeout`,
180181
correctiveActions: {
181182
manualSteps: [
182183
i18n.translate('xpack.security.deprecations.idleTimeout.manualStepOneMessage', {
183-
defaultMessage: `Set "xpack.security.session.idleTimeout" in your Kibana configuration to override the default session idle timeout.`,
184-
}),
185-
i18n.translate('xpack.security.deprecations.idleTimeout.manualStepTwoMessage', {
186-
defaultMessage: `To disable the session idle timeout, set "xpack.security.session.idleTimeout" to 0.`,
184+
defaultMessage: `To configure a custom timeout, set "xpack.security.session.idleTimeout". A value of 0 disables the timeout.`,
187185
}),
188186
],
189187
},
@@ -194,19 +192,17 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
194192
addDeprecation({
195193
level: 'warning',
196194
title: i18n.translate('xpack.security.deprecations.lifespanTitle', {
197-
defaultMessage: 'The "xpack.security.session.lifespan" default is changing',
195+
defaultMessage: '"xpack.security.session.lifespan" is now 30 days',
198196
}),
199197
message: i18n.translate('xpack.security.deprecations.lifespanMessage', {
200-
defaultMessage: 'The session lifespan will default to 30 days in 8.0.',
198+
defaultMessage:
199+
'Users are automatically required to log in again after 30 days starting in 8.0. Override this value to change the timeout.',
201200
}),
202201
documentationUrl: `https://www.elastic.co/guide/en/kibana/${branch}/xpack-security-session-management.html#session-lifespan`,
203202
correctiveActions: {
204203
manualSteps: [
205204
i18n.translate('xpack.security.deprecations.lifespan.manualStepOneMessage', {
206-
defaultMessage: `Set "xpack.security.session.lifespan" in your Kibana configuration to override the default session lifespan.`,
207-
}),
208-
i18n.translate('xpack.security.deprecations.lifespan.manualStepTwoMessage', {
209-
defaultMessage: `To disable the session lifespan, set "xpack.security.session.lifespan" to 0.`,
205+
defaultMessage: `To configure a custom timeout, set "xpack.security.session.lifespan". A value of 0 disables the timeout.`,
210206
}),
211207
],
212208
},

‎x-pack/plugins/translations/translations/ja-JP.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5026,6 +5026,16 @@
50265026
"visTypeMetric.colorModes.backgroundOptionLabel": "背景",
50275027
"visTypeMetric.colorModes.labelsOptionLabel": "ラベル",
50285028
"visTypeMetric.colorModes.noneOptionLabel": "なし",
5029+
"visTypeMetric.metricDescription": "計算結果を単独の数字として表示します。",
5030+
"visTypeMetric.metricTitle": "メトリック",
5031+
"visTypeMetric.params.color.useForLabel": "使用する色",
5032+
"visTypeMetric.params.rangesTitle": "範囲",
5033+
"visTypeMetric.params.settingsTitle": "設定",
5034+
"visTypeMetric.params.showTitleLabel": "タイトルを表示",
5035+
"visTypeMetric.params.style.fontSizeLabel": "ポイント単位のメトリックフォントサイズ",
5036+
"visTypeMetric.params.style.styleTitle": "スタイル",
5037+
"visTypeMetric.schemas.metricTitle": "メトリック",
5038+
"visTypeMetric.schemas.splitGroupTitle": "グループを分割",
50295039
"expressionMetricVis.function.dimension.splitGroup": "グループを分割",
50305040
"expressionMetricVis.function.bgFill.help": "html 16 進数コード（#123456）、html 色（red、blue）、または rgba 値（rgba（255,255,255,1））。",
50315041
"expressionMetricVis.function.bucket.help": "バケットディメンションの構成です。",
@@ -5041,16 +5051,6 @@
50415051
"expressionMetricVis.function.showLabels.help": "メトリック値の下にラベルを表示します。",
50425052
"expressionMetricVis.function.subText.help": "メトリックの下に表示するカスタムテキスト",
50435053
"expressionMetricVis.function.useRanges.help": "有効な色範囲です。",
5044-
"visTypeMetric.metricDescription": "計算結果を単独の数字として表示します。",
5045-
"visTypeMetric.metricTitle": "メトリック",
5046-
"visTypeMetric.params.color.useForLabel": "使用する色",
5047-
"visTypeMetric.params.rangesTitle": "範囲",
5048-
"visTypeMetric.params.settingsTitle": "設定",
5049-
"visTypeMetric.params.showTitleLabel": "タイトルを表示",
5050-
"visTypeMetric.params.style.fontSizeLabel": "ポイント単位のメトリックフォントサイズ",
5051-
"visTypeMetric.params.style.styleTitle": "スタイル",
5052-
"visTypeMetric.schemas.metricTitle": "メトリック",
5053-
"visTypeMetric.schemas.splitGroupTitle": "グループを分割",
50545054
"visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.deprecation": "Visualizeの円グラフのレガシーグラフライブラリは廃止予定であり、8.0以降ではサポートされません。",
50555055
"visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.description": "Visualizeで円グラフのレガシーグラフライブラリを有効にします。",
50565056
"visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.name": "円グラフのレガシーグラフライブラリ",

‎x-pack/plugins/translations/translations/zh-CN.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5072,6 +5072,16 @@
50725072
"visTypeMetric.colorModes.backgroundOptionLabel": "背景",
50735073
"visTypeMetric.colorModes.labelsOptionLabel": "标签",
50745074
"visTypeMetric.colorModes.noneOptionLabel": "无",
5075+
"visTypeMetric.metricDescription": "将计算结果显示为单个数字。",
5076+
"visTypeMetric.metricTitle": "指标",
5077+
"visTypeMetric.params.color.useForLabel": "将颜色用于",
5078+
"visTypeMetric.params.rangesTitle": "范围",
5079+
"visTypeMetric.params.settingsTitle": "设置",
5080+
"visTypeMetric.params.showTitleLabel": "显示标题",
5081+
"visTypeMetric.params.style.fontSizeLabel": "指标字体大小（磅）",
5082+
"visTypeMetric.params.style.styleTitle": "样式",
5083+
"visTypeMetric.schemas.metricTitle": "指标",
5084+
"visTypeMetric.schemas.splitGroupTitle": "拆分组",
50755085
"expressionMetricVis.function.dimension.splitGroup": "拆分组",
50765086
"expressionMetricVis.function.bgFill.help": "将颜色表示为 html 十六进制代码 (#123456)、html 颜色（red、blue）或 rgba 值 (rgba(255,255,255,1))。",
50775087
"expressionMetricVis.function.bucket.help": "存储桶维度配置",
@@ -5087,16 +5097,6 @@
50875097
"expressionMetricVis.function.showLabels.help": "在指标值下显示标签。",
50885098
"expressionMetricVis.function.subText.help": "要在指标下显示的定制文本",
50895099
"expressionMetricVis.function.useRanges.help": "已启用颜色范围。",
5090-
"visTypeMetric.metricDescription": "将计算结果显示为单个数字。",
5091-
"visTypeMetric.metricTitle": "指标",
5092-
"visTypeMetric.params.color.useForLabel": "将颜色用于",
5093-
"visTypeMetric.params.rangesTitle": "范围",
5094-
"visTypeMetric.params.settingsTitle": "设置",
5095-
"visTypeMetric.params.showTitleLabel": "显示标题",
5096-
"visTypeMetric.params.style.fontSizeLabel": "指标字体大小（磅）",
5097-
"visTypeMetric.params.style.styleTitle": "样式",
5098-
"visTypeMetric.schemas.metricTitle": "指标",
5099-
"visTypeMetric.schemas.splitGroupTitle": "拆分组",
51005100
"visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.deprecation": "Visualize 中饼图的旧版图表库已弃用，自 8.0 后将不受支持。",
51015101
"visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.description": "在 Visualize 中启用饼图的旧版图表库。",
51025102
"visTypePie.advancedSettings.visualization.legacyPieChartsLibrary.name": "饼图旧版图表库",

0 commit comments

Comments
 (0)