From 488dc6a8e01319e10c06b01207a9d4fc08a858eb Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Tue, 14 Jun 2022 19:55:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=89=80=E5=9C=A8=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=A3=81?= =?UTF-8?q?=E7=9B=98=E7=A9=BA=E9=97=B4=E8=BF=87=E5=B0=8F=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- go.sum | 23 ++++- .../web/actions/default/dashboard/index.go | 60 ++++++++++++ .../boards/{dns_plus.css => dns.css} | 2 +- .../@default/dashboard/boards/dns.css.map | 1 + .../boards/{dns_plus.less => dns.less} | 0 .../dashboard/boards/dns_plus.css.map | 1 - .../@default/dashboard/boards/index_plus.css | 75 -------------- .../dashboard/boards/index_plus.css.map | 1 - .../@default/dashboard/boards/index_plus.less | 98 ------------------- .../@default/dashboard/boards/user_plus.css | 13 --- .../dashboard/boards/user_plus.css.map | 1 - .../@default/dashboard/boards/user_plus.less | 18 ---- .../@default/dashboard/boards/waf_plus.css | 23 ----- .../dashboard/boards/waf_plus.css.map | 1 - .../@default/dashboard/boards/waf_plus.less | 31 ------ web/views/@default/dashboard/index.html | 7 ++ 17 files changed, 89 insertions(+), 268 deletions(-) rename web/views/@default/dashboard/boards/{dns_plus.css => dns.css} (72%) create mode 100644 web/views/@default/dashboard/boards/dns.css.map rename web/views/@default/dashboard/boards/{dns_plus.less => dns.less} (100%) delete mode 100644 web/views/@default/dashboard/boards/dns_plus.css.map delete mode 100644 web/views/@default/dashboard/boards/index_plus.css delete mode 100644 web/views/@default/dashboard/boards/index_plus.css.map delete mode 100644 web/views/@default/dashboard/boards/index_plus.less delete mode 100644 web/views/@default/dashboard/boards/user_plus.css delete mode 100644 web/views/@default/dashboard/boards/user_plus.css.map delete mode 100644 web/views/@default/dashboard/boards/user_plus.less delete mode 100644 web/views/@default/dashboard/boards/waf_plus.css delete mode 100644 web/views/@default/dashboard/boards/waf_plus.css.map delete mode 100644 web/views/@default/dashboard/boards/waf_plus.less diff --git a/go.mod b/go.mod index 335c5eed..819ffe8b 100644 --- a/go.mod +++ b/go.mod @@ -10,13 +10,13 @@ require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/frankban/quicktest v1.11.3 // indirect github.com/go-sql-driver/mysql v1.5.0 - github.com/google/go-cmp v0.5.7 // indirect github.com/iwind/TeaGo v0.0.0-20220304043459-0dd944a5b475 github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4 github.com/json-iterator/go v1.1.12 // indirect github.com/kr/text v0.2.0 // indirect github.com/miekg/dns v1.1.43 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/shirou/gopsutil/v3 v3.22.5 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/tealeg/xlsx/v3 v3.2.3 github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119 diff --git a/go.sum b/go.sum index d5686483..8bacf9ee 100644 --- a/go.sum +++ b/go.sum @@ -39,6 +39,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-redis/redis/v8 v8.0.0-beta.7/go.mod h1:FGJAWDWFht1sQ4qxyJHZZbVyvnVcKQN0E3u5/5lRz+g= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= @@ -67,8 +69,9 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= @@ -87,6 +90,7 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg= github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -111,11 +115,15 @@ github.com/pkg/profile v1.5.0 h1:042Buzk+NhDI+DeSAA62RwJL8VAuZUMQZUjCsRz1Mug= github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/shabbyrobe/xmlwriter v0.0.0-20200208144257-9fca06d00ffa h1:2cO3RojjYl3hVTbEvJVqrMaFmORhL6O06qdW42toftk= github.com/shabbyrobe/xmlwriter v0.0.0-20200208144257-9fca06d00ffa/go.mod h1:Yjr3bdWaVWyME1kha7X0jsz3k2DgXNa1Pj3XGyUAbx8= +github.com/shirou/gopsutil/v3 v3.22.5 h1:atX36I/IXgFiB81687vSiBI5zrMsxcIBkP9cQMJQoJA= +github.com/shirou/gopsutil/v3 v3.22.5/go.mod h1:so9G9VzeHt/hsd0YwqprnjHnfARAUktauykSbr+y2gA= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= @@ -124,12 +132,17 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tealeg/xlsx/v3 v3.2.3 h1:MXnVh+9Y8cUglowItTy2HL3Kv6z+q/0aNjeKuTsVqZQ= github.com/tealeg/xlsx/v3 v3.2.3/go.mod h1:0hGmAEoZ48SS1ZAE6eqZJkJVXgOMY+8a33vjXa8S8HA= +github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= +github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119 h1:YyPWX3jLOtYKulBR6AScGIs74lLrJcgeKRwcbAuQOG4= github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119/go.mod h1:/nuTSlK+okRfR/vnIPqR89fFKonnWPiZymN5ydRJkX8= +github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= +github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opentelemetry.io/otel v0.7.0/go.mod h1:aZMyHG5TqDOXEgH2tyLiXSUKly1jT3yqE9PmrzIeCdo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -175,6 +188,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -182,11 +196,13 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -206,7 +222,6 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/internal/web/actions/default/dashboard/index.go b/internal/web/actions/default/dashboard/index.go index 318fecfd..26d8c362 100644 --- a/internal/web/actions/default/dashboard/index.go +++ b/internal/web/actions/default/dashboard/index.go @@ -3,14 +3,20 @@ package dashboard import ( + "fmt" "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" + "github.com/TeaOSLab/EdgeAdmin/internal/utils/sizes" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" + "github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/maps" + "github.com/iwind/TeaGo/types" + "github.com/shirou/gopsutil/v3/disk" "regexp" + "runtime" ) type IndexAction struct { @@ -57,6 +63,14 @@ func (this *IndexAction) RunPost(params struct{}) { this.ErrorPage(err) return } + + // 检查当前服务器空间 + var diskUsageWarning = "" + diskPath, diskUsage, diskUsagePercent, shouldWarning := this.checkDiskPartitions(90) + if shouldWarning { + diskUsageWarning = "当前服务器磁盘空间不足，请立即扩充容量，文件路径：" + diskPath + "，已使用：" + types.String(diskUsage/1024/1024/1024) + "G，已使用比例：" + fmt.Sprintf("%.2f%%", diskUsagePercent) + "，仅剩余空间：" + fmt.Sprintf("%.2f%%", 100-diskUsagePercent) + "。" + } + this.Data["dashboard"] = maps.Map{ "defaultClusterId": resp.DefaultNodeClusterId, @@ -75,6 +89,8 @@ func (this *IndexAction) RunPost(params struct{}) { "canGoNodes": configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeNode), "canGoSettings": configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeSetting), "canGoUsers": configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeUser), + + "diskUsageWarning": diskUsageWarning, } // 今日流量 @@ -249,3 +265,47 @@ func (this *IndexAction) RunPost(params struct{}) { this.Success() } + +// 检查服务器磁盘空间 +func (this *IndexAction) checkDiskPartitions(thresholdPercent float64) (path string, usage uint64, usagePercent float64, shouldWarning bool) { + partitions, err := disk.Partitions(false) + if err != nil { + return + } + if !lists.ContainsString([]string{"darwin", "linux", "freebsd"}, runtime.GOOS) { + return + } + + var rootFS = "" + + for _, p := range partitions { + if p.Mountpoint == "/" { + rootFS = p.Fstype + break + } + } + + for _, p := range partitions { + if p.Mountpoint == "/boot" { + continue + } + if p.Fstype != rootFS { + continue + } + stat, _ := disk.Usage(p.Mountpoint) + if stat != nil { + if stat.Used < 2*uint64(sizes.G) { + continue + } + if stat.UsedPercent > thresholdPercent { + path = stat.Path + usage = stat.Used + usagePercent = stat.UsedPercent + shouldWarning = true + break + } + } + } + + return +} diff --git a/web/views/@default/dashboard/boards/dns_plus.css b/web/views/@default/dashboard/boards/dns.css similarity index 72% rename from web/views/@default/dashboard/boards/dns_plus.css rename to web/views/@default/dashboard/boards/dns.css index a83fdd3a..7147c634 100644 --- a/web/views/@default/dashboard/boards/dns_plus.css +++ b/web/views/@default/dashboard/boards/dns.css @@ -6,4 +6,4 @@ .chart-box { height: 14em; } -/*# sourceMappingURL=dns_plus.css.map */ \ No newline at end of file +/*# sourceMappingURL=dns.css.map */ \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/dns.css.map b/web/views/@default/dashboard/boards/dns.css.map new file mode 100644 index 00000000..926a343a --- /dev/null +++ b/web/views/@default/dashboard/boards/dns.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["dns.less"],"names":[],"mappings":"AAAA,GAAG,QACF;EACC,kBAAA;EACA,UAAA;EACA,UAAA;;AAIF;EACC,YAAA","file":"dns.css"} \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/dns_plus.less b/web/views/@default/dashboard/boards/dns.less similarity index 100% rename from web/views/@default/dashboard/boards/dns_plus.less rename to web/views/@default/dashboard/boards/dns.less diff --git a/web/views/@default/dashboard/boards/dns_plus.css.map b/web/views/@default/dashboard/boards/dns_plus.css.map deleted file mode 100644 index 75839e9a..00000000 --- a/web/views/@default/dashboard/boards/dns_plus.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["dns_plus.less"],"names":[],"mappings":"AAAA,GAAG,QACF;EACC,kBAAA;EACA,UAAA;EACA,UAAA;;AAIF;EACC,YAAA","file":"dns_plus.css"} \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/index_plus.css b/web/views/@default/dashboard/boards/index_plus.css deleted file mode 100644 index 2b2f75f3..00000000 --- a/web/views/@default/dashboard/boards/index_plus.css +++ /dev/null @@ -1,75 +0,0 @@ -.ui.message a .icon.remove { - position: absolute; - right: 1em; - top: 2em; -} -.grid.realtime-chart { - margin-left: 0.4em !important; - position: relative; -} -.grid.realtime-chart .column { - margin-bottom: 1em; - border: 1px rgba(0, 0, 0, 0.1) solid; - border-right: none; -} -.grid.realtime-chart .column.with-border { - border-right: 1px rgba(0, 0, 0, 0.1) solid; -} -.grid.realtime-chart .chart { - height: 10em; -} -.grid.realtime-chart a { - display: none; - font-size: 0.85em; - position: absolute; - right: 1em; -} -.grid.realtime-chart .column:hover { - background: rgba(0, 0, 0, 0.03); -} -.grid.realtime-chart .column:hover a { - display: inline; -} -.chart-box { - height: 14em; -} -.traffic-map-box { - height: 16em; -} -.traffic-map-box div::-webkit-scrollbar { - width: 4px; -} -h4 span { - font-size: 0.8em; - color: grey; -} -.percent-box { - position: relative; - text-align: center; -} -.percent-box .detail { - position: absolute; - top: 50%; - margin-top: -2em; - left: 0; - right: 0; - font-size: 0.8em; -} -.percent-box .detail .label { - color: grey; -} -.percent-box .detail .value { - font-size: 1.2em; -} -.percent-box .summary { - color: grey; - margin-top: 0.5em; -} -.percent-box .summary span { - font-size: 0.8em; - padding-left: 0.2em; -} -.percent-box .summary a { - font-size: 0.8em; -} -/*# sourceMappingURL=index_plus.css.map */ \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/index_plus.css.map b/web/views/@default/dashboard/boards/index_plus.css.map deleted file mode 100644 index 7c4e9f78..00000000 --- a/web/views/@default/dashboard/boards/index_plus.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["index_plus.less"],"names":[],"mappings":"AAAA,GAAG,QACF,EACC,MAAK;EACJ,kBAAA;EACA,UAAA;EACA,QAAA;;AAKH,KAAK;EACJ,kBAAA;EACA,kBAAA;;AAFD,KAAK,eAIJ;EACC,kBAAA;EACA,oCAAA;EACA,kBAAA;;AAPF,KAAK,eAUJ,QAAO;EACN,0CAAA;;AAXF,KAAK,eAcJ;EACC,YAAA;;AAfF,KAAK,eAkBJ;EACC,aAAA;EACA,iBAAA;EACA,kBAAA;EACA,UAAA;;AAtBF,KAAK,eAyBJ,QAAO;EACN,+BAAA;;AA1BF,KAAK,eAyBJ,QAAO,MAGN;EACC,eAAA;;AAKH;EACC,YAAA;;AAGD;EACC,YAAA;;AADD,gBAGC,IAAG;EACF,UAAA;;AAIF,EACC;EACC,gBAAA;EACA,WAAA;;AAIF;EACC,kBAAA;EACA,kBAAA;;AAFD,YAIC;EACC,kBAAA;EACA,QAAA;EACA,gBAAA;EACA,OAAA;EACA,QAAA;EACA,gBAAA;;AAVF,YAIC,QAQC;EACC,WAAA;;AAbH,YAIC,QAYC;EACC,gBAAA;;AAjBH,YAqBC;EACC,WAAA;EACA,iBAAA;;AAvBF,YAqBC,SAIC;EACC,gBAAA;EACA,mBAAA;;AA3BH,YAqBC,SASC;EACC,gBAAA","file":"index_plus.css"} \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/index_plus.less b/web/views/@default/dashboard/boards/index_plus.less deleted file mode 100644 index c54d16c4..00000000 --- a/web/views/@default/dashboard/boards/index_plus.less +++ /dev/null @@ -1,98 +0,0 @@ -.ui.message { - a { - .icon.remove { - position: absolute; - right: 1em; - top: 2em; - } - } -} - -.grid.realtime-chart { - margin-left: 0.4em !important; - position: relative; - - .column { - margin-bottom: 1em; - border: 1px rgba(0, 0, 0, .1) solid; - border-right: none; - } - - .column.with-border { - border-right: 1px rgba(0, 0, 0, .1) solid; - } - - .chart { - height: 10em; - } - - a { - display: none; - font-size: 0.85em; - position: absolute; - right: 1em; - } - - .column:hover { - background: rgba(0, 0, 0, .03); - - a { - display: inline; - } - } -} - -.chart-box { - height: 14em; -} - -.traffic-map-box { - height: 16em; - - div::-webkit-scrollbar { - width: 4px; - } -} - -h4 { - span { - font-size: 0.8em; - color: grey; - } -} - -.percent-box { - position: relative; - text-align: center; - - .detail { - position: absolute; - top: 50%; - margin-top: -2em; - left: 0; - right: 0; - font-size: 0.8em; - - .label { - color: grey; - } - - .value { - font-size: 1.2em; - } - } - - .summary { - color: grey; - margin-top: 0.5em; - - span { - font-size: 0.8em; - padding-left: 0.2em; - } - - a { - font-size: 0.8em; - } - } -} \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/user_plus.css b/web/views/@default/dashboard/boards/user_plus.css deleted file mode 100644 index dac64a83..00000000 --- a/web/views/@default/dashboard/boards/user_plus.css +++ /dev/null @@ -1,13 +0,0 @@ -.ui.message .icon { - position: absolute; - right: 1em; - top: 1.8em; -} -.chart-box { - height: 14em; -} -h4 span { - font-size: 0.8em; - color: grey; -} -/*# sourceMappingURL=user_plus.css.map */ \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/user_plus.css.map b/web/views/@default/dashboard/boards/user_plus.css.map deleted file mode 100644 index 536a7ba4..00000000 --- a/web/views/@default/dashboard/boards/user_plus.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["user_plus.less"],"names":[],"mappings":"AAAA,GAAG,QACF;EACC,kBAAA;EACA,UAAA;EACA,UAAA;;AAIF;EACC,YAAA;;AAGD,EACC;EACC,gBAAA;EACA,WAAA","file":"user_plus.css"} \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/user_plus.less b/web/views/@default/dashboard/boards/user_plus.less deleted file mode 100644 index 7f27103f..00000000 --- a/web/views/@default/dashboard/boards/user_plus.less +++ /dev/null @@ -1,18 +0,0 @@ -.ui.message { - .icon { - position: absolute; - right: 1em; - top: 1.8em; - } -} - -.chart-box { - height: 14em; -} - -h4 { - span { - font-size: 0.8em; - color: grey; - } -} \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/waf_plus.css b/web/views/@default/dashboard/boards/waf_plus.css deleted file mode 100644 index af09a5a1..00000000 --- a/web/views/@default/dashboard/boards/waf_plus.css +++ /dev/null @@ -1,23 +0,0 @@ -.ui.message .icon { - position: absolute; - right: 1em; - top: 1.8em; -} -.chart-box { - height: 14em; -} -.traffic-map-box { - height: 16em; -} -.traffic-map-box div::-webkit-scrollbar { - width: 4px; -} -.color-span { - font-size: 0.8em; - padding: 4px; -} -h4.header a { - font-size: 0.85em; - float: right; -} -/*# sourceMappingURL=waf_plus.css.map */ \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/waf_plus.css.map b/web/views/@default/dashboard/boards/waf_plus.css.map deleted file mode 100644 index f5609763..00000000 --- a/web/views/@default/dashboard/boards/waf_plus.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["waf_plus.less"],"names":[],"mappings":"AAAA,GAAG,QACF;EACC,kBAAA;EACA,UAAA;EACA,UAAA;;AAIF;EACC,YAAA;;AAGD;EACC,YAAA;;AADD,gBAGC,IAAG;EACF,UAAA;;AAIF;EACC,gBAAA;EACA,YAAA;;AAGD,EAAE,OACD;EACC,iBAAA;EACA,YAAA","file":"waf_plus.css"} \ No newline at end of file diff --git a/web/views/@default/dashboard/boards/waf_plus.less b/web/views/@default/dashboard/boards/waf_plus.less deleted file mode 100644 index 90920f39..00000000 --- a/web/views/@default/dashboard/boards/waf_plus.less +++ /dev/null @@ -1,31 +0,0 @@ -.ui.message { - .icon { - position: absolute; - right: 1em; - top: 1.8em; - } -} - -.chart-box { - height: 14em; -} - -.traffic-map-box { - height: 16em; - - div::-webkit-scrollbar { - width: 4px; - } -} - -.color-span { - font-size: 0.8em; - padding: 4px; -} - -h4.header { - a { - font-size: 0.85em; - float: right; - } -} \ No newline at end of file diff --git a/web/views/@default/dashboard/index.html b/web/views/@default/dashboard/index.html index 34b39474..29962299 100644 --- a/web/views/@default/dashboard/index.html +++ b/web/views/@default/dashboard/index.html @@ -33,6 +33,13 @@ 升级提醒：有 {{apiNodeUpgradeInfo.count}} 个API节点需要升级到 v{{apiNodeUpgradeInfo.version}} 版本 + +
+ + {{dashboard.diskUsageWarning}} + +
+