Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64221 discussions

Check_MK Git: check_mk: FIX: Linux Agent: Fixed ipmi-sensors handling of Power_Unit data

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 04fcfb6ff7cf1dfa8515dc95e06e9bd2cdc02a70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04fcfb6ff7cf1d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 08:46:55 2012 +0100 FIX: Linux Agent: Fixed ipmi-sensors handling of Power_Unit data --- ChangeLog | 1 + agents/check_mk_agent.linux | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index af32aea..7a2a5d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * FIX: fix inventory of f5_bigip_temp * mk_oracle (lnx+win): Fixed TEMP tablespace size calculations * ps: output node process is running on (only for clusters) + * FIX: Linux Agent: Fixed ipmi-sensors handling of Power_Unit data Multisite: * Added several missing localization stringsw diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a78eb77..68e3329 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -253,7 +253,8 @@ then # in case of parallel or overlapping calls of the agent. ( flock -n 200 --wait 60 - for class in Temperature 'Power Unit' Fan + # At least with ipmi-sensoirs 0.7.16 this group is Power_Unit instead of "Power Unit" + for class in Temperature Power_Unit Fan do $WAITMAX ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache -g "$class" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' # In case of a timeout immediately leave loop.

12 years, 7 months

Check_MK Git: check_mk: FIX: megaraid_bbu: fix problem with alternative agent output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 736df5840b36de96d78f229d50955fbfefc11c8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=736df5840b36de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 23 13:15:00 2012 +0100 FIX: megaraid_bbu: fix problem with alternative agent output --- ChangeLog | 2 ++ checks/megaraid_bbu | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 353c5a0..dd84683 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,8 @@ * FIX: check_mk-hp_blade_psu.php: allow more than 4 power supplies * FIX: smart plugin: handle cases with missing vendor (thanks to Stefan Kärst) + * FIX: megaraid_bbu: fix problem with alternative agent output + (thanks to Daniel Tuecks) Multisite: * Added several missing localization strings diff --git a/checks/megaraid_bbu b/checks/megaraid_bbu index 183352b..1e0066b 100644 --- a/checks/megaraid_bbu +++ b/checks/megaraid_bbu @@ -82,11 +82,14 @@ def check_megaraid_bbu(item, _no_params, info): # verify defined important parameters to current level for varname, (refvalue, refstate) in megaraid_bbu_refvalues.items(): - value = controller[varname] - # build a list of all errors - if controller[varname] != refvalue: - broken.append("%s is %s, but should be %s(%s)" % (varname, value, refvalue, "!" * refstate)) - state = max(state, refstate) + try: + value = controller[varname] + # build a list of all errors + if controller[varname] != refvalue: + broken.append("%s is %s, but should be %s(%s)" % (varname, value, refvalue, "!" * refstate)) + state = max(state, refstate) + except: + pass # return assembled info if broken:

12 years, 7 months

Check_MK Git: check_mk: FIX: smart plugin: handle cases with missing vendor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ea85d88a23a7d4d72baffd267f118ba5ed52e659 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea85d88a23a7d4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 23 12:53:52 2012 +0100 FIX: smart plugin: handle cases with missing vendor --- ChangeLog | 2 ++ agents/plugins/smart | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92a90a5..353c5a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,8 @@ alarms. * postfix_mailq: handle output with 'Total requests:' in last line * FIX: check_mk-hp_blade_psu.php: allow more than 4 power supplies + * FIX: smart plugin: handle cases with missing vendor (thanks + to Stefan Kärst) Multisite: * Added several missing localization strings diff --git a/agents/plugins/smart b/agents/plugins/smart index 220fef6..caeb769 100755 --- a/agents/plugins/smart +++ b/agents/plugins/smart @@ -5,8 +5,22 @@ if which smartctl > /dev/null 2>&1 ; then echo '<<<smart>>>' for D in /dev/[sh]d[a-z] /dev/[sh]d[a-z][a-z]; do N=${D##*/} - VEND=$(tr -d ' ' < /sys/block/$N/device/vendor) - MODEL=$(sed -e 's/ /_/g' -e 's/_*$//g' < /sys/block/$N/device/model) - smartctl -A $D | grep Always | sed "s|^|$D $VEND $MODEL |" + if [ -r /sys/block/$N/device/vendor ]; then + VEND=$(tr -d ' ' < /sys/block/$N/device/vendor) + else + # 2012-01-25 Stefan Kaerst CDJ - in case $N does not exist + VEND=ATA + fi + # 2012-01-25 Stefan Kaerst CDJ - special option in case vendor is AMCC + if [ "$VEND" == "AMCC" ]; then + D='/dev/twa0' + SPECOPS='-d 3ware,0' + fi + if [ -r /sys/block/$N/device/model ]; then + MODEL=$(sed -e 's/ /_/g' -e 's/_*$//g' < /sys/block/$N/device/model) + else + MODEL=$(smartctl -a $D | grep -i "device model" | sed -e "s/.*:[ ]*//g" -e "s/\ /_/g") + fi + smartctl $SPECOPS -v 9,raw48 -A $D | grep Always | egrep -v '^190(.*)Temperature(.*)' | sed "s|^|$D $VEND $MODEL |" done 2>/dev/null fi

12 years, 7 months

Check_MK Git: check_mk: Do buffering in HTML creation per default

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 408a0967c56f1bc052cba0bd2e1cfe9e5e8a1d44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=408a0967c56f1b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 23 12:19:18 2012 +0100 Do buffering in HTML creation per default This greatly reduces network traffic, esp. via HTTPS You can deactivate this by setting buffered_http_stream = False in multisite.mk --- ChangeLog | 1 + web/htdocs/config.py | 3 +++ web/htdocs/htmllib.py | 9 ++++++++- web/htdocs/index.py | 1 + web/plugins/wato/check_mk_configuration.py | 12 ++++++++++++ 5 files changed, 25 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 361c05f..92a90a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * Retry livestatus connect until timeout is used up. This avoids error messages when the core is being restarted * Events view now shows icon and text for "flapping" events + * Use buffer for HTML creation (this speeds up esp. HTTPS a lot) Livestatus: * Add missing column check_freshness to services table diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 8273b6e..3677e31 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -580,6 +580,9 @@ auth_type = 'basic' # always all buttons to be shown context_buttons_to_show = 5 +# Buffering of HTML output stream +buffered_http_stream = True + # __ ___ _____ ___ # \ \ / / \|_ _/ _ \ # \ \ /\ / / _ \ | || | | | diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 807f7f0..f7de478 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -173,6 +173,10 @@ class html: self.form_vars = [] self.context_buttons_open = False self.mobile = False + self.buffering = True + + def set_buffering(self, b): + self.buffering = b def plugin_stylesheets(self): global plugin_stylesheets @@ -199,7 +203,10 @@ class html: def write(self, text): if type(text) == unicode: text = text.encode("utf-8") - self.req.write(text) + if self.buffering: + self.req.write(text, 0) + else: + self.req.write(text) def heading(self, text): self.write("<h2>%s</h2>\n" % text) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 42e7c03..8aadb0b 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -199,6 +199,7 @@ def handler(req, profiling = True): config.load_config() # load multisite.mk if html.var("debug"): # Debug flag may be set via URL config.debug = True + html.set_buffering(config.buffered_http_stream) # profiling can be enabled in multisite.mk if profiling and config.profile: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f1c46c2..fc52c27 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -61,6 +61,18 @@ register_configvar(group, domain = "multisite") register_configvar(group, + "buffered_http_stream", + Checkbox(title = _("Buffered HTTP stream"), + label = _("enable buffering"), + help = _("When buffering the HTTP stream is enabled, then Multisite " + "will not send single TCP segments for each particle of HTML " + "output but try to make larger segments. This saves bandwidth " + "especially when using HTTPS. On the backside there might be " + "a higher latency for the beginning of pages being displayed."), + default_value = True), + domain = "multisite") + +register_configvar(group, "show_livestatus_errors", Checkbox(title = _("Show MK Livestatus error messages"), label = _("show errors"),

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0667

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7b0bbf0e09ec459f052930ac885183789aaf4de1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b0bbf0e09ec45… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 23 11:51:07 2012 +0100 Updated bug entries #0667 --- .bugs/667 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/667 b/.bugs/667 new file mode 100644 index 0000000..91389dc --- /dev/null +++ b/.bugs/667 @@ -0,0 +1,10 @@ +Title: extra_service_conf["use"] should work +Component: core +State: open +Date: 2012-02-23 11:50:15 +Targetversion: future +Class: feature + +Somehow this does not seem to work. We should handle this +specially and omit the standard use in case we see a +custom extra_conf "use".

12 years, 7 months

Check_MK Git: check_mk: Reserved 20 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c886eed43ef5d8bf6d986e6beb44df4f2b55521b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c886eed43ef5d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 23 11:50:09 2012 +0100 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index a24ddf9..a3888f7 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -667 +687

12 years, 7 months

Check_MK Git: check_mk: Livestatus: Add missing column check_freshness to services table

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d83049d5f6d8c1909ca52a264b744f2157e258d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d83049d5f6d8c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 23 11:48:15 2012 +0100 Livestatus: Add missing column check_freshness to services table --- ChangeLog | 2 ++ livestatus/src/TableServices.cc | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3045b8d..361c05f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,8 @@ error messages when the core is being restarted * Events view now shows icon and text for "flapping" events + Livestatus: + * Add missing column check_freshness to services table BI: * New column (painter) for simplistic box display of tree. diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index fe017cf..bd0d4c4 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -295,6 +295,8 @@ void TableServices::addColumns(Table *table, string prefix, int indirect_offset, "The current check option, forced, normal, freshness... (0/1)", (char *)(&svc.check_options) - ref, indirect_offset)); table->addColumn(new OffsetIntColumn(prefix + "flap_detection_enabled", "Whether flap detection is enabled for the service (0/1)", (char *)(&svc.flap_detection_enabled) - ref, indirect_offset)); + table->addColumn(new OffsetIntColumn(prefix + "check_freshness", + "Whether freshness checks are activated (0/1)", (char *)(&svc.check_freshness) - ref, indirect_offset)); table->addColumn(new OffsetIntColumn(prefix + "obsess_over_service", "Whether 'obsess_over_service' is enabled for the service (0/1)", (char *)(&svc.obsess_over_service) - ref, indirect_offset)); table->addColumn(new AttributelistColumn(prefix + "modified_attributes",

12 years, 7 months

Check_MK Git: check_mk: check_mk_templates.cfg: added s to notification options

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7ca99152ed01b897192acf03c18ba42a59b08d8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ca99152ed01b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 23 11:25:41 2012 +0100 check_mk_templates.cfg: added s to notification options --- ChangeLog | 2 ++ check_mk_templates.cfg | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef1fc26..3045b8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ * FIX: fix problem with check includes in subchecks * Option --checks now also applies to ad-hoc check (e.g. cmk --checks=mrpe,df -v somehost) + * check_mk_templates.cfg: added s to notification options + of host and service (= downtime alerts) WATO: * Much more checks are configurable via WATO now diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index 47fd36d..bd96561 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -77,7 +77,7 @@ define host { max_check_attempts 1 notification_interval 0 notification_period 24X7 - notification_options d,u,r,f + notification_options d,u,r,f,s contact_groups check_mk } @@ -150,7 +150,7 @@ define service { normal_check_interval 1 retry_check_interval 1 max_check_attempts 1 - notification_options u,c,w,r,f + notification_options u,c,w,r,f,s notification_period 24X7 check_period 24X7 }

12 years, 7 months

Check_MK Git: check_mk: FIX: create auth.php if it is empty

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1cc55e81e851a35a700cc44ba7f38539043733cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cc55e81e851a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 23 11:05:01 2012 +0100 FIX: create auth.php if it is empty --- web/htdocs/login.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index f36aa5c..6c87621 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -211,7 +211,8 @@ def normal_login_page(): # We assume: Each user must visit this login page before using the multisite based # authorization. So we can easily create the file here if it is missing. # This is a good place to replace old api based files in the future. - if not os.path.exists(defaults.var_dir + '/wato/auth/auth.php'): + auth_php = defaults.var_dir + '/wato/auth/auth.php' + if not os.path.exists(auth_php) or os.path.getsize(auth_php) == 0: import wato wato.load_plugins() wato.create_auth_file(wato.load_users())

12 years, 7 months

Check_MK Git: check_mk: WATO: move comment to top of hosts.mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 927dad26b2fdbade44afd26223985437e8daf4b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=927dad26b2fdba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 23:23:00 2012 +0100 WATO: move comment to top of hosts.mk --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7cbd719..1795a19 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -602,6 +602,7 @@ def save_hosts(folder = None): make_nagios_directories(dirname) out = create_user_file(filename, 'w') + out.write("# Written by WATO\n# encoding: utf-8\n\n") hosts = folder.get(".hosts", []) if len(hosts) == 0: @@ -671,7 +672,6 @@ def save_hosts(folder = None): custom_macros[nag_varname] = {} custom_macros[nag_varname][hostname] = nagstring - out.write("# Written by WATO\n# encoding: utf-8\n\n") if len(all_hosts) > 0: out.write("all_hosts += [\n") for entry in all_hosts:

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits