Module: check_mk
Branch: master
Commit: ace8d83841da1c86abea2b1d0589022ad1dbfa9f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ace8d83841da1c…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Thu Aug 8 11:48:01 2013 +0200
Updated bug entries #0960, #0961, #0959
---
.bugs/959 | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
.bugs/960 | 45 +++++++++++++++++++++++++++++++++++++++++++++
.bugs/961 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 166 insertions(+)
diff --git a/.bugs/959 b/.bugs/959
new file mode 100644
index 0000000..0acccbf
--- /dev/null
+++ b/.bugs/959
@@ -0,0 +1,61 @@
+Title: Livestatus/Nagios Core crashes, if nagios.log is not accessible
+Component: livestatus
+State: open
+Date: 2013-08-08 11:30:12
+Targetversion: 1.2.3
+Class: bug
+
+kam an info(a)mathias-kettner.de, Orginal-Mail im feedback/gitbug noch vorhanden
+
+Date: Tue, 30 Jul 2013 11:36:12 +0200
+From: Oliver Kutscher <ok(a)addix.net>
+User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:17.0) Gecko/20130620 Thunderbird/17.0.7
+MIME-Version: 1.0
+To: info(a)mathias-kettner.de
+Subject: MK-Livestatus
+Content-Type: text/plain; charset=ISO-8859-15; format=flowed
+Content-Transfer-Encoding: 8bit
+X-ADDIX-Received: 212.51.6.4
+X-ADDIX-Info: Bitte wenden Sie sich an uns, falls Sie mehr Informationen benoetigen.
+X-MailScanner-ID: 1V46Lm-0000Lc-7H
+X-ADDIX-Scan: Virenfrei
+X-ADDIX-From: ok(a)addix.net
+
+Hallo Herr Kettner,
+
+vermutlich ist das die falsche Mailadresse, um Vorschläger oder Probleme
+zu melden. Aber ich habe keine passende(re) gefunden.
+
+In Benutzung war: Nagios 3.3, Check_MK check_mk-1.2.2p2 sowie
+mk-livestatus-1.2.2p2 auf einem Centos 5.5.
+
+Ich hatte das Phänomen, dass der Nagios Core abstürzte, sobald ich die
+Check_MK-Seite aufgerufen habe. Ursache war, dass das nagios.log-Logfile
+durch fehlende Berechtigungen nicht rotiert werden konnte und somit auf
+ > 2 GB angewachsen ist. Aus diesem Grund konnte das Livestatus die
+Datei nicht mehr öffnen, was wiederum zu einem Absturz des
+Nagios-Prozess (SIGSEGV) führte.
+
+Ich weiß nicht, inwieweit das Verhalten von Livestatus, die
+Fehlermeldung bzw. ein Eintrag in der Dokumentation angepasst werden
+könnten. Der Fehler ist in gewisser Weise selbst verschuldet, jedoch war
+es nicht leicht, die Ursache zu finden.
+
+
+Mit freundlichen Grüßen,
+i.A.
+Oliver Kutscher
+
+--
+
+Postanschrift:
+
+ADDIX Internet Services GmbH
+Postfach 1225
+D-24011 Kiel
+
+Tel: +49 431 7755 140
+Fax: +49 431 7755 105
+
+ok(a)addix.net
+www.addix.net
diff --git a/.bugs/960 b/.bugs/960
new file mode 100644
index 0000000..aa08076
--- /dev/null
+++ b/.bugs/960
@@ -0,0 +1,45 @@
+Title: Security issue if agent_vsphere exits with RC != 0
+Component: checks
+State: open
+Date: 2013-08-08 11:37:26
+Targetversion: 1.2.3
+Class: bug
+
+kam an feedback@ rein, orginal-Mail im folder feedback/gitbug eroffnet noch vorhanden
+
+Date: Fri, 26 Jul 2013 12:21:13 +0200 (CEST)
+From: Udo Woehler <uw(a)bsw-com.de>
+To: "feedback " <feedback(a)check-mk.org>
+Message-ID: <11092989.648.1374834057793.JavaMail.uwoehler@LAPTOP-UW>
+In-Reply-To: <26615552.645.1374833862296.JavaMail.uwoehler@LAPTOP-UW>
+Subject: Noch ein kleines Security Problem
+
+Hallo Herr Kettner,
+
+mit dem vSphere Agent ist mir noch ein kleines Security Problem aufgefallen.
+Ab und zu läuft der Agent bei uns in einen Fehler, der zu einem Critical des Check_mk führt.
+Dieser meldet dann:
+CRIT - Program '/omd/sites/bsw/share/check_mk/agents/special/agent_vsphere -u '<username>' -s '<password>' -i hostsystem,virtualmachine,datastore,counters '<ip>'' exited with code 1, execution time 3.8 sec
+
+Da sollte man zumindest das Passwort ausfiltern
+
+Gruß
+
+Udo Wöhler
+
+----------------------------------------------
+BITTE BEACHTEN SIE UNSERE NEUE BÃœROANSCHRIFT
+
+Udo Wöhler
+CCIE #4919 (R&S, Security)
+
+BSW-COM GmbH
+Heisenbergstraße 26-40
+D-50169 Kerpen
+
+Mobil: +49 178 93044 54
+Fax: +49 2237 638302 89
+EMail: uw(a)bsw-com.de
+
+Sitz der Gesellschaft ist Viersen, HRB 13785 AG Mönchengladbach
+Geschäftsführer: Mario Buschbell, Frank Schlesinger, Hasso-Ulrich Döring
diff --git a/.bugs/961 b/.bugs/961
new file mode 100644
index 0000000..cbb3b33
--- /dev/null
+++ b/.bugs/961
@@ -0,0 +1,60 @@
+Title: check_http: allow regex to span newlines
+Component: checks
+State: open
+Date: 2013-08-08 11:43:24
+Targetversion: future
+Class: feature
+
+kam per feedback@ rein, Orginal-Mail ist im feedback/gitbug eroeffnet folder noch vorhanden
+
+
+Date: Thu, 25 Jul 2013 18:25:38 +0200
+Message-ID: <CAPyBW-xa=wLVp4CfyBgUY6j6GKi-0JNG=kif3GBc3qnYv2sixA(a)mail.gmail.com>
+Subject: [Patch]: Erweiterung des aktiven HTTP Checks mit "Allow regex to span newlines"
+From: Marcel Schulte <schulte.marcel(a)gmail.com>
+To: feedback(a)check-mk.org
+
+Hallo ihr MK'ler,
+
+ich habe den Check um die genante Funktion erweitert. Dazu findet ihr
+im Anhang die Patches fuer folgende Dateien:
+
+* "checks/check_http"
+* "web/plugins/wato/active_checks.py"
+
+Waere echt toll, wenn ihr die einbauen koenntet
+
+Ach ja, ich habe gegen 1.2.2p2 gepatcht - vielleicht schaffen es die
+Patches ja noch ins naechste Release der 1.2.2?
+
+Schoene Gruesse aus'm Sauerland,
+Marcel
+
+
+check_http.patch
+
+--- check_http_ori 2013-07-25 16:43:58.415663477 +0200
++++ check_http 2013-07-25 16:46:45.401102140 +0200
+@@ -96,6 +96,8 @@
+ args += ' %s' % quote_shell_string(settings['expect_regex'][0])
+ if settings['expect_regex'][2]:
+ args += ' --invert-regex'
++ if settings['expect_regex'][3]:
++ args += ' -l'
+
+ if "post_data" in settings:
+ data, content_type = settings["post_data"]
+
+
+active_checks.py.patch
+
+--- active_checks.py_ori 2013-07-25 15:11:57.945206130 +0200
++++ active_checks.py 2013-07-25 18:12:30.297378001 +0200
+@@ -397,6 +397,7 @@
+ RegExp(label = _("Regular expression: ")),
+ Checkbox(label = _("Case insensitive")),
+ Checkbox(label = _("return CRITICAL if found, OK if not")),
++ Checkbox(label = _("Allow regex to span newlines")),
+ ])
+ ),
+ ( "post_data",
Module: check_mk
Branch: master
Commit: 98934cd43a88ba9eba885a4e4f36d2b851007876
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98934cd43a88ba…
Author: Götz Golla <gg(a)mathias-kettner.de>
Date: Wed Aug 7 10:17:21 2013 +0200
various text improvements
---
web/htdocs/wato.py | 2 +-
web/plugins/wato/check_parameters.py | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 5004bf6..2af8805 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -11066,7 +11066,7 @@ def mode_edit_rule(phase, new = False):
# Host tags
forms.section(_("Host tags"))
render_condition_editor(tag_specs)
- html.help(_("The rule will only be applied to hosts fullfulling all of "
+ html.help(_("The rule will only be applied to hosts fullfilling all of "
"of the host tag conditions listed here, even if they appear "
"in the list of explicit host names."))
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 347f364..899c1ee 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -131,7 +131,8 @@ register_rule(group + '/' + subgroup_applications,
itemtype = 'item',
itemname = 'Logfile',
itemhelp = _("Put the item names of the logfiles here. For example \"System$\" "
- "to select the service \"LOG System\"."),
+ "to select the service \"LOG System\". You can use regular "
+ "expressions which must match the beginning of the logfile name."),
match = 'all',
)
@@ -3244,8 +3245,8 @@ register_check_parameters(subgroup_applications,
"console can be configured for each host in a separate rule."),
elements = [
FixedValue(
- None,
- totext = "Messages are handled by logwatch.",
+ "",
+ totext = _("Messages are handled by logwatch."),
title = _("No forwarding"),
),
Dictionary(
@@ -3256,7 +3257,7 @@ register_check_parameters(subgroup_applications,
title = _('Restrict Logfiles (Prefix matching regular expressions)'),
help = _("Put the item names of the logfiles here. For example \"System$\" "
"to select the service \"LOG System\". You can use regular expressions "
- "here which must match the beginning of the logfile name."),
+ "which must match the beginning of the logfile name."),
),
),
('method', Alternative(
@@ -3267,7 +3268,7 @@ register_check_parameters(subgroup_applications,
elements = [
FixedValue(
"",
- totext = "Directly forward to event console",
+ totext = _("Directly forward to event console"),
title = _("Send events to local event console in same OMD site"),
),
TextAscii(
@@ -3277,7 +3278,7 @@ register_check_parameters(subgroup_applications,
FixedValue(
"spool:",
- totext = "Spool to event console",
+ totext = _("Spool to event console"),
title = _("Spooling: Send events to local event console in same OMD site"),
),
Transform(
Module: check_mk
Branch: master
Commit: 470eecef864faefbb18e64de20200d96b0dbb7f0
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=470eecef864fae…
Author: Götz Golla <gg(a)mathias-kettner.de>
Date: Tue Aug 6 16:07:07 2013 +0200
position of brackets corrected
---
web/htdocs/wato.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 12c2252..5004bf6 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -1100,11 +1100,11 @@ def check_folder_permissions(folder, how, exception=True, user = None, users = N
if c in cgs:
return True
- reason = _("Sorry, you have no permission on the folder '<b>%s</b>'. " % folder["title"])
+ reason = _("Sorry, you have no permissions to access the folder <b>%s</b>. ") % folder["title"]
if not cgs:
reason += _("The folder has no contact groups assigned to.")
else:
- reason += _("The folder's contact groups are <b>%s</b>. " % ", ".join(cgs))
+ reason += _("The folder's contact groups are <b>%s</b>. ") % ", ".join(cgs)
if user_cgs:
reason += _("Your contact groups are <b>%s</b>.") % ", ".join(user_cgs)
else:
@@ -7087,7 +7087,7 @@ def mode_edit_site(phase):
"or the classical Nagios GUI when a link to such applications points to a host or "
"service on that site. You can either use an absolute URL prefix like <tt>http://some.host/mysite/</tt> "
"or a relative URL like <tt>/mysite/</tt>. When using relative prefixes you needed a mod_proxy "
- "configuration in your local system apache that proxies such URLs ot the according remote site. "
+ "configuration in your local system apache that proxies such URLs to the according remote site. "
"Please refer to the <a target=_blank href='%s'>online documentation</a> for details. "
"The prefix should end with a slash. Omit the <tt>/pnp4nagios/</tt> from the prefix.") % docu_url)