Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3565ee2e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
3565ee2e
编写于
5月 07, 2019
作者:
A
Adriel Santiago
提交者:
Clement Ho
5月 07, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add external dashboard link
Add settings for linking to external dashboard from metrics dashboard
上级
4ebfcd3b
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
286 addition
and
1 deletion
+286
-1
app/assets/javascripts/monitoring/components/dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+16
-1
app/assets/javascripts/operation_settings/components/external_dashboard.vue
...ipts/operation_settings/components/external_dashboard.vue
+57
-0
app/assets/javascripts/operation_settings/index.js
app/assets/javascripts/operation_settings/index.js
+26
-0
app/assets/javascripts/pages/projects/settings/operations/show/index.js
...ascripts/pages/projects/settings/operations/show/index.js
+2
-0
app/controllers/projects/environments_controller.rb
app/controllers/projects/environments_controller.rb
+1
-0
app/controllers/projects/settings/operations_controller.rb
app/controllers/projects/settings/operations_controller.rb
+4
-0
app/views/projects/settings/operations/_external_dashboard.html.haml
...rojects/settings/operations/_external_dashboard.html.haml
+2
-0
app/views/projects/settings/operations/show.html.haml
app/views/projects/settings/operations/show.html.haml
+1
-0
locale/gitlab.pot
locale/gitlab.pot
+15
-0
spec/frontend/operation_settings/components/external_dashboard_spec.js
.../operation_settings/components/external_dashboard_spec.js
+100
-0
spec/javascripts/monitoring/dashboard_spec.js
spec/javascripts/monitoring/dashboard_spec.js
+62
-0
未找到文件。
app/assets/javascripts/monitoring/components/dashboard.vue
浏览文件 @
3565ee2e
<
script
>
<
script
>
import
{
GlDropdown
,
GlDropdownItem
,
GlLink
}
from
'
@gitlab/ui
'
;
import
{
Gl
Button
,
Gl
Dropdown
,
GlDropdownItem
,
GlLink
}
from
'
@gitlab/ui
'
;
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
...
@@ -23,12 +23,18 @@ export default {
...
@@ -23,12 +23,18 @@ export default {
GraphGroup
,
GraphGroup
,
EmptyState
,
EmptyState
,
Icon
,
Icon
,
GlButton
,
GlDropdown
,
GlDropdown
,
GlDropdownItem
,
GlDropdownItem
,
GlLink
,
GlLink
,
},
},
props
:
{
props
:
{
externalDashboardPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
hasMetrics
:
{
hasMetrics
:
{
type
:
Boolean
,
type
:
Boolean
,
required
:
false
,
required
:
false
,
...
@@ -241,6 +247,15 @@ export default {
...
@@ -241,6 +247,15 @@ export default {
>
>
</gl-dropdown>
</gl-dropdown>
</div>
</div>
<gl-button
v-if=
"externalDashboardPath.length"
class=
"js-external-dashboard-link"
variant=
"primary"
:href=
"externalDashboardPath"
>
{{
__
(
'
View full dashboard
'
)
}}
<icon
name=
"external-link"
/>
</gl-button>
</div>
</div>
<graph-group
<graph-group
v-for=
"(groupData, index) in store.groups"
v-for=
"(groupData, index) in store.groups"
...
...
app/assets/javascripts/operation_settings/components/external_dashboard.vue
0 → 100644
浏览文件 @
3565ee2e
<
script
>
import
{
GlButton
,
GlFormGroup
,
GlFormInput
,
GlLink
}
from
'
@gitlab/ui
'
;
export
default
{
components
:
{
GlButton
,
GlFormGroup
,
GlFormInput
,
GlLink
,
},
props
:
{
externalDashboardPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
externalDashboardHelpPagePath
:
{
type
:
String
,
required
:
true
,
},
},
};
</
script
>
<
template
>
<section
class=
"settings expanded"
>
<div
class=
"settings-header"
>
<h4
class=
"js-section-header"
>
{{
s__
(
'
ExternalMetrics|External Dashboard
'
)
}}
</h4>
<p
class=
"js-section-sub-header"
>
{{
s__
(
'
ExternalMetrics|Add a button to the metrics dashboard linking directly to your existing external dashboards.
'
,
)
}}
<gl-link
:href=
"externalDashboardHelpPagePath"
>
{{
__
(
'
Learn more
'
)
}}
</gl-link>
</p>
</div>
<div
class=
"settings-content"
>
<form>
<gl-form-group
:label=
"s__('ExternalMetrics|Full dashboard URL')"
:description=
"s__('ExternalMetrics|Enter the URL of the dashboard you want to link to')"
>
<gl-form-input
:value=
"externalDashboardPath"
placeholder=
"https://my-org.gitlab.io/my-dashboards"
/>
</gl-form-group>
<gl-button
variant=
"success"
>
{{
__
(
'
Save Changes
'
)
}}
</gl-button>
</form>
</div>
</section>
</
template
>
app/assets/javascripts/operation_settings/index.js
0 → 100644
浏览文件 @
3565ee2e
import
Vue
from
'
vue
'
;
import
ExternalDashboardForm
from
'
./components/external_dashboard.vue
'
;
export
default
()
=>
{
/**
* This check can be removed when we remove
* the :grafana_dashboard_link feature flag
*/
if
(
!
gon
.
features
.
grafanaDashboardLink
)
{
return
null
;
}
const
el
=
document
.
querySelector
(
'
.js-operation-settings
'
);
return
new
Vue
({
el
,
render
(
createElement
)
{
return
createElement
(
ExternalDashboardForm
,
{
props
:
{
...
el
.
dataset
,
expanded
:
false
,
},
});
},
});
};
app/assets/javascripts/pages/projects/settings/operations/show/index.js
浏览文件 @
3565ee2e
import
mountErrorTrackingForm
from
'
~/error_tracking_settings
'
;
import
mountErrorTrackingForm
from
'
~/error_tracking_settings
'
;
import
mountOperationSettings
from
'
~/operation_settings
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
mountErrorTrackingForm
();
mountErrorTrackingForm
();
mountOperationSettings
();
});
});
app/controllers/projects/environments_controller.rb
浏览文件 @
3565ee2e
...
@@ -14,6 +14,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
...
@@ -14,6 +14,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
push_frontend_feature_flag
(
:metrics_time_window
)
push_frontend_feature_flag
(
:metrics_time_window
)
push_frontend_feature_flag
(
:environment_metrics_use_prometheus_endpoint
)
push_frontend_feature_flag
(
:environment_metrics_use_prometheus_endpoint
)
push_frontend_feature_flag
(
:environment_metrics_show_multiple_dashboards
)
push_frontend_feature_flag
(
:environment_metrics_show_multiple_dashboards
)
push_frontend_feature_flag
(
:grafana_dashboard_link
)
end
end
def
index
def
index
...
...
app/controllers/projects/settings/operations_controller.rb
浏览文件 @
3565ee2e
...
@@ -5,6 +5,10 @@ module Projects
...
@@ -5,6 +5,10 @@ module Projects
class
OperationsController
<
Projects
::
ApplicationController
class
OperationsController
<
Projects
::
ApplicationController
before_action
:authorize_update_environment!
before_action
:authorize_update_environment!
before_action
do
push_frontend_feature_flag
(
:grafana_dashboard_link
)
end
helper_method
:error_tracking_setting
helper_method
:error_tracking_setting
def
show
def
show
...
...
app/views/projects/settings/operations/_external_dashboard.html.haml
0 → 100644
浏览文件 @
3565ee2e
.js-operation-settings
{
data:
{
external_dashboard:
{
path:
''
,
help_page_path:
help_page_path
(
'user/project/operations/link_to_external_dashboard'
)
}
}
}
app/views/projects/settings/operations/show.html.haml
浏览文件 @
3565ee2e
...
@@ -4,4 +4,5 @@
...
@@ -4,4 +4,5 @@
=
render_if_exists
'projects/settings/operations/incidents'
=
render_if_exists
'projects/settings/operations/incidents'
=
render
'projects/settings/operations/error_tracking'
,
expanded:
true
=
render
'projects/settings/operations/error_tracking'
,
expanded:
true
=
render
'projects/settings/operations/external_dashboard'
=
render_if_exists
'projects/settings/operations/tracing'
=
render_if_exists
'projects/settings/operations/tracing'
locale/gitlab.pot
浏览文件 @
3565ee2e
...
@@ -4115,6 +4115,18 @@ msgstr ""
...
@@ -4115,6 +4115,18 @@ msgstr ""
msgid "ExternalAuthorizationService|When no classification label is set the default label `%{default_label}` will be used."
msgid "ExternalAuthorizationService|When no classification label is set the default label `%{default_label}` will be used."
msgstr ""
msgstr ""
msgid "ExternalMetrics|Add a button to the metrics dashboard linking directly to your existing external dashboards."
msgstr ""
msgid "ExternalMetrics|Enter the URL of the dashboard you want to link to"
msgstr ""
msgid "ExternalMetrics|External Dashboard"
msgstr ""
msgid "ExternalMetrics|Full dashboard URL"
msgstr ""
msgid "ExternalWikiService|External Wiki"
msgid "ExternalWikiService|External Wiki"
msgstr ""
msgstr ""
...
@@ -10565,6 +10577,9 @@ msgstr ""
...
@@ -10565,6 +10577,9 @@ msgstr ""
msgid "View file @ "
msgid "View file @ "
msgstr ""
msgstr ""
msgid "View full dashboard"
msgstr ""
msgid "View group labels"
msgid "View group labels"
msgstr ""
msgstr ""
...
...
spec/frontend/operation_settings/components/external_dashboard_spec.js
0 → 100644
浏览文件 @
3565ee2e
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
GlButton
,
GlLink
,
GlFormGroup
,
GlFormInput
}
from
'
@gitlab/ui
'
;
import
ExternalDashboard
from
'
~/operation_settings/components/external_dashboard.vue
'
;
import
{
TEST_HOST
}
from
'
helpers/test_constants
'
;
describe
(
'
operation settings external dashboard component
'
,
()
=>
{
let
wrapper
;
const
externalDashboardPath
=
`http://mock-external-domain.com/external/dashboard/path`
;
const
externalDashboardHelpPagePath
=
`
${
TEST_HOST
}
/help/page/path`
;
beforeEach
(()
=>
{
wrapper
=
shallowMount
(
ExternalDashboard
,
{
propsData
:
{
externalDashboardPath
,
externalDashboardHelpPagePath
,
},
});
});
it
(
'
renders header text
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.js-section-header
'
).
text
()).
toBe
(
'
External Dashboard
'
);
});
describe
(
'
sub-header
'
,
()
=>
{
let
subHeader
;
beforeEach
(()
=>
{
subHeader
=
wrapper
.
find
(
'
.js-section-sub-header
'
);
});
it
(
'
renders descriptive text
'
,
()
=>
{
expect
(
subHeader
.
text
()).
toContain
(
'
Add a button to the metrics dashboard linking directly to your existing external dashboards.
'
,
);
});
it
(
'
renders help page link
'
,
()
=>
{
const
link
=
subHeader
.
find
(
GlLink
);
expect
(
link
.
text
()).
toBe
(
'
Learn more
'
);
expect
(
link
.
attributes
().
href
).
toBe
(
externalDashboardHelpPagePath
);
});
});
describe
(
'
form
'
,
()
=>
{
let
form
;
beforeEach
(()
=>
{
form
=
wrapper
.
find
(
'
form
'
);
});
describe
(
'
external dashboard url
'
,
()
=>
{
describe
(
'
input label
'
,
()
=>
{
let
formGroup
;
beforeEach
(()
=>
{
formGroup
=
form
.
find
(
GlFormGroup
);
});
it
(
'
uses label text
'
,
()
=>
{
expect
(
formGroup
.
attributes
().
label
).
toBe
(
'
Full dashboard URL
'
);
});
it
(
'
uses description text
'
,
()
=>
{
expect
(
formGroup
.
attributes
().
description
).
toBe
(
'
Enter the URL of the dashboard you want to link to
'
,
);
});
});
describe
(
'
input field
'
,
()
=>
{
let
input
;
beforeEach
(()
=>
{
input
=
form
.
find
(
GlFormInput
);
});
it
(
'
defaults to externalDashboardPath prop
'
,
()
=>
{
expect
(
input
.
attributes
().
value
).
toBe
(
externalDashboardPath
);
});
it
(
'
uses a placeholder
'
,
()
=>
{
expect
(
input
.
attributes
().
placeholder
).
toBe
(
'
https://my-org.gitlab.io/my-dashboards
'
);
});
});
describe
(
'
submit button
'
,
()
=>
{
let
submit
;
beforeEach
(()
=>
{
submit
=
form
.
find
(
GlButton
);
});
it
(
'
renders button label
'
,
()
=>
{
expect
(
submit
.
text
()).
toBe
(
'
Save Changes
'
);
});
});
});
});
});
spec/javascripts/monitoring/dashboard_spec.js
浏览文件 @
3565ee2e
...
@@ -37,6 +37,9 @@ describe('Dashboard', () => {
...
@@ -37,6 +37,9 @@ describe('Dashboard', () => {
window
.
gon
=
{
window
.
gon
=
{
...
window
.
gon
,
...
window
.
gon
,
ee
:
false
,
ee
:
false
,
features
:
{
grafanaDashboardLink
:
true
,
},
};
};
mock
=
new
MockAdapter
(
axios
);
mock
=
new
MockAdapter
(
axios
);
...
@@ -323,4 +326,63 @@ describe('Dashboard', () => {
...
@@ -323,4 +326,63 @@ describe('Dashboard', () => {
.
catch
(
done
.
fail
);
.
catch
(
done
.
fail
);
});
});
});
});
describe
(
'
external dashboard link
'
,
()
=>
{
let
component
;
beforeEach
(()
=>
{
mock
.
onGet
(
mockApiEndpoint
).
reply
(
200
,
metricsGroupsAPIResponse
);
});
afterEach
(()
=>
{
component
.
$destroy
();
});
describe
(
'
with feature flag enabled
'
,
()
=>
{
beforeEach
(()
=>
{
component
=
new
DashboardComponent
({
el
:
document
.
querySelector
(
'
.prometheus-graphs
'
),
propsData
:
{
...
propsData
,
hasMetrics
:
true
,
showPanels
:
false
,
showTimeWindowDropdown
:
false
,
externalDashboardPath
:
'
/mockPath
'
,
},
});
});
it
(
'
shows the link
'
,
done
=>
{
setTimeout
(()
=>
{
expect
(
component
.
$el
.
querySelector
(
'
.js-external-dashboard-link
'
).
innerText
).
toContain
(
'
View full dashboard
'
,
);
done
();
});
});
});
describe
(
'
without feature flage enabled
'
,
()
=>
{
beforeEach
(()
=>
{
window
.
gon
.
features
.
grafanaDashboardLink
=
false
;
component
=
new
DashboardComponent
({
el
:
document
.
querySelector
(
'
.prometheus-graphs
'
),
propsData
:
{
...
propsData
,
hasMetrics
:
true
,
showPanels
:
false
,
showTimeWindowDropdown
:
false
,
externalDashboardPath
:
''
,
},
});
});
it
(
'
does not show the link
'
,
done
=>
{
setTimeout
(()
=>
{
expect
(
component
.
$el
.
querySelector
(
'
.js-external-dashboard-link
'
)).
toBe
(
null
);
done
();
});
});
});
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录