WebSVN – computer_asset_manager_v1 – Diff – /modules/sysinfo/cli_tools/parse_sysinfo.php

  * them to simpl eval() blocks.
+ *
  * V0.9.2 20160217 RWR
  * Fixed issue where if a device was marked as part of a Xen machine, it
  * was being deleted by pci updates.
+ * Fixed issue where serial number was not being updated
+ *
 */
 require 'library.php';
 $VERSION='0.9.2';
    private $errors = array( 1 => 'Could not process file, not xml, yaml or ini',
 => 'Invalid report, does not have one or more of report date, client name or computer name',
 => 'Invalid Report, invalid machine name',
 => 'Duplicate Report',
 => 'New Report, must be added to CAMP',
-=> 'Report is in queue for addition after updates to CAMP'
+=> 'Report is in queue for addition after updates to CAMP',
+=> 'Too many entries match criteria of name, client and serial number'
                           );
    /*
     * $parsingArray contains one or more rows, each of which have three rows, starttag, endtag and eval
     * starttag and endtag are regex's which match the beginning and end of a document (ie, --- and ... for yaml)
       array_unshift( $this->messages,
             "Report on $this->reportDateSQL, client $this->clientName, system $this->machineName ($this->fileType)");
       // now, we do every step in turn. If they set the FATAL flag, we exit.
       if ( $this->FATAL ) return $this->returnCode;
       $this->getMachineID();
-      if ( empty( $this->machineID ) ) return $this->returnCode;
+      if ( empty( $this->machineID ) or $this->FATAL ) return $this->returnCode;
       $this->checkDuplicate();
       if ( $this->FATAL) return $this->returnCode;
       $this->updateComputerMakeup();
       $this->updateOS();
       $this->updateBootTime();
       $this->doIPAddresses();
       $this->processPCI();
       $this->processSoftwarePackages();
+      $this->processXen();
       // at this point, we don't really need the report title information
       // so we will remove it before recordReport has a chance to put it
       // in database
       array_shift( $this->messages );
       // now record the report
       } else {
          $this->machineName = $this->report['system']['hostname'];
+      }
       $this->FATAL = ! empty( $this->messages );
-      /* removed for the time being.
       // serial number is fairly new, so it is not a critical error
       // it will be set in getMachineID if we have it here, but not there
       if ( empty ( $this->report['system']['serial'] ) ) {
          $this->messages[] = 'No Serial Number';
       } else {
          $this->serialNumber = $this->report['system']['serial'];
+      }
-      */
    } // function validateReport
    /*
     *    machineID - index value of machine in database
     */
    private function getMachineID () {
       $this->clientID = getClientID( $this->clientName );
       if ( $this->clientID ) {
+         try {
-         $this->machineID = getMachineID( $this->machineName, $this->clientID, $this->serialNumber );
+            $this->machineID = getMachineID( $this->machineName, $this->clientID, $this->serialNumber );
+         }
+         catch (Exception $e) {
+            $this->messages[] = "Duplicate entries found when trying to process Machine [$this->machineName], Client [$this->clientID], Serial [$this->serialNumber]";
+            $this->FATAL = true;
+            $this->returnCode = 7;
+            return false;
+         }
+      }
       if ( empty( $this->machineID ) ) {
          $this->messages[] = $this->makeUnknown( $this->clientName, $this->machineName, $this->reportDateSQL );
          return false;
+      }
-      if ( $this->machineID == -1 ) {
-         $this->messages[] = "Duplicate serial number found for serial [$this->serialNumber], aborting";
-         return false;
-      }
       return true;
    } // function getMachineID
    /*
     * checks for a duplicate report, ie one that has already been run.
     * if this computer has a report already for this date/time
     */
    private function checkDuplicate() {
+      }
       return $result;
+   }
    /*
+    * checks to values to see if they are equal
+    * If they are both numeric, and $fuzzyValue is non-zero, will determine
+    * if $value2 is within $value1 +/- percentage of $fuzzyValue.
+    * Thus, if $fuzzyValue is 0.10, they are "equal" as long as $value1 is
+    * within $value2 +/- 10%
+    */
+   private function sloppyEqual ( $value1, $value2, $fuzzyValue ) {
+      return
+         ( is_numeric( $value1 ) and is_numeric( $value2 ) and $fuzzyValue and
+            $value1 <= $value2 + $value2 * $fuzzyValue and
+            $value1 >= $value2 - $value2 * $fuzzyValue
+         )
+         or
+         $value1 == $value2;
+   }
+   /*
     * Checks an attribute from the device_attriburtes table. If the value has
     * changed, sets the old one's removed_date to this report date, then adds
     * new record for new value.
+    * If value is not off by more than $slop, will not update. Useful for memory and speed on
+    * virtual devices where the values may be slightly different at different readings
     * If the record does not exist, simply creates it
     */
