Module: check_mk
Branch: master
Commit: 28014abedf48fdee15690fb55011842cb495a868
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28014abedf48fd…
Author: Götz Golla <gg(a)mathias-kettner.de>
Date: Mon Aug 26 17:19:40 2013 +0200
wording change in wato text
---
web/plugins/wato/check_parameters.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index b9472f2..b1a0602 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -1253,7 +1253,7 @@ register_check_parameters(
"tcp_connections",
_("Monitor specific TCP/UDP connections and listeners"),
Dictionary(
- help = _("This rule allows to monitor the existance of specify TCP connections or "
+ help = _("This rule allows to monitor the existence of specific TCP connections or "
"TCP/UDP listeners."),
elements = [
( "proto",
@@ -1811,26 +1811,26 @@ register_check_parameters(
"You can change this behaviour on a per-state-base here."),
optional_keys = False,
elements = [
- ( "states",
+ ( "states",
Dictionary(
title = _("Target states"),
optional_keys = False,
elements = [
- ( "poweredOn",
+ ( "poweredOn",
MonitoringState(
title = _("Powered ON"),
help = _("Check result if the host or VM is powered on"),
default_value = 0,
)
),
- ( "poweredOff",
+ ( "poweredOff",
MonitoringState(
title = _("Powered OFF"),
help = _("Check result if the host or VM is powered off"),
default_value = 1,
)
),
- ( "suspended",
+ ( "suspended",
MonitoringState(
title = _("Suspended"),
help = _("Check result if the host or VM is suspended"),
@@ -1872,7 +1872,7 @@ register_check_parameters(
register_check_parameters(
subgroup_printing,
"windows_printer_queues",
- _("Number of open jobs of a printer on windows" ),
+ _("Number of open jobs of a printer on windows" ),
Tuple(
help = _("This rule is applied to the number of print jobs "
"currently waiting in windows printer queue."),
@@ -2005,7 +2005,7 @@ register_check_parameters(
help = _("A tablespace is a container for segments (tables, indexes, etc). A "
"database consists of one or more tablespaces, each made up of one or "
"more data files. Tables and indexes are created within a particular "
- "tablespace. "
+ "tablespace. "
"This rule allows you to define checks on the size of tablespaces."),
elements = [
("levels",
@@ -3672,7 +3672,7 @@ register_check_parameters(
help = _("Leave this empty, if the user does not matter"),
none_is_empty = True,
)),
- ( "cpulevels",
+ ( "cpulevels",
Tuple(
title = _("Levels on CPU utilization"),
elements = [
Module: check_mk
Branch: master
Commit: 217f542b660fb05f57a301193dd1d61b228b0b83
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=217f542b660fb0…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Aug 26 14:21:46 2013 +0200
Updated bug entries #1029, #1030, #1031
---
.bugs/1029 | 36 ++++++++++++++++++++++++++++++++++++
.bugs/1030 | 43 +++++++++++++++++++++++++++++++++++++++++++
.bugs/1031 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 128 insertions(+)
diff --git a/.bugs/1029 b/.bugs/1029
new file mode 100644
index 0000000..be38d11
--- /dev/null
+++ b/.bugs/1029
@@ -0,0 +1,36 @@
+Title: monitor I/O for md raidsets too
+Component: checks
+State: open
+Date: 2013-08-26 12:30:45
+Targetversion: 1.2.3
+Class: feature
+
+patch came in via feedback@ // original mail still available in feeedback/gitbug folder
+
+
+Date: Tue, 2 Jul 2013 14:46:10 -0400
+Message-ID: <CANzfhcfnDOKnRqdDeiyubh1Ph+6ihNap7nOv4ZOdPSQWR5hk8w(a)mail.gmail.com>
+Subject: [Bug]: agent does not monitor io for md raidsets
+From: Philip Kubat <philip(a)kubat.com>
+
+the egrep needs updated ti include md arrays
+
+# Performancecounter Platten
+echo '<<<diskstat>>>'
+date +%s
+egrep ' (md[0-9]|x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*) ' < /proc/diskstats
+if type dmsetup >/dev/null ; then
+ echo '[dmsetup_info]'
+ dmsetup info -c --noheadings --separator ' ' -o name,devno,vg_name,lv_name
+fi
+if [ -d /dev/vx/dsk ] ; then
+ echo '[vx_dsk]'
+ stat -c "%t %T %n" /dev/vx/dsk/*/*
+fi
+
+
+
+=============
+
+-egrep ' (md[0-9]|x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*) ' < /proc/diskstats
++egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*) ' < /proc/diskstats
diff --git a/.bugs/1030 b/.bugs/1030
new file mode 100644
index 0000000..ff65073
--- /dev/null
+++ b/.bugs/1030
@@ -0,0 +1,43 @@
+Title: Bug in hr_mem with swap not yet fixed
+Component: checks
+State: open
+Date: 2013-08-26 12:46:09
+Targetversion: 1.2.3
+Class: bug
+
+came in by email to mk@ // original mail still available in feedback/gitbug folder
+
+
+Subject: Fehler in hr_mem mit Swap
+From: =?utf-8?Q?Christof_Musik?= <christof(a)senfdax.de>
+To: =?utf-8?Q?mk=40mathias-kettner=2Ede?= <mk(a)mathias-kettner.de>
+Date: Wed, 10 Jul 2013 21:24:50 +0200
+
+
+Hallo Mathias,
+
+vor einiger Zeit wurde ein Fehler im hr_mem Check auf der ML gemeldet. (http://www.mail-archive.com/checkmk-en@lists.mathias-kettner.de/msg06808.ht…)
+Daraufhin hast du geantwortet das der Bug #1 behoben wäre. Dies ist allerdings nicht der Fall.
+Ich habe gerade 1.2.2p2 installiert und mir auch git angeschaut. Dort ist kein Fix für den Fehler zu erkennen.
+
+Das Problem ist sollte wohl mit c505863948d2e2df9e93d94c1c91b17f773c0516 gefixed sein. Dies tut es aber leider nicht.
+Ich weiß jetzt leider auch keine elegante Lösung, als mit hrStorageDescr zu arbeiten. Hast du vielleicht noch eine Idee? Den Patch kann ich gerne umsetzen.
+
+Um das Problem noch mal kurz zu erklären: In der aktuellen Version wird geprüft ob ein Wert von hrStorageVirtualMemory ausgelesen wurde oder nicht. Der erste
+Wert gewinnt. Auf manchen System ist es aber "Virtual memory" und nicht "Swap space". Damit kommen falsche Werte zustande und der Check meldet falsche Zustände.
+
+HOST-RESOURCES-MIB::hrStorageType.1 = OID: HOST-RESOURCES-TYPES::hrStorageRam
+HOST-RESOURCES-MIB::hrStorageType.3 = OID: HOST-RESOURCES-TYPES::hrStorageVirtualMemory
+HOST-RESOURCES-MIB::hrStorageType.6 = OID: HOST-RESOURCES-TYPES::hrStorageOther
+HOST-RESOURCES-MIB::hrStorageType.7 = OID: HOST-RESOURCES-TYPES::hrStorageOther
+HOST-RESOURCES-MIB::hrStorageType.8 = OID: HOST-RESOURCES-TYPES::hrStorageOther
+HOST-RESOURCES-MIB::hrStorageType.10 = OID: HOST-RESOURCES-TYPES::hrStorageVirtualMemory
+HOST-RESOURCES-MIB::hrStorageDescr.1 = STRING: Physical memory
+HOST-RESOURCES-MIB::hrStorageDescr.3 = STRING: Virtual memory
+HOST-RESOURCES-MIB::hrStorageDescr.6 = STRING: Memory buffers
+HOST-RESOURCES-MIB::hrStorageDescr.7 = STRING: Cached memory
+HOST-RESOURCES-MIB::hrStorageDescr.8 = STRING: Shared memory
+HOST-RESOURCES-MIB::hrStorageDescr.10 = STRING: Swap space
+
+Gruß
+Christof
diff --git a/.bugs/1031 b/.bugs/1031
new file mode 100644
index 0000000..49b7d84
--- /dev/null
+++ b/.bugs/1031
@@ -0,0 +1,49 @@
+Title: Patch for setup.sh: fix DESTDIR
+Component: core
+State: open
+Date: 2013-08-26 13:01:12
+Targetversion: 1.2.3
+Class: cleanup
+
+came in via checkmk-de@ // original mail available in feedback/gitbug folder
+
+Date: Mon, 15 Jul 2013 13:44:02 +0200
+From: Marcel =?UTF-8?B?UGVubmV3acOf?= <mailinglists(a)pennewiss.de>
+To: checkmk-de(a)lists.mathias-kettner.de
+Message-ID: <20130715134402.5743e494(a)marcel.intern.exa-edv.de>
+X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.10; x86_64-suse-linux-gnu)
+Mime-Version: 1.0
+Content-Type: multipart/mixed; boundary="MP_/diqzEXo3x_6IHPojiKv3M6F"
+Subject: [Check_mk (deutsch)] =?utf-8?q?BUG=3A_setup=2Esh_-_Erstellung_der?=
+ =?utf-8?q?_auth=2Eserials_au=C3=9Ferhalb_von_DESTDIR?=
+
+
+Hallo,
+
+ich verwende check_mk und check_mk-agent auch unter Gentoo. Der
+Build-Prozess wird dort in einer Sandbox vollzogen, was die
+Beachtung von DESTDIR als Grundvoraussetzung mit sich bringt.
+
+Im Commit 2657b3ee wurde die Erstellung der auth.serials implementiert,
+welches jedoch außerhalb des DESTDIR erfolgt und somit mindestens unter
+Gentoo zu Problem führt.
+
+Anbei ein passender Patch.
+
+Grüße,
+Marcel
+
+
+setup.sh.patch
+
+--- setup.sh.old 2013-07-02 15:49:46.269385640 +0200
++++ setup.sh 2013-07-02 15:49:40.089462901 +0200
+@@ -1004,7 +1004,7 @@
+ done &&
+ # make htpasswd writable by apache, since we need this for
+ # WATO. Also create an empty and Apache-writable auth.serials
+- serials_file=${htpasswd_file%/*}/auth.serials &&
++ serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials &&
+ touch "$serials_file" &&
+ chown $wwwuser "$serials_file" &&
+ chown $wwwuser "$htpasswd_file" &&
Module: check_mk
Branch: master
Commit: 928dc9e97d064119717233060207e6da24ac9682
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=928dc9e97d0641…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Aug 26 11:14:46 2013 +0200
Cleaned up view editor layout a bit
---
web/htdocs/forms.py | 3 +++
web/htdocs/views.py | 35 +++++++++++++++++++----------------
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py
index 78d90ac..40fee79 100644
--- a/web/htdocs/forms.py
+++ b/web/htdocs/forms.py
@@ -152,6 +152,9 @@ def container():
(g_section_isopen and "open" or "closed"))
g_section_open = True
+def space():
+ html.write('<tr><td colspan=2 style="height:15px;"></td></tr>')
+
def section(title = None, checkbox = None, id = "", simple=False, hide = False):
global g_section_open
if g_section_open:
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 6acaf10..62f1a70 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -376,7 +376,7 @@ def page_edit_views(msg=None):
html.write('<table class=data>')
html.write("<tr>")
html.write("<th>%s</th>" % _("Actions"))
- html.write("<th>%s</th>" % _("Link Name"))
+ html.write("<th>%s</th>" % _("View Name"))
html.write("<th>%s</th>" % _("Title"))
html.write("<th>%s</th>" % _("Datasource"))
html.write("<th>%s</th>" % _("Owner"))
@@ -420,7 +420,7 @@ def page_edit_views(msg=None):
% viewname, _("Delete this view!"), "delete")
html.write('</td>')
- # Link name
+ # View Name
html.write('<td>%s</td>' % viewname)
# Title
@@ -579,39 +579,42 @@ def page_edit_view():
forms.header(_("Basic Settings"))
- forms.section(_("Title"))
- vs['title'].render_input('view_title', view.get('title'))
-
- forms.section(_("Link Name"))
+ forms.section(_("View Name"))
html.text_input("view_name", size=12)
- html.help(_("The link name will be used in URLs that point to a view, e.g. "
+ html.help(_("The view name will be used in URLs that point to a view, e.g. "
"<tt>view.py?view_name=<b>myview</b></tt>. It will also be used "
"internally for identifying a view. You can create several views "
- "with the same title but only one per link name. If you create a "
- "view that has the same link name as a builtin view, then your "
+ "with the same title but only one per view name. If you create a "
+ "view that has the same view name as a builtin view, then your "
"view will override that (shadowing it)."))
forms.section(_("Datasource"), simple=True)
datasource_title = multisite_datasources[datasourcename]["title"]
- html.write("%s: <b>%s</b><br>\n" % (_('Datasource'), datasource_title))
+ html.write("%s: <b>%s</b><br />\n" % (_('Datasource'), datasource_title))
html.hidden_field("datasource", datasourcename)
html.help(_("The datasource of a view cannot be changed."))
+ forms.space()
+
+ forms.section(_("Title"))
+ vs['title'].render_input('view_title', view.get('title'))
+
forms.section(_("Topic"))
vs['topic'].render_input('view_topic', view.get('topic'))
html.help(_("The view will be sorted under this topic in the Views snapin. "))
- forms.section(_("Button"))
- html.write(_('Text') + ': ')
+ forms.section(_("Description"))
+ vs['description'].render_input('view_description', view.get('description'))
+
+ forms.section(_("Button Text"))
vs['linktitle'].render_input('view_linktitle', view.get('linktitle'))
html.help(_("If you define a text here, then it will be used in "
"buttons to the view instead of of view title."))
- html.write('<p>' + _('Icon') + ': ')
+
+ forms.section(_("Button Icon"))
html.text_input("view_icon", size=14)
- html.write('</p>')
- forms.section(_("Description"))
- vs['description'].render_input('view_description', view.get('description'))
+ forms.space()
forms.section(_("Visibility"))
if config.may("general.publish_views"):