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.

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

Renamed button and dropdown items in headers (apm, logs, metrics and uptime) from alerts to rules #100918

Merged
merged 170 commits into from
Jun 22, 2021
Merged
Show file tree
Hide file tree
Changes from 167 commits
Commits
Show all changes
170 commits
Select commit Hold shift + click to select a range
7f1a7dd
Adding feature flag for auth
jonathan-buttner Mar 9, 2021
164582d
Hiding SOs and adding consumer field
jonathan-buttner Mar 9, 2021
7eaf41e
First pass at adding security changes
jonathan-buttner Mar 9, 2021
f8e62c6
Consumer as the app's plugin ID
cnasikas Mar 10, 2021
09589c3
Create addConsumerToSO migration helper
cnasikas Mar 10, 2021
eb75eb0
Fix mapping's SO consumer
cnasikas Mar 10, 2021
a930f03
Add test for CasesActions
cnasikas Mar 10, 2021
d6f3b09
Declare hidden types on SO client
cnasikas Mar 10, 2021
b82e686
Restructure integration tests
cnasikas Mar 10, 2021
4d05175
Init spaces_only integration tests
cnasikas Mar 10, 2021
75d72ae
Implementing the cases security string
jonathan-buttner Mar 10, 2021
e65838b
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner Mar 10, 2021
1fd66af
Adding security plugin tests for cases
jonathan-buttner Mar 10, 2021
4560d42
Rough concept for authorization class
jonathan-buttner Mar 10, 2021
ef9b3b2
Adding comments
jonathan-buttner Mar 10, 2021
b22a032
Fix merge
cnasikas Mar 11, 2021
ddc2280
Get requiredPrivileges for classes
cnasikas Mar 11, 2021
9d008d8
Check privillages
cnasikas Mar 11, 2021
7bb23dd
Ensure that all classes are available
cnasikas Mar 11, 2021
65d4c6b
Success if hasAllRequested is true
cnasikas Mar 11, 2021
59e4045
Failure if hasAllRequested is false
cnasikas Mar 11, 2021
4092733
Adding schema updates for feature plugin
jonathan-buttner Mar 11, 2021
311e3f4
Seperate basic from trial
cnasikas Mar 16, 2021
f2a50d3
Enable SIR on integration tests
cnasikas Mar 16, 2021
00d89ca
Starting the plumbing for authorization in plugin
jonathan-buttner Mar 16, 2021
40cfcce
Merge branch 'master' into cases-rbac-poc
cnasikas Mar 17, 2021
644a7ac
Unit tests working
jonathan-buttner Mar 17, 2021
9bb1b86
Merge branch 'cases-rbac-poc-plugin-changes' into cases-rbac-poc
jonathan-buttner Mar 17, 2021
12d6e2e
Move find route logic to case client
cnasikas Mar 17, 2021
84d9167
Create integration test helper functions
cnasikas Mar 17, 2021
4bed458
Adding auth to create call
jonathan-buttner Mar 17, 2021
ecb3135
Create getClassFilter helper
cnasikas Mar 18, 2021
fe1d8c8
Add class attribute to find request
cnasikas Mar 18, 2021
22e7752
Create getFindAuthorizationFilter
cnasikas Mar 18, 2021
96f81a4
Ensure savedObject is authorized in find method
cnasikas Mar 18, 2021
e3ae097
Merge branch 'master' into cases-rbac-poc
cnasikas Mar 22, 2021
06d7c64
Include fields for authorization
cnasikas Mar 22, 2021
2ca4134
Combine authorization filter with cases & subcases filter
cnasikas Mar 22, 2021
17110b1
Fix isAuthorized flag
cnasikas Mar 22, 2021
bc06264
Fix merge issue
cnasikas Mar 22, 2021
a04e0d7
Create/delete spaces & users before and after tests
cnasikas Mar 22, 2021
7fe4e40
Add more user and roles
cnasikas Mar 22, 2021
2847861
[Cases] Convert filters from strings to KueryNode (#95288)
cnasikas Mar 24, 2021
a2e1da8
[Cases] RBAC: Rename class to scope (#95535)
cnasikas Mar 26, 2021
9263d7d
Merge branch 'master' into cases-rbac-poc
cnasikas Mar 26, 2021
afff0cc
Merge branch 'master' into cases-rbac-poc
cnasikas Apr 1, 2021
7cf9172
[Cases][RBAC] Rename scope to owner (#96035)
cnasikas Apr 1, 2021
0a95e55
[Cases] RBAC: Create & Find integration tests (#95511)
cnasikas Apr 2, 2021
1a895e5
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner Apr 5, 2021
9ffc3db
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner Apr 6, 2021
4f3c37e
[Cases] Cases client enchantment (#95923)
cnasikas Apr 6, 2021
36781db
[Cases] Authorization and Client Audit Logger (#95477)
jonathan-buttner Apr 6, 2021
73a4bfc
[Cases] Migrate sub cases routes to a client (#96461)
jonathan-buttner Apr 8, 2021
ae918cc
Merge branch 'master' into cases-rbac-poc
cnasikas Apr 12, 2021
e59602c
Merge branch 'cases-rbac-poc' of github.com:elastic/kibana into cases…
cnasikas Apr 12, 2021
34f2d86
[Cases] RBAC: Migrate routes' unit tests to integration tests (#96374)
cnasikas Apr 14, 2021
613e859
[Cases] Move remaining HTTP functionality to client (#96507)
jonathan-buttner Apr 14, 2021
676173e
[Cases] Refactoring authorization (#97483)
jonathan-buttner Apr 20, 2021
6cdfa84
[Cases] Add authorization to configuration & cases routes (#97228)
cnasikas Apr 26, 2021
7b21b7a
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner Apr 27, 2021
103388e
[Cases] Attachments RBAC (#97756)
jonathan-buttner Apr 30, 2021
18e75d9
[Cases] Add RBAC to remaining Cases APIs (#98762)
jonathan-buttner May 4, 2021
d99d9f8
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner May 4, 2021
b121662
Fixing some type errors
jonathan-buttner May 4, 2021
42162e3
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner May 6, 2021
298ba34
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner May 6, 2021
c0fb868
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner May 7, 2021
21d173d
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner May 10, 2021
b910889
[Cases] Add space only tests (#99409)
jonathan-buttner May 10, 2021
78dfac4
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner May 10, 2021
bf583a8
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner May 11, 2021
3fd893f
[Cases] Add security only tests (#99679)
jonathan-buttner May 11, 2021
86568ed
Adding sub feature
jonathan-buttner May 12, 2021
952e2a3
[Cases] Cleaning up the services and TODOs (#99723)
jonathan-buttner May 14, 2021
e26de43
Integration tests for cases privs and fixes (#100038)
jonathan-buttner May 14, 2021
2d8601b
[Cases] RBAC on UI (#99478)
cnasikas May 14, 2021
570cddb
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner May 14, 2021
3c7670b
Fixing case ids by alert id route call
jonathan-buttner May 14, 2021
dafb4fe
[Cases] Fixing UI feature permissions and adding UI tests (#100074)
jonathan-buttner May 14, 2021
b7c5ebd
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner May 14, 2021
698e8e2
Fixing type error
jonathan-buttner May 14, 2021
22abf1f
Merge branch 'master' into cases-rbac-poc
kibanamachine May 17, 2021
71225eb
Adding some comments
jonathan-buttner May 17, 2021
f7a816b
Validate cases features
cnasikas May 18, 2021
2ed0a99
Merge branch 'master' into cases-rbac-poc
cnasikas May 18, 2021
fd39b25
Fix new schema
cnasikas May 18, 2021
84141fc
Merge branch 'master' into cases_obs
stephmilovic May 18, 2021
e3d3e8c
Cases routing
stephmilovic May 18, 2021
a193138
Merge branch 'master' into cases-rbac-poc
kibanamachine May 18, 2021
eb7fdd7
Adding cases feature
jonathan-buttner May 18, 2021
ce68009
wip
stephmilovic May 18, 2021
77b5a54
Merge pull request #3 from jonathan-buttner/obs-cases-feature
stephmilovic May 18, 2021
722649e
i made a case
stephmilovic May 18, 2021
85e3de7
cases in obs
stephmilovic May 19, 2021
1c7b613
add back in user permissions
stephmilovic May 20, 2021
1f9059c
Merge branch 'master' into cases-rbac-poc
kibanamachine May 20, 2021
2085a3b
Merge branch 'master' into cases-rbac-poc
kibanamachine May 24, 2021
ccd7e79
Merge branch 'master' into cases_obs
stephmilovic May 24, 2021
66c1d43
Adding owner param for the status stats
jonathan-buttner May 24, 2021
018dcb5
Merge branch 'master' into cases-rbac-poc
kibanamachine May 24, 2021
34b16c5
Fix get case status tests
cnasikas May 25, 2021
fb7e7a9
in middle of removing alerts stuff
stephmilovic May 25, 2021
9f9f936
Merge branch 'cases-rbac-poc' into cases_obs
stephmilovic May 25, 2021
882d97c
removed alerting and fixing types
stephmilovic May 25, 2021
fe20f5c
fix submitCase when no alerting
stephmilovic May 25, 2021
5345d40
fix up breadcrumbs
stephmilovic May 25, 2021
8c2cc61
Fix jest
stephmilovic May 25, 2021
528c9be
Fix types
stephmilovic May 25, 2021
bd694ca
change key for message storage
stephmilovic May 25, 2021
9ba1243
Adjusting permissions text and fixing status
jonathan-buttner May 25, 2021
9ef3ab4
may it please CI
stephmilovic May 25, 2021
5df7d33
arrys rbac changes
stephmilovic May 26, 2021
315a6e4
Address PR feedback
jonathan-buttner May 26, 2021
02ad6a4
Adding top level feature back
jonathan-buttner May 26, 2021
e8c3532
Merge branch 'master' into cases-rbac-poc
kibanamachine May 26, 2021
fd54706
fix type
stephmilovic May 27, 2021
8881899
Fixing feature privileges
jonathan-buttner May 27, 2021
dd62656
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner May 27, 2021
acf550b
Renaming
jonathan-buttner May 27, 2021
148623e
Removing uneeded else
jonathan-buttner May 27, 2021
7acf83a
Fixing tests and adding cases merge tests
jonathan-buttner May 27, 2021
dd38b98
renamed button and dropdown items in headers (apm, logs, metrics and …
katrin-freihofner May 28, 2021
b03fa4c
Merge branch 'master' into cases-rbac-poc
kibanamachine May 28, 2021
532edae
fix linting
katrin-freihofner May 31, 2021
0af0562
removed wrong translations
katrin-freihofner May 31, 2021
1301303
fix test
katrin-freihofner Jun 1, 2021
673e77c
Merge branch 'master' into rename-alerts-to-rules
kibanamachine Jun 1, 2021
445c846
[Cases][Security Solution] Basic license security solution API tests …
jonathan-buttner Jun 1, 2021
c08ac43
Merge branch 'master' of github.com:elastic/kibana into cases-rbac-poc
jonathan-buttner Jun 1, 2021
bee51fd
midst of nathans pr changes
stephmilovic Jun 1, 2021
359df83
merge conflicts and EuiPage to ObsPage on cases
stephmilovic Jun 1, 2021
bf02730
redirect after delete
stephmilovic Jun 1, 2021
c0f2105
does not exist page
stephmilovic Jun 2, 2021
9266b17
fix tests
stephmilovic Jun 2, 2021
1edb767
fix types
stephmilovic Jun 2, 2021
373cd68
Merge branch 'master' into cases-rbac-poc
kibanamachine Jun 2, 2021
8f2cb30
fix jest
stephmilovic Jun 3, 2021
6a66a6c
Merge branch 'cases-rbac-poc' into cases_obs
stephmilovic Jun 3, 2021
d59dbad
renaming to unsecuredSavedObjectsClient (#101215)
jonathan-buttner Jun 3, 2021
7ef02f4
Merge branch 'master' into cases-rbac-poc
kibanamachine Jun 3, 2021
739fd6f
[Cases] RBAC Refactoring audit logging (#100952)
jonathan-buttner Jun 3, 2021
9d87078
fixing links
stephmilovic Jun 3, 2021
28152b8
Merge branch 'cases-rbac-poc' into cases_obs
stephmilovic Jun 3, 2021
e66eb40
[Cases] Cleaning up RBAC integration tests (#101324)
jonathan-buttner Jun 4, 2021
5bd080b
Merge branch 'master' into cases-rbac-poc
kibanamachine Jun 4, 2021
56e0f0d
Merge branch 'master' into cases-rbac-poc
kibanamachine Jun 7, 2021
1211f7f
Merge branch 'cases-rbac-poc' into cases_obs
kibanamachine Jun 7, 2021
7534f28
merge w masteR
stephmilovic Jun 7, 2021
6611765
remove testing links
stephmilovic Jun 7, 2021
c27aa29
add comments
stephmilovic Jun 7, 2021
831dedb
pr changes and remove unnecessary vars
stephmilovic Jun 7, 2021
511f3f7
pr changes and WIP func tests
stephmilovic Jun 9, 2021
58a4ecf
add es archiver
stephmilovic Jun 9, 2021
109a5da
Getting cases to show up in the nav
jonathan-buttner Jun 9, 2021
66f2645
finish func tests
stephmilovic Jun 9, 2021
f93a6ac
Merge branch 'cases_obs' of github.com:stephmilovic/kibana into cases…
stephmilovic Jun 9, 2021
edbd419
a fixing
stephmilovic Jun 9, 2021
0f34792
more pr updates
stephmilovic Jun 9, 2021
09e9ca0
fix telemetry
stephmilovic Jun 9, 2021
1014700
fix a few types and test
stephmilovic Jun 9, 2021
4e7fde7
Merge branch 'cases_obs' of https://github.com/stephmilovic/kibana in…
katrin-freihofner Jun 10, 2021
a610aca
Merge branch 'rename-alerts-to-rules' of https://github.com/katrin-fr…
katrin-freihofner Jun 17, 2021
1015301
renamed alerts in Uptime and on the Overview page
katrin-freihofner Jun 17, 2021
4f55665
resolve conflics
katrin-freihofner Jun 17, 2021
8666712
resolve conflics
katrin-freihofner Jun 17, 2021
24ee82d
fix tests
katrin-freihofner Jun 18, 2021
597bcdc
fix tests
katrin-freihofner Jun 18, 2021
2808f68
added label to list of translations
katrin-freihofner Jun 21, 2021
7b958ad
fix tests
katrin-freihofner Jun 22, 2021
6e79546
Merge branch 'master' into rename-alerts-to-rules
kibanamachine Jun 22, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { AlertType } from '../../../../common/alert_types';
import { AlertingFlyout } from '../../alerting/alerting_flyout';

const alertLabel = i18n.translate('xpack.apm.home.alertsMenu.alerts', {
defaultMessage: 'Alerts',
defaultMessage: 'Alerts and rules',
});
const transactionDurationLabel = i18n.translate(
'xpack.apm.home.alertsMenu.transactionDuration',
Expand All @@ -33,11 +33,11 @@ const errorCountLabel = i18n.translate('xpack.apm.home.alertsMenu.errorCount', {
});
const createThresholdAlertLabel = i18n.translate(
'xpack.apm.home.alertsMenu.createThresholdAlert',
{ defaultMessage: 'Create threshold alert' }
{ defaultMessage: 'Create threshold rule' }
);
const createAnomalyAlertAlertLabel = i18n.translate(
'xpack.apm.home.alertsMenu.createAnomalyAlert',
{ defaultMessage: 'Create anomaly alert' }
{ defaultMessage: 'Create anomaly rule' }
);

const CREATE_TRANSACTION_DURATION_ALERT_PANEL_ID =
Expand Down Expand Up @@ -102,7 +102,7 @@ export function AlertingPopoverAndFlyout({
{
name: i18n.translate(
'xpack.apm.home.alertsMenu.viewActiveAlerts',
{ defaultMessage: 'View active alerts' }
{ defaultMessage: 'Manage rules' }
),
href: basePath.prepend(
'/app/management/insightsAndAlerting/triggersActions/alerts'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ export const MetricsAlertDropdown = () => {
() => ({
id: 1,
title: i18n.translate('xpack.infra.alerting.infrastructureDropdownTitle', {
defaultMessage: 'Infrastructure alerts',
defaultMessage: 'Infrastructure rules',
}),
items: [
{
name: i18n.translate('xpack.infra.alerting.createInventoryAlertButton', {
defaultMessage: 'Create inventory alert',
defaultMessage: 'Create inventory rule',
}),
onClick: () => setVisibleFlyoutType('inventory'),
},
Expand All @@ -54,12 +54,12 @@ export const MetricsAlertDropdown = () => {
() => ({
id: 2,
title: i18n.translate('xpack.infra.alerting.metricsDropdownTitle', {
defaultMessage: 'Metrics alerts',
defaultMessage: 'Metrics rules',
}),
items: [
{
name: i18n.translate('xpack.infra.alerting.createThresholdAlertButton', {
defaultMessage: 'Create threshold alert',
defaultMessage: 'Create threshold rule',
}),
onClick: () => setVisibleFlyoutType('threshold'),
},
Expand All @@ -76,7 +76,7 @@ export const MetricsAlertDropdown = () => {
const manageAlertsMenuItem = useMemo(
() => ({
name: i18n.translate('xpack.infra.alerting.manageAlerts', {
defaultMessage: 'Manage alerts',
defaultMessage: 'Manage rules',
}),
icon: 'tableOfContents',
onClick: manageAlertsLinkProps.onClick,
Expand Down Expand Up @@ -112,7 +112,7 @@ export const MetricsAlertDropdown = () => {
{
id: 0,
title: i18n.translate('xpack.infra.alerting.alertDropdownTitle', {
defaultMessage: 'Alerts',
defaultMessage: 'Alerts and rules',
}),
items: firstPanelMenuItems,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const ManageAlertsContextMenuItem = () => {
});
return (
<EuiContextMenuItem icon="tableOfContents" key="manageLink" {...manageAlertsLinkProps}>
<FormattedMessage id="xpack.infra.alerting.manageAlerts" defaultMessage="Manage alerts" />
<FormattedMessage id="xpack.infra.alerting.manageAlerts" defaultMessage="Manage rules" />
</EuiContextMenuItem>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ export const AlertDropdown = () => {
>
<FormattedMessage
id="xpack.infra.alerting.logs.createAlertButton"
defaultMessage="Create alert"
defaultMessage="Create rule"
/>
</EuiContextMenuItem>,
<EuiContextMenuItem icon="tableOfContents" key="manageLink" {...manageAlertsLinkProps}>
<FormattedMessage
id="xpack.infra.alerting.logs.manageAlerts"
defaultMessage="Manage alerts"
defaultMessage="Manage rules"
/>
</EuiContextMenuItem>,
];
Expand Down
10 changes: 5 additions & 5 deletions x-pack/plugins/monitoring/public/alerts/configuration.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
} catch (err) {
Legacy.shims.toastNotifications.addDanger({
title: i18n.translate('xpack.monitoring.alerts.panel.disableAlert.errorTitle', {
defaultMessage: `Unable to disable alert`,
defaultMessage: `Unable to disable rule`,
}),
text: err.message,
});
Expand All @@ -46,7 +46,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
} catch (err) {
Legacy.shims.toastNotifications.addDanger({
title: i18n.translate('xpack.monitoring.alerts.panel.enableAlert.errorTitle', {
defaultMessage: `Unable to enable alert`,
defaultMessage: `Unable to enable rule`,
}),
text: err.message,
});
Expand All @@ -60,7 +60,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
} catch (err) {
Legacy.shims.toastNotifications.addDanger({
title: i18n.translate('xpack.monitoring.alerts.panel.muteAlert.errorTitle', {
defaultMessage: `Unable to mute alert`,
defaultMessage: `Unable to mute rule`,
}),
text: err.message,
});
Expand All @@ -74,7 +74,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
} catch (err) {
Legacy.shims.toastNotifications.addDanger({
title: i18n.translate('xpack.monitoring.alerts.panel.ummuteAlert.errorTitle', {
defaultMessage: `Unable to unmute alert`,
defaultMessage: `Unable to unmute rule`,
}),
text: err.message,
});
Expand Down Expand Up @@ -112,7 +112,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
}}
>
{i18n.translate('xpack.monitoring.alerts.panel.editAlert', {
defaultMessage: `Edit alert`,
defaultMessage: `Edit rule`,
})}
</EuiButton>
</EuiFlexItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const getEmptySections = ({ core }: { core: CoreStart }): ISection[] => {
'Are 503 errors stacking up? Are services responding? Is CPU and RAM utilization jumping? See warnings as they happen—not as part of the post-mortem.',
}),
linkTitle: i18n.translate('xpack.observability.emptySection.apps.alert.link', {
defaultMessage: 'Create alert',
defaultMessage: 'Create rule',
}),
href: core.http.basePath.prepend(
'/app/management/insightsAndAlerting/triggersActions/alerts'
Expand Down
Loading