WebSVN – camp_sysinfo_client_3 – Diff – /trunk/sysinfo-client

+#
 # Version 3.4.1 20191117 RWR
 # Added syslog as a possible option for logging.
+#
 # find our location and use it for searching for libraries
 BEGIN {
    use FindBin;
    use File::Spec;
    use lib File::Spec->catdir($FindBin::Bin);
+   eval( 'use YAML::Tiny;' );
+   eval( 'use Data::Dumper;' );
+}
+# contains the directory our script is in
+my $sourceDir = File::Spec->catdir($FindBin::Bin);
+# define the version number
+# see https://metacpan.org/pod/release/JPEACOCK/version-0.97/lib/version.pod
-use YAML::Tiny;
+use version;
+our $VERSION = version->declare("v3.5.0");
+our $DATA_VERSION = version->declare( 'v3.0.0' ); # used in sending the data file. sets version of XML/YAML data file
+# see https://perldoc.perl.org/Getopt/Long.html
-use Data::Dumper;
+use Getopt::Long;
+# allow -vvn (ie, --verbose --verbose --dryrun)
+Getopt::Long::Configure ("bundling");
 # Following are global variables overridden if configuration file exists
 my $TESTING = 0; # if set to 1, will do everything, but will dump output to /tmp/sysinfo.testing.yaml
-our $VERSION = '3.4.1';
 my $indentLevel = 2; # number of spaces to indent per level in XML or YAML
 # paths to search for configuration file
 my @confFileSearchPath = ( '.', '/etc/camp/sysinfo-client', '/etc/camp', '/usr/local/etc/camp/sysinfo-client' );
 my $configurationFile = 'sysinfo-client.yaml'; # name of the configuration file
 my $reportDate = &timeStamp(); # set report date
+my $interactive = 0; # if set to 1, will go into interactive mode and output to local file
+my $periodicOverrideFile = '/tmp/sysinfo.firstrun'; # if this file exists, library.pm will tell all periodic modules to run anyway
+my $periodic = 0; # if set to 1, will do modules which are only supposed to run weekly, monthly, etc...
+my $version;
+my $help;
 my %configuration = (
    'logging' => { 'log type' => 'cache', 'log level' => 0 },    # if set, will point to logging
-   'moduleDirs' => [], # search paths for modules
+   'moduleDirs' => ["$sourceDir/modules"], # search paths for modules
-   'scriptDirs' => [], # search paths for scripts
+   'scriptDirs' => ["$sourceDir/scripts"], # search paths for scripts
    'clientName' => '',  # Required!! Must be set in conf file (no defaults)
    'serialNumber' => '', # serial number of machine
    'UUID'         => '', # UUID of machine
-   'transports'   => [], # hash with various transports
+   'transports'   => {'3' => { '-name-' => 'saveLocal', 'sendScript' => 'save_local', 'output directory' => "$sourceDir/reports" }  }, # hash with various transports
    'hostname' => &getHostName() # fully qualified host name of machine
-)
-;
+);
-my $DATA_VERSION = '3.0.0'; # used in sending the data file. sets version of XML/YAML data file
 #######################################################
+#
 # timeStamp
+#
 # loadConfigurationFile($confFile)
+#
 # Loads configuration file defined by $configurationFile, and dies if not available
 # This is a YAML file containing serialized contents of
+# Parameters:
-# Parameters: configuration file fully path/file name
+#    $fileName - name of file to look for
-# NOTE: conf file must be a valid Perl file
+#    @searchPath - array of paths to find $filename
+#
 #######################################################
 sub loadConfigurationFile {
    my ( $fileName, @searchPath ) = @_;
    } # foreach
    # add sysinfo-client (me) to the software list, since we're obviously installed
    &tabDelimitedToHash( $system, "software\tsysinfo-client\tversion\t$main::VERSION\n" );
