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
309c1e6b
Commit
309c1e6b
authored
Nov 05, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pass all graph queries into createTimeSeries
parent
b7273c10
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
app/assets/javascripts/monitoring/components/graph.vue
app/assets/javascripts/monitoring/components/graph.vue
+1
-1
app/assets/javascripts/monitoring/utils/multiple_time_series.js
...sets/javascripts/monitoring/utils/multiple_time_series.js
+2
-1
No files found.
app/assets/javascripts/monitoring/components/graph.vue
View file @
309c1e6b
...
@@ -138,7 +138,7 @@
...
@@ -138,7 +138,7 @@
renderAxesPaths
()
{
renderAxesPaths
()
{
this
.
timeSeries
=
createTimeSeries
(
this
.
timeSeries
=
createTimeSeries
(
this
.
graphData
.
queries
[
0
]
,
this
.
graphData
.
queries
,
this
.
graphWidth
,
this
.
graphWidth
,
this
.
graphHeight
,
this
.
graphHeight
,
this
.
graphHeightOffset
,
this
.
graphHeightOffset
,
...
...
app/assets/javascripts/monitoring/utils/multiple_time_series.js
View file @
309c1e6b
...
@@ -11,7 +11,8 @@ const defaultColorPalette = {
...
@@ -11,7 +11,8 @@ const defaultColorPalette = {
const
defaultColorOrder
=
[
'
blue
'
,
'
orange
'
,
'
red
'
,
'
green
'
,
'
purple
'
];
const
defaultColorOrder
=
[
'
blue
'
,
'
orange
'
,
'
red
'
,
'
green
'
,
'
purple
'
];
export
default
function
createTimeSeries
(
queryData
,
graphWidth
,
graphHeight
,
graphHeightOffset
)
{
export
default
function
createTimeSeries
(
queries
,
graphWidth
,
graphHeight
,
graphHeightOffset
)
{
const
queryData
=
queries
[
0
];
let
usedColors
=
[];
let
usedColors
=
[];
function
pickColor
(
name
)
{
function
pickColor
(
name
)
{
...
...
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