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
cc52dfab
Commit
cc52dfab
authored
Apr 25, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'metrics-graph-error-fix' into 'master'
Metrics graph error fix Closes #30840 See merge request !10839
parents
9852cae8
61abdb15
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
29 deletions
+38
-29
app/assets/javascripts/monitoring/prometheus_graph.js
app/assets/javascripts/monitoring/prometheus_graph.js
+34
-29
changelogs/unreleased/metrics-graph-error-fix.yml
changelogs/unreleased/metrics-graph-error-fix.yml
+4
-0
No files found.
app/assets/javascripts/monitoring/prometheus_graph.js
View file @
cc52dfab
...
...
@@ -22,6 +22,7 @@ class PrometheusGraph {
const
hasMetrics
=
$prometheusContainer
.
data
(
'
has-metrics
'
);
this
.
docLink
=
$prometheusContainer
.
data
(
'
doc-link
'
);
this
.
integrationLink
=
$prometheusContainer
.
data
(
'
prometheus-integration
'
);
this
.
state
=
''
;
$
(
document
).
ajaxError
(()
=>
{});
...
...
@@ -38,8 +39,9 @@ class PrometheusGraph {
this
.
configureGraph
();
this
.
init
();
}
else
{
const
prevState
=
this
.
state
;
this
.
state
=
'
.js-getting-started
'
;
this
.
updateState
();
this
.
updateState
(
prevState
);
}
}
...
...
@@ -53,26 +55,26 @@ class PrometheusGraph {
}
init
()
{
this
.
getData
().
then
((
metricsResponse
)
=>
{
return
this
.
getData
().
then
((
metricsResponse
)
=>
{
let
enoughData
=
true
;
Object
.
keys
(
metricsResponse
.
metrics
).
forEach
((
key
)
=>
{
let
currentKey
;
if
(
key
===
'
cpu_values
'
||
key
===
'
memory_values
'
)
{
currentKey
=
metricsResponse
.
metrics
[
key
];
if
(
Object
.
keys
(
currentKey
).
length
===
0
)
{
enoughData
=
false
;
}
}
});
if
(
!
enoughData
)
{
this
.
state
=
'
.js-loading
'
;
this
.
updateState
();
if
(
typeof
metricsResponse
===
'
undefined
'
)
{
enoughData
=
false
;
}
else
{
Object
.
keys
(
metricsResponse
.
metrics
).
forEach
((
key
)
=>
{
if
(
key
===
'
cpu_values
'
||
key
===
'
memory_values
'
)
{
const
currentData
=
(
metricsResponse
.
metrics
[
key
])[
0
];
if
(
currentData
.
values
.
length
<=
2
)
{
enoughData
=
false
;
}
}
});
}
if
(
enoughData
)
{
$
(
prometheusStatesContainer
).
hide
();
$
(
prometheusParentGraphContainer
).
show
();
this
.
transformData
(
metricsResponse
);
this
.
createGraph
();
}
}).
catch
(()
=>
{
new
Flash
(
'
An error occurred when trying to load metrics. Please try again.
'
);
});
}
...
...
@@ -342,6 +344,8 @@ class PrometheusGraph {
getData
()
{
const
maxNumberOfRequests
=
3
;
this
.
state
=
'
.js-loading
'
;
this
.
updateState
();
return
gl
.
utils
.
backOff
((
next
,
stop
)
=>
{
$
.
ajax
({
url
:
metricsEndpoint
,
...
...
@@ -352,12 +356,11 @@ class PrometheusGraph {
this
.
backOffRequestCounter
=
this
.
backOffRequestCounter
+=
1
;
if
(
this
.
backOffRequestCounter
<
maxNumberOfRequests
)
{
next
();
}
else
{
stop
({
status
:
resp
.
status
,
metrics
:
data
,
});
}
else
if
(
this
.
backOffRequestCounter
>=
maxNumberOfRequests
)
{
stop
(
new
Error
(
'
loading
'
));
}
}
else
if
(
!
data
.
success
)
{
stop
(
new
Error
(
'
loading
'
));
}
else
{
stop
({
status
:
resp
.
status
,
...
...
@@ -373,8 +376,9 @@ class PrometheusGraph {
return
resp
.
metrics
;
})
.
catch
(()
=>
{
const
prevState
=
this
.
state
;
this
.
state
=
'
.js-unable-to-connect
'
;
this
.
updateState
();
this
.
updateState
(
prevState
);
});
}
...
...
@@ -382,19 +386,20 @@ class PrometheusGraph {
Object
.
keys
(
metricsResponse
.
metrics
).
forEach
((
key
)
=>
{
if
(
key
===
'
cpu_values
'
||
key
===
'
memory_values
'
)
{
const
metricValues
=
(
metricsResponse
.
metrics
[
key
])[
0
];
if
(
metricValues
!==
undefined
)
{
this
.
graphSpecificProperties
[
key
].
data
=
metricValues
.
values
.
map
(
metric
=>
({
time
:
new
Date
(
metric
[
0
]
*
1000
),
value
:
metric
[
1
],
}));
}
this
.
graphSpecificProperties
[
key
].
data
=
metricValues
.
values
.
map
(
metric
=>
({
time
:
new
Date
(
metric
[
0
]
*
1000
),
value
:
metric
[
1
],
}));
}
});
}
updateState
()
{
updateState
(
prevState
)
{
const
$statesContainer
=
$
(
prometheusStatesContainer
);
$
(
prometheusParentGraphContainer
).
hide
();
if
(
prevState
)
{
$
(
`
${
prevState
}
`
,
$statesContainer
).
addClass
(
'
hidden
'
);
}
$
(
`
${
this
.
state
}
`
,
$statesContainer
).
removeClass
(
'
hidden
'
);
$
(
prometheusStatesContainer
).
show
();
}
...
...
changelogs/unreleased/metrics-graph-error-fix.yml
0 → 100644
View file @
cc52dfab
---
title
:
Fixed Prometheus monitoring graphs not showing empty states in certain scenarios
merge_request
:
author
:
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