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
7c6c092c
Commit
7c6c092c
authored
May 06, 2019
by
Peter Leitzen
Committed by
Fatih Acet
May 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EE Backport: Support Prometheus for group-level clusters
parent
2e5b3bb4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
2 deletions
+10
-2
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+0
-1
changelogs/unreleased/51963-support-prometheus-for-group-level-clusters.yml
...sed/51963-support-prometheus-for-group-level-clusters.yml
+5
-0
ee/app/assets/javascripts/pages/groups/clusters/show/index.js
...pp/assets/javascripts/pages/groups/clusters/show/index.js
+4
-0
spec/frontend/clusters/components/applications_spec.js
spec/frontend/clusters/components/applications_spec.js
+1
-1
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
7c6c092c
...
...
@@ -389,7 +389,6 @@ export default {
</
template
>
</application-row>
<application-row
v-if=
"isProjectCluster"
id=
"prometheus"
:logo-url=
"prometheusLogo"
:title=
"applications.prometheus.title"
...
...
changelogs/unreleased/51963-support-prometheus-for-group-level-clusters.yml
0 → 100644
View file @
7c6c092c
---
title
:
Support prometheus for group level clusters
merge_request
:
27280
author
:
type
:
changed
ee/app/assets/javascripts/pages/groups/clusters/show/index.js
0 → 100644
View file @
7c6c092c
import
'
~/pages/projects/clusters/show
'
;
import
initClusterHealth
from
'
../../../projects/clusters/show/cluster_health
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initClusterHealth
);
spec/frontend/clusters/components/applications_spec.js
View file @
7c6c092c
...
...
@@ -75,7 +75,7 @@ describe('Applications', () => {
});
it
(
'
renders a row for Prometheus
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-cluster-application-row-prometheus
'
)).
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.js-cluster-application-row-prometheus
'
)).
not
.
toBeNull
();
});
it
(
'
renders a row for GitLab Runner
'
,
()
=>
{
...
...
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