diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/assets/javascripts/incidents_settings | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/assets/javascripts/incidents_settings')
3 files changed, 20 insertions, 8 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..17a77f650e0 100644 --- a/app/assets/javascripts/incidents_settings/components/alerts_form.vue +++ b/app/assets/javascripts/incidents_settings/components/alerts_form.vue @@ -6,8 +6,8 @@ import { GlIcon, GlFormGroup, GlFormCheckbox, - GlNewDropdown, - GlNewDropdownItem, + GlDropdown, + GlDropdownItem, } from '@gitlab/ui'; import { I18N_ALERT_SETTINGS_FORM, @@ -24,8 +24,8 @@ export default { GlFormGroup, GlIcon, GlFormCheckbox, - GlNewDropdown, - GlNewDropdownItem, + GlDropdown, + GlDropdownItem, }, inject: ['service', 'alertSettings'], data() { @@ -34,6 +34,7 @@ export default { createIssueEnabled: this.alertSettings.createIssue, issueTemplate: this.alertSettings.issueTemplateKey, sendEmailEnabled: this.alertSettings.sendEmail, + autoCloseIncident: this.alertSettings.autoCloseIncident, loading: false, }; }, @@ -49,6 +50,7 @@ export default { create_issue: this.createIssueEnabled, issue_template_key: this.issueTemplate, send_email: this.sendEmailEnabled, + auto_close_incident: this.autoCloseIncident, }; }, }, @@ -99,13 +101,13 @@ export default { <gl-icon name="question" :size="12" /> </gl-link> </label> - <gl-new-dropdown + <gl-dropdown id="alert-integration-settings-issue-template" data-qa-selector="incident_templates_dropdown" :text="issueTemplateHeader" :block="true" > - <gl-new-dropdown-item + <gl-dropdown-item v-for="template in templates" :key="template.key" data-qa-selector="incident_templates_item" @@ -114,8 +116,8 @@ export default { @click="selectIssueTemplate(template.key)" > {{ template.name }} - </gl-new-dropdown-item> - </gl-new-dropdown> + </gl-dropdown-item> + </gl-dropdown> </gl-form-group> <gl-form-group class="gl-pl-0 gl-mb-5"> @@ -123,6 +125,11 @@ export default { <span>{{ $options.i18n.sendEmail.label }}</span> </gl-form-checkbox> </gl-form-group> + <gl-form-group 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), |