Commit 5c96eb9a authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'tr-remove-incident-summary' into 'master'

Remove Summary heading from auto-generated incidents

See merge request gitlab-org/gitlab!41043
parents 66fca594 47544c54
...@@ -31,8 +31,6 @@ module AlertManagement ...@@ -31,8 +31,6 @@ module AlertManagement
def issue_summary_markdown def issue_summary_markdown
<<~MARKDOWN.chomp <<~MARKDOWN.chomp
#### Summary
#{metadata_list} #{metadata_list}
#{alert_details}#{metric_embed_for_alert} #{alert_details}#{metric_embed_for_alert}
MARKDOWN MARKDOWN
......
...@@ -51,8 +51,6 @@ module Projects ...@@ -51,8 +51,6 @@ module Projects
def issue_summary_markdown def issue_summary_markdown
<<~MARKDOWN.chomp <<~MARKDOWN.chomp
#### Summary
#{metadata_list} #{metadata_list}
#{alert_details}#{metric_embed_for_alert} #{alert_details}#{metric_embed_for_alert}
MARKDOWN MARKDOWN
......
...@@ -27,8 +27,6 @@ RSpec.describe AlertManagement::AlertPresenter do ...@@ -27,8 +27,6 @@ RSpec.describe AlertManagement::AlertPresenter do
it 'returns an alert issue description' do it 'returns an alert issue description' do
expect(presenter.issue_description).to eq( expect(presenter.issue_description).to eq(
<<~MARKDOWN.chomp <<~MARKDOWN.chomp
#### Summary
**Start time:** #{presenter.start_time}#{markdown_line_break} **Start time:** #{presenter.start_time}#{markdown_line_break}
**Severity:** #{presenter.severity}#{markdown_line_break} **Severity:** #{presenter.severity}#{markdown_line_break}
**Service:** #{alert.service}#{markdown_line_break} **Service:** #{alert.service}#{markdown_line_break}
......
...@@ -30,8 +30,6 @@ RSpec.describe AlertManagement::PrometheusAlertPresenter do ...@@ -30,8 +30,6 @@ RSpec.describe AlertManagement::PrometheusAlertPresenter do
it 'returns an alert issue description' do it 'returns an alert issue description' do
expect(presenter.issue_description).to eq( expect(presenter.issue_description).to eq(
<<~MARKDOWN.chomp <<~MARKDOWN.chomp
#### Summary
**Start time:** #{presenter.start_time}#{markdown_line_break} **Start time:** #{presenter.start_time}#{markdown_line_break}
**Severity:** #{presenter.severity}#{markdown_line_break} **Severity:** #{presenter.severity}#{markdown_line_break}
**full_query:** `vector(1)`#{markdown_line_break} **full_query:** `vector(1)`#{markdown_line_break}
......
...@@ -63,8 +63,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do ...@@ -63,8 +63,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do
it do it do
is_expected.to eq( is_expected.to eq(
<<~MARKDOWN.chomp <<~MARKDOWN.chomp
#### Summary
**Start time:** #{presenter.start_time} **Start time:** #{presenter.start_time}
MARKDOWN MARKDOWN
...@@ -80,8 +78,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do ...@@ -80,8 +78,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do
it do it do
is_expected.to eq( is_expected.to eq(
<<~MARKDOWN.chomp <<~MARKDOWN.chomp
#### Summary
**Start time:** #{presenter.start_time} **Start time:** #{presenter.start_time}
#### Alert Details #### Alert Details
...@@ -101,8 +97,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do ...@@ -101,8 +97,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do
it do it do
is_expected.to eq( is_expected.to eq(
<<~MARKDOWN.chomp <<~MARKDOWN.chomp
#### Summary
**Start time:** #{presenter.start_time}#{markdown_line_break} **Start time:** #{presenter.start_time}#{markdown_line_break}
**full_query:** `query` **full_query:** `query`
...@@ -129,8 +123,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do ...@@ -129,8 +123,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do
it do it do
is_expected.to eq( is_expected.to eq(
<<~MARKDOWN.chomp <<~MARKDOWN.chomp
#### Summary
**Start time:** #{presenter.start_time}#{markdown_line_break} **Start time:** #{presenter.start_time}#{markdown_line_break}
**Service:** service_name#{markdown_line_break} **Service:** service_name#{markdown_line_break}
**Monitoring tool:** monitoring_tool_name#{markdown_line_break} **Monitoring tool:** monitoring_tool_name#{markdown_line_break}
...@@ -151,8 +143,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do ...@@ -151,8 +143,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do
it do it do
is_expected.to eq( is_expected.to eq(
<<~MARKDOWN.chomp <<~MARKDOWN.chomp
#### Summary
**Start time:** #{presenter.start_time}#{markdown_line_break} **Start time:** #{presenter.start_time}#{markdown_line_break}
**Hosts:** http://localhost:3000 **Hosts:** http://localhost:3000
...@@ -168,8 +158,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do ...@@ -168,8 +158,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do
shared_examples_for 'markdown with metrics embed' do shared_examples_for 'markdown with metrics embed' do
let(:expected_markdown) do let(:expected_markdown) do
<<~MARKDOWN.chomp <<~MARKDOWN.chomp
#### Summary
**Start time:** #{presenter.start_time}#{markdown_line_break} **Start time:** #{presenter.start_time}#{markdown_line_break}
**full_query:** `avg(metric) > 1.0` **full_query:** `avg(metric) > 1.0`
...@@ -222,8 +210,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do ...@@ -222,8 +210,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do
context 'when not enough information is present for an embed' do context 'when not enough information is present for an embed' do
let(:expected_markdown) do let(:expected_markdown) do
<<~MARKDOWN.chomp <<~MARKDOWN.chomp
#### Summary
**Start time:** #{presenter.start_time}#{markdown_line_break} **Start time:** #{presenter.start_time}#{markdown_line_break}
**full_query:** `avg(metric) > 1.0` **full_query:** `avg(metric) > 1.0`
...@@ -249,8 +235,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do ...@@ -249,8 +235,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do
context 'without full_query' do context 'without full_query' do
let(:expected_markdown) do let(:expected_markdown) do
<<~MARKDOWN.chomp <<~MARKDOWN.chomp
#### Summary
**Start time:** #{presenter.start_time} **Start time:** #{presenter.start_time}
MARKDOWN MARKDOWN
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment