diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2010-01-21 13:44:46 +0000 |
|---|---|---|
| committer | Petter Reinholdtsen <pere@hungry.com> | 2010-01-21 13:44:46 +0000 |
| commit | f0f8937a52565ba021e02970260ff1fe518e9145 (patch) | |
| tree | cc13db041556a699a48effa72c5cdfa43a865ee1 | |
| parent | 719414b5a7604ab762c21aff015f7dccc2c83973 (diff) | |
| download | sitesummary-f0f8937a52565ba021e02970260ff1fe518e9145.tar.gz sitesummary-f0f8937a52565ba021e02970260ff1fe518e9145.tar.bz2 sitesummary-f0f8937a52565ba021e02970260ff1fe518e9145.tar.xz | |
Collect switch port information using CPD when cdpr is installed.
Recommend cdpr to increase the chance of finding cdpr.
| -rw-r--r-- | collect.d/system | 13 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/collect.d/system b/collect.d/system index 4ec5438..71c2f38 100644 --- a/collect.d/system +++ b/collect.d/system @@ -63,3 +63,16 @@ done if [ -f /etc/X11/xorg.conf ]; then cp /etc/X11/xorg.conf . fi + +# Collect Cisco Discover Protocol information from all interfaces, in +# parallell. +if type cdpr >/dev/null 2>&1; then + childs="" + for if in $(ip link show up|awk '/^[0-9]+:/ {print $2}' | cut -d: -f1) ; do + cdpr -d $if -t 61 > cdpr.$if & + childs="$childs $!" + done + for pid in $childs ; do + wait $pid + done +fi diff --git a/debian/changelog b/debian/changelog index d71efb4..974d265 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ sitesummary (0.0.57~svnX) UNRELEASED; urgency=low * Create Nagios hostclass for sitesummary hostclass. - + * Collect switch port information using CPD when cdpr is installed. + Recommend cdpr to increase the chance of finding cdpr. + -- Petter Reinholdtsen <pere@debian.org> Thu, 21 Jan 2010 11:26:58 +0100 sitesummary (0.0.56) unstable; urgency=low diff --git a/debian/control b/debian/control index 17eebcb..60be23e 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Description: Generate site summary of submitting hosts (server part) Package: sitesummary-client Architecture: all Depends: ${misc:Depends}, gnupg, perl-modules -Recommends: cron, dmidecode, pciutils, usbutils, lsscsi +Recommends: cron, dmidecode, pciutils, usbutils, lsscsi, cdpr Suggests: sitesummary, munin-node, nagios-nrpe-server, nagios-plugins-standard Description: Generate site summary of submitting hosts (client part) The sitesummary system makes it easier to keep track of a lot of |