Commit f42e8221 authored by Fatih Acet's avatar Fatih Acet

Merge branch '51963-support-prometheus-for-group-level-clusters-ee' into 'master'

EE Backport: Support Prometheus for group-level clusters

See merge request gitlab-org/gitlab-ee!10868
parents 2e5b3bb4 7c6c092c
......@@ -389,7 +389,6 @@ export default {
</template>
</application-row>
<application-row
v-if="isProjectCluster"
id="prometheus"
:logo-url="prometheusLogo"
:title="applications.prometheus.title"
......
---
title: Support prometheus for group level clusters
merge_request: 27280
author:
type: changed
import '~/pages/projects/clusters/show';
import initClusterHealth from '../../../projects/clusters/show/cluster_health';
document.addEventListener('DOMContentLoaded', initClusterHealth);
......@@ -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', () => {
......
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