From 46c7af2ac216bfce7c55347ee2ecea3d391abfa7 Mon Sep 17 00:00:00 2001 From: Petter Reinholdtsen Date: Fri, 25 Jul 2008 16:55:19 +0000 Subject: * Add new statistics script hardware-models to list the different hardware vendor and models. --- Makefile | 1 + SiteSummary.pm | 32 +++++++++++++++++++++++ debian/changelog | 7 +++++ hardware-models | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+) create mode 100755 hardware-models diff --git a/Makefile b/Makefile index 69859cb..e7596c8 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,7 @@ COLLECTORS = \ SUMMARYSCRIPTS = \ agesinceseen-summary \ site-summary \ + hardware-models \ hostclass-summary \ kernelversion-summary \ debian_edu-summary diff --git a/SiteSummary.pm b/SiteSummary.pm index f5a1db4..033956b 100644 --- a/SiteSummary.pm +++ b/SiteSummary.pm @@ -19,6 +19,7 @@ our @EXPORT = qw( get_linux_kernel_ver get_debian_edu_profile get_debian_edu_ver + get_hardware_info ); my $pwd = "/var/lib/sitesummary/entries"; # Path to the entries @@ -207,6 +208,37 @@ sub get_debian_edu_ver { } } +sub get_hardware_info { + my $hostid = shift; + my $path = get_filepath_current($hostid, "/system/dmidecode"); + if (open(FILE, "<", $path)) { + my $sysinfo = 0; + my ($vendor, $model, $version, $serial); + while () { + chomp; + next unless ($sysinfo || m/^System Information/); + $sysinfo = 1; + $vendor = $1 if (m/Manufacturer: (.+\S)\s*$/); + $model = $1 if (m/Product Name: (.+\S)\s*$/); + $version = $1 if (m/Version: (.+\S)\s*$/); + $serial = $1 if (m/Serial Number: (.+\S)\s*$/); + last if (m/^Handle /); + } + close(FILE); + + # Append version string to get for example the thinkpad model + # name, but ignore bogus entries. + $model = "$model $version" if ($version + && $version ne "Not Specified" + && $version ne "Not Available" + && $version ne "None"); + + return ($vendor, $model, $serial); + } else { + return undef; + } +} + sub for_all_hosts { my $callback = shift; diff --git a/debian/changelog b/debian/changelog index 03a6796..579803d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sitesummary (0.0.45) UNRELEASED; urgency=low + + * Add new statistics script hardware-models to list the different + hardware vendor and models. + + -- Petter Reinholdtsen Fri, 25 Jul 2008 00:50:51 +0200 + sitesummary (0.0.44) unstable; urgency=low * Undo fix for slow propagation of information on first time install, diff --git a/hardware-models b/hardware-models new file mode 100755 index 0000000..3cb857d --- /dev/null +++ b/hardware-models @@ -0,0 +1,78 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +use SiteSummary; +use Getopt::Std; + +my %vendors; +my %models; +my %hostmap; +my %modelmap; +my %opts; + +sub usage { + my $retval = shift; + print <