Skip to content
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

[Monitoring] Added deprecated tag to the advanced settings for xPack:defaultAdminEmail #70280

Merged
merged 10 commits into from
Jul 7, 2020
Merged

[Monitoring] Added deprecated tag to the advanced settings for xPack:defaultAdminEmail #70280

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fb47f96
Added deprecated tag to the advanced settings
igoristic Jun 30, 2020
28c5d45
Merge branch '7.x' of https://github.com/elastic/kibana into deprecat…
igoristic Jul 1, 2020
50739f0
Addressed code feedback
igoristic Jul 2, 2020
8dea103
Merge branch '7.x' of https://github.com/elastic/kibana into deprecat…
igoristic Jul 2, 2020
f0623bd
Code feedback
igoristic Jul 2, 2020
bdf11ac
Merge branch '7.x' of https://github.com/elastic/kibana into deprecat…
igoristic Jul 2, 2020
84628e5
Merge branch '7.x' of https://github.com/elastic/kibana into deprecat…
igoristic Jul 6, 2020
78cd7c4
Code feedback
igoristic Jul 6, 2020
0bbc689
Fixed version
igoristic Jul 6, 2020
c59742b
Merge branch '7.x' into deprecate-default-email
elasticmachine Jul 6, 2020
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
3 changes: 2 additions & 1 deletion docs/management/advanced-options.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ Example: `{ "display": "15 seconds", "pause": true, "value": 15000 }`.
`timepicker:timeDefaults`:: The default selection in the time filter.
`truncate:maxHeight`:: The maximum height that a cell occupies in a table. Set to 0 to disable
truncation.
`xPack:defaultAdminEmail`:: Email address for X-Pack admin operations, such as
`xPack:defaultAdminEmail`:: **Deprecated. Use <<cluster-alert-email-notifications,Email Notifications>> instead.**
Email address for X-Pack admin operations, such as
cluster alert notifications from Monitoring.


Expand Down
1 change: 1 addition & 0 deletions src/core/public/doc_links/doc_links_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ export class DocLinksService {
dateMath: `${ELASTICSEARCH_DOCS}common-options.html#date-math`,
},
management: {
kibanaGeneralSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/advanced-options.html#kibana-general-settings`,
kibanaSearchSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/advanced-options.html#kibana-search-settings`,
dashboardSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/advanced-options.html#kibana-dashboard-settings`,
},
Expand Down
7 changes: 7 additions & 0 deletions x-pack/legacy/plugins/xpack_main/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ export const xpackMain = (kibana) => {
defaultMessage:
'Recipient email address for X-Pack admin operations, such as Cluster Alert email notifications from Monitoring.',
}),
deprecation: {
message: i18n.translate('xpack.main.uiSettings.adminEmailDeprecation', {
defaultMessage:
'This setting is deprecated and will not be supported in Kibana 7.0. Please configure `xpack.monitoring.cluster_alerts.email_notifications.email_address` in your kibana.yml settings.',
igoristic marked this conversation as resolved.
Show resolved Hide resolved
}),
docLinksKey: 'kibanaGeneralSettings',
},
type: 'string', // TODO: Any way of ensuring this is a valid email address?
value: null,
},
Expand Down