Remove JSON

master
Heuzef 5 years ago
parent d7da4b4a24
commit 620122f900
  1. 27
      Check.pm
  2. 14
      readme.txt

@ -22,7 +22,6 @@ use lib "/usr/share/BackupPC/lib";
use BackupPC::Lib; use BackupPC::Lib;
use BackupPC::CGI::Lib qw(:all); use BackupPC::CGI::Lib qw(:all);
use POSIX; use POSIX;
use JSON;
use Getopt::Long; use Getopt::Long;
use Statistics::Descriptive; use Statistics::Descriptive;
use Data::Dumper; use Data::Dumper;
@ -133,12 +132,12 @@ sub action
# Check Size Consistency # Check Size Consistency
my $bpc = BackupPC::Lib->new(); my $bpc = BackupPC::Lib->new();
my $mainConf = $bpc->ConfigDataRead(); my $mainConf = $bpc->ConfigDataRead();
my $json = {}; my $check = {};
my $hostConf = $bpc->ConfigDataRead($host); my $hostConf = $bpc->ConfigDataRead($host);
my $conf = { %$mainConf, %$hostConf }; my $conf = { %$mainConf, %$hostConf };
my $age = -1; my $age = -1;
$json = { $check = {
bkp => 0, bkp => 0,
last_age => 0, last_age => 0,
errors => 0, errors => 0,
@ -159,25 +158,25 @@ if ( scalar( @bpc_info ) ){
# Push all the sizes in our data set to compute avg sizes # Push all the sizes in our data set to compute avg sizes
# Exclude backup N°0 as it'll always have much more new data than normal backups # Exclude backup N°0 as it'll always have much more new data than normal backups
$sizes->add_data($backup->{sizeNew}) unless ( $backup->{num} == 0 ); $sizes->add_data($backup->{sizeNew}) unless ( $backup->{num} == 0 );
$json->{bkp}++; $check->{bkp}++;
} }
# Ignore the last backup if it's not full or incr (which means it's either partial or active) # Ignore the last backup if it's not full or incr (which means it's either partial or active)
my $i = ( $bpc_info[-1]->{type} =~ m/^full|incr$/ ) ? -1 : -2; my $i = ( $bpc_info[-1]->{type} =~ m/^full|incr$/ ) ? -1 : -2;
$json->{errors} = $bpc_info[$i]->{xferErrs}; $check->{errors} = $bpc_info[$i]->{xferErrs};
$json->{new_size} = $bpc_info[$i]->{sizeNew}; $check->{new_size} = $bpc_info[$i]->{sizeNew};
$json->{new_size_avg} = int $sizes->mean; $check->{new_size_avg} = int $sizes->mean;
$json->{new_size_median} = int $sizes->median; $check->{new_size_median} = int $sizes->median;
$json->{new_size_q1} = eval { int $sizes->quantile(1) } || 0; $check->{new_size_q1} = eval { int $sizes->quantile(1) } || 0;
$json->{new_size_q3} = eval { int $sizes->quantile(3) } || 0; $check->{new_size_q3} = eval { int $sizes->quantile(3) } || 0;
$json->{age} = time - $bpc_info[$i]->{startTime}; $check->{age} = time - $bpc_info[$i]->{startTime};
$json->{last_age} = sprintf("%.1f", ($json->{age}) / 84600); $check->{last_age} = sprintf("%.1f", ($check->{age}) / 84600);
} }
# TOO BIG ? # TOO BIG ?
my $toobig = "1"; my $toobig = "1";
if ( $json->{new_size} > ($json->{new_size_q3} + $json->{new_size_q3} - $json->{new_size_q1}) * 1.5 or $json->{new_size} > $json->{new_size_avg} * 6 ) { if ( $check->{new_size} > ($check->{new_size_q3} + $check->{new_size_q3} - $check->{new_size_q1}) * 1.5 or $check->{new_size} > $check->{new_size_avg} * 6 ) {
$toobig = "1"; $toobig = "1";
} }
else { else {
@ -186,7 +185,7 @@ else {
# TOO SMALL ? # TOO SMALL ?
my $toosmall = "1"; my $toosmall = "1";
if ( $json->{new_size} < ($json->{new_size_q1} - $json->{new_size_q3} - $json->{new_size_q1}) * 1.5 or $json->{new_size} < $json->{new_size_avg} / 3 ) { if ( $check->{new_size} < ($check->{new_size_q1} - $check->{new_size_q3} - $check->{new_size_q1}) * 1.5 or $check->{new_size} < $check->{new_size_avg} / 3 ) {
$toosmall = "1"; $toosmall = "1";
} }
else { else {

@ -1,12 +1,14 @@
# Install Backup-Check # Install
## Install dependencies : ## Install dependencies
``yum -y install perl-JSON perl-Statistics-Descriptive`` ``yum -y perl-Statistics-Descriptive``
## Install Backup-Check
``sh update.sh`` ``sh update.sh``
## Add menu links ## Add menu link
Edit config -> CGI -> CgiNavBarLinks Edit config -> CGI -> CgiNavBarLinks
Add link "Check" to "?action=check" Add link "Check" to "?action=check"
@ -15,5 +17,5 @@ Add link "Check" to "?action=check"
# TODO # TODO
- Vérification de la fréquence IncrPeriod et FullPeriod pour l'age quotidienne et hebdomadaire. - Vérification de la fréquence IncrPeriod et FullPeriod pour l'age quotidienne et hebdomadaire.
- Harmonisation du code Size Consistency avec des variables cohérentes scalaires et sans JSON. - Harmonisation du code Size Consistency avec des variables cohérentes scalaires.
- Diminuer la redondance des conditions - Diminuer la redondance des conditions.

Loading…
Cancel
Save