tcjlj/nezha
1
0
Fork 0
mirror of https://github.com/nezhahq/nezha.git synced 2025-01-22 20:58:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: revert service html and block service in backend (#318)

Browse Source 
Co-authored-by: LvGJ <lvgj1998@gmail.com>
This commit is contained in:
Ko no dio 2024-02-14 13:12:24 +08:00 committed by GitHub
parent f3fac9325c
commit fdb2fd8839
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/dashboard/controller/common_page.go
View File

@ -118,6 +118,11 @@ func (p *commonPage) service(c *gin.Context) {
var statsStore map[uint64]model.CycleTransferStats var statsStore map[uint64]model.CycleTransferStats
copier.Copy(&stats, singleton.ServiceSentinelShared.LoadStats()) copier.Copy(&stats, singleton.ServiceSentinelShared.LoadStats())
copier.Copy(&statsStore, singleton.AlertsCycleTransferStatsStore) copier.Copy(&statsStore, singleton.AlertsCycleTransferStatsStore)
for k, service := range stats {
if !service.Monitor.EnableShowInService {
delete(stats, k)
}
}
return []interface { return []interface {
}{ }{
stats, statsStore, stats, statsStore,

2
resource/template/theme-daynight/service.html vendored
View File

@ -61,7 +61,6 @@
</section> </section>
<section class="monitor-container"> <section class="monitor-container">
{{range $service := .Services}} {{range $service := .Services}}
{{if $service.Monitor.EnableShowInService}}
<section class="monitor-info-container"> <section class="monitor-info-container">
<div class="monitor-state"> <div class="monitor-state">
<span class="monitor-state-dot {{className (divU64 $service.CurrentUp (addU64 $service.CurrentUp $service.CurrentDown))}}"></span> <span class="monitor-state-dot {{className (divU64 $service.CurrentUp (addU64 $service.CurrentUp $service.CurrentDown))}}"></span>
@ -83,7 +82,6 @@
</div> </div>
</section> </section>
{{end}} {{end}}
{{end}}
</section> </section>
{{if .CycleTransferStats}} {{if .CycleTransferStats}}
<h2 class="mdui-m-t-5 mdui-text-center">{{tr "CycleTransferStats"}}</h2> <h2 class="mdui-m-t-5 mdui-text-center">{{tr "CycleTransferStats"}}</h2>

3
resource/template/theme-default/service.html vendored
View File

@ -18,7 +18,6 @@
</thead> </thead>
<tbody> <tbody>
{{range $service := .Services}} {{range $service := .Services}}
{{if $service.Monitor.EnableShowInService}}
<tr> <tr>
<td class="ui center aligned">{{$service.Monitor.Name}}</td> <td class="ui center aligned">{{$service.Monitor.Name}}</td>
<td class="ui center aligned"> <td class="ui center aligned">
@ -34,7 +33,7 @@
class="delay-today {{className (divU64 $service.CurrentUp (addU64 $service.CurrentUp $service.CurrentDown))}}"></i> class="delay-today {{className (divU64 $service.CurrentUp (addU64 $service.CurrentUp $service.CurrentDown))}}"></i>
{{statusName (divU64 $service.CurrentUp (addU64 $service.CurrentUp $service.CurrentDown))}} {{statusName (divU64 $service.CurrentUp (addU64 $service.CurrentUp $service.CurrentDown))}}
</td> </td>
</tr> {{end}} {{end}} </tr> {{end}}
</tbody> </tbody>
</table> </table>

3
resource/template/theme-server-status/service.html vendored
View File

@ -15,7 +15,7 @@
</thead> </thead>
<tbody id="servers"> <tbody id="servers">
<template v-for="service in services"> <template v-for="service in services">
<tr v-if="service.enableShow === 'true'"> <tr>
<td class="node-cell center"> <td class="node-cell center">
<div class="delay-today"> <div class="delay-today">
<i class="delay-today" :class="service.health.className"></i> <i class="delay-today" :class="service.health.className"></i>
@ -137,7 +137,6 @@
delay: '{{$service.Delay}}'.replaceAll("[","").replaceAll("]","").split(" "), delay: '{{$service.Delay}}'.replaceAll("[","").replaceAll("]","").split(" "),
up: '{{$service.Up}}'.replaceAll("[","").replaceAll("]","").split(" "), up: '{{$service.Up}}'.replaceAll("[","").replaceAll("]","").split(" "),
down: '{{$service.Down}}'.replaceAll("[","").replaceAll("]","").split(" "), down: '{{$service.Down}}'.replaceAll("[","").replaceAll("]","").split(" "),
enableShow: '{{$service.Monitor.EnableShowInService}}',
}) })
{{end}} {{end}}
// @formatter:on // @formatter:on