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
40d93ce6
Commit
40d93ce6
authored
7 years ago
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add button to configure prometheus integration from cluster page
parent
d2688b28
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
app/assets/javascripts/clusters/clusters_bundle.js
app/assets/javascripts/clusters/clusters_bundle.js
+3
-0
app/assets/javascripts/clusters/stores/clusters_store.js
app/assets/javascripts/clusters/stores/clusters_store.js
+4
-0
app/views/projects/clusters/show.html.haml
app/views/projects/clusters/show.html.haml
+2
-1
No files found.
app/assets/javascripts/clusters/clusters_bundle.js
View file @
40d93ce6
...
@@ -32,6 +32,7 @@ export default class Clusters {
...
@@ -32,6 +32,7 @@ export default class Clusters {
installIngressPath
,
installIngressPath
,
installRunnerPath
,
installRunnerPath
,
installPrometheusPath
,
installPrometheusPath
,
managePrometheusPath
,
clusterStatus
,
clusterStatus
,
clusterStatusReason
,
clusterStatusReason
,
helpPath
,
helpPath
,
...
@@ -39,6 +40,7 @@ export default class Clusters {
...
@@ -39,6 +40,7 @@ export default class Clusters {
this
.
store
=
new
ClustersStore
();
this
.
store
=
new
ClustersStore
();
this
.
store
.
setHelpPath
(
helpPath
);
this
.
store
.
setHelpPath
(
helpPath
);
this
.
store
.
setManagePrometheusPath
(
managePrometheusPath
);
this
.
store
.
updateStatus
(
clusterStatus
);
this
.
store
.
updateStatus
(
clusterStatus
);
this
.
store
.
updateStatusReason
(
clusterStatusReason
);
this
.
store
.
updateStatusReason
(
clusterStatusReason
);
this
.
service
=
new
ClustersService
({
this
.
service
=
new
ClustersService
({
...
@@ -93,6 +95,7 @@ export default class Clusters {
...
@@ -93,6 +95,7 @@ export default class Clusters {
props
:
{
props
:
{
applications
:
this
.
state
.
applications
,
applications
:
this
.
state
.
applications
,
helpPath
:
this
.
state
.
helpPath
,
helpPath
:
this
.
state
.
helpPath
,
managePrometheusPath
:
this
.
state
.
managePrometheusPath
,
},
},
});
});
},
},
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/clusters/stores/clusters_store.js
View file @
40d93ce6
...
@@ -43,6 +43,10 @@ export default class ClusterStore {
...
@@ -43,6 +43,10 @@ export default class ClusterStore {
this
.
state
.
helpPath
=
helpPath
;
this
.
state
.
helpPath
=
helpPath
;
}
}
setManagePrometheusPath
(
managePrometheusPath
)
{
this
.
state
.
managePrometheusPath
=
managePrometheusPath
;
}
updateStatus
(
status
)
{
updateStatus
(
status
)
{
this
.
state
.
status
=
status
;
this
.
state
.
status
=
status
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/clusters/show.html.haml
View file @
40d93ce6
...
@@ -13,7 +13,8 @@
...
@@ -13,7 +13,8 @@
toggle_status:
@cluster
.
enabled?
?
'true'
:
'false'
,
toggle_status:
@cluster
.
enabled?
?
'true'
:
'false'
,
cluster_status:
@cluster
.
status_name
,
cluster_status:
@cluster
.
status_name
,
cluster_status_reason:
@cluster
.
status_reason
,
cluster_status_reason:
@cluster
.
status_reason
,
help_path:
help_page_path
(
'user/project/clusters/index.md'
,
anchor:
'installing-applications'
)
}
}
help_path:
help_page_path
(
'user/project/clusters/index.md'
,
anchor:
'installing-applications'
),
manage_prometheus_path:
edit_project_service_path
(
@cluster
.
project
,
'prometheus'
)
}
}
.js-cluster-application-notice
.js-cluster-application-notice
.flash-container
.flash-container
...
...
This diff is collapsed.
Click to expand it.
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