-   public function checkAndUpdateAttribute( $attribute, $value ) {
+   public function checkAndUpdateAttribute( $attribute, $value, $slop = 0 ) {
       if ( !isset($attribute) || !isset($value ) ) {
          $this->messages[] = "Error: attempt to use null value for [$attribute], value [$value] for ID $this->machineID in checkAndUPdateAttribute";
          return false;
+      }
-      $value = makeSafeSQLValue($value); # we want to always quote the value on this particular one
-      //$attribute = makeSafeSQLValue( $attribute );
       $attrib_id = $this->getAttributeID( $attribute, $this->reportDateSQL );
       $result = getOneDBValue( "select device_attrib.value
          from device_attrib join attrib using (attrib_id)
          where device_attrib.device_id = $this->machineID
                and device_attrib.removed_date is null
                and attrib.attrib_id = $attrib_id
          ");
-      $result = makeSafeSQLValue( $result ); # we must do this since we are comparing to $value which has had this done
-      if ( isset( $result ) ) { # got it, now see if it compares ok
+      if ( isset( $result ) && ! $this->sloppyEqual( $value, $result, $slop ) ) { # got it, now see if it compares ok
-         if ( $value != $result ) { # nope, this has changed. Note, must use fixDatabaseValue for escapes already in $value
+         $this->messages[] = "New value [$value] for $attribute for device $this->machineID, voiding previous";
-            $this->messages[] = "New value [$value] for $attribute for device $this->machineID, voiding previous";
+         $value = makeSafeSQLValue($value); # we want to always quote the value on this particular one
-            queryDatabaseExtended( "update device_attrib
+         queryDatabaseExtended( "update device_attrib
-                                       set removed_date = '$this->reportDateSQL'
+                                    set removed_date = '$this->reportDateSQL'
-                                    where device_id = $this->machineID
+                                 where device_id = $this->machineID
-                                          and attrib_id = $attrib_id
+                                       and attrib_id = $attrib_id
-                                          and removed_date is null");
+                                       and removed_date is null");
-            unset( $result ); # this will force the insert in the next block of code
+         unset( $result ); # this will force the insert in the next block of code
-         } # if $result ne $value
       } # if ($result)
       if ( ! isset( $result ) ) { # we have no valid entry for this attribute
          //$this->messages[] = "In checkAndUpdateAttribute, adding new record with insert into device_attrib(device_id,attrib_id,value,added_date) values ($this->machineID,$attrib_id,$value,$this->reportDateSQL)";
          queryDatabaseExtended( "insert into device_attrib(device_id,attrib_id,value,added_date)
                                  values ($this->machineID,$attrib_id,$value,'$this->reportDateSQL')");
       return false;
    } // checkAndUpdateAttribute
    # simply verifies some attributes of the computer
    private function updateComputerMakeup() {
-      $this->checkAndUpdateAttribute('Memory',        $this->report['system']['memory']);
+      $this->checkAndUpdateAttribute('Memory',        $this->report['system']['memory'], 0.30); // memory can be plus/minus 30%
       $this->checkAndUpdateAttribute('Number of CPUs',$this->report['system']['num_cpu']);
       $this->checkAndUpdateAttribute('CPU Type',      $this->report['system']['cpu_type']);
       $this->checkAndUpdateAttribute('CPU SubType',   $this->report['system']['cpu_sub']);
-      $this->checkAndUpdateAttribute('CPU Speed',     $this->report['system']['cpu_speed']);
+      $this->checkAndUpdateAttribute('CPU Speed',     $this->report['system']['cpu_speed'], 0.30 ); // cpu speed can be plus/minus 30%
+      // validate serial number and update if necessary
+      if ( $this->serialNumber ) {
+         $dbSerial = getOneDBValue( "select serial from device where device_id = $this->machineID" );
+         if ( ! isset ( $dbSerial ) or $dbSerial != $this->serialNumber ) {
+            $this->messages[] = "Updating serial number to $this->serialNumber";
+            queryDatabaseExtended( "update device set serial = '$this->serialNumber' where device_id = $this->machineID" );
+         }
+      }
    } // updateComputerMakeup
    // This is kind of funky, because column = null does not work, it must be column is null, so we have to look for it.
    function makeSQLEquals ( $field, $value ) {
       return "$field " . ( $value == 'null' ? 'is null' : '=' . $value );
+   }
          } // foreach
          if ( $count )
             $this->messages[] = "$count software packages added/updated";
+      }
    } // processSoftwarePackages
+   function processXenVirtual ( $name, $values ) {
+      // Determine if the virtual is on a new machine or not
+      $virtualID = getMachineID( $name ); // see if we can find the virtual
+      if ( $virtualID ) {
+         if ( $this->machineID == getOneDBValue( "select part_of from device where device.device_id = $virtualID" ) ) {
+            return;
+         }
+      } else { // we could not find the device
+         $this->messages[] = "Could not locate id for virtual $name which is running on $this->machineName";
+         return;
+      }
+      // we made it this far, which means we found the virtual's ID, but it does not have
+      // this machine as its parent, so we need to update it.
+      queryDatabaseExtended( "update device set part_of = $this->machineID where device_id = $virtualID" );
+      $this->messages[] = "Virtual $name ($virtualID) now running on $this->machineName";
+   } // processXenVirtual
+   function processXen ( ) {
+      // Is this a Xen DOM0?
+      if ( ! isset( $this->report['xen'] ) ) return;
+      $machineID;  // id in database
+      $machineName;// name in report
+      foreach ( $this->report['xen']['virtual'] as $virtual => $data ) {
+         $this->processXenVirtual( $virtual, $data );
+      }
+   } // processXen
 } // class sysinfo
+}
 if ( ! $result )
    exit ( 1 );
 $result = $thisReport->processReport();
 print $thisReport->dumpMessages();
-//var_dump( $thisReport );
+// var_dump( $thisReport );
 exit ( $result );
 ?>

Subversion Repositories computer_asset_manager_v1

(root)/modules/sysinfo/cli_tools/parse_sysinfo.php – Rev 16 → 36