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
92f35b62
Commit
92f35b62
authored
Jul 01, 2020
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'jivanvl-move-cluster-health-frontend-core' into 'master'"
This reverts merge request !35198
parent
ac01a943
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
9 deletions
+15
-9
app/assets/javascripts/pages/admin/clusters/show/index.js
app/assets/javascripts/pages/admin/clusters/show/index.js
+0
-2
app/assets/javascripts/pages/groups/clusters/show/index.js
app/assets/javascripts/pages/groups/clusters/show/index.js
+0
-2
app/assets/javascripts/pages/projects/clusters/show/index.js
app/assets/javascripts/pages/projects/clusters/show/index.js
+0
-2
app/views/clusters/clusters/show.html.haml
app/views/clusters/clusters/show.html.haml
+1
-1
ee/app/assets/javascripts/pages/admin/clusters/show/index.js
ee/app/assets/javascripts/pages/admin/clusters/show/index.js
+4
-0
ee/app/assets/javascripts/pages/groups/clusters/show/index.js
...pp/assets/javascripts/pages/groups/clusters/show/index.js
+4
-0
ee/app/assets/javascripts/pages/projects/clusters/show/cluster_health.js
...avascripts/pages/projects/clusters/show/cluster_health.js
+2
-2
ee/app/assets/javascripts/pages/projects/clusters/show/index.js
.../assets/javascripts/pages/projects/clusters/show/index.js
+4
-0
No files found.
app/assets/javascripts/pages/admin/clusters/show/index.js
View file @
92f35b62
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
();
});
});
app/assets/javascripts/pages/groups/clusters/show/index.js
View file @
92f35b62
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
();
});
});
app/assets/javascripts/pages/projects/clusters/show/index.js
View file @
92f35b62
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
();
});
});
app/views/clusters/clusters/show.html.haml
View file @
92f35b62
...
@@ -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
'clusters/clusters/health_tab'
=
render
_if_exists
'clusters/clusters/health_tab'
=
render
'applications_tab'
=
render
'applications_tab'
=
render
'advanced_settings_tab'
=
render
'advanced_settings_tab'
...
...
ee/app/assets/javascripts/pages/admin/clusters/show/index.js
0 → 100644
View file @
92f35b62
import
'
~/pages/admin/clusters/show
'
;
import
initClusterHealth
from
'
../../../projects/clusters/show/cluster_health
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initClusterHealth
);
ee/app/assets/javascripts/pages/groups/clusters/show/index.js
0 → 100644
View file @
92f35b62
import
'
~/pages/projects/clusters/show
'
;
import
initClusterHealth
from
'
../../../projects/clusters/show/cluster_health
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initClusterHealth
);
app/assets/javascripts/pages/projects/clusters/show/cluster_health.js
→
ee/
app/assets/javascripts/pages/projects/clusters/show/cluster_health.js
View file @
92f35b62
import
monitoringApp
from
'
~/monitoring/monitoring_app
'
;
import
initCeBundle
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
)
{
monitoringApp
({
initCeBundle
({
...
el
.
dataset
,
...
el
.
dataset
,
showLegend
:
false
,
showLegend
:
false
,
showHeader
:
false
,
showHeader
:
false
,
...
...
ee/app/assets/javascripts/pages/projects/clusters/show/index.js
0 → 100644
View file @
92f35b62
import
'
~/pages/projects/clusters/show
'
;
import
initClusterHealth
from
'
./cluster_health
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initClusterHealth
);
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