Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gyuricska Milán
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
79ddd6fb
authored
Aug 14, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix node monitor
parent
c994d2c1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
circle/dashboard/views.py
+1
-1
circle/vm/models/node.py
+1
-1
No files found.
circle/dashboard/views.py
View file @
79ddd6fb
...
@@ -2813,7 +2813,7 @@ class NodeGraphView(SuperuserRequiredMixin, GraphViewBase):
...
@@ -2813,7 +2813,7 @@ class NodeGraphView(SuperuserRequiredMixin, GraphViewBase):
model
=
Node
model
=
Node
def
get_prefix
(
self
,
instance
):
def
get_prefix
(
self
,
instance
):
return
'circle.
%
s'
%
instance
.
name
return
'circle.
%
s'
%
instance
.
host
.
host
name
def
get_title
(
self
,
instance
,
metric
):
def
get_title
(
self
,
instance
,
metric
):
return
'
%
s -
%
s'
%
(
instance
.
name
,
metric
)
return
'
%
s -
%
s'
%
(
instance
.
name
,
metric
)
...
...
circle/vm/models/node.py
View file @
79ddd6fb
...
@@ -257,7 +257,7 @@ class Node(OperatedMixin, TimeStampedModel):
...
@@ -257,7 +257,7 @@ class Node(OperatedMixin, TimeStampedModel):
@method_cache
(
10
)
@method_cache
(
10
)
def
monitor_info
(
self
):
def
monitor_info
(
self
):
metrics
=
(
'cpu.usage'
,
'memory.usage'
)
metrics
=
(
'cpu.usage'
,
'memory.usage'
)
prefix
=
'circle.
%
s.'
%
self
.
name
prefix
=
'circle.
%
s.'
%
self
.
host
.
host
name
params
=
[(
'target'
,
'
%
s
%
s'
%
(
prefix
,
metric
))
params
=
[(
'target'
,
'
%
s
%
s'
%
(
prefix
,
metric
))
for
metric
in
metrics
]
for
metric
in
metrics
]
params
.
append
((
'from'
,
'-5min'
))
params
.
append
((
'from'
,
'-5min'
))
...
...
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