+}
-sub processParameters {
+sub getDMIDecode {
+   my ( $key, $type ) = @_;
+   my $command = 'dmidecode ';
-   while ( my $parameter = shift ) {
+   $command .= "-t $type " if $type;
+   $command .= " | grep -i '$key'";
+   my $value = `$command`;
+   chomp $value;
-      if ( $parameter eq '-v' ) {
+   if ( $value =~ m/:\s*(.*)\s*$/ ) {
-         print "$main::VERSION\n";
+      return $1;
+   } else {
-         exit;
+      return '';
+   }
+}
+sub interactiveConfig {
+   my $config = shift;
+   $config->{'moduleDirs'} = $config->{'moduleDirs'}[0];
+   $config->{'scriptDirs'} = $config->{'scriptDirs'}[0];
+   $config->{'UUID'} = getDMIDecode( 'uuid', 'system' ) unless $config->{'UUID'};
+   $config->{'serialNumber'} = getDMIDecode( 'serial number', 'system' ) unless $config->{'serialNumber'};
+   my %menu = (
-      } elsif ( $parameter eq 'firstrun' ) {
+=> {'prompt' => 'Host Name', 'key' => 'hostname' },
+=> {'prompt' => 'Client Name', 'key' => 'clientName' },
+=> {'prompt' => 'Serial Number', 'key' => 'serialNumber' },
+=> {'prompt' => 'UUID', 'key' => 'UUID' },
+=> {'prompt' => 'Modules Directory', 'key' => 'moduleDirs' },
+=> {'prompt' => 'Scripts Directory', 'key' => 'scriptDirs' }
+   );
+   my $choice = 'quit';
+   while ( $choice ) {
-         `touch /tmp/sysinfo.firstrun`;
+      foreach my $menuItem ( sort keys %menu ) {
+         print "$menuItem\. " . $menu{$menuItem}{'prompt'} . ': ' . $config->{$menu{$menuItem}{'key'}} . "\n";
+      }
+      print "Enter Menu Item to change, or press Enter to proceed ";
+      $choice = <>;
-   } # while
+      chomp $choice;
+      last unless $choice;
+      print $menu{$choice}{'prompt'} . ' [' . $config->{$menu{$choice}{'key'}} . '] : ';
+      my $value = <>;
+      chomp $value;
+      $config->{$menu{$choice}{'key'}} = $value if ($value);
+   }
+   $config->{'moduleDirs'} = [ $config->{'moduleDirs'} ];
+   $config->{'scriptDirs'} = [ $config->{'scriptDirs'} ];
+   return $config;
+}
+# simple display if --help is passed
+sub help {
+   use File::Basename;
+   print basename($0) . " $VERSION\n";
+   print <<END
+$0 [options]
+Options:
+   -i,
+   --interactive    - do not read configuration file
+   --version        - display version and exit
+   -c,
+   --client='xxx'   - Client name for interactive mode
+   -s,
+   --serial='xxx'   - Serial Number for interactive mode
+   -h,
+   --hostname='xxx' - override hostname
+   -m,
+   --modules=/path/ - override path to modules
+   --scripts=/path/ - override path to scripts
+   -p,
+   --periodic       - runs modules designed to be run only weekly, monthly, etc...
+END
+}
-&processParameters( @ARGV );
+# handle any command line parameters that may have been passed in
+GetOptions (
+            'interactive|i' => \$interactive, # ask questions instead of using config file
+            'periodic|p'    => \$periodic,    # will do modules which are marked as periodic
+            'help|h'        => \$help,
+            'version'       => \$version,
+            'client|c=s'    => \$configuration{clientName},
+            'serial|s=s'    => \$configuration{serialNumber},
+            'hostname=s'    => \$configuration{hostname},
+            'modules|m=s'   => \$configuration{moduleDirs},
+            'scripts=s'     => \$configuration{scriptDirs},
+            ) or die "Error parsing command line\n";
+if ( $help ) { &help() ; exit; }
+if ( $version ) { use File::Basename; print basename($0) . " $VERSION\n"; exit; }
+if ( $interactive ) {
+   %configuration = %{ &interactiveConfig( \%configuration ) };
+} else {
-# load the configuration file
+   # load the configuration file
-%configuration = %{ &loadConfigurationFile( $configurationFile, @confFileSearchPath) };
+   %configuration = %{ &loadConfigurationFile( $configurationFile, @confFileSearchPath) };
+}
+`touch $periodicOverrideFile` if $periodic; # tells periodic modules to run
+#die Dumper (\%configuration );
 # user did not define a serial number, so make something up
 $configuration{'serialNumber'} = '' unless $configuration{'serialNumber'};
 # oops, no client name (required) so tell them and exit
 die "No client name defined in $configurationFile" unless $configuration{'clientName'};
 &logIt( 0, "Testing => $TESTING" ) if $TESTING;
 my $System; # hash reference that will store all info we are going to send to the server
 # some defaults.
-$System->{'report'}->{'version'} = $DATA_VERSION;
+$System->{'report'}->{'version'} = $DATA_VERSION->normal;
 $System->{'report'}->{'date'} = $reportDate;
 $System->{'report'}->{'client'} = $configuration{'clientName'};
 $System->{'system'}->{'hostname'} = $configuration{'hostname'};
 $System->{'system'}->{'serial'} = $configuration{'serialNumber'};
 $System->{'system'}->{'UUID'} = $configuration{'UUID'};
    &ProcessModules( $System, "$moduleDir/" );
+}
 &logIt( 4, "After processing modules\n" . Data::Dumper->Dump( [$System], [qw( $System )] ) );
-# now, everything ins in $System, so convert it to the proper output format
-#my $out = "#sysinfo: $VERSION YAML\n---\n" . &hashToYAML( $System ) . "...\n";
-my $out =  "#sysinfo: $VERSION YAML\n" . Dump( $System );
+my $out =  sprintf( "#sysinfo: %s YAML\n", $VERSION->normal ) . &Dump( $System );
 &logIt( 4, 'At line number ' . __LINE__ . "\n" . Data::Dumper->Dump([$System],[qw($System)]) );
 # load some global values for use in the script, if required
 my $globals = {
-      'data version' => $DATA_VERSION,
+      'data version' => $DATA_VERSION->normal,
       'report date'  => $reportDate,
       'client name'  => $configuration{'clientName'},
       'host name'    => $configuration{'hostname'},
       'serial number'=> $configuration{'serialNumber'},
       'UUID'         => $configuration{'UUID'}
    if ( my $success = &sendResults( $globals, $configuration{'transports'}, $out, $configuration{'scriptDirs'} ) != 1 ) {
       &logIt( 0, "Error $success while sending report from $configuration{'hostname'}" );
+   }
+}
+unlink ( $periodicOverrideFile ) if -e $periodicOverrideFile;
 &logIt( 0, 'Ending sysinfo Run' );
 ;

Subversion Repositories camp_sysinfo_client_3

(root)/trunk/sysinfo-client – Rev 153 → 154