Checkmk git commits May 2014

checkmk-commits@lists.checkmk.com

5 participants
134 discussions

Check_MK Git: check_mk: akcp_daisy_temp: fix detection of first port, add perfdata

by Mathias Kettner

Module: check_mk Branch: master Commit: 4b71709456bfc2ffc27a3583f13cc2ac0e726709 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b71709456bfc2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 5 10:02:32 2014 +0200 akcp_daisy_temp: fix detection of first port, add perfdata --- checks/akcp_daisy_temp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/akcp_daisy_temp b/checks/akcp_daisy_temp index 89aa267..15cd6bf 100644 --- a/checks/akcp_daisy_temp +++ b/checks/akcp_daisy_temp @@ -23,21 +23,20 @@ # License along with GNU Make; see the file COPYING. If not, write # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + akcp_daisy_temp_defaultlevels = (28, 32) + def inventory_akcp_daisy_temp(info): inventory = [] - pass_first = True for port, subport, name, temp in info: + # Ignore sensors that are found by the non-daisychaining-version of + # this check (akcp_sensor_temp) if subport != '-1' and subport != '0': - # We have to ignore the first item, because it will be also reported - # by akcp_sensor_temp on the port were this sensor chain is connected - if pass_first: - pass_first = False - continue inventory.append((name, 'akcp_daisy_temp_defaultlevels' )) return inventory + def check_akcp_daisy_temp(item, params, info): for port, subport, name, temp in info: if name == item: @@ -50,9 +49,10 @@ def check_akcp_daisy_temp(item, params, info): return 2, infotext + levels, perfdata if temp > warn: return 1, infotext + levels, perfdata - return 0, infotext + return 0, infotext, perfdata return 3, "Sensor not found" + check_info["akcp_daisy_temp"] = { 'check_function': check_akcp_daisy_temp, 'inventory_function': inventory_akcp_daisy_temp, @@ -68,7 +68,7 @@ check_info["akcp_daisy_temp"] = { "2.1.14", # Degree Celsius ] ), - 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0") in\ + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.3854.1.2.2.1.1", ".1.3.6.1.4.1.3854.1" ], 'group' : 'room_temperature', }

10 years, 1 month

Check_MK Git: check_mk: Cumulative permissions and contact groups for WATO folders

by Mathias Kettner

Module: check_mk Branch: master Commit: 56f05ee2757289fd649757d399c396873dc7c847 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56f05ee2757289… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 18:06:08 2014 +0200 Cumulative permissions and contact groups for WATO folders WATO folders have now two new checkboxes in the Permissions attributes: <ul> <li>Give these groups also permission on all subfolders</li> <li>Add these groups as contacts in all subfolders</li> </ul> The first one will add the configured groups of a folder also as permitted groups to all subfolders (recursively). The second one will add the configured groups as contact groups to the hosts in all subfolders. The idea behind that is a simplification of the configuration. It is now sufficient to specify the groups of you more general administrators at the top of the folder tree and add more and more specific groups at the lower levels of your folder tree. In the table of hosts you now will see the permitted groups and the contact groups of a host as two separate columns. --- .werks/965 | 25 ++++ ChangeLog | 1 + web/htdocs/wato.py | 203 +++++++++++++++++++++++--------- web/plugins/wato/builtin_attributes.py | 2 +- 4 files changed, 176 insertions(+), 55 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=56f05ee275…

10 years, 1 month

Check_MK Git: check_mk: Fix folder editing when a contact group has the name "use"

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c259a73b1cf22e252ddacf95b84d69fcb56bf64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c259a73b1cf22… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 15:56:33 2014 +0200 Fix folder editing when a contact group has the name "use" --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2b9b755..aa304e1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5556,7 +5556,7 @@ class ContactGroupsAttribute(Attribute): items = self._contactgroups.items() items.sort(cmp = lambda a,b: cmp(a[1], b[1])) for name, alias in items: - html.checkbox(self._name + "_" + name, name in cgs) + html.checkbox(self._name + "_n_" + name, name in cgs) html.write(' <a href="%s">%s</a> ' % (make_link([("mode", "edit_contact_group"), ("edit", name)]), alias and alias or name)) html.write("<hr>") html.checkbox(self._name + "_use", use) @@ -5574,7 +5574,7 @@ class ContactGroupsAttribute(Attribute): cgs = [] self.load_data() for name in self._contactgroups: - if html.get_checkbox(self._name + "_" + name): + if html.get_checkbox(self._name + "_n_" + name): cgs.append(name) return html.get_checkbox(self._name + "_use"), cgs

10 years, 1 month

Check_MK Git: check_mk: dell_om_disks: fix syntax error in check

by Mathias Kettner

Module: check_mk Branch: master Commit: 66f29f1a8bb8f76bf01b7853b29f28ed015eeb89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66f29f1a8bb8f7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 14:38:55 2014 +0200 dell_om_disks: fix syntax error in check --- checks/dell_om_disks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/dell_om_disks b/checks/dell_om_disks index 7bf2349..58cc564 100644 --- a/checks/dell_om_disks +++ b/checks/dell_om_disks @@ -99,7 +99,7 @@ def check_dell_om_disks(item, _no_params, info): state = 0 label = "" - msg.append("state %s%s" % ( pdisk_state.get(dstate, 'ukn (%s)' % dstate ), + msg.append("state %s%s" % ( pdisk_state.get(dstate, 'ukn (%s)' % dstate ), label)) msg.append("Bus Type: %s" % bus_type.get(btype,'unk (%s)' % btype) ) if sstate != 5:

10 years, 1 month

Check_MK Git: check_mk: akcp_daisy_temp: fixed inventory

by Mathias Kettner

Module: check_mk Branch: master Commit: bd3964fab6acef597c716aaaba6006d74ca26c9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd3964fab6acef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 14:09:33 2014 +0200 akcp_daisy_temp: fixed inventory --- checks/akcp_daisy_temp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/akcp_daisy_temp b/checks/akcp_daisy_temp index 9f5c54b..89aa267 100644 --- a/checks/akcp_daisy_temp +++ b/checks/akcp_daisy_temp @@ -29,13 +29,13 @@ def inventory_akcp_daisy_temp(info): inventory = [] pass_first = True for port, subport, name, temp in info: - if subport != '-1': + if subport != '-1' and subport != '0': # We have to ignore the first item, because it will be also reported - # by akcp_sensor_temp on the port were this sensor chain are connected + # by akcp_sensor_temp on the port were this sensor chain is connected if pass_first: pass_first = False continue - inventory.append((name, 'akcp_daisy_temp_defaultlevels' )) + inventory.append((name, 'akcp_daisy_temp_defaultlevels' )) return inventory def check_akcp_daisy_temp(item, params, info): @@ -44,7 +44,7 @@ def check_akcp_daisy_temp(item, params, info): warn, crit = params temp = savefloat(temp) / 10 infotext = "%.1f °C " % temp - levels = " (warn/crit at %.1f/%.1f °C)" % (warn, crit) + levels = " (warn/crit at %.1f/%.1f °C)" % (warn, crit) perfdata = [ ( "temperature", temp, warn, crit ) ] if temp > crit: return 2, infotext + levels, perfdata @@ -59,8 +59,8 @@ check_info["akcp_daisy_temp"] = { 'service_description': 'Temperature %s', 'has_perfdata': True, 'snmp_info': ( - ".1.3.6.1.4.1.3854.1.2.2.1.19.33", - [ 1, 2, 3, 4, 5, 6, 7 ], + ".1.3.6.1.4.1.3854.1.2.2.1.19.33", + [ 1, 2, 3, 4, 5, 6, 7, 8 ], [ OID_END, # Port/Subport "2.1.1", # subport

10 years, 1 month

Check_MK Git: check_mk: FIX Fix hanging shutdown of CMC on RedHat 5.X

by Mathias Kettner

Module: check_mk Branch: master Commit: ed201374b763b56197c36fef707adbc021da5e9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed201374b763b5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 13:48:25 2014 +0200 FIX Fix hanging shutdown of CMC on RedHat 5.X When using the CMC on RedHat/CentOS 5.X then the CMC would not correctly shutdown. The reason is, that the Python implementation of that OSes raises an Exception on sys.exit, while newer versions don't. This has been fixed by handling <tt>SystemExit</tt> explicitely. --- .werks/964 | 12 ++++++++++++ ChangeLog | 1 + modules/notify.py | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/.werks/964 b/.werks/964 new file mode 100644 index 0000000..9f81088 --- /dev/null +++ b/.werks/964 @@ -0,0 +1,12 @@ +Title: Fix hanging shutdown of CMC on RedHat 5.X +Level: 2 +Component: notifications +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1399031217 + +When using the CMC on RedHat/CentOS 5.X then the CMC would not correctly +shutdown. The reason is, that the Python implementation of that OSes +raises an Exception on sys.exit, while newer versions don't. This has +been fixed by handling <tt>SystemExit</tt> explicitely. diff --git a/ChangeLog b/ChangeLog index 6f65994..54fd5a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ * 0752 FIX: FIX: compute correct state transitions for notifications... * 0753 FIX: FIX: correctly show original state in HTML notification mails... * 0609 FIX: mail notification script now uses 6 digit hex codes for colors to be better compatible with web based mail browsers + * 0964 FIX: Fix hanging shutdown of CMC on RedHat 5.X... Reporting & Availability: * 0756 Allow availability of multisite BI aggregates at once... diff --git a/modules/notify.py b/modules/notify.py index 2aa518d..4351b46 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -370,6 +370,10 @@ def notify_keepalive(): sys.stdout.write("*") sys.stdout.flush() + + # Fix vor Python 2.4: + except SystemExit, e: + sys.exit(e) except Exception, e: if opt_debug: raise

10 years, 1 month

Check_MK Git: check_mk: Added draft for notification configuration ( now really!)

by Mathias Kettner

Module: check_mk Branch: master Commit: a55b7ca559e5230743d1a432280c122f4b17e0ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a55b7ca559e523… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 13:40:31 2014 +0200 Added draft for notification configuration (now really!) --- doc/drafts/README.notification_configuration | 89 ++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/doc/drafts/README.notification_configuration b/doc/drafts/README.notification_configuration new file mode 100644 index 0000000..b9983a6 --- /dev/null +++ b/doc/drafts/README.notification_configuration @@ -0,0 +1,89 @@ +Configuration of notification plugins +------------------------------------- + +Currently the only API for making notification plugins configurable is via +a list of unnamed number parameters. The values of this list can be configured +at the place where the notification is being setup (i.e. in a channel of +flexible notifications and in a rule in the RBN). + +For the legacy ASCII-email in addition there are global options. + +This is not flexible enough, for several reasons. Here are some +examples of missing configuration options: + +* Configure a From address for HTML emails + - This should be done as a global option + +* Configure a Reply-To address for HTML emails + - This should be on options to be set in the actual notification + rule, so that different rules can set differen reply-tos. + +* Configure the general structure of HTML emails + Which fields should be displayed? How should the subject + look like, etc. + - This should be global. Otherwise the user would have to repeate + the complete configuration for each rule. + +* Configure credentials for an SMS gateway + - should be a global option + + +So what we need is two things: + +1. WATO configuration for the global settings of a notification. We +could do this either as true global options. Or we could do that +rule based. The idea: every notification is about a specific host +and maybe also a service. So we could use the WATO rule system +for having different groups of hosts have different global +notification settings. + +2. WATO configuration for the per-rule settings of a notification. +In order to be as flexible as possible we could allow the *same* +configuration values as for the global settings. If we implement +this as a dictionary with optional values then the settings +in a specific rule can simply override global settings. So for +example you could specify a From: address via a global setting +but override this in a single rule. + + +IMPLEMENTATION +-------------- +Each notification plugin can optionally register a WATO +configuration for its options. This must be of type dictionary +and is configured in share/check_mk/web/plugins/wato/notifcations.py +For each configuration there will be created two WATO rules: +one for host notifications, one for service notifications. + +The same configuration will also be added to the notification +rules. Here we need to change the way the script selection and +cancelling is being configured, since the configuration of +the plugin must be displayed as soon as the plugin is being +selected. + +For each plugin that has a configuration a second plugin +needs to be registered: One that converts the dictionary +into a list of command line arguments. When a notification +is being created then the upper configuration rules are +being executed, then rule-specific configuration can +override the parameters and as a last step this is +being converted into command line arguments. + +Plugins that do not have a WATO configuration (legacy +style, self written plugins) directly use a list +of strings - like now. + + +ACTUAL CONFIGURATION PARAMTERS +------------------------------ +We will start by implementing the following parameters for +the HTML emails: + +1. From: address +2. Reply-To: address +3. Subject: +--> It is allowed to use macros like $HOSTNAME$ here. + +4. Selection of data fields to show. This will be selection from +a list of fields, e.g. "Host name", "Service Description", "Current state", +"Type of notification", etc.. +

10 years, 1 month

Check_MK Git: check_mk: Added draft for notification configuration

by Mathias Kettner

Module: check_mk Branch: master Commit: 773c636bf11af94548fa64065e26b52ae2e5a5ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=773c636bf11af9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 13:40:17 2014 +0200 Added draft for notification configuration --- doc/drafts/LIESMICH.baum_anhand_von_tags | 52 ------------------------------ 1 file changed, 52 deletions(-) diff --git a/doc/drafts/LIESMICH.baum_anhand_von_tags b/doc/drafts/LIESMICH.baum_anhand_von_tags deleted file mode 100644 index c14a81d..0000000 --- a/doc/drafts/LIESMICH.baum_anhand_von_tags +++ /dev/null @@ -1,52 +0,0 @@ -Konzept für ein automatisches Erzeugen eines Baumes ---------------------------------------------------- - -Ausgangspunkt: WATO sieht über die Ordnerstruktur für Hosts vor, dass man -diese hierarchisch organisieren kann. Nun gibt es hier leider nur einen -Baum. Manchmal möchte man die Hosts nur unter dem Gesichtspunkt von -anderen Hierarchien sehen. - -Die Idee ist jetzt, dass man dazu die vorhandenen Hosttag-Gruppen -verwendet. Denn jeder Host hat in jeder Taggruppe genau einen -Wert. Der Benutzer könnte jetzt eine Anzahl von Taggruppen -herauspicken, z.B.: - -1. Standort -2. Anwendung -3. Kritikalität - -Diese können dann in hierarchieebenen eines logischen Baumes -umgewandelt werden. Auf der obersten Ebene wäre der Standort, -darunter die Anwendung, darunter die Kritikalität. - -Das ganze könnte man wie folgt umsetzen: - -1. In den globalen Einstellungen für Multisite fügen wir eine neue Option ein, -mit der man beliebige virtuelle Baumansichten anlegen kann. Das wird als -Liste realisiert. Dort kann man pro Eintrag eingeben: - - Einen Titel für die Ansicht - - Eine sortierte Liste von Hosttaggruppen, die den Baum bilden sollen. - -2. Ein neues Sidebar-Snanip "Virtuelle Baumansicht" wird geschrieben. Dieses - erlaubt die Auswahl einer der oben realisierten virtuellen Bäume (falls - es mehr als einen gibt). Es stellt dann diesen Baum zum Aufklappen dar. - - Wenn man auf einen Ast klickt, ergibt sich dadurch eine Liste von - Hosttags bzw. von nicht vorhandenen Hosttags (wenn man bei Checkbox- - Hosttags den negativen Wert wählt, oder ein Tag leer ist). - - Man landet dann auf der Ansicht "All Hosts", bei welcher der Filter - für die Host-Tags vorausgefüllt ist. - -3. Die Ansicht "All Hosts" bekommt standardmäßig immer den Filter für - die Host Tags. - - -Eine mögliche Ausbaustufe wäre, dass man das Verhalten des neuen -Snapins analog zu dem "Folders"-Snapin macht. Das würde bedeuten, -dass man nicht immer auf die Ansicht "All Hosts" gelangt, sondern -auf die jeweils gewählte Ansicht. Dazu müsste in jeder Ansicht -der Hosttag-Filter implizit vorhanden sein. Außerdem müsste -der kombinierte Filter aus Ordner und Tags dann sauber funktionieren. -Frage ist, ob das nicht zu komplex wird. -

10 years, 1 month

Check_MK Git: check_mk: Fix autoresize of textarea for Firefox 29

by Mathias Kettner

Module: check_mk Branch: master Commit: 4fc4c37c8017986def93d0ed1c2227eb3d74442a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fc4c37c801798… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 13:03:17 2014 +0200 Fix autoresize of textarea for Firefox 29 --- web/htdocs/js/checkmk.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index eea264d..d0957ce 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1662,9 +1662,13 @@ function valuespec_cascading_change(oSelect, varprefix, count) { } function valuespec_textarea_resize(oArea) { - oArea.style.height = (oArea.scrollHeight - (/Chrome/i.test(navigator.userAgent) ? 6 : 0)) + "px"; + oArea.style.height = (oArea.scrollHeight + - (/Chrome/i.test(navigator.userAgent) ? 6 : 0) + - (/Firefox.29.0/i.test(navigator.userAgent) ? 6 : 0) + ) + "px"; } + function valuespec_listof_add(varprefix, magic) { var oCountInput = document.getElementById(varprefix + "_count"); var count = parseInt(oCountInput.value);

10 years, 1 month

Check_MK Git: check_mk: Automatically refresh new virtual tree snapin

by Mathias Kettner

Module: check_mk Branch: master Commit: 1df1b983ec3ce4f5c9539e7722ee4c2162afc8a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1df1b983ec3ce4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 12:44:21 2014 +0200 Automatically refresh new virtual tree snapin --- web/plugins/sidebar/shipped.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 768cb02..82031b9 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1354,6 +1354,7 @@ sidebar_snapins["tag_tree"] = { "description" : _("This snapin shows tree views of your hosts based on their tag classifications. You " "can configure which tags to use in your global settings of Multisite."), "render" : render_tag_tree, + "refresh" : True, "allowed" : [ "admin", "user", "guest" ], "styles" : """

10 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2014