Skip to content

Commit 73fe477

Browse files
KelvinTegelaarKelvinTegelaar
committed
improvements to alerts
1 parent 0262511 commit 73fe477

File tree

2 files changed

+54
-45
lines changed

2 files changed

+54
-45
lines changed

‎src/views/cipp/CIPPSettings.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,8 @@ const NotificationsSettings = () => {
11431143
{ value: 'Alert', name: 'Alert' },
11441144
{ value: 'Error', name: 'Error' },
11451145
{ value: 'Info', name: 'Info' },
1146-
{ value: 'Warn', name: 'Warn' },
1146+
{ value: 'Warning', name: 'Warning' },
1147+
{ value: 'Critical', name: 'Critical' },
11471148
]}
11481149
/>
11491150
</CCol>

‎src/views/tenant/administration/AlertWizard.js

Lines changed: 52 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { faCheck, faExclamationTriangle, faTimes } from '@fortawesome/free-solid
66
import { CippWizard } from 'src/components/layout'
77
import { WizardTableField } from 'src/components/tables'
88
import PropTypes from 'prop-types'
9-
import { RFFCFormSelect, RFFCFormSwitch, RFFSelectSearch } from 'src/components/forms'
9+
import { Condition, RFFCFormSelect, RFFCFormSwitch, RFFSelectSearch } from 'src/components/forms'
1010
import { useLazyGenericPostRequestQuery } from 'src/store/api/app'
1111
import countryList from 'src/data/countryList.json'
1212
const Error = ({ name }) => (
@@ -98,53 +98,61 @@ const AlertWizard = () => {
9898
These alerts will be sent to the user or webhook configured in the CIPP notification
9999
settings menu.
100100
</p>
101+
<RFFCFormSwitch
102+
value={true}
103+
name="SetAlerts"
104+
label="Setup alerts for the selected tenants"
105+
/>
101106
<CRow>
102-
<CCol>
103-
<RFFCFormSwitch
104-
value={true}
105-
name="MFAAlertUsers"
106-
label="Alert on users without any form of MFA"
107-
/>
108-
<RFFCFormSwitch name="MFAAdmins" label="Alert on admins without any form of MFA" />
109-
<RFFCFormSwitch
110-
name="NoCAConfig"
111-
label="Alert on tenants without a Conditional Access policy, while having Conditional Access licensing available."
112-
/>
113-
<RFFCFormSwitch name="NewRole" label="Alert on new users added to any admin role" />
114-
<RFFCFormSwitch name="AdminPassword" label="Alert on changed admin Passwords" />
115-
<RFFCFormSwitch
116-
name="DefenderStatus"
117-
label="Alert if Defender is not running (Tenant must be on-boarded in Lighthouse)"
118-
/>
119-
<RFFCFormSwitch
120-
name="DefenderMalware"
121-
label="Alert on Defender Malware found (Tenant must be on-boarded in Lighthouse)"
122-
/>
123-
<RFFCFormSwitch name="QuotaUsed" label="Alert on 90% mailbox quota used" />
124-
</CCol>
125-
<CCol>
126-
<RFFCFormSwitch name="SharePointQuota" label="Alert on 90% SharePoint quota used" />
127-
<RFFCFormSwitch name="UnusedLicenses" label="Alert on unused licenses" />
128-
<RFFCFormSwitch name="OverusedLicenses" label="Alert on overused licenses" />
129-
<RFFCFormSwitch
130-
name="ExpiringLicenses"
131-
label="Alert on licenses expiring in 30 days"
132-
/>
107+
<Condition when="SetAlerts" is={true}>
108+
<CCol>
109+
<RFFCFormSwitch
110+
value={true}
111+
name="MFAAlertUsers"
112+
label="Alert on users without any form of MFA"
113+
/>
114+
<RFFCFormSwitch name="MFAAdmins" label="Alert on admins without any form of MFA" />
115+
<RFFCFormSwitch
116+
name="NoCAConfig"
117+
label="Alert on tenants without a Conditional Access policy, while having Conditional Access licensing available."
118+
/>
119+
<RFFCFormSwitch name="NewRole" label="Alert on new users added to any admin role" />
120+
<RFFCFormSwitch name="AdminPassword" label="Alert on changed admin Passwords" />
121+
<RFFCFormSwitch
122+
name="DefenderStatus"
123+
label="Alert if Defender is not running (Tenant must be on-boarded in Lighthouse)"
124+
/>
125+
<RFFCFormSwitch
126+
name="DefenderMalware"
127+
label="Alert on Defender Malware found (Tenant must be on-boarded in Lighthouse)"
128+
/>
129+
<RFFCFormSwitch name="QuotaUsed" label="Alert on 90% mailbox quota used" />
130+
</CCol>
131+
<CCol>
132+
<RFFCFormSwitch name="SharePointQuota" label="Alert on 90% SharePoint quota used" />
133+
<RFFCFormSwitch name="UnusedLicenses" label="Alert on unused licenses" />
134+
<RFFCFormSwitch name="OverusedLicenses" label="Alert on overused licenses" />
135+
<RFFCFormSwitch
136+
name="ExpiringLicenses"
137+
label="Alert on licenses expiring in 30 days"
138+
/>
133139

134-
<RFFCFormSwitch
135-
name="AppSecretExpiry"
136-
label="Alert on expiring application secrets"
137-
/>
138-
<RFFCFormSwitch name="ApnCertExpiry" label="Alert on expiring APN certificates" />
139-
<RFFCFormSwitch name="VppTokenExpiry" label="Alert on expiring VPP tokens" />
140-
<RFFCFormSwitch name="DepTokenExpiry" label="Alert on expiring DEP tokens" />
141-
<RFFCFormSwitch
142-
name="SecDefaultsUpsell"
143-
label="Alert on Security Defaults automatic enablement"
144-
/>
145-
</CCol>
140+
<RFFCFormSwitch
141+
name="AppSecretExpiry"
142+
label="Alert on expiring application secrets"
143+
/>
144+
<RFFCFormSwitch name="ApnCertExpiry" label="Alert on expiring APN certificates" />
145+
<RFFCFormSwitch name="VppTokenExpiry" label="Alert on expiring VPP tokens" />
146+
<RFFCFormSwitch name="DepTokenExpiry" label="Alert on expiring DEP tokens" />
147+
<RFFCFormSwitch
148+
name="SecDefaultsUpsell"
149+
label="Alert on Security Defaults automatic enablement"
150+
/>
151+
</CCol>
152+
</Condition>
146153
</CRow>
147154
</CForm>
155+
148156
<hr className="my-4" />
149157
</CippWizard.Page>
150158
<CippWizard.Page

0 commit comments

Comments
 (0)