From d1711507e664e419be9f9530e990a797f26a3941 Mon Sep 17 00:00:00 2001 From: naiba Date: Thu, 5 May 2022 10:57:05 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=F0=9F=8D=B1=20update=20brand.svg=20[skip?= =?UTF-8?q?=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/static/brand.svg | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/resource/static/brand.svg b/resource/static/brand.svg index 255fecf..0abaa44 100644 --- a/resource/static/brand.svg +++ b/resource/static/brand.svg @@ -1,18 +1 @@ - - - - - - - - - \ No newline at end of file + \ No newline at end of file From d7a588a6fa856d30957adb1a0b97134aa9c06048 Mon Sep 17 00:00:00 2001 From: xh33006 <33201711+xh33006@users.noreply.github.com> Date: Thu, 5 May 2022 19:05:22 +0800 Subject: [PATCH 2/9] Add files via upload MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 火火火火火柴 考研结束 寄了, [2022/5/5 18:47] [回复 Sean] 改完了PR来 --- .../static/theme-hotaru/img/clients/CN.png | Bin 834 -> 1179 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/resource/static/theme-hotaru/img/clients/CN.png b/resource/static/theme-hotaru/img/clients/CN.png index b9b81fd86c11aaacd2be7231e64ab4f42cc1b7c3..898c49a9b99b25846904d64e4219390a55a42e6b 100644 GIT binary patch delta 1170 zcmV;D1a14m2Ac_x8Gi-<003UqycPfe00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01m?d01m?e$8V@)000CqNklSK@e32R)M=}> zic$Q+j-^h3Z%)0|)nCIM?n7pTXKRECH?|qP&d-&h`zwb>V$fE((4ZARTR|2mk zY7wiAAoJAymyHY}nKb&-UFhpd;(oFdy`AP3vJ;O*BC(U1_{kdAJz3WMc8RE*uLe zWg62DXazL5J!_^@9n^Q!R1E}|^7a^2me1Kfp_*p%qIF?|GAx%RkEvJPFvkks|5bti znN(iJEH~{d)cSwj*oyoK4>Lu4Onv5tep8+?`KO)_Oj|Zg*e%SI-PAI6Rm%4=-l6RB zkJ63Vz<)11$;4s~_320^!K$QHwT4m>#VDEm7v&?~drX{@tut{YrDgLDwUjDUVO3?W zQ-j%_%YEuw%l)E-pEuXUzfec~-DkXwY2z2wxnm^!NgcGDU@JfG23tMWPNWV5)fiQf zZ`jOqdnKdla(F&31vc42e8kWD*_bg)CI!|Q(SOUy{R3!zrEs2VEn{L@zE|F4Fvacr zNRiFA8u*eYIeuSjbbu?z6tSM#c-4)4#`1v25^;v5qgV~oL*dR+P2tCX_=kHcmNBYO zdOO5qMasYBWLd7cmhPJHS==&hNwCB%VY7{@qV%Y+iDI()iTyc7CA%2YOj{~nGczum zSbu2aZuc)+gq<-p++=KwnW0Ou4T%q+T0X;3@w!6kJ&n)VBJ7OOGfa*F>PM=PGijs~ zXBhvd8-`-PGiGOH#18YGo~!g| zk%LDh><`|nO<`HCp9ieJt#l&y~mhZwr?xZAmizKfD%>&2`JoOfO9V*u~qoz55*Aum<2=2dbKS$CSOn2c? k*KyoCeil7v-BI9wz2fRHy1~8101E&B07*qoM6N<$f`V2q6951J literal 834 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qh!3-obxqVa^7#O_*d_r7(G7H~^rc#K$?RI(_ zminP4;>!Z>&(ri@AZ>|=fS=UKiV$|JvRcYYh5 z@@Znghw6wgOTFGkrhKT3{JPooV{7R9+}IDr(VzMQKlKKEsET+Om-Km#@7t*4w~@)8 zCI@`o==yn@|NDZNFDpGhc7%MM;{P@x<;x1sud6)1Ecg7f%Hv&p;>Wu154GW6*Sme& z>HID}>DvzHuWQ`jrN+ODNq(Of^L4eyhob0r$q8SUcztXLd!G~gE+ygXCfCn%eLhbP z__ECNV^i3to}f=%!Jj&VKa@s&nh^M9vDdflF5kAfeBI*mWxmh*!sxGS-QTChzl~1* zJlpqOQo@%N9$yxDZ%wz@2@G7Zk|4iehS&c#xIJI7m~-6=kM%3v-*Bw;`@72bk(YHX zFx)44x;TbZ+yjgUbK^bZ&4hvyMI2qHct|HZ&^Tu-30b%3^`rABW7pzXKkN>P;!L z;WN!^oWypBG3~FE$d=m4mKG}NWec7Jt8MFS^1RevWOR4sqtcrd*YhH0)-7{m%#`pr ze8D`&aI#|i2iIp;lG0kg9Q3)pd&fS@*IOsOT%^cuZ0iu`yE3)uPuU>rds&0m44+} zw0hH~KBZe%E*#lgw{p(GX_eJWizhM0+Fn*R-fX}*`EkIxoC%i})vT1_QUAZ${nbp> zPyYE|@)xzoOxte7>CAK^?EH_N0xgPC$sF%5?fbCeY5yVf57P3#icUy-POP~qVyxQh zJ6ZqkhS`oCZ(9DI3I1T2tQ{P1GQ?b}ul~v(*#s@L4oCVIl>?)X!PC{xWt~$(69D3VrQiSn From 4a37ffc4b36a961daea67d8736c64b24bfaddd6f Mon Sep 17 00:00:00 2001 From: xh33006 <33201711+xh33006@users.noreply.github.com> Date: Thu, 5 May 2022 19:55:34 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=9B=BD=E6=97=97=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E4=B8=8D=E5=A4=9F=E9=B2=9C=E8=89=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修正国旗星星朝向 --- .../static/theme-hotaru/img/clients/CN.png | Bin 1179 -> 2242 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/resource/static/theme-hotaru/img/clients/CN.png b/resource/static/theme-hotaru/img/clients/CN.png index 898c49a9b99b25846904d64e4219390a55a42e6b..5165243d5e08ce4e7ae4afad00482abbfafddf36 100644 GIT binary patch delta 2218 zcmV;b2vzr+3BnPOFnn5eI6z(mDB&=&;^6pB*mMQPnjx9xVf zyL-%B_sp4d=Ca#G;wDXZX3m*8|KIuk-#KS?hCuN7XU)LfN`EQ*C_wK8kN`#8R*Z^j zdF&&SxuS?Kkqhg5tjT_~lWvn01VIjgf`e-mWLwAh$QkPt>CS=mR0;h6px1)JDZ~zhIMiHlkvV zSrAv2fINU~$UP|DLkJK%GLGnjb5_0FXK~~YbOR+50{7o?MZ5Z}6L_gM031rldnDDJ zI17r6tbbx`P*|04a2j6v2XsL};mvkA7)MF~k-f86@z$hOC$sq$&?`}WTTtG)&*@!` zx;1$XJ*R?6Yx5LFF*+E=U|BUWsTH3Z0p>%<3=G)&LzO%qAgh{487L}1dkOLLmyzim z)Qbz0B~%1EoQpuRt*LH=%8*o7f;!d0cnS~21b^02Li^N3tqG}B31Cris)hxmHc$|_ zGL%R8QdB!;jab#HW*O6|0)}$FA_HRVkM2(*cKB}%#{B*s6y9&M2W~-N)WgH!%4nNm zpyBmv$RFqg6o9NRfL@lRnINV74Cg-lMgWEYWyXkE6J}t=M@OObE@_u2UTQ%0j&*j$ zuz%`sQ;r2o2dHkgO^={>wh`e?i^%TnL+RU?#KYs#zUU2y13J`rJiP)iO>)h$Cgx!>FX?DHAs6YtN^xhO2A5+&`)qfT~YDfOL zZhb0XDo2!31PJYzN7D<_h}^ztT`>1n2Y>Rfu6Fv9W!4^Wsxx1Zlua?tG>Yy^BlgB$ zRguX)-HYOpxE_@DC-57ay7c2suU$iA*DSJI`w`x}h~if(06l93>fyjFo5!$V%3R85 zsYEmbjQ?`k_u7ntAhTfrRGrPTfxCgx6rh8N?3_dC_lSL&ARVc$hhijPv@}qF=6@p- zXxKIDs-DH8ZOA>@qx+L7_kfD=J*V+ApQ%?WfrHg@ZWQ5ltgb7Zif5XT-P~VM$^Qq8 zG2?X%*M|3~lhy2bSH+~7HyB21`U*R-GdxCUzLk`?0Tsh61q8!&c;_ryKAms{GrRL< zl#Vw$Cwr#(@+xAt)toivGGt2*^na%&m(j=sUN4U^mIT^7#xPskN}E|XtvG%Kku5n3 z%39rt53hClixISKSzuF6B|xRWfY#Gv$aD|>_h6)xJZnWw(4NuL zXzABR%x&!l<_%|SrD*x?4}^!+dk{b>w!uCcnNV!%U{cK(kwW+65Z#kOWPjTNLOn|; zo@zoluVCTn9w24h+Hj0cbykc6jM`XpWT8Olfd#aF`6uRI>_Xw~4qXwV1ut2^2cs`q2`+YV-cvUQWG5T=~-cD$tbSP2e0_SWpQ@5oKcmE#HnI|8X2mkEf8nZ2*|&MjffIa6RJYFEx3L3Puz(?>TIH zSo8Jj4YqfghQ^LgAb+}5|COL{B8J?-PS6pOmEaFg(@DSD#oD#?tiywH&5|Wjz_OG9R3^m zgIyK8Li6S>;%DTkK`pvs)-b8$1&CD^s}wglej6w%$NQ5gWu)~yr0k`14UEh;909vL z<=~|pz9DYF`~azgudq$j6~ljIL5e`hR8&oeS+G1(M+U`hf57&L!T3#+Kq_&Qh~z}F zDna)Lgra*)pMSt(+)fk(Mv$_8Q_V94tDqpLqJ#0P5ZN_@0+5yWGV1FD#Z*ih;GW9# z>p9D%EU!-X0=A6aVl*W~QhkGG0kYAnZN3e9xl|P-SU=zb1xU}4cHCHGbRYtK4!bsLnu)cqWU4+_n1Z$fR|-WMATT0;;A|r>~%c z6si``^?_kV;(RjPJfgizK=1*G@h(A-;DeN{b{-St8iC5Xyi35IM|=AO${rBhr@ejR sHO~puh$9=Ku=)1Mk7blU7rlM*FBGn6kGx5HUH||907*qoM6N<$f+IXP#{d8T delta 1146 zcmV-=1cm#;5t|8+Fn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pJ zFiAu~RA@u(noVd_R~*I9yx7h(jqwW;wbW^=wu({w!j7d_s9*v`iV=zUL6Ine1x2Ns zQWtJqMBKF`1ENB0K_Y~@C>hdMnV7t% zc|SPs{_lN|nS1!(`@io^BFLiw)eXBac~=6jC2A3?jUe;X{g;glBAGP$(_QH6O5%R9 z6TO}07P1qMMIy12nfS>jR5xWu$0?`LdwM&rZtufjUxfxvAbw&qCT-5%9mmumS{Fw& z-hrNu$XZNXn}5RFDRVD`)Z=n}MGI!OEI@3585@1p{0>Y>12=2UK=7zSMU}G}m8(sE zY*dAJz3WMc8RE*uLeWg62DXnzGXxIJs8QytWI)Km=wm-6-) zRhG}$KB1as^P+WOgEB0aC6B3B-7v=r-v3pB|Cv-?#w<7OE7bab-Pnr!2@f+xd`x}j zhJI6?G5M#S4@_G&OxP{Vl-<-ac2&yvGTx!=@{iJu*}yM6$;4s~_320^!K$QHwT4m> z#VDEm7k}j=-g``(ldUsxC8cHa4z-jjRAE(Ru2X~Ap38meTg&~Tg`YRq#J^BS{M~1~ zjcMZ-)wyFN{7D_OoM0~v)=s1j1l1T-kZ;(`bbBSE>T-BKF9kN)LVU!}``MT= zOC|-@7}3kg{R3!zrEs2VEn{L@zE|F4FvacrNPm&dw;K48Cpms!Yjl7s#}u)i+IZEC zea7;D#}aXdrK4C4(?j9TQcdBP0ljrFJ;ie`rjqSpp*u>GOH#18YGo`0+KXpw_QBQ0UAPP*cPh8bc;f`>00hfd+!h7%rt3i?Pj^7l_ap4?<%+ z2#xU|G{%F_7!N{YJP3{PAT-8<&=?OwV?1!~;K>~mhZwr?xZAmizKf08_fgA z3_SG~dL1g)HKV3Ef!7nYs0i-AZa+uT7)*EJQP*+YJAM{DXWdcYf4$=BFuK9L#sB~S M07*qoM6N<$f?=pALjV8( From e272d6a0f7e318af42e342cfc74d769e50867349 Mon Sep 17 00:00:00 2001 From: naiba Date: Thu, 5 May 2022 20:55:23 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=F0=9F=92=84=20`dashboard=20v0.13.10`=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- cmd/agent/monitor/monitor.go | 2 +- cmd/playground/main.go | 12 ++++++++++- go.mod | 2 +- go.sum | 4 ++-- resource/template/common/header.html | 7 ++++-- resource/template/dashboard/server.html | 2 +- resource/template/dashboard/terminal.html | 8 +++---- resource/template/theme-daynight/home.html | 6 +++--- resource/template/theme-default/home.html | 25 ++++++++++++++-------- service/singleton/singleton.go | 2 +- 11 files changed, 46 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 1d7ef39..55386d2 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
LOGO designed by 熊大 .

-    +   

:trollface: Nezha Monitoring self-hosted lightweight monitoring and operation and maintenance system. Supports system status, HTTP (SSL certificate change, upcoming expiration, expiration), TCP, Ping monitoring and alerting, execute scheduled tasks and web terminal.

diff --git a/cmd/agent/monitor/monitor.go b/cmd/agent/monitor/monitor.go index 0977e37..d62014d 100644 --- a/cmd/agent/monitor/monitor.go +++ b/cmd/agent/monitor/monitor.go @@ -71,7 +71,7 @@ func GetHost(agentConfig *model.AgentConfig) *model.Host { } return &model.Host{ - Platform: hi.OS, + Platform: hi.Platform, PlatformVersion: hi.PlatformVersion, CPU: cpus, MemTotal: mv.Total, diff --git a/cmd/playground/main.go b/cmd/playground/main.go index 7905807..af2dedb 100644 --- a/cmd/playground/main.go +++ b/cmd/playground/main.go @@ -1,5 +1,15 @@ package main -func main() { +import ( + "log" + "github.com/shirou/gopsutil/v3/host" +) + +func main() { + info, err := host.Info() + if err != nil { + panic(err) + } + log.Printf("%#v", info) } diff --git a/go.mod b/go.mod index 615c6b6..25c5e71 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/p14yground/go-github-selfupdate v0.0.0-20220205132106-76a6d59b925b github.com/patrickmn/go-cache v2.1.0+incompatible github.com/robfig/cron/v3 v3.0.1 - github.com/shirou/gopsutil/v3 v3.22.3 + github.com/shirou/gopsutil/v3 v3.22.4 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.11.0 github.com/stretchr/testify v1.7.1 diff --git a/go.sum b/go.sum index 60e7982..6b61363 100644 --- a/go.sum +++ b/go.sum @@ -291,8 +291,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= -github.com/shirou/gopsutil/v3 v3.22.3 h1:UebRzEomgMpv61e3hgD1tGooqX5trFbdU/ehphbHd00= -github.com/shirou/gopsutil/v3 v3.22.3/go.mod h1:D01hZJ4pVHPpCTZ3m3T2+wDF2YAGfd+H4ifUguaQzHM= +github.com/shirou/gopsutil/v3 v3.22.4 h1:srAQaiX6jX/cYL6q29aE0m8lOskT9CurZ9N61YR3yoI= +github.com/shirou/gopsutil/v3 v3.22.4/go.mod h1:D01hZJ4pVHPpCTZ3m3T2+wDF2YAGfd+H4ifUguaQzHM= github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= diff --git a/resource/template/common/header.html b/resource/template/common/header.html index 13ee240..0443dc9 100644 --- a/resource/template/common/header.html +++ b/resource/template/common/header.html @@ -7,11 +7,14 @@ {{.Title}} - + + - {{end}} + {{end}} \ No newline at end of file diff --git a/resource/template/dashboard/server.html b/resource/template/dashboard/server.html index 7164b34..934c122 100644 --- a/resource/template/dashboard/server.html +++ b/resource/template/dashboard/server.html @@ -73,7 +73,7 @@ {{template "component/server" .}} {{template "common/footer" .}} - + - - + + + {{if ts .CustomCode}} @@ -165,8 +165,8 @@ - - + +