Add latest changes from gitlab-org/gitlab@master

2 files changed, 49 insertions, 0 deletions

diff --git a/app/views/notify/prometheus_alert_fired_email.html.haml b/app/views/notify/prometheus_alert_fired_email.html.haml
new file mode 100644
index 00000000000..17f9481d353
--- /dev/null
+++ b/app/views/notify/prometheus_alert_fired_email.html.haml
@@ -0,0 +1,28 @@
+%p
+  = _('An alert has been triggered in %{project_path}.') % { project_path: @alert.project_full_path }
+
+- if description = @alert.description
+  %p
+    = _('Description:')
+    = description
+
+- if env_name = @alert.environment_name
+  %p
+    = _('Environment:')
+    = env_name
+
+- if metric_query = @alert.metric_query
+  %p
+    = _('Metric:')
+
+    %pre
+      = metric_query
+
+- if @alert.show_incident_issues_link?
+  %p
+    = link_to(_('View incident issues.'), @alert.incident_issues_link)
+
+- if @alert.show_performance_dashboard_link?
+  %p
+    = link_to(_('View performance dashboard.'), @alert.performance_dashboard_link)
+
diff --git a/app/views/notify/prometheus_alert_fired_email.text.erb b/app/views/notify/prometheus_alert_fired_email.text.erb
new file mode 100644
index 00000000000..c3f005cfb7e
--- /dev/null
+++ b/app/views/notify/prometheus_alert_fired_email.text.erb
@@ -0,0 +1,21 @@
+<%= _('An alert has been triggered in %{project_path}.') % { project_path: @alert.project_full_path } %>.
+
+<% if description = @alert.description %>
+<%= _('Description:') %> <%= description %>
+<% end %>
+
+<% if env_name = @alert.environment_name %>
+<%= _('Environment:') %> <%= env_name %>
+<% end %>
+
+<% if metric_query = @alert.metric_query %>
+<%= _('Metric:') %> <%= metric_query %>
+<% end %>
+
+<% if @alert.show_incident_issues_link? %>
+<%= _('View incident issues.') %> <%= @alert.incident_issues_link %>
+<% end %>
+
+<% if @alert.show_performance_dashboard_link? %>
+<%= _('View the performance dashboard at') %> <%= @alert.performance_dashboard_link %>
+<% end %>