Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
d64dbe91
G
glances
项目概览
蜕变的菜鸟
/
glances
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
glances
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d64dbe91
编写于
8月 30, 2015
作者:
N
nicolargo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Docker plugin crashs with webserver mode (issue #654)
上级
4b0cfe80
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
8 deletion
+16
-8
glances/outputs/static/html/plugins/docker.html
glances/outputs/static/html/plugins/docker.html
+4
-0
glances/outputs/static/html/plugins/network.html
glances/outputs/static/html/plugins/network.html
+6
-6
glances/outputs/static/js/services/plugins/glances_docker.js
glances/outputs/static/js/services/plugins/glances_docker.js
+5
-2
glances/outputs/static/js/services/plugins/glances_network.js
...ces/outputs/static/js/services/plugins/glances_network.js
+1
-0
未找到文件。
glances/outputs/static/html/plugins/docker.html
浏览文件 @
d64dbe91
...
...
@@ -7,6 +7,8 @@
<div
class=
"table-cell"
>
Status
</div>
<div
class=
"table-cell"
>
CPU%
</div>
<div
class=
"table-cell"
>
MEM
</div>
<div
class=
"table-cell"
>
RX/s
</div>
<div
class=
"table-cell"
>
TX/s
</div>
<div
class=
"table-cell text-left"
>
Command
</div>
</div>
<div
class=
"table-row"
ng-repeat=
"container in statsDocker.containers"
>
...
...
@@ -15,6 +17,8 @@
<div
class=
"table-cell"
ng-class=
"container.status == 'Paused' ? 'careful' : 'ok'"
>
{{ container.status }}
</div>
<div
class=
"table-cell"
>
{{ container.cpu | number:1 }}
</div>
<div
class=
"table-cell"
>
{{ container.memory | bytes }}
</div>
<div
class=
"table-cell"
>
{{ container.rx / container.time_since_update | bits }}
</div>
<div
class=
"table-cell"
>
{{ container.tx / container.time_since_update | bits }}
</div>
<div
class=
"table-cell text-left"
>
{{ container.command }}
</div>
</div>
</div>
glances/outputs/static/html/plugins/network.html
浏览文件 @
d64dbe91
...
...
@@ -14,15 +14,15 @@
</div>
<div
class=
"table-row"
ng-repeat=
"network in statsNetwork.networks | orderBy: 'interfaceName'"
>
<div
class=
"table-cell text-left"
>
{{ network.interfaceName | min_size }}
</div>
<div
class=
"table-cell"
ng-show=
"!show.network_io_cumulative && !show.network_io_combination"
>
{{ show.network_by_bytes ? (network.rx
|bytes) : (network.rx|
bits) }}
</div>
<div
class=
"table-cell"
ng-show=
"!show.network_io_cumulative && !show.network_io_combination"
>
{{ show.network_by_bytes ? (network.tx
|bytes) : (network.tx|
bits) }}
</div>
<div
class=
"table-cell"
ng-show=
"!show.network_io_cumulative && !show.network_io_combination"
>
{{ show.network_by_bytes ? (network.rx
/ network.time_since_update | bytes) : (network.rx / network.time_since_update |
bits) }}
</div>
<div
class=
"table-cell"
ng-show=
"!show.network_io_cumulative && !show.network_io_combination"
>
{{ show.network_by_bytes ? (network.tx
/ network.time_since_update | bytes) : (network.tx / network.time_since_update |
bits) }}
</div>
<div
class=
"table-cell"
ng-show=
"!show.network_io_cumulative && show.network_io_combination"
></div>
<div
class=
"table-cell"
ng-show=
"!show.network_io_cumulative && show.network_io_combination"
>
{{ show.network_by_bytes ? (network.cx
|bytes) : (network.cx|
bits) }}
</div>
<div
class=
"table-cell"
ng-show=
"!show.network_io_cumulative && show.network_io_combination"
>
{{ show.network_by_bytes ? (network.cx
/ network.time_since_update | bytes) : (network.cx / network.time_since_update |
bits) }}
</div>
<div
class=
"table-cell"
ng-show=
"show.network_io_cumulative && !show.network_io_combination"
>
{{ show.network_by_bytes ? (network.cumulativeRx
|bytes) : (network.cumulativeRx|
bits) }}
</div>
<div
class=
"table-cell"
ng-show=
"show.network_io_cumulative && !show.network_io_combination"
>
{{ show.network_by_bytes ? (network.cumulativeTx
|bytes) : (network.cumulativeTx|
bits) }}
</div>
<div
class=
"table-cell"
ng-show=
"show.network_io_cumulative && !show.network_io_combination"
>
{{ show.network_by_bytes ? (network.cumulativeRx
| bytes) : (network.cumulativeRx |
bits) }}
</div>
<div
class=
"table-cell"
ng-show=
"show.network_io_cumulative && !show.network_io_combination"
>
{{ show.network_by_bytes ? (network.cumulativeTx
| bytes) : (network.cumulativeTx |
bits) }}
</div>
<div
class=
"table-cell"
ng-show=
"show.network_io_cumulative && show.network_io_combination"
></div>
<div
class=
"table-cell"
ng-show=
"show.network_io_cumulative && show.network_io_combination"
>
{{ show.network_by_bytes ? (network.cumulativeCx
|bytes) : (network.cumulativeCx|
bits) }}
</div>
<div
class=
"table-cell"
ng-show=
"show.network_io_cumulative && show.network_io_combination"
>
{{ show.network_by_bytes ? (network.cumulativeCx
| bytes) : (network.cumulativeCx |
bits) }}
</div>
</div>
glances/outputs/static/js/services/plugins/glances_docker.js
浏览文件 @
d64dbe91
...
...
@@ -17,10 +17,13 @@ glancesApp.service('GlancesPluginDocker', function(GlancesPlugin) {
var
container
=
{
'
id
'
:
containerData
.
Id
,
'
name
'
:
containerData
.
Names
[
0
],
'
name
'
:
containerData
.
Names
[
0
]
.
split
(
'
/
'
).
splice
(
-
1
)[
0
]
,
'
status
'
:
containerData
.
Status
,
'
cpu
'
:
containerData
.
cpu
.
total
,
'
memory
'
:
containerData
.
memory
.
total
!=
undefined
?
containerData
.
memory
.
total
:
'
?
'
,
'
memory
'
:
containerData
.
memory
.
usage
!=
undefined
?
containerData
.
memory
.
usage
:
'
?
'
,
'
rx
'
:
containerData
.
network
.
rx
!=
undefined
?
containerData
.
network
.
rx
:
'
?
'
,
'
tx
'
:
containerData
.
network
.
tx
!=
undefined
?
containerData
.
network
.
tx
:
'
?
'
,
'
time_since_update
'
:
containerData
.
network
.
time_since_update
,
'
command
'
:
containerData
.
Command
,
'
image
'
:
containerData
.
Image
};
...
...
glances/outputs/static/js/services/plugins/glances_network.js
浏览文件 @
d64dbe91
...
...
@@ -13,6 +13,7 @@ glancesApp.service('GlancesPluginNetwork', function() {
'
rx
'
:
networkData
[
'
rx
'
],
'
tx
'
:
networkData
[
'
tx
'
],
'
cx
'
:
networkData
[
'
cx
'
],
'
time_since_update
'
:
networkData
[
'
time_since_update
'
],
'
cumulativeRx
'
:
networkData
[
'
cumulative_rx
'
],
'
cumulativeTx
'
:
networkData
[
'
cumulative_tx
'
],
'
cumulativeCx
'
:
networkData
[
'
cumulative_cx
'
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录