Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
07f15f9a
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,发现更多精彩内容 >>
未验证
提交
07f15f9a
编写于
10月 16, 2018
作者:
A
Adriel Santiago
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix prometheus graphs in firefox
上级
b0808af2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
2 deletion
+8
-2
app/assets/javascripts/monitoring/components/graph.vue
app/assets/javascripts/monitoring/components/graph.vue
+3
-2
changelogs/unreleased/40372-prometheus-dashboard-broken-on-firefox.yml
...released/40372-prometheus-dashboard-broken-on-firefox.yml
+5
-0
未找到文件。
app/assets/javascripts/monitoring/components/graph.vue
浏览文件 @
07f15f9a
...
@@ -121,6 +121,7 @@ export default {
...
@@ -121,6 +121,7 @@ export default {
draw
()
{
draw
()
{
const
breakpointSize
=
bp
.
getBreakpointSize
();
const
breakpointSize
=
bp
.
getBreakpointSize
();
const
query
=
this
.
graphData
.
queries
[
0
];
const
query
=
this
.
graphData
.
queries
[
0
];
const
svgWidth
=
this
.
$refs
.
baseSvg
.
getBoundingClientRect
().
width
;
this
.
margin
=
measurements
.
large
.
margin
;
this
.
margin
=
measurements
.
large
.
margin
;
if
(
this
.
smallGraph
||
breakpointSize
===
'
xs
'
||
breakpointSize
===
'
sm
'
)
{
if
(
this
.
smallGraph
||
breakpointSize
===
'
xs
'
||
breakpointSize
===
'
sm
'
)
{
this
.
graphHeight
=
300
;
this
.
graphHeight
=
300
;
...
@@ -130,13 +131,13 @@ export default {
...
@@ -130,13 +131,13 @@ export default {
this
.
unitOfDisplay
=
query
.
unit
||
''
;
this
.
unitOfDisplay
=
query
.
unit
||
''
;
this
.
yAxisLabel
=
this
.
graphData
.
y_label
||
'
Values
'
;
this
.
yAxisLabel
=
this
.
graphData
.
y_label
||
'
Values
'
;
this
.
legendTitle
=
query
.
label
||
'
Average
'
;
this
.
legendTitle
=
query
.
label
||
'
Average
'
;
this
.
graphWidth
=
this
.
$refs
.
baseSvg
.
client
Width
-
this
.
margin
.
left
-
this
.
margin
.
right
;
this
.
graphWidth
=
svg
Width
-
this
.
margin
.
left
-
this
.
margin
.
right
;
this
.
graphHeight
=
this
.
graphHeight
-
this
.
margin
.
top
-
this
.
margin
.
bottom
;
this
.
graphHeight
=
this
.
graphHeight
-
this
.
margin
.
top
-
this
.
margin
.
bottom
;
this
.
baseGraphHeight
=
this
.
graphHeight
-
50
;
this
.
baseGraphHeight
=
this
.
graphHeight
-
50
;
this
.
baseGraphWidth
=
this
.
graphWidth
;
this
.
baseGraphWidth
=
this
.
graphWidth
;
// pixel offsets inside the svg and outside are not 1:1
// pixel offsets inside the svg and outside are not 1:1
this
.
realPixelRatio
=
this
.
$refs
.
baseSvg
.
client
Width
/
this
.
baseGraphWidth
;
this
.
realPixelRatio
=
svg
Width
/
this
.
baseGraphWidth
;
this
.
renderAxesPaths
();
this
.
renderAxesPaths
();
this
.
formatDeployments
();
this
.
formatDeployments
();
...
...
changelogs/unreleased/40372-prometheus-dashboard-broken-on-firefox.yml
0 → 100644
浏览文件 @
07f15f9a
---
title
:
Fix prometheus graphs in firefox
merge_request
:
22400
author
:
type
:
fixed
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录