Commit 94c53bcf authored by Jose Vargas's avatar Jose Vargas

Move cluster_health to core

This moves the frontend components as
well as the QA tests to core
parent 460a3e7c
import ClustersBundle from '~/clusters/clusters_bundle'; import ClustersBundle from '~/clusters/clusters_bundle';
import initClusterHealth from '~/pages/projects/clusters/show/cluster_health';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
new ClustersBundle(); // eslint-disable-line no-new new ClustersBundle(); // eslint-disable-line no-new
initClusterHealth();
}); });
import ClustersBundle from '~/clusters/clusters_bundle'; import ClustersBundle from '~/clusters/clusters_bundle';
import initClusterHealth from '~/pages/projects/clusters/show/cluster_health';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
new ClustersBundle(); // eslint-disable-line no-new new ClustersBundle(); // eslint-disable-line no-new
initClusterHealth();
}); });
import initCeBundle from '~/monitoring/monitoring_app'; import monitoringApp from '~/monitoring/monitoring_app';
export default () => { export default () => {
const el = document.getElementById('prometheus-graphs'); const el = document.getElementById('prometheus-graphs');
if (el && el.dataset) { if (el && el.dataset) {
initCeBundle({ monitoringApp({
...el.dataset, ...el.dataset,
showLegend: false, showLegend: false,
showHeader: false, showHeader: false,
......
import ClustersBundle from '~/clusters/clusters_bundle'; import ClustersBundle from '~/clusters/clusters_bundle';
import initGkeNamespace from '~/create_cluster/gke_cluster_namespace'; import initGkeNamespace from '~/create_cluster/gke_cluster_namespace';
import initClusterHealth from './cluster_health';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
new ClustersBundle(); // eslint-disable-line no-new new ClustersBundle(); // eslint-disable-line no-new
initGkeNamespace(); initGkeNamespace();
initClusterHealth();
}); });
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
%ul.nav-links.mobile-separator.nav.nav-tabs{ role: 'tablist' } %ul.nav-links.mobile-separator.nav.nav-tabs{ role: 'tablist' }
= render 'details_tab' = render 'details_tab'
= render_if_exists 'clusters/clusters/environments_tab' = render_if_exists 'clusters/clusters/environments_tab'
= render_if_exists 'clusters/clusters/health_tab' = render 'clusters/clusters/health_tab'
= render 'applications_tab' = render 'applications_tab'
= render 'advanced_settings_tab' = render 'advanced_settings_tab'
......
import '~/pages/admin/clusters/show';
import initClusterHealth from '../../../projects/clusters/show/cluster_health';
document.addEventListener('DOMContentLoaded', initClusterHealth);
import '~/pages/projects/clusters/show';
import initClusterHealth from '../../../projects/clusters/show/cluster_health';
document.addEventListener('DOMContentLoaded', initClusterHealth);
import '~/pages/projects/clusters/show';
import initClusterHealth from './cluster_health';
document.addEventListener('DOMContentLoaded', initClusterHealth);
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
module EE
module Page module Page
module Project module Project
module Operations module Operations
...@@ -13,11 +12,11 @@ module QA ...@@ -13,11 +12,11 @@ module QA
super super
base.class_eval do base.class_eval do
view 'ee/app/views/clusters/clusters/_health.html.haml' do view 'app/views/clusters/clusters/_health.html.haml' do
element :cluster_health_section element :cluster_health_section
end end
view 'ee/app/views/clusters/clusters/_health_tab.html.haml' do view 'app/views/clusters/clusters/_health_tab.html.haml' do
element :health, required: true element :health, required: true
end end
end end
...@@ -50,5 +49,4 @@ module QA ...@@ -50,5 +49,4 @@ module QA
end end
end end
end end
end
end end
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