Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9ba9b397
Commit
9ba9b397
authored
Aug 17, 2020
by
Sarah Yasonik
Committed by
Phil Hughes
Aug 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show runbook in alert detail view
parent
d7239da8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
0 deletions
+17
-0
app/assets/javascripts/alert_management/components/alert_details.vue
...javascripts/alert_management/components/alert_details.vue
+6
-0
app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql
...management/graphql/fragments/detail_item.fragment.graphql
+1
-0
changelogs/unreleased/sy-surface-runbook-in-alert.yml
changelogs/unreleased/sy-surface-runbook-in-alert.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/frontend/alert_management/components/alert_details_spec.js
...rontend/alert_management/components/alert_details_spec.js
+2
-0
No files found.
app/assets/javascripts/alert_management/components/alert_details.vue
View file @
9ba9b397
...
@@ -324,6 +324,12 @@ export default {
...
@@ -324,6 +324,12 @@ export default {
</div>
</div>
<div
class=
"gl-pl-2"
data-testid=
"service"
>
{{ alert.service }}
</div>
<div
class=
"gl-pl-2"
data-testid=
"service"
>
{{ alert.service }}
</div>
</div>
</div>
<div
v-if=
"alert.runbook"
class=
"gl-my-5 gl-display-flex"
>
<div
class=
"bold gl-w-13 gl-text-right gl-pr-3"
>
{{ s__('AlertManagement|Runbook') }}:
</div>
<div
class=
"gl-pl-2"
data-testid=
"runbook"
>
{{ alert.runbook }}
</div>
</div>
<
template
>
<
template
>
<div
v-if=
"alert.notes.nodes"
class=
"issuable-discussion py-5"
>
<div
v-if=
"alert.notes.nodes"
class=
"issuable-discussion py-5"
>
<ul
class=
"notes main-notes-list timeline"
>
<ul
class=
"notes main-notes-list timeline"
>
...
...
app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql
View file @
9ba9b397
...
@@ -11,6 +11,7 @@ fragment AlertDetailItem on AlertManagementAlert {
...
@@ -11,6 +11,7 @@ fragment AlertDetailItem on AlertManagementAlert {
updatedAt
updatedAt
endedAt
endedAt
details
details
runbook
todos
{
todos
{
nodes
{
nodes
{
id
id
...
...
changelogs/unreleased/sy-surface-runbook-in-alert.yml
0 → 100644
View file @
9ba9b397
---
title
:
Show runbook for alert in detail view
merge_request
:
39477
author
:
type
:
added
locale/gitlab.pot
View file @
9ba9b397
...
@@ -2174,6 +2174,9 @@ msgstr ""
...
@@ -2174,6 +2174,9 @@ msgstr ""
msgid "AlertManagement|Resolved"
msgid "AlertManagement|Resolved"
msgstr ""
msgstr ""
msgid "AlertManagement|Runbook"
msgstr ""
msgid "AlertManagement|Service"
msgid "AlertManagement|Service"
msgstr ""
msgstr ""
...
...
spec/frontend/alert_management/components/alert_details_spec.js
View file @
9ba9b397
...
@@ -118,6 +118,8 @@ describe('AlertDetails', () => {
...
@@ -118,6 +118,8 @@ describe('AlertDetails', () => {
${
'
monitoringTool
'
}
|
${
undefined
}
|
${
false
}
${
'
monitoringTool
'
}
|
${
undefined
}
|
${
false
}
${
'
service
'
}
|
${
'
Prometheus
'
}
|
${
true
}
${
'
service
'
}
|
${
'
Prometheus
'
}
|
${
true
}
${
'
service
'
}
|
${
undefined
}
|
${
false
}
${
'
service
'
}
|
${
undefined
}
|
${
false
}
${
'
runbook
'
}
|
${
undefined
}
|
${
false
}
${
'
runbook
'
}
|
${
'
run.com
'
}
|
${
true
}
`
(
`$desc`
,
({
field
,
data
,
isShown
})
=>
{
`
(
`$desc`
,
({
field
,
data
,
isShown
})
=>
{
beforeEach
(()
=>
{
beforeEach
(()
=>
{
mountComponent
({
data
:
{
alert
:
{
...
mockAlert
,
[
field
]:
data
}
}
});
mountComponent
({
data
:
{
alert
:
{
...
mockAlert
,
[
field
]:
data
}
}
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment