From 5ef44390faf3a69a56e8b44a107484204d6f52eb Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Sun, 25 Feb 2018 15:05:07 +0100 Subject: [PATCH] Support web url monitoring in web ui --- .../js/components/plugin-folders/view.html | 2 ++ .../js/components/plugin-ports/controller.js | 20 +++++++++++++----- .../js/components/plugin-ports/view.html | 7 +++++- glances/outputs/static/public/glances.js | Bin 2111096 -> 2111964 bytes glances/outputs/static/public/glances.map.js | Bin 2522661 -> 2523660 bytes 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/glances/outputs/static/js/components/plugin-folders/view.html b/glances/outputs/static/js/components/plugin-folders/view.html index 4308ff58..26e984e4 100644 --- a/glances/outputs/static/js/components/plugin-folders/view.html +++ b/glances/outputs/static/js/components/plugin-folders/view.html @@ -1,8 +1,10 @@
FOLDERS
+
Size
{{ folder.path }}
+
{{ folder.size | bytes }}
diff --git a/glances/outputs/static/js/components/plugin-ports/controller.js b/glances/outputs/static/js/components/plugin-ports/controller.js index ec6725c5..326f245e 100644 --- a/glances/outputs/static/js/components/plugin-ports/controller.js +++ b/glances/outputs/static/js/components/plugin-ports/controller.js @@ -20,16 +20,26 @@ export default function GlancesPluginPortsController($scope, GlancesStats) { }, this); } - vm.getDecoration = function (port) { + vm.getPortDecoration = function (port) { if (port.status === null) { return 'careful'; - } - - if (port.status === false) { + } else if (port.status === false) { return 'critical'; + } else if (port.rtt_warning !== null && port.status > port.rtt_warning) { + return 'warning'; } - if (port.rtt_warning !== null && port.status > port.rtt_warning) { + return 'ok'; + }; + + vm.getWebDecoration = function (web) { + var okCodes = [200, 301, 302]; + + if (web.status === null) { + return 'careful'; + } else if (okCodes.indexOf(web.status) === -1) { + return 'critical'; + } else if (web.rtt_warning !== null && web.elapsed > web.rtt_warning) { return 'warning'; } diff --git a/glances/outputs/static/js/components/plugin-ports/view.html b/glances/outputs/static/js/components/plugin-ports/view.html index 560886a2..3af369bd 100644 --- a/glances/outputs/static/js/components/plugin-ports/view.html +++ b/glances/outputs/static/js/components/plugin-ports/view.html @@ -3,10 +3,15 @@ 20}}
-
+
Scanning Timeout Open {{port.status * 1000.0 | number:0}}ms
+
+ Scanning + Error + Code {{ port.status }} +
\ No newline at end of file diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js index 2a2d8f9d9db24b9febe81e624f099a8944906983..2b5a1b67cc04299bf768a042001cdcafcd62d7f3 100644 GIT binary patch delta 1709 zcma)6O-vI(6i%U*wzTE1ohP6;t)ZgQ@?$)iHX?yUBU&uPL_pKpEi|s(vbzNhKjAQm ziP2~zGJ1fsiIQMqTt$q*3l|Sw!~=3NUetK;0tXXk3sG*oO}^co%=f-|@0)qE@pH=Z z<@c0jidk3@D`r-;_Z%=d!y)YtWDlBzYOWkpS7 zlWJa<dy$+^v=j&A?%z1aI$Pj(7 z>aoTYRp<9V5#X0&5a;8P)ydz*pl$2V(+!Morbub=MJZXJb&N{M!*t9^x1W)ON|kHv zN=njbg!Z*IH#gE_%`N7ub>M{aA1{-p4I(tG=?Oir@nx$6_`N?a2cM0Bx3E~vwoEva zO-VP-r+3m9zS{^tY4iU(@gqqD{2dO_2q1n7F(_oOAbCR6MX;O+t z%@L1u!|X1Om^VY%ICud%EycnXJ`{(Bna9Lho=Hdg136(-cu3Lo{s3?3fm;4F4qtih zG;#1~9F7(Y%EaN28Bz8>BCpCj0;28?RaMmfK(z4X%W?2?`E`|@m=4mhFnE^kJIXw>wu9wd&K@L+^ p$S7KY4|Y_Zlq delta 1303 zcmccfxq)7RDB)7UmX~7SHl_#ZJ546QCxQW$K7H^-1u~D2kHtY!utEy#3u9MGYAqid!LFq z5fOr3@5N%d2%Gllr`QG}0{ShRxDQ@WLfqCOB;HGeX)*HRlkp}Kh-p^3;`2oCdciPN zTyMLIllTh0>3X$d;?ti8hzC!9!^X`w{da)4!1RznaYG2VKTy17djC!_!RgC_#mxzu zsTm^f#yI^zqZs$}x=?YM=?mtFb5Hj>CB`*_^t1^_L-;-mlo diff --git a/glances/outputs/static/public/glances.map.js b/glances/outputs/static/public/glances.map.js index 3fe041df72927c958f1e6c339a98d16898db96fc..3c256e9b7396245783f7110f820d049c9740e36e 100644 GIT binary patch delta 2300 zcma)+eN0B%>)e-1oVs?jF~?eE5WByvgBjZt%Oe_Df=*S#tVrnVNKJgi6(A1;v0_QAm z>J@~hUe`c}APjW4ns*CA^X|<4=^cj}@$@t|f-@g$iYA`TGAlDLZctACT%HKeax^@f z%}xLBe zEbEC%k!XD&7>f90esYQ*&RF*0IO zQ;EfANDe;S4HfjqH^`hC2WnCNkm#xDBjT{C+2W`{kMDiUF0$$ZUL+(}jaIo~Fks_( z*ntnsljqT9fqU_bdGa}0)2l=8l5+a?b<$&0)$6R$k~Xsz$4{}RekmUum`V~GdL3Y< zAKWBuIcnPA-*^9YZ2zA`uTGQ72FsfJ|C9wSsve}mo3oWMbH+Oljz0z_I%R@A22}^0 z$pbB(EP}PpzmN}qsTmBna?xU*ssZDA!%bQ4wp-MkU)g0f(C54` zl)ql}!ZT1u+q%J-!*zusm^(*`@PH2<#p_Pqgx~m}V|i8Oha(_sRUqXV4enLkBuSq7>y@`NucA-7dbt?MZ)aeqvjnyjnRB;A@z=E*kU2;!*6f zS2;2KpfMZ6elXyak4+cb-dwWWtZqOSrJ-GcHIhxJ+39fLSCoy$;v6Y&Nq39HVtWtz zBJzN|kFRKL<>h!V$X8eM>HnmlFC3LbzAf`>O(lLpSweEJksf8zW|-)Q9cmoII{~n! z1L2vtzyff!ABr^@|L%xTm(Er;dY9OMheMHA-TqKC*4NipiFLP#6GIZ%uw8=N6H%7y zX%RdbM;Aq?T@~sx!gvH1Zj#dfB-?E}Bau)f-K#CL!Z8UdOGPQ*iw9$EY3KRjVLqc> zv36krN@#5Wj;}jgY!I5(omW=WsMOnaG&l^CHWf}a;`9;F(mgN13Fms{Y`SZy_jM3e zRpQub7SW^qaNlyax159bRb>Oeo&`H?JrD1wdKD-$j$C^GW%x~}=KOf$JJ2gn7p#46 ny!kzpuIp_2@)({2ZNi!YMj4}=!80ltm5dFHDr!w_ES&rYCwW(1AzT_D?St-Ng5WyeL43c_NI>LGJ?y|sEa%cv&{ zvPF!xIu9TAU_EppFe<{PAW5Piiz1L749%tJLiA7%1wpqFAA*R+hab$qf6mM|-<;z| z&qx=(4@f5~aw-F*D_6%#1JUwmba$*Q5~&PC^-&2h{h>fPqV;N0uQqR3lU=twfi08< zws>Qd#=LpT!MsJeQF2 zaM!qOF6j!cUXrjyyz-VsMfW4{vEX~M-zLnnUtdW19AZ5(G>fmB zm0IDVBHUCjQSHp11FktV{h?}O=R9y_4y9|htl3^aUJBFVUhC5~h5aZ4vno6=+f3nb zwkWn76Pv-LCmfd97ql@9Z&h6T3i5DM6Extj6j8CTN;Tk66NLUu4GFDlKc0w!3v(mT zflJ?!4f>!%(We|%OvGTdaAWHbU;Th{}F4$&#g&=cT4`>GV2$rWXN`qQjzw(KI* zi=(LB1N%(jRm?d8SH<1br?VB7^$2c=Un+Bs!%vg&v^Y8eX4d!uYJ?Z&OMZF{+yc(S T6>>#fF}ILg#6G=VOa^}gf8&{#