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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
d2688b28
Commit
d2688b28
authored
Jan 30, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add manage button to application rows in cluster integration
parent
529edc9e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
5 deletions
+28
-5
app/assets/javascripts/clusters/components/application_row.vue
...ssets/javascripts/clusters/components/application_row.vue
+17
-1
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+11
-4
No files found.
app/assets/javascripts/clusters/components/application_row.vue
View file @
d2688b28
...
@@ -32,6 +32,10 @@
...
@@ -32,6 +32,10 @@
type
:
String
,
type
:
String
,
required
:
false
,
required
:
false
,
},
},
manageLink
:
{
type
:
String
,
required
:
false
,
},
description
:
{
description
:
{
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
...
@@ -141,9 +145,21 @@
...
@@ -141,9 +145,21 @@
<div
v-html=
"description"
></div>
<div
v-html=
"description"
></div>
</div>
</div>
<div
<div
class=
"table-section table-button-footer section-15 section-align-top"
class=
"table-section table-button-footer section-align-top"
:class=
"
{ 'section-20': manageLink, 'section-15': !manageLink }"
role="gridcell"
role="gridcell"
>
>
<div
v-if=
"manageLink"
class=
"btn-group table-action-buttons"
>
<a
class=
"btn"
:href=
"manageLink"
>
Manage
</a>
</div>
<div
class=
"btn-group table-action-buttons"
>
<div
class=
"btn-group table-action-buttons"
>
<loading-button
<loading-button
class=
"js-cluster-application-install-button"
class=
"js-cluster-application-install-button"
...
...
app/assets/javascripts/clusters/components/applications.vue
View file @
d2688b28
...
@@ -18,6 +18,11 @@
...
@@ -18,6 +18,11 @@
required
:
false
,
required
:
false
,
default
:
''
,
default
:
''
,
},
},
managePrometheusPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
}
},
},
computed
:
{
computed
:
{
generalApplicationDescription
()
{
generalApplicationDescription
()
{
...
@@ -76,11 +81,12 @@
...
@@ -76,11 +81,12 @@
},
},
prometheusDescription
()
{
prometheusDescription
()
{
return
sprintf
(
return
sprintf
(
_
.
escape
(
s__
(
`ClusterIntegration|Prometheus is an open-source monitoring system
_
.
escape
(
s__
(
with %{gitlabIntegrationLink} to monitor deployed applications.`
)),
`ClusterIntegration|Prometheus is an open-source monitoring system
{
with %{gitlabIntegrationLink} to monitor deployed applications.`
,
)),
{
gitlabIntegrationLink
:
`<a href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html"
gitlabIntegrationLink
:
`<a href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html"
target="_blank" rel="noopener noreferrer">
target="_blank" rel="noopener noreferrer">
${
_
.
escape
(
s__
(
'
ClusterIntegration|GitLab Integration
'
))}
</a>`
,
${
_
.
escape
(
s__
(
'
ClusterIntegration|GitLab Integration
'
))}
</a>`
,
},
},
false
,
false
,
...
@@ -129,6 +135,7 @@ target="_blank" rel="noopener noreferrer">
...
@@ -129,6 +135,7 @@ target="_blank" rel="noopener noreferrer">
id=
"prometheus"
id=
"prometheus"
:title=
"applications.prometheus.title"
:title=
"applications.prometheus.title"
title-link=
"https://prometheus.io/docs/introduction/overview/"
title-link=
"https://prometheus.io/docs/introduction/overview/"
:manage-link=
"managePrometheusPath"
:description=
"prometheusDescription"
:description=
"prometheusDescription"
:status=
"applications.prometheus.status"
:status=
"applications.prometheus.status"
:status-reason=
"applications.prometheus.statusReason"
:status-reason=
"applications.prometheus.statusReason"
...
...
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