stable update proposal: sitesummary 0.1.8
Ref <URL: http://wiki.debian.org/DebianEdu/ArchivePolicy > here is a
update proposal for the stable release.
To get a more robust nagios setup and to update some translations, I
propose to update sitesummary from version 0.1.3 to 0.1.8. The change
also implement support for disabling some checks if a package is
installed but not enabled on a client.
Here is the debdiff:
diff -Nru sitesummary-0.1.3/debian/changelog sitesummary-0.1.8/debian/changelog
--- sitesummary-0.1.3/debian/changelog 2012-02-15 08:19:59.000000000 +0100
+++ sitesummary-0.1.8/debian/changelog 2012-11-30 21:36:28.000000000 +0100
@@ -1,3 +1,48 @@
+sitesummary (0.1.8) unstable; urgency=low
+
+ * nagios-plugins/check_kernel_status: Add support for new format of
+ /proc/version introduced in kernel package version 3.2.32-1.
+
+ -- Petter Reinholdtsen <pere@debian.org> Fri, 30 Nov 2012 21:36:13 +0100
+
+sitesummary (0.1.7) unstable; urgency=low
+
+ [ David Prévot ]
+ * debian/control: Fix Vcs- entries.
+
+ -- Petter Reinholdtsen <pere@debian.org> Tue, 06 Nov 2012 15:04:19 +0100
+
+sitesummary (0.1.6) unstable; urgency=low
+
+ [ Petter Reinholdtsen ]
+ * Make Nagios config more robust, ignore hosts without any name and
+ address, which must be the result of a corrupt sitesummary entry.
+ * Do not check xenfs file systems when generating Nagios config.
+
+ [ David Prévot ]
+ * Add Italian debconf translation, thanks to Beatrice Torracca
+ (closes: #691353).
+ * Fix encoding in German debconf translation.
+
+ -- Petter Reinholdtsen <pere@debian.org> Sun, 04 Nov 2012 00:06:13 +0100
+
+sitesummary (0.1.5) unstable; urgency=low
+
+ * Team upload.
+ * Add Danish debconf translation, thanks to Joe Hansen (closes: #675598).
+
+ -- David Prévot <taffit@debian.org> Sat, 18 Aug 2012 13:41:40 -0400
+
+sitesummary (0.1.4) unstable; urgency=low
+
+ * Add support in check_kernel_version for any 3.X kernel.
+ * Add support in the Nagios configuration generator to ignore
+ specific checks for a given host by listing it in
+ /etc/sitesummary/nagiosignore. Useful for machines where a
+ package is installed but disabled.
+
+ -- Petter Reinholdtsen <pere@debian.org> Sun, 29 Apr 2012 20:44:32 +0200
+
sitesummary (0.1.3) unstable; urgency=low
* Change temp file name created by nagios-plugins check_cups_queue
diff -Nru sitesummary-0.1.3/debian/control sitesummary-0.1.8/debian/control
--- sitesummary-0.1.3/debian/control 2011-12-23 22:03:18.000000000 +0100
+++ sitesummary-0.1.8/debian/control 2012-11-06 15:03:40.000000000 +0100
@@ -6,8 +6,8 @@
Build-Depends: debhelper (>= 5), cdbs
Standards-Version: 3.9.2
Homepage: http://wiki.debian.org/DebianEdu/HowTo/SiteSummary
-Vcs-Browser: http://svn.debian.org/wsvn/debian-edu/trunk/src/sitesummary/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/debian-edu/trunk/src/sitesummary/
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-edu/trunk/src/sitesummary/
+Vcs-Svn: svn://anonscm.debian.org/debian-edu/trunk/src/sitesummary/
Package: sitesummary
Architecture: all
diff -Nru sitesummary-0.1.3/debian/po/ca.po sitesummary-0.1.8/debian/po/ca.po
--- sitesummary-0.1.3/debian/po/ca.po 2011-11-24 19:24:30.000000000 +0100
+++ sitesummary-0.1.8/debian/po/ca.po 2012-08-31 10:59:58.000000000 +0200
@@ -9,10 +9,11 @@
msgstr ""
"Project-Id-Version: ca\n"
"Report-Msgid-Bugs-To: debian-edu@lists.debian.org\n"
-"POT-Creation-Date: 2006-09-17 20:23+0200\n"
+"POT-Creation-Date: 2007-04-29 00:52+0200\n"
"PO-Revision-Date: 2011-01-11 20:49+0100\n"
"Last-Translator: Sergi Casbas <sergi.debian@qscsoft.net>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
+"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -38,6 +39,12 @@
#. Type: string
#. Description
+#: ../sitesummary-client.templates:1001
+msgid "The default URL is http://localhost/cgi-bin/sitesummary-collector.cgi";
+msgstr ""
+
+#. Type: string
+#. Description
#: ../sitesummary-client.templates:2001
msgid "Site:"
msgstr "Lloc:"
diff -Nru sitesummary-0.1.3/debian/po/cs.po sitesummary-0.1.8/debian/po/cs.po
--- sitesummary-0.1.3/debian/po/cs.po 2009-08-30 13:17:20.000000000 +0200
+++ sitesummary-0.1.8/debian/po/cs.po 2012-08-31 10:59:58.000000000 +0200
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2009-06-07 14:13+0200\n"
"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -27,8 +28,8 @@
"Insert the URL to the sitesummary collector, where should the sitesummary "
"information be submitted. Several URLs can be specified separated by space."
msgstr ""
-"Zadejte URL ke kolektoru sitesummary, kam by měly být odesílány "
-"informace sitesummary. Můžete zadat několik URL adres oddělených mezerou."
+"Zadejte URL ke kolektoru sitesummary, kam by měly být odesílány informace "
+"sitesummary. Můžete zadat několik URL adres oddělených mezerou."
#. Type: string
#. Description
diff -Nru sitesummary-0.1.3/debian/po/da.po sitesummary-0.1.8/debian/po/da.po
--- sitesummary-0.1.3/debian/po/da.po 1970-01-01 01:00:00.000000000 +0100
+++ sitesummary-0.1.8/debian/po/da.po 2012-08-31 10:59:58.000000000 +0200
@@ -0,0 +1,83 @@
+# Danish translation sitesummary.
+# Copyright (C) 2012 sitesummary & nedenstående oversættere.
+# This file is distributed under the same license as the sitesummary package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sitesummary\n"
+"Report-Msgid-Bugs-To: debian-edu@lists.debian.org\n"
+"POT-Creation-Date: 2007-04-29 00:52+0200\n"
+"PO-Revision-Date: 2012-06-02 19:21+0100\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:1001
+msgid "URL:"
+msgstr "Adresse:"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:1001
+msgid ""
+"Insert the URL to the sitesummary collector, where should the sitesummary "
+"information be submitted. Several URLs can be specified separated by space."
+msgstr ""
+"Indsæt adressen for sitesummary's indsamler, hvor skal informationen for "
+"sitesummary indsendes. Flere adresser kan angives adskilt af mellemrum."
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:1001
+msgid "The default URL is http://localhost/cgi-bin/sitesummary-collector.cgi";
+msgstr "Standardadressen er http://localhost/cgi-bin/sitesummary-collector.cgi";
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:2001
+msgid "Site:"
+msgstr "Side:"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:2001
+msgid "Insert a string identifying the site where this machine is located."
+msgstr "Indsæt en streng der identificerer siden hvor maskinen er placeret."
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:3001
+msgid "Sitegroup:"
+msgstr "Sidegruppe:"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:3001
+msgid ""
+"Insert a string identifying the subgroup within the site where this machine "
+"is located."
+msgstr ""
+"Indsæt en streng der identificerer undergruppen inden i siden hvor denne "
+"maskine er placeret."
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:4001
+msgid "Host class:"
+msgstr "Værtsklasse:"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:4001
+msgid ""
+"Insert string identifying the host class, like workstation, server, laptop, "
+"thin client etc."
+msgstr ""
+"Indsæt streng der identificerer værtsklassen, såsom arbejdsstation, server, "
+"bærbar, tynd klient etc."
diff -Nru sitesummary-0.1.3/debian/po/de.po sitesummary-0.1.8/debian/po/de.po
--- sitesummary-0.1.3/debian/po/de.po 2007-05-09 09:23:08.000000000 +0200
+++ sitesummary-0.1.8/debian/po/de.po 2012-11-04 00:05:52.000000000 +0100
@@ -10,8 +10,9 @@
"PO-Revision-Date: 2007-02-19 21:54+0100\n"
"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: string
diff -Nru sitesummary-0.1.3/debian/po/es.po sitesummary-0.1.8/debian/po/es.po
--- sitesummary-0.1.3/debian/po/es.po 2010-06-02 08:45:10.000000000 +0200
+++ sitesummary-0.1.8/debian/po/es.po 2012-08-31 10:59:58.000000000 +0200
@@ -35,6 +35,7 @@
"PO-Revision-Date: 2010-05-17 12:26+0100\n"
"Last-Translator: Camaleón <noelamac@gmail.com>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -48,14 +49,20 @@
#. Type: string
#. Description
#: ../sitesummary-client.templates:1001
-msgid "Insert the URL to the sitesummary collector, where should the sitesummary information be submitted. Several URLs can be specified separated by space."
-msgstr "Introduzca la URL al colector de «sitesummary» donde se enviará la información. Puede especificar varias direcciones URL separadas por un espacio."
+msgid ""
+"Insert the URL to the sitesummary collector, where should the sitesummary "
+"information be submitted. Several URLs can be specified separated by space."
+msgstr ""
+"Introduzca la URL al colector de «sitesummary» donde se enviará la "
+"información. Puede especificar varias direcciones URL separadas por un "
+"espacio."
#. Type: string
#. Description
#: ../sitesummary-client.templates:1001
msgid "The default URL is http://localhost/cgi-bin/sitesummary-collector.cgi";
-msgstr "La URL predeterminada es «http://localhost/cgi-bin/sitesummary-collector.cgi»";
+msgstr ""
+"La URL predeterminada es «http://localhost/cgi-bin/sitesummary-collector.cgi»";
#. Type: string
#. Description
@@ -67,7 +74,8 @@
#. Description
#: ../sitesummary-client.templates:2001
msgid "Insert a string identifying the site where this machine is located."
-msgstr "Introduzca un texto para identificar el sitio donde se encuentra este equipo."
+msgstr ""
+"Introduzca un texto para identificar el sitio donde se encuentra este equipo."
#. Type: string
#. Description
@@ -78,8 +86,12 @@
#. Type: string
#. Description
#: ../sitesummary-client.templates:3001
-msgid "Insert a string identifying the subgroup within the site where this machine is located."
-msgstr "Introduzca un texto para identificar un subgrupo dentro del sitio donde se encuentra este equipo."
+msgid ""
+"Insert a string identifying the subgroup within the site where this machine "
+"is located."
+msgstr ""
+"Introduzca un texto para identificar un subgrupo dentro del sitio donde se "
+"encuentra este equipo."
#. Type: string
#. Description
@@ -90,6 +102,9 @@
#. Type: string
#. Description
#: ../sitesummary-client.templates:4001
-msgid "Insert string identifying the host class, like workstation, server, laptop, thin client etc."
-msgstr "Introduzca un texto para identificar el tipo de equipo, por ejemplo: estación de trabajo, servidor, equipo portátil, cliente ligero, etc."
-
+msgid ""
+"Insert string identifying the host class, like workstation, server, laptop, "
+"thin client etc."
+msgstr ""
+"Introduzca un texto para identificar el tipo de equipo, por ejemplo: "
+"estación de trabajo, servidor, equipo portátil, cliente ligero, etc."
diff -Nru sitesummary-0.1.3/debian/po/fr.po sitesummary-0.1.8/debian/po/fr.po
--- sitesummary-0.1.3/debian/po/fr.po 2007-05-09 09:23:08.000000000 +0200
+++ sitesummary-0.1.8/debian/po/fr.po 2012-08-31 10:59:58.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2006-10-03 20:40+0200\n"
"Last-Translator: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -Nru sitesummary-0.1.3/debian/po/it.po sitesummary-0.1.8/debian/po/it.po
--- sitesummary-0.1.3/debian/po/it.po 1970-01-01 01:00:00.000000000 +0100
+++ sitesummary-0.1.8/debian/po/it.po 2012-10-24 22:29:23.000000000 +0200
@@ -0,0 +1,87 @@
+# Italian translation of sitesummary debconf messages
+# Copyright (C) 2012, Beatrice Torracca
+# This file is distributed under the same license as the sitesummary package.
+# Beatrice Torracca <beatricet@libero.it>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: sitesummary\n"
+"Report-Msgid-Bugs-To: debian-edu@lists.debian.org\n"
+"POT-Creation-Date: 2007-04-29 00:52+0200\n"
+"PO-Revision-Date: 2012-10-10 14:55+0200\n"
+"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:1001
+msgid "URL:"
+msgstr "URL:"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:1001
+msgid ""
+"Insert the URL to the sitesummary collector, where should the sitesummary "
+"information be submitted. Several URLs can be specified separated by space."
+msgstr ""
+"Inserire l'URL del collettore di sitesummary, dove devono essere inviate le "
+"informazioni di sitesummary. Possono essere specificati più URL separati da "
+"spazi."
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:1001
+msgid "The default URL is http://localhost/cgi-bin/sitesummary-collector.cgi";
+msgstr "L'URL predefinito è http://localhost/cgi-bin/sitesummary-collector.cgi";
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:2001
+msgid "Site:"
+msgstr "Sito:"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:2001
+msgid "Insert a string identifying the site where this machine is located."
+msgstr ""
+"Inserire una stringa che identifica il sito in cui è collocata questa "
+"macchina."
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:3001
+msgid "Sitegroup:"
+msgstr "Gruppo sito:"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:3001
+msgid ""
+"Insert a string identifying the subgroup within the site where this machine "
+"is located."
+msgstr ""
+"Inserire una stringa che identifica il sottogruppo all'interno del sito dove "
+"è collocata questa macchina."
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:4001
+msgid "Host class:"
+msgstr "Classe host:"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:4001
+msgid ""
+"Insert string identifying the host class, like workstation, server, laptop, "
+"thin client etc."
+msgstr ""
+"Inserire una stringa che identifica la classe dell'host, come workstation, "
+"server, laptop, thin client, ecc."
diff -Nru sitesummary-0.1.3/debian/po/ja.po sitesummary-0.1.8/debian/po/ja.po
--- sitesummary-0.1.3/debian/po/ja.po 2010-01-06 19:04:53.000000000 +0100
+++ sitesummary-0.1.8/debian/po/ja.po 2012-08-31 10:59:58.000000000 +0200
@@ -2,81 +2,84 @@
# as sitesummary Debian package's copyright holder.
# This file is distributed under the same license as sitesummary package.
# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: sitesummary 0.0.48\n"
-"Report-Msgid-Bugs-To: debian-edu@lists.debian.org\n"
-"POT-Creation-Date: 2007-04-29 00:52+0200\n"
-"PO-Revision-Date: 2009-04-05 08:26+0900\n"
-"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
-"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../sitesummary-client.templates:1001
-msgid "URL:"
-msgstr "URL:"
-
-#. Type: string
-#. Description
-#: ../sitesummary-client.templates:1001
-msgid ""
-"Insert the URL to the sitesummary collector, where should the sitesummary "
-"information be submitted. Several URLs can be specified separated by space."
-msgstr ""
-"sitesummary の情報が報告される sitesummary collector の URL を入力してください。"
-"複数の URL の場合は空白で区切ることができます。"
-
-#. Type: string
-#. Description
-#: ../sitesummary-client.templates:1001
-msgid "The default URL is http://localhost/cgi-bin/sitesummary-collector.cgi";
-msgstr "デフォルトの URL は http://localhost/cgi-bin/sitesummary-collector.cgi です。"
-
-#. Type: string
-#. Description
-#: ../sitesummary-client.templates:2001
-msgid "Site:"
-msgstr "サイト:"
-
-#. Type: string
-#. Description
-#: ../sitesummary-client.templates:2001
-msgid "Insert a string identifying the site where this machine is located."
-msgstr "このマシンが配置されているサイトを識別するための文字列を入力してください。"
-
-#. Type: string
-#. Description
-#: ../sitesummary-client.templates:3001
-msgid "Sitegroup:"
-msgstr "サイトグループ:"
-
-#. Type: string
-#. Description
-#: ../sitesummary-client.templates:3001
-msgid ""
-"Insert a string identifying the subgroup within the site where this machine "
-"is located."
-msgstr ""
-"このマシンが配置されているサイト内のサブグループを識別する文字列を挿入してください。"
-
-#. Type: string
-#. Description
-#: ../sitesummary-client.templates:4001
-msgid "Host class:"
-msgstr "ホストクラス:"
-
-#. Type: string
-#. Description
-#: ../sitesummary-client.templates:4001
-msgid ""
-"Insert string identifying the host class, like workstation, server, laptop, "
-"thin client etc."
-msgstr ""
-"ワークステーション、サーバ、ラップトップ、シンクライアントなどのホストクラスを"
-"識別する文字列を入力してください。"
-
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sitesummary 0.0.48\n"
+"Report-Msgid-Bugs-To: debian-edu@lists.debian.org\n"
+"POT-Creation-Date: 2007-04-29 00:52+0200\n"
+"PO-Revision-Date: 2009-04-05 08:26+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:1001
+msgid "URL:"
+msgstr "URL:"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:1001
+msgid ""
+"Insert the URL to the sitesummary collector, where should the sitesummary "
+"information be submitted. Several URLs can be specified separated by space."
+msgstr ""
+"sitesummary の情報が報告される sitesummary collector の URL を入力してくださ"
+"い。複数の URL の場合は空白で区切ることができます。"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:1001
+msgid "The default URL is http://localhost/cgi-bin/sitesummary-collector.cgi";
+msgstr ""
+"デフォルトの URL は http://localhost/cgi-bin/sitesummary-collector.cgi です。"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:2001
+msgid "Site:"
+msgstr "サイト:"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:2001
+msgid "Insert a string identifying the site where this machine is located."
+msgstr ""
+"このマシンが配置されているサイトを識別するための文字列を入力してください。"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:3001
+msgid "Sitegroup:"
+msgstr "サイトグループ:"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:3001
+msgid ""
+"Insert a string identifying the subgroup within the site where this machine "
+"is located."
+msgstr ""
+"このマシンが配置されているサイト内のサブグループを識別する文字列を挿入してく"
+"ださい。"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:4001
+msgid "Host class:"
+msgstr "ホストクラス:"
+
+#. Type: string
+#. Description
+#: ../sitesummary-client.templates:4001
+msgid ""
+"Insert string identifying the host class, like workstation, server, laptop, "
+"thin client etc."
+msgstr ""
+"ワークステーション、サーバ、ラップトップ、シンクライアントなどのホストクラス"
+"を識別する文字列を入力してください。"
diff -Nru sitesummary-0.1.3/debian/po/nb.po sitesummary-0.1.8/debian/po/nb.po
--- sitesummary-0.1.3/debian/po/nb.po 2012-01-09 11:11:00.000000000 +0100
+++ sitesummary-0.1.8/debian/po/nb.po 2012-08-31 10:59:58.000000000 +0200
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2012-01-09 11:11+0100\n"
"Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -29,9 +30,9 @@
"Insert the URL to the sitesummary collector, where should the sitesummary "
"information be submitted. Several URLs can be specified separated by space."
msgstr ""
-"Legg inn URLen til hvor sitesummarys innsamler, hvor "
-"sitesummary-informasjonen skal bli sendt. Flere URLer kan spesifiseres med "
-"mellomrom som skilletegn."
+"Legg inn URLen til hvor sitesummarys innsamler, hvor sitesummary-"
+"informasjonen skal bli sendt. Flere URLer kan spesifiseres med mellomrom "
+"som skilletegn."
#. Type: string
#. Description
@@ -84,4 +85,3 @@
msgstr ""
"Legg inn streng som identifiserer vertstype, som arbedsstasjon, tjener, "
"bærbare, tynn klient etc."
-
diff -Nru sitesummary-0.1.3/debian/po/nl.po sitesummary-0.1.8/debian/po/nl.po
--- sitesummary-0.1.3/debian/po/nl.po 2007-05-09 09:23:08.000000000 +0200
+++ sitesummary-0.1.8/debian/po/nl.po 2012-08-31 10:59:58.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2007-04-29 15:03+0100\n"
"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,12 @@
#. Type: string
#. Description
#: ../sitesummary-client.templates:1001
-msgid "Insert the URL to the sitesummary collector, where should the sitesummary information be submitted. Several URLs can be specified separated by space."
-msgstr "Wat is de URL waar de sitesummary-collector de sitesummary-informatie moet naar toe sturen? U kunt meerder URL's opgeven gescheiden door spaties."
+msgid ""
+"Insert the URL to the sitesummary collector, where should the sitesummary "
+"information be submitted. Several URLs can be specified separated by space."
+msgstr ""
+"Wat is de URL waar de sitesummary-collector de sitesummary-informatie moet "
+"naar toe sturen? U kunt meerder URL's opgeven gescheiden door spaties."
#. Type: string
#. Description
@@ -44,7 +49,9 @@
#. Description
#: ../sitesummary-client.templates:2001
msgid "Insert a string identifying the site where this machine is located."
-msgstr "Voer hier een string in die de locatie identificeert waar deze machine zich bevindt. "
+msgstr ""
+"Voer hier een string in die de locatie identificeert waar deze machine zich "
+"bevindt. "
#. Type: string
#. Description
@@ -55,8 +62,12 @@
#. Type: string
#. Description
#: ../sitesummary-client.templates:3001
-msgid "Insert a string identifying the subgroup within the site where this machine is located."
-msgstr "Voer hier een string in de de subgroep van de lokatie identificeert waar deze machine zich bevindt. "
+msgid ""
+"Insert a string identifying the subgroup within the site where this machine "
+"is located."
+msgstr ""
+"Voer hier een string in de de subgroep van de lokatie identificeert waar "
+"deze machine zich bevindt. "
#. Type: string
#. Description
@@ -67,6 +78,9 @@
#. Type: string
#. Description
#: ../sitesummary-client.templates:4001
-msgid "Insert string identifying the host class, like workstation, server, laptop, thin client etc."
-msgstr "Voer hier een string in die de computerklasse identificeert (bv. werkstation, server, laptop, thin-client, ...)."
-
+msgid ""
+"Insert string identifying the host class, like workstation, server, laptop, "
+"thin client etc."
+msgstr ""
+"Voer hier een string in die de computerklasse identificeert (bv. "
+"werkstation, server, laptop, thin-client, ...)."
diff -Nru sitesummary-0.1.3/debian/po/pt.po sitesummary-0.1.8/debian/po/pt.po
--- sitesummary-0.1.3/debian/po/pt.po 2007-05-09 09:23:08.000000000 +0200
+++ sitesummary-0.1.8/debian/po/pt.po 2012-08-31 10:59:58.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2007-02-02 18:18+0000\n"
"Last-Translator: Carlos Lisboa <carloslisboa@gmail.com>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -Nru sitesummary-0.1.3/debian/po/ru.po sitesummary-0.1.8/debian/po/ru.po
--- sitesummary-0.1.3/debian/po/ru.po 2009-08-30 13:15:06.000000000 +0200
+++ sitesummary-0.1.8/debian/po/ru.po 2012-08-31 10:59:58.000000000 +0200
@@ -11,11 +11,13 @@
"PO-Revision-Date: 2009-08-16 09:24+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#. Type: string
#. Description
@@ -30,8 +32,8 @@
"Insert the URL to the sitesummary collector, where should the sitesummary "
"information be submitted. Several URLs can be specified separated by space."
msgstr ""
-"Введите URL сборщика информации sitesummary, на который нужно "
-"отправлять информацию. Можно указать несколько URL через пробел."
+"Введите URL сборщика информации sitesummary, на который нужно отправлять "
+"информацию. Можно указать несколько URL через пробел."
#. Type: string
#. Description
@@ -64,8 +66,7 @@
"Insert a string identifying the subgroup within the site where this machine "
"is located."
msgstr ""
-"Введите строку, обозначающую подгруппу места, "
-"где расположена эта машина."
+"Введите строку, обозначающую подгруппу места, где расположена эта машина."
#. Type: string
#. Description
@@ -80,6 +81,5 @@
"Insert string identifying the host class, like workstation, server, laptop, "
"thin client etc."
msgstr ""
-"Введите строку, обозначающую тип машины, например: рабочая "
-"станция, сервер, ноутбук, тонкий клиент и т.д."
-
+"Введите строку, обозначающую тип машины, например: рабочая станция, сервер, "
+"ноутбук, тонкий клиент и т.д."
diff -Nru sitesummary-0.1.3/debian/po/sk.po sitesummary-0.1.8/debian/po/sk.po
--- sitesummary-0.1.3/debian/po/sk.po 2009-08-30 13:20:04.000000000 +0200
+++ sitesummary-0.1.8/debian/po/sk.po 2012-08-31 10:59:58.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2009-06-13 11:38+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,8 +25,12 @@
#. Type: string
#. Description
#: ../sitesummary-client.templates:1001
-msgid "Insert the URL to the sitesummary collector, where should the sitesummary information be submitted. Several URLs can be specified separated by space."
-msgstr "Zadajte URL zberača sitesummary, kam sa majú zasielať informácie sitesummary. Je možné uviesť niekoľko URL oddelených medzerou."
+msgid ""
+"Insert the URL to the sitesummary collector, where should the sitesummary "
+"information be submitted. Several URLs can be specified separated by space."
+msgstr ""
+"Zadajte URL zberača sitesummary, kam sa majú zasielať informácie "
+"sitesummary. Je možné uviesť niekoľko URL oddelených medzerou."
#. Type: string
#. Description
@@ -54,8 +59,12 @@
#. Type: string
#. Description
#: ../sitesummary-client.templates:3001
-msgid "Insert a string identifying the subgroup within the site where this machine is located."
-msgstr "Zadajte reťazec identifikujúci podskupinu v rámci lokality, kde sa stroj nachádza."
+msgid ""
+"Insert a string identifying the subgroup within the site where this machine "
+"is located."
+msgstr ""
+"Zadajte reťazec identifikujúci podskupinu v rámci lokality, kde sa stroj "
+"nachádza."
#. Type: string
#. Description
@@ -66,6 +75,9 @@
#. Type: string
#. Description
#: ../sitesummary-client.templates:4001
-msgid "Insert string identifying the host class, like workstation, server, laptop, thin client etc."
-msgstr "Zadajte reťazec identifijujúci triedu hostiteľa ako pracovná stanica, server, notebook, tenký klient atď."
-
+msgid ""
+"Insert string identifying the host class, like workstation, server, laptop, "
+"thin client etc."
+msgstr ""
+"Zadajte reťazec identifijujúci triedu hostiteľa ako pracovná stanica, "
+"server, notebook, tenký klient atď."
diff -Nru sitesummary-0.1.3/debian/po/sv.po sitesummary-0.1.8/debian/po/sv.po
--- sitesummary-0.1.3/debian/po/sv.po 2008-07-28 19:00:19.000000000 +0200
+++ sitesummary-0.1.8/debian/po/sv.po 2012-08-31 10:59:58.000000000 +0200
@@ -12,6 +12,7 @@
"PO-Revision-Date: 2008-07-23 18:04+0200\n"
"Last-Translator: Martin Ågren <martin.agren@gmail.com>\n"
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +31,9 @@
msgid ""
"Insert the URL to the sitesummary collector, where should the sitesummary "
"information be submitted. Several URLs can be specified separated by space."
-msgstr "Ange URL:en till sitesummarys insamlare där sitesummary-information ska postas. Flera URL:er kan anges separerade med blanksteg."
+msgstr ""
+"Ange URL:en till sitesummarys insamlare där sitesummary-information ska "
+"postas. Flera URL:er kan anges separerade med blanksteg."
#. Type: string
#. Description
@@ -62,7 +65,9 @@
msgid ""
"Insert a string identifying the subgroup within the site where this machine "
"is located."
-msgstr "Ange en sträng som identifierar den undergrupp inom platsen där den här maskinen är benägen."
+msgstr ""
+"Ange en sträng som identifierar den undergrupp inom platsen där den här "
+"maskinen är benägen."
#. Type: string
#. Description
@@ -76,5 +81,6 @@
msgid ""
"Insert string identifying the host class, like workstation, server, laptop, "
"thin client etc."
-msgstr "Ange en sträng som identifierar värdklassen, som exempelvis arbetsstation, server, bärbar, tunn klient etc."
-
+msgstr ""
+"Ange en sträng som identifierar värdklassen, som exempelvis arbetsstation, "
+"server, bärbar, tunn klient etc."
diff -Nru sitesummary-0.1.3/nagios-plugins/check_kernel_status sitesummary-0.1.8/nagios-plugins/check_kernel_status
--- sitesummary-0.1.3/nagios-plugins/check_kernel_status 2011-12-26 00:28:49.000000000 +0100
+++ sitesummary-0.1.8/nagios-plugins/check_kernel_status 2012-11-06 23:04:04.000000000 +0100
@@ -41,6 +41,10 @@
|| $sig =~ /\(Debian (\d+)\.(\d+)\.(\d+)\.dfsg\.(\d+)-(\d+)\w+(\d+)\)/
|| $sig =~ /\(Debian (\d+)\.(\d+)\.(\d+)-(\d+).+?(\d+).+?(\d+)\)/
|| $sig =~ /\(Debian (\d+)\.(\d+)\.(\d+)-(\d+)lenny(\d+)\)/
+
+ # New format in kernel package version 3.2.32-1
+ || $sig =~ / Debian (\d+)\.(\d+)\.(\d+)-(\d+)/
+
)
{
@running_version = ($1, $2, $3, $4, $5, $6);
@@ -58,14 +62,14 @@
}
# Next, find the installed kernel version
-# Yes, as you can see, it is limited to 2.6 and 3.0 kernels here.
+# Yes, as you can see, it is limited to 2.6 and 3.X kernels here.
# But I assume that you don't need reboots anymore when this major
# version has passed.
my $dpkg_list = `COLUMNS=1024 dpkg -l`;
my $dpkg;
for my $line (split("\n", $dpkg_list)) {
chomp $line;
- $dpkg = $line if ($line =~ m/^ii.+linux-image-(2.6|3.0)/);
+ $dpkg = $line if ($line =~ m/^ii.+linux-image-(2.6|3.\d)/);
}
# Now, which OS is it, and which footprint do they use?
diff -Nru sitesummary-0.1.3/README sitesummary-0.1.8/README
--- sitesummary-0.1.3/README 2011-12-17 14:41:51.000000000 +0100
+++ sitesummary-0.1.8/README 2012-04-29 20:14:03.000000000 +0200
@@ -94,6 +94,23 @@
For this to work, the new-name entry must map to a IP address, either
in DNS via an entry in /etc/hosts.
+Ignoring specific Nagios checks for some hosts
+----------------------------------------------
+
+Some times a machine have a package installed that cause some Nagios
+test to be enabled, but the service provided by the package is
+disabled and the check always fail. In this case, the Nagios test can
+be disabled using the /etc/sitesummary/nagiosignore file.
+
+For example, to disable the DHCP check for a given host, add the
+hostname and the Nagios check description to
+/etc/sitesummary/nagiosignore like this:
+
+ some.nagios.host.com process - dhcpd3
+
+The nagios description can be found in
+/var/lib/sitesummary/nagios-generated.cfg.
+
Design draft
------------
system to collect key info about all the machines on a site, to help
diff -Nru sitesummary-0.1.3/sitesummary-nodes sitesummary-0.1.8/sitesummary-nodes
--- sitesummary-0.1.3/sitesummary-nodes 2012-02-13 11:54:28.000000000 +0100
+++ sitesummary-0.1.8/sitesummary-nodes 2012-10-24 22:29:09.000000000 +0200
@@ -31,6 +31,9 @@
my %opts;
getopts("hmnw", \%opts) || (usage(), exit(1));
+my $nagiosignorefile = "/etc/sitesummary/nagiosignore";
+my %nagios_ignore;
+
my %hostnames;
my $server_hostid = get_localhost_hostid() ||
die "Unable to figure out hostid for the local host";
@@ -45,6 +48,14 @@
} elsif ($opts{'w'}) {
print_ip_hw_list();
} elsif ($opts{'n'}) {
+ if (open(my $fh, $nagiosignorefile)) {
+ while (<$fh>) {
+ chomp;
+ my ($hostname, $nagioscheck) = split(/ /, $_, 2);
+ $nagios_ignore{"$hostname $nagioscheck"} = 1;
+ }
+ close $fh;
+ }
generate_nagios_config();
} else {
print_list();
@@ -173,6 +184,8 @@
sub print_nagios_service_check {
my ($remote, $hostname, $description, $check, $check_args) = @_;
my $template = "server-service";
+
+ return if exists $nagios_ignore{"$hostname $description"};
my $cmd;
if ($remote) {
$cmd = "check_nrpe!$check";
@@ -238,6 +251,11 @@
my $address = get_dns_address($hostid);
my $localhostname = get_localhostname($hostid);
+ unless (defined $address && defined $localhostname) {
+ print "# Skipping ID $hostid without hostname and address\n";
+ next;
+ }
+
my $redirect = "";
my $nagiosclient = is_nagios_client($hostid);
my $remote = is_remote_nagios_client($hostid);
@@ -505,6 +523,7 @@
$fs eq "sysfs" ||
$fs eq "tmpfs" ||
$fs eq "devtmpfs" ||
+ $fs eq "xenfs" ||
$fs eq "usbfs");
$checked{$device} = 1;
--
Happy hacking
Petter Reinholdtsen
Reply to: