diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-21 18:10:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-21 18:10:03 +0300 |
commit | d5098d9fe3a5f05d9b90996851ab753f8b40cf65 (patch) | |
tree | 6f909667e89a3ad70e10c39b48fc417459b759fd /app/assets/javascripts/incidents_settings | |
parent | 4ea7a80898d3266d386ca928d7c253d4bf588e1c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/incidents_settings')
3 files changed, 14 insertions, 0 deletions
diff --git a/app/assets/javascripts/incidents_settings/components/alerts_form.vue b/app/assets/javascripts/incidents_settings/components/alerts_form.vue index 5872ac39c96..636d9fc4b90 100644 --- a/app/assets/javascripts/incidents_settings/components/alerts_form.vue +++ b/app/assets/javascripts/incidents_settings/components/alerts_form.vue @@ -9,6 +9,7 @@ import { GlNewDropdown, GlNewDropdownItem, } from '@gitlab/ui'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { I18N_ALERT_SETTINGS_FORM, NO_ISSUE_TEMPLATE_SELECTED, @@ -27,6 +28,7 @@ export default { GlNewDropdown, GlNewDropdownItem, }, + mixins: [glFeatureFlagsMixin()], inject: ['service', 'alertSettings'], data() { return { @@ -34,6 +36,7 @@ export default { createIssueEnabled: this.alertSettings.createIssue, issueTemplate: this.alertSettings.issueTemplateKey, sendEmailEnabled: this.alertSettings.sendEmail, + autoCloseIncident: this.alertSettings.autoCloseIncident, loading: false, }; }, @@ -49,6 +52,7 @@ export default { create_issue: this.createIssueEnabled, issue_template_key: this.issueTemplate, send_email: this.sendEmailEnabled, + auto_close_incident: this.autoCloseIncident, }; }, }, @@ -123,6 +127,11 @@ export default { <span>{{ $options.i18n.sendEmail.label }}</span> </gl-form-checkbox> </gl-form-group> + <gl-form-group v-if="glFeatures.autoCloseIncident" class="gl-pl-0 gl-mb-5"> + <gl-form-checkbox v-model="autoCloseIncident"> + <span>{{ $options.i18n.autoCloseIncidents.label }}</span> + </gl-form-checkbox> + </gl-form-group> <div class="gl-display-flex gl-justify-content-end"> <gl-button ref="submitBtn" diff --git a/app/assets/javascripts/incidents_settings/constants.js b/app/assets/javascripts/incidents_settings/constants.js index 77f7ee2c4a3..42f1f645d16 100644 --- a/app/assets/javascripts/incidents_settings/constants.js +++ b/app/assets/javascripts/incidents_settings/constants.js @@ -42,6 +42,9 @@ export const I18N_ALERT_SETTINGS_FORM = { sendEmail: { label: __('Send a separate email notification to Developers.'), }, + autoCloseIncidents: { + label: __('Automatically close incident issues when the associated Prometheus alert resolves.'), + }, }; export const NO_ISSUE_TEMPLATE_SELECTED = { key: '', name: __('No template selected') }; diff --git a/app/assets/javascripts/incidents_settings/index.js b/app/assets/javascripts/incidents_settings/index.js index 80e7d07feca..ad875d49768 100644 --- a/app/assets/javascripts/incidents_settings/index.js +++ b/app/assets/javascripts/incidents_settings/index.js @@ -20,6 +20,7 @@ export default () => { pagerdutyActive, pagerdutyWebhookUrl, pagerdutyResetKeyPath, + autoCloseIncident, }, } = el; @@ -33,6 +34,7 @@ export default () => { createIssue: parseBoolean(createIssue), issueTemplateKey, sendEmail: parseBoolean(sendEmail), + autoCloseIncident: parseBoolean(autoCloseIncident), }, pagerDutySettings: { active: parseBoolean(pagerdutyActive), |