diff --git a/plugins/mysql/mysql_size_ b/plugins/mysql/mysql_size_ index 4c5eeb6b..9d980255 100755 --- a/plugins/mysql/mysql_size_ +++ b/plugins/mysql/mysql_size_ @@ -48,7 +48,7 @@ my $db = $2; my $MYSQLADMIN = $ENV{mysqladmin} || "mysql"; my %WANTED = ( "Index" => "index", - "Datas" => "datas", + "Data" => "data", ); my $arg = shift(); @@ -65,7 +65,7 @@ if ($arg eq 'config') { exit; } -my $datas = 0; +my $data_count = 0; my $indexes = 0; my (@infos,$info,$i_data,$i_index); @@ -99,12 +99,12 @@ open(SERVICE, "$COMMAND |") while () { (m/(\d+).*?(\d+(?:\.\d+)?)/); - $datas += $1; + $data_count += $1; $indexes += $2; } close(SERVICE); -print("datas.value $datas\n"); +print("data.value $data_count\n"); print("index.value $indexes\n"); diff --git a/plugins/network/if b/plugins/network/if index f2a5f40a..312034aa 100755 --- a/plugins/network/if +++ b/plugins/network/if @@ -1204,36 +1204,36 @@ sub check_field_avialability #------------------------------ percent ------------------------ if($fields->{$field}{'source'}{'calculated'}{'type'} eq 'percent') { - my %avialable; + my %available; for my $a ('full', 'part') { if($fields->{$field}{'source'}{'calculated'}{$a}{'source'} eq 'interface') { - $avialable{$a} = exists($interfaces->{$if}{$fields->{$field}{'source'}{'calculated'}{$a}{'name'}}); + $available{$a} = exists($interfaces->{$if}{$fields->{$field}{'source'}{'calculated'}{$a}{'name'}}); } elsif($fields->{$field}{'source'}{'calculated'}{$a}{'source'} eq 'field') { - $avialable{$a} = check_field_avialability($if, $fields->{$field}{'source'}{'calculated'}{$a}{'name'}); + $available{$a} = check_field_avialability($if, $fields->{$field}{'source'}{'calculated'}{$a}{'name'}); } } - $fields->{$field}{'avialable'}{$if} = ($avialable{'full'} and $avialable{'part'}); + $fields->{$field}{'available'}{$if} = ($available{'full'} and $available{'part'}); } #------------------------------ division ------------------------ elsif($fields->{$field}{'source'}{'calculated'}{'type'} eq 'division') { - my %avialable; + my %available; for my $a ('dividend', 'divider') { if($fields->{$field}{'source'}{'calculated'}{$a}{'source'} eq 'interface') { - $avialable{$a} = exists($interfaces->{$if}{$fields->{$field}{'source'}{'calculated'}{$a}{'name'}}); + $available{$a} = exists($interfaces->{$if}{$fields->{$field}{'source'}{'calculated'}{$a}{'name'}}); } elsif($fields->{$field}{'source'}{'calculated'}{$a}{'source'} eq 'field') { - $avialable{$a} = check_field_avialability($if, $fields->{$field}{'source'}{'calculated'}{$a}{'name'}); + $available{$a} = check_field_avialability($if, $fields->{$field}{'source'}{'calculated'}{$a}{'name'}); } } - $fields->{$field}{'avialable'}{$if} = ($avialable{'dividend'} and $avialable{'divider'}); + $fields->{$field}{'available'}{$if} = ($available{'dividend'} and $available{'divider'}); } #------------------------------ sum ------------------------ elsif($fields->{$field}{'source'}{'calculated'}{'type'} eq 'sum') diff --git a/plugins/rackspace/rackspace_cdn_count.php b/plugins/rackspace/rackspace_cdn_count.php index 111d6590..ca2e66b5 100755 --- a/plugins/rackspace/rackspace_cdn_count.php +++ b/plugins/rackspace/rackspace_cdn_count.php @@ -17,8 +17,8 @@ $api_url='https://auth.api.rackspacecloud.com/v1.0/'; function SplitTwice($content,$first,$second) { $s1=split($first,$content); - $splitted=split($second,$s1[1]); - return trim($splitted[0]); + $tokens=split($second,$s1[1]); + return trim($tokens[0]); } diff --git a/plugins/rackspace/rackspace_cdn_size.php b/plugins/rackspace/rackspace_cdn_size.php index b3b836fd..5f50257b 100755 --- a/plugins/rackspace/rackspace_cdn_size.php +++ b/plugins/rackspace/rackspace_cdn_size.php @@ -16,8 +16,8 @@ $api_url='https://auth.api.rackspacecloud.com/v1.0/'; function SplitTwice($content,$first,$second) { $s1=split($first,$content); - $splitted=split($second,$s1[1]); - return trim($splitted[0]); + $tokens=split($second,$s1[1]); + return trim($tokens[0]); } diff --git a/plugins/zope/zope_conflict_errors b/plugins/zope/zope_conflict_errors index c2e03d35..5458d750 100755 --- a/plugins/zope/zope_conflict_errors +++ b/plugins/zope/zope_conflict_errors @@ -46,9 +46,9 @@ else: log = logs[i] error_count = 0 for line in file(log): - splitted = line.split() - if 'ConflictError' in splitted: - logdate = datetime(*time.strptime(splitted[0], date_format)[:-3]) + tokens = line.split() + if 'ConflictError' in tokens: + logdate = datetime(*time.strptime(tokens[0], date_format)[:-3]) delta = datetime.now() - logdate if delta.days >= 1: continue