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
b6ea6d7f
Commit
b6ea6d7f
authored
Aug 21, 2019
by
Miguel Rincon
Committed by
Filipa Lacerda
Aug 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE Port: Use EE panel type to display alert menu correctly in dashboards
parent
ba30e5de
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
app/assets/javascripts/monitoring/components/dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+13
-1
spec/javascripts/monitoring/components/dashboard_spec.js
spec/javascripts/monitoring/components/dashboard_spec.js
+1
-1
No files found.
app/assets/javascripts/monitoring/components/dashboard.vue
View file @
b6ea6d7f
...
@@ -14,9 +14,9 @@ import { __, s__ } from '~/locale';
...
@@ -14,9 +14,9 @@ import { __, s__ } from '~/locale';
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
{
getParameterValues
,
mergeUrlParams
}
from
'
~/lib/utils/url_utility
'
;
import
{
getParameterValues
,
mergeUrlParams
}
from
'
~/lib/utils/url_utility
'
;
import
invalidUrl
from
'
~/lib/utils/invalid_url
'
;
import
invalidUrl
from
'
~/lib/utils/invalid_url
'
;
import
PanelType
from
'
ee_else_ce/monitoring/components/panel_type.vue
'
;
import
MonitorAreaChart
from
'
./charts/area.vue
'
;
import
MonitorAreaChart
from
'
./charts/area.vue
'
;
import
MonitorSingleStatChart
from
'
./charts/single_stat.vue
'
;
import
MonitorSingleStatChart
from
'
./charts/single_stat.vue
'
;
import
PanelType
from
'
./panel_type.vue
'
;
import
GraphGroup
from
'
./graph_group.vue
'
;
import
GraphGroup
from
'
./graph_group.vue
'
;
import
EmptyState
from
'
./empty_state.vue
'
;
import
EmptyState
from
'
./empty_state.vue
'
;
import
{
sidebarAnimationDuration
,
timeWindows
}
from
'
../constants
'
;
import
{
sidebarAnimationDuration
,
timeWindows
}
from
'
../constants
'
;
...
@@ -141,6 +141,16 @@ export default {
...
@@ -141,6 +141,16 @@ export default {
required
:
false
,
required
:
false
,
default
:
false
,
default
:
false
,
},
},
alertsEndpoint
:
{
type
:
String
,
required
:
false
,
default
:
null
,
},
prometheusAlertsAvailable
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -449,6 +459,8 @@ export default {
...
@@ -449,6 +459,8 @@ export default {
:clipboard-text="generateLink(groupData.group, graphData.title, graphData.y_label)"
:clipboard-text="generateLink(groupData.group, graphData.title, graphData.y_label)"
:graph-data="graphData"
:graph-data="graphData"
:dashboard-width="elWidth"
:dashboard-width="elWidth"
:alerts-endpoint="alertsEndpoint"
:prometheus-alerts-available="prometheusAlertsAvailable"
:index="`${index}-${graphIndex}`"
:index="`${index}-${graphIndex}`"
/>
/>
</
template
>
</
template
>
...
...
spec/javascripts/monitoring/dashboard_spec.js
→
spec/javascripts/monitoring/
components/
dashboard_spec.js
View file @
b6ea6d7f
...
@@ -13,7 +13,7 @@ import MonitoringMock, {
...
@@ -13,7 +13,7 @@ import MonitoringMock, {
environmentData
,
environmentData
,
singleGroupResponse
,
singleGroupResponse
,
dashboardGitResponse
,
dashboardGitResponse
,
}
from
'
./mock_data
'
;
}
from
'
.
.
/mock_data
'
;
const
localVue
=
createLocalVue
();
const
localVue
=
createLocalVue
();
const
propsData
=
{
const
propsData
=
{
...
...
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