Changeset 132 for trunk/klask

Timestamp:

Nov 1, 2013, 2:09:52 PM (11 years ago)

Author:

g7moreau

Message:

• Many update and fix in bad-vlan-config method
• Activate fastping in updatedb method (without, pb when two IP on same network)
• Create graph in horizontal and not vertical any more

File:

• trunk/klask (modified) (7 diffs)

trunk/klask

@@ -187 +187 @@
 sub fast_ping {
    # Launch this command without waiting...
-   system "fping -c 1 @_ >/dev/null 2>&1 &";
+   system "fping -q -c 1 @_ >/dev/null 2>&1 &";
    return;
    }
@@ -768 +768 @@
       my $current_interface = get_current_interface($net);
 
-      #fast_ping(@computer);
+      fast_ping(@computer);
 
       LOOP_ON_COMPUTER:
@@ -1285 +1285 @@
    my $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE");
 
+   # create a database with the most recent computer by switch port
    my %swithportdb = ();
    LOOP_ON_IP_ADDRESS:
@@ -1290 +1291 @@
       # to be improve in the future
       next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{hostname_fq} eq ($computerdb->{$ip}{switch_hostname} || $computerdb->{$ip}{switch_description}); # switch on himself !
+      next LOOP_ON_IP_ADDRESS if ($computerdb->{$ip}{switch_hostname} || $computerdb->{$ip}{switch_description}) eq 'unknow';
+      next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{switch_port} eq '0';
 
       my $ip_timestamp   = $computerdb->{$ip}{timestamp};
@@ -1306 +1309 @@
          };
 
-      if (
-         ($ip_hostname_fq =~ m/$RE_FLOAT_HOSTNAME/ and $ip_timestamp > $swithportdb{$swpt}->{timestamp} + (15 * 24 * 3600))
-         or
-         ($ip_hostname_fq !~ m/$RE_FLOAT_HOSTNAME/ and (
-            ($swithportdb{$swpt}->{hostname_fq} =~ m/$RE_FLOAT_HOSTNAME/ and $ip_timestamp > $swithportdb{$swpt}->{timestamp} - (15 * 24 * 3600))
-            or
-            ($swithportdb{$swpt}->{hostname_fq} !~ m/$RE_FLOAT_HOSTNAME/ and $ip_timestamp > $swithportdb{$swpt}->{timestamp})
-            ))
-         ) {
+      # if float computer, set date 15 day before warning...
+      my $ip_timestamp_mod = $ip_timestamp;
+      my $ip_timestamp_ref = $swithportdb{$swpt}->{timestamp};
+      $ip_timestamp_mod -= 15 * 24 * 3600 if $ip_hostname_fq =~ m/$RE_FLOAT_HOSTNAME/;
+      $ip_timestamp_ref -= 15 * 24 * 3600 if $swithportdb{$swpt}->{hostname_fq} =~ m/$RE_FLOAT_HOSTNAME/;
+      
+      if ($ip_timestamp_mod > $ip_timestamp_ref) {
          $swithportdb{$swpt} = {
             ip          => $ip,
@@ -1339 +1340 @@
          $src_timestamp = $computerdb->{$ip}{timestamp};
          }
-      
+
+      # keep only if float computer is the most recent
       next if $src_timestamp == 0;
-      
+      next if $swithportdb{$swpt}->{timestamp} < $src_timestamp;
+
       my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime $swithportdb{$swpt}->{timestamp};
       $year += 1900;
       $mon++;
-      my $date = sprintf '%04i-%02i-%02i %02i:%02i', $year, $mon, $mday, $hour, $min;
+      my $date = sprintf '%04i-%02i-%02i/%02i:%02i', $year, $mon, $mday, $hour, $min;
 
       ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime $computerdb->{$src_ip}{timestamp};
       $year += 1900;
       $mon++;
-      my $src_date = sprintf '%04i-%02i-%02i %02i:%02i', $year, $mon, $mday, $hour, $min;
-
-      printf "%s / %-10s +-> %-10s  %s / %s # %s\n",
+      my $src_date = sprintf '%04i-%02i-%02i/%02i:%02i', $year, $mon, $mday, $hour, $min;
+
+      printf "%s / %-10s +-> %-10s  %s %s %s %s\n",
          $swpt, $swithportdb{$swpt}->{vlan}, $computerdb->{$src_ip}{network},
          $date,
          $src_date,
+         $computerdb->{$src_ip}{mac_address},
          $computerdb->{$src_ip}{hostname_fq};
       }
@@ -1984 +1988 @@
 
    print "digraph G {\n";
+   print "rankdir = LR;\n";
 
    print "site [label = \"site\", color = black, fillcolor = gold, shape = invhouse, style = filled];\n";