From fa96923d6f34c7fc5f73361cea0007dae9b7a18d Mon Sep 17 00:00:00 2001
From: gbaconni <gbaconni@student.42lausanne.ch>
Date: Thu, 4 Nov 2021 18:19:45 +0100
Subject: [PATCH] 2021-11-04 18:19:45

---
 .monitoring.sh.swp | Bin 12288 -> 12288 bytes
 monitoring.sh      |  12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.monitoring.sh.swp b/.monitoring.sh.swp
index eb0379dc979cebba93fb6c1d6ba92a7a7ccf40f1..c295445687c9a562d60706ec452d6bfb558f67a1 100644
GIT binary patch
delta 760
zcmb`@-%HbB6vy$itu^%``l)uK5A18Yt+^l0@&_BZO)6t`p$I|P=Jsuw`<34<C526h
zy6Hx~fww`>MRbvjpeQ1ux(G5PBD#qv3A(JjjOe}m7kc0YpYt4^bKt2ZYe_ZjpFELJ
z1HD1v>=x;2y_z~UX4qbqEHa%+7gtuawfM76d&DXdF`Lz5b*n|>Cw|}?Ht_(5puvfD
zwBl*A$P+xqJ={eRdE_vKv#`Me!LKG};|dlqj~Qe!+9Xwp5uykoh_4QjRT#L05_F^y
zLK_ZXKOC^*!%mSq7)2ZQVAC%085?+ub-cn0EMp9DdsSqR(2owZqXl;S-XXGu@A!gG
zc#k)Djz_qU+gQa7)KJDOl9<E<#&HrcL=nLs8$Yym^P0uH?#zrk|Nk*xJA3Q>+J;rT
zSggzyQaN=lb~=#=8<k8^Evf9BUQ*t)YTS*Sir0hP7pxrt8makN)$N<=ij^upwWuma
zDyxUJphpXt?_6iJnL@co>vIj$&@<tGRfwvT)(hqB@`%eEaUb1vSe1)qw)#}S@AsRx
z+y^_OdF7o@-kkC-sB*q^-e`o3etA1DnIGN5R;|xm?%8MhJpR3n4Lsi-<8F+p8=iHG
RV_+ySI1~!jk9!|l{{p|-lz#vK

delta 736
zcmYk(%WD%s9Ki8O(ln{s2c~+eW}pkrYnx5Fv>_our9z{4RPfYnvm0B8NieCV)Y2lN
z2Q8(nsCW=>BI=>WgBL-HJ$MPePNJnf6~%wS>Niaf4t(bKo1NEhnWfxPPEKhTvgc%C
zI4)>?Lag`PH2j&WYop>2Q%1hLx~i;=zw^62P9Z#Ymz-bxeL#p`_=!z?#|s=rA9~RN
zCsw+ISjJr}U>+xsK^jr0`05qnGd|%x)^QeDOdyE_j(WwS=qK^P4HsT}gqX%SPT?d*
zq2o`d5L?*94}3%uPf$h=w%kH|!%IBFBRs?dtY8^u;6t~2kv}8Z?GR!I+xUVeHt-g&
z@ElL^8251pH!z1HayXAH($EovAIC6&ejLI<c(Ci@jn?kna@e;AO?y)5?j6*5H>=&(
zXKIa%^4A$D%#=(Sy=q*E7R#5S)mgJF)!JOek_D-jjLVkfv%D^^<)vC|7(>%eZ(K^%
zl-jWUA$Z&uRz|~0OhX(xM(v&8#Un~QC1<OanN~(pvXZw-wX~w!W@yZiA(@ECK&@Oe
zimf~-qcRZFG>yT3AsA_IOUZ>H(PdJN+TNlTDNtJVT6{l_>_@#7>xHVl9ZGfXtyS%T
h@ag_QtB&^Jt-JPS8r5*q;TcQniDXP`OsH?1{{Ss}k*oj!

diff --git a/monitoring.sh b/monitoring.sh
index 7ee2ce4..55ae22f 100755
--- a/monitoring.sh
+++ b/monitoring.sh
@@ -6,7 +6,7 @@
 #    By: gbaconni@student.42lausanne.ch             +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2021/11/04 12:36:53 by gbaconni          #+#    #+#              #
-#    Updated: 2021/11/04 17:48:10 by gbaconni         ###   lausanne.ch        #
+#    Updated: 2021/11/04 18:19:42 by gbaconni         ###   lausanne.ch        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -25,18 +25,18 @@ ft_cpu ()
 
 ft_memory ()
 {
-	free -m | awk '/Mem:/ { total=$2; used=total-$3; } END { printf "#Memory Usage: %d/%dMB (%.2f%%)\n", used, total, (used * 100) / total; }'
+	free -m | awk '/Mem:/ { total=$2; used=$3; } END { printf "#Memory Usage: %d/%dMB (%.2f%%)\n", used, total, used / total * 100; }'
 }
 
 ft_disk ()
 {
-	df --total -l -t ext2 -t ext3 -t ext4 -t xfs \
-		| awk '/^total/ { total=$2; used=$3; pcent=$4 } END { printf "#Disk Usage: %d/%dGb (%.2f%%)\n", used * 8, (total * 8) / (1000 * 1000 * 1000), pcent; }'
+	df --total -Bm -T -l -x tmpfs -x devtmpfs | \
+		| awk '/^total/ { total=int($3); used=int($4); pcent=int($6) } END { printf "#Disk Usage: %d/%dGb (%.2f%%)\n", used, total / 1000, pcent; }'
 }
 
 ft_load ()
 {
-	top -b -n 2  -d 0.1 | awk '/^%Cpu/ { usage=$2+$4+$6+$10+$12+$14+$16; } END {printf "#CPU load: %d%%\n", usage; }'
+	top -b -n 1 | awk '/^%Cpu/ { usage=$2+$4; } END {printf "#CPU load: %d%%\n", usage; }'
 }
 
 ft_lastboot ()
@@ -68,7 +68,7 @@ ft_network ()
 
 ft_sudo ()
 {
-	count=$(find /var/log/sudo -type f -name log | wc -l)
+	count=$(journal _COMM=sudo | grep -c COMMAND)
 	echo "#Sudo : ${count} cmd"
 }