Skip to content

Commit 612fe54

Browse files
authored
Merge pull request #28 from YoshinoriN/issue/27
(refs #27) Display all cpus information if instance is Linux
2 parents 7bb817c + 91482c7 commit 612fe54

File tree

1 file changed

+54
-2
lines changed

1 file changed

+54
-2
lines changed

src/main/twirl/net/yoshinorin/gitbucket/monitoring/information/resources.scala.html

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
swap: Either[net.yoshinorin.gitbucket.monitoring.utils.Error, net.yoshinorin.gitbucket.monitoring.models.Swap],
55
diskSpace: net.yoshinorin.gitbucket.monitoring.models.DiskSpace)(implicit context: gitbucket.core.controller.Context)
66
@import context._
7+
@import net.yoshinorin.gitbucket.monitoring.services.operatingsystem.OperatingSystem
78
@import net.yoshinorin.gitbucket.monitoring.utils.Error
89
@gitbucket.core.html.main("Monitoring") {
910
@gitbucket.core.admin.html.menu("monitoring") {
@@ -15,8 +16,59 @@
1516
@net.yoshinorin.gitbucket.monitoring.helper.html.colsm2("Core", core.toString)
1617
@cpu match {
1718
case Left(error) => { @net.yoshinorin.gitbucket.monitoring.helper.html.colsm2("Used", error.message)}
18-
case Right(c) => { @net.yoshinorin.gitbucket.monitoring.helper.html.colsm2("Used", c.usage + "%")}
19-
}
19+
case Right(c) => {
20+
@net.yoshinorin.gitbucket.monitoring.helper.html.colsm2("Used", c.usage + "%")
21+
@OperatingSystem.osType match {
22+
case OperatingSystem.Linux => {
23+
<table class="table table-hover">
24+
<tr>
25+
<tr>
26+
<td>user</td>
27+
<td>@c.us %</td>
28+
<td>time running un-niced user processes</td>
29+
</tr>
30+
<tr>
31+
<td>system</td>
32+
<td>@c.sy %</td>
33+
<td>time running kernel processes</td>
34+
</tr>
35+
<tr>
36+
<td>nice</td>
37+
<td>@c.ni %</td>
38+
<td>time running niced user processes</td>
39+
</tr>
40+
<tr>
41+
<td>idle</td>
42+
<td>@c.id %</td>
43+
<td>time spent in the kernel idle handler</td>
44+
</tr>
45+
<tr>
46+
<td>I/O wait</td>
47+
<td>@c.wa %</td>
48+
<td>time waiting for I/O completion</td>
49+
</tr>
50+
<tr>
51+
<td>hi</td>
52+
<td>@c.hi %</td>
53+
<td>time spent servicing hardware interrupts</td>
54+
</tr>
55+
<tr>
56+
<td>si</td>
57+
<td>@c.si %</td>
58+
<td>time spent servicing software interrupts</td>
59+
</tr>
60+
<tr>
61+
<td>st</td>
62+
<td>@c.st %</td>
63+
<td>time stolen from this vm by the hypervisor</td>
64+
</tr>
65+
</tr>
66+
</table>
67+
}
68+
case _ => {}
69+
}
70+
}
71+
}
2072
</div>
2173
</div>
2274
</div>

0 commit comments

Comments
 (0)