feat: Add GPU inspection support (#373)

nezhahq · Jun 23, 2024 · cf9bbb5 · cf9bbb5
1 parent 65dee23
commit cf9bbb5
Show file tree

Hide file tree

Showing 9 changed files with 110 additions and 72 deletions.
diff --git a/model/host.go b/model/host.go
@@ -32,6 +32,7 @@ type HostState struct {
 	UdpConnCount   uint64
 	ProcessCount   uint64
 	Temperatures   []SensorTemperature
+	GPU            float64
 }
 
 func (s *HostState) PB() *pb.State {
@@ -60,6 +61,7 @@ func (s *HostState) PB() *pb.State {
 		UdpConnCount:   s.UdpConnCount,
 		ProcessCount:   s.ProcessCount,
 		Temperatures:   ts,
+		Gpu:            s.GPU,
 	}
 }
 
@@ -89,6 +91,7 @@ func PB2State(s *pb.State) HostState {
 		UdpConnCount:   s.GetUdpConnCount(),
 		ProcessCount:   s.GetProcessCount(),
 		Temperatures:   ts,
+		GPU:            s.GetGpu(),
 	}
 }
 
@@ -105,6 +108,7 @@ type Host struct {
 	IP              string `json:"-"`
 	CountryCode     string
 	Version         string
+	GPU             []string
 }
 
 func (h *Host) PB() *pb.Host {
@@ -121,6 +125,7 @@ func (h *Host) PB() *pb.Host {
 		Ip:              h.IP,
 		CountryCode:     h.CountryCode,
 		Version:         h.Version,
+		Gpu:             h.GPU,
 	}
 }
 
@@ -138,5 +143,6 @@ func PB2Host(h *pb.Host) Host {
 		IP:              h.GetIp(),
 		CountryCode:     h.GetCountryCode(),
 		Version:         h.GetVersion(),
+		GPU:             h.GetGpu(),
 	}
 }
diff --git a/proto/nezha.pb.go b/proto/nezha.pb.go
diff --git a/proto/nezha.proto b/proto/nezha.proto
@@ -23,6 +23,7 @@ message Host {
     string ip = 10;
     string country_code = 11;
     string version = 12;
+    repeated string gpu = 13;
 }
 
 message State {
@@ -42,6 +43,7 @@ message State {
     uint64 udp_conn_count = 15;
     uint64 process_count = 16;
     repeated State_SensorTemperature temperatures = 17;
+    double gpu = 18;
 }
 
 message State_SensorTemperature {

diff --git a/resource/template/theme-angel-kanade/home.html b/resource/template/theme-angel-kanade/home.html
@@ -24,6 +24,7 @@
                   [<span
                     v-if="server.Host.Virtualization">@#server.Host.Virtualization#@:</span>@#server.Host.Arch#@]<br />
                   CPU: @#server.Host.CPU#@<br />
+                  GPU: @#server.Host.GPU#@<br />
                   {{tr "DiskUsed"}}:
                   @#formatByteSize(server.State.DiskUsed)#@/@#formatByteSize(server.Host.DiskTotal)#@<br />
                   {{tr "MemUsed"}}:

diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html
@@ -28,6 +28,8 @@
                                         <br />
                                         CPU: @#server.Host.CPU#@
                                         <br />
+                                        GPU: @#server.Host.GPU#@
+                                        <br />
                                         {{tr "DiskUsed"}}:
                                         @#formatByteSize(server.State.DiskUsed)#@/@#formatByteSize(server.Host.DiskTotal)#@
                                         <br />

diff --git a/resource/template/theme-mdui/home.html b/resource/template/theme-mdui/home.html
@@ -221,7 +221,7 @@
               var disk = this.formatByteSize(server.State.DiskUsed) + '/' + this.formatByteSize(server.Host.DiskTotal);
               var upTime = this.secondToDate(server.State.Uptime);
               var tooltip =
-`{content: 'System: ${server.Host.Platform}-${server.Host.PlatformVersion}[${server.Host.Arch}]<br>CPU: ${server.Host.CPU}<br>Disk: ${disk}<br>Online: ${upTime}<br>Version: ${server.Host.Version}'}`;
+`{content: 'System: ${server.Host.Platform}-${server.Host.PlatformVersion}[${server.Host.Arch}]<br>CPU: ${server.Host.CPU}<br>GPU: ${server.Host.GPU}<br>Disk: ${disk}<br>Online: ${upTime}<br>Version: ${server.Host.Version}'}`;
               return tooltip
             }
         }

diff --git a/resource/template/theme-server-status/home-group-false.html b/resource/template/theme-server-status/home-group-false.html
@@ -73,6 +73,10 @@
                             <span class="node-cell-expand-label">CPU:</span>
                             @#node.host.CPU.join(",")#@ (@#node.cpu.percent#@%)
                         </span>
+                        <span class="node-cell-expand" v-if="node.host.GPU">
+                            <span class="node-cell-expand-label">GPU:</span>
+                            @#node.host.GPU.join(",")#@ (@#node.gpu.percent#@%)
+                        </span>
                         <span class="node-cell-expand">
                             <span class="node-cell-expand-label">{{tr "DiskUsed"}}:</span>
                             @#formatByteSize(node.state.DiskUsed)#@ / @#formatByteSize(node.host.DiskTotal)#@ (@#node.hdd.percent#@%)

diff --git a/resource/template/theme-server-status/home-group-true.html b/resource/template/theme-server-status/home-group-true.html
@@ -76,6 +76,10 @@
                             <span class="node-cell-expand-label">CPU:</span>
                             @#node.host.CPU.join(",")#@ (@#node.cpu.percent#@%)
                         </span>
+                        <span class="node-cell-expand" v-if="node.host.GPU">
+                            <span class="node-cell-expand-label">GPU:</span>
+                            @#node.host.GPU.join(",")#@ (@#node.gpu.percent#@%)
+                        </span>
                         <span class="node-cell-expand">
                             <span class="node-cell-expand-label">{{tr "DiskUsed"}}:</span>
                             @#formatByteSize(node.state.DiskUsed)#@ / @#formatByteSize(node.host.DiskTotal)#@ (@#node.hdd.percent#@%)

diff --git a/resource/template/theme-server-status/home.html b/resource/template/theme-server-status/home.html
@@ -396,6 +396,7 @@ <h4 class="modal-title" id="mapChartTitle">{{tr "ServersOnWorldMap"}}</h4>
                         network: this.getNetworkSpeed(server.State.NetInSpeed, server.State.NetOutSpeed),
                         traffic: this.formatByteSize(server.State.NetInTransfer) + ' | ' + this.formatByteSize(server.State.NetOutTransfer),
                         cpu: this.formatPercents(server.live, this.toFixed2(server.State.CPU)),
+                        gpu: this.formatPercents(server.live, this.toFixed2(server.State.GPU)),
                         memory: this.formatPercent(server.live, server.State.MemUsed, server.Host.MemTotal),
                         hdd: this.formatPercent(server.live, server.State.DiskUsed, server.Host.DiskTotal),
                         online: server.live,