Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64414 discussions

Check_MK Git: check_mk: Fixed .f12 compile helpers

by Mathias Kettner

Module: check_mk Branch: master Commit: 536ef4fbc9271950b544127e683de9fade01eaa5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=536ef4fbc92719… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 17 12:21:16 2013 +0100 Fixed .f12 compile helpers --- agents/.f12 | 3 ++- checks/.f12 | 3 ++- modules/.f12 | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/agents/.f12 b/agents/.f12 index d1f6a26..4c32b21 100644 --- a/agents/.f12 +++ b/agents/.f12 @@ -1,4 +1,5 @@ -sudo cp -r * /omd/versions/default/share/check_mk/agents/ +SITE=${SITE:-$(omd sites --bare | head -n 1)} +sudo cp -r * /omd/sites/$SITE/share/check_mk/agents/ if [ -e /etc/check_mk ] then sudo install -m 644 logwatch.cfg /etc/check_mk/ diff --git a/checks/.f12 b/checks/.f12 index 1aedc3d..959cb4c 100644 --- a/checks/.f12 +++ b/checks/.f12 @@ -1,2 +1,3 @@ -sudo install -m 644 * /omd/versions/default/share/check_mk/checks +SITE=${SITE:-$(omd sites --bare | head -n 1)} +sudo install -m 644 * /omd/sites/$SITE/share/check_mk/checks diff --git a/modules/.f12 b/modules/.f12 index 98c404c..ac2a73c 100644 --- a/modules/.f12 +++ b/modules/.f12 @@ -1 +1,2 @@ -sudo cp -v *.py /omd/versions/default/share/check_mk/modules/ +SITE=${SITE:-$(omd sites --bare | head -n 1)} +sudo cp -v *.py /omd/sites/$SITE/share/check_mk/modules/

11 years, 7 months

Check_MK Git: check_mk: new special agent agent_random for creating random monitoring data

by Mathias Kettner

Module: check_mk Branch: master Commit: 0eb634360333fb53df7a5d13ceffc62e886851d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0eb634360333fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 17 12:25:41 2013 +0100 new special agent agent_random for creating random monitoring data --- ChangeLog | 16 ++++++--- .../ds_random => agents/special/agent_random | 0 checks/agent_random | 37 ++++++++++++++++++++ checks/agent_vsphere | 2 +- modules/check_mk.py | 2 +- web/plugins/wato/datasource_programs.py | 12 ++++++ 6 files changed, 62 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78c2152..30e30e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,20 @@ 1.2.3i1: Core: - * New feature: agents can send data for other hosts - "piggyback". + * Agents can send data for other hosts "piggyback". This is being + used by the vSphere and SAP plugins Event Console: - * New rule feature: automatically delete after action + * New rule feature: automatically delete event after actions Checks & Agents: - * Add: Memory and Swap for Solaris Agent - * Add: Monitoring of ESX (VMware) Hosts + * solaris_mem: New check for memory and swap for Solaris agent + * New special agent agent_vsphere for monitoring ESX (VMware) Hosts + via vSphere interface + * new special agent agent_random for creating random monitoring data + + WATO: + * Configuration of datasource programs via dedicated rules + 1.2.2b3 Checks & Agents: diff --git a/doc/treasures/ds_random b/agents/special/agent_random similarity index 100% rename from doc/treasures/ds_random rename to agents/special/agent_random diff --git a/checks/agent_random b/checks/agent_random new file mode 100644 index 0000000..6f4d0a2 --- /dev/null +++ b/checks/agent_random @@ -0,0 +1,37 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# 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. + +# { +# 'tcp_port': 4711, +# 'secret': 'wef', +# 'infos': ['hostsystem', 'virtualmachine'], +# 'user': 'wefwef' +# } + +def agent_random_arguments(params, hostname, ipaddress): + return hostname + +special_agent_info['random'] = agent_random_arguments diff --git a/checks/agent_vsphere b/checks/agent_vsphere index 5c29668..ac403cc 100644 --- a/checks/agent_vsphere +++ b/checks/agent_vsphere @@ -31,7 +31,7 @@ # 'user': 'wefwef' # } -def agent_vsphere_arguments(params, ipaddress): +def agent_vsphere_arguments(params, hostname, ipaddress): args = '' if "tcp_port" in params: args += " -p %d" % params["tcp_port"] diff --git a/modules/check_mk.py b/modules/check_mk.py index 7a1ff6c..9c95f10 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1002,7 +1002,7 @@ def get_datasource_program(hostname, ipaddress): params = host_extra_conf(hostname, ruleset) if params: # rule match! # Create command line using the special_agent_info - cmd_arguments = special_agent_info[agentname](params[0], ipaddress) + cmd_arguments = special_agent_info[agentname](params[0], hostname, ipaddress) return '%s/agent_%s %s' % ( special_agent_dir, agentname, cmd_arguments) programs = host_extra_conf(hostname, datasource_programs) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 621d5e5..ed0b4d1 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -82,3 +82,15 @@ register_rule(group, match = 'first') +register_rule(group, + "special_agents:random", + FixedValue( + {}, + title = _("Create random monitoring data"), + help = _("By configuring this rule for a host - instead of the normal " + "Check_MK agent random monitoring data will be created."), + totext = _("No configuration neccessary."), + ), + match = 'first') + +

11 years, 7 months

Check_MK Git: check_mk: FIX: list of strings (e.g. host list in rule editor ) didn't work anymore

by Mathias Kettner

Module: check_mk Branch: master Commit: e26c836337ded8c71b7b5f5da14094f829025632 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e26c836337ded8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 16 19:24:09 2013 +0100 FIX: list of strings (e.g. host list in rule editor) didn't work anymore --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 7 +++---- web/htdocs/wato.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2377f3..78c2152 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ Multisite: * FIX: Removed uuid module dependency to be compatible to python < 2.5 * FIX: remove Javascript debug popup from multi-string input fields + * FIX: list of strings (e.g. host list in rule editor) didn't work anymore 1.2.2b2: Checks & Agents: diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index cf9fa15..510b2a0 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1503,9 +1503,8 @@ function valuespec_toggle_dropdownn(oDropdown, divid) { /* This function is called after the table with of input elements has been rendered. It attaches the onFocus-function to the last - of the input elements. The reason is, that ListOfString does not render - the input fields itself. This does so other ValueSpec element - where we have no access to */ + of the input elements. That function will append another + input field as soon as the user focusses the last field. */ function list_of_strings_init(divid) { var oContainer = document.getElementById(divid); var numChilds = oContainer.childNodes.length; @@ -1551,7 +1550,7 @@ function list_of_strings_extend(oInput, j) { var oNewDiv = document.createElement("DIV"); oNewDiv.innerHTML = oDiv.innerHTML.replace('"' + oldName + '"', '"' + newName + '"'); // IE7 does not have quotes in innerHTML, trying to workaround this here. - oNewDiv.innerHTML = oDiv.innerHTML.replace('=' + oldName + ' ', '=' + newName + ' '); + oNewDiv.innerHTML = oNewDiv.innerHTML.replace('=' + oldName + ' ', '=' + newName + ' '); oContainer.appendChild(oNewDiv); /* Move focus function from old last to new last input field */ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6c19801..eb18733 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10159,7 +10159,7 @@ def render_conditions(ruleset, tagspecs, host_list, item_list, varname, folder): if host_list != ALL_HOSTS: condition = None if host_list == []: - condition = _("This rule does <b>never</b> apply!") + condition = _("This rule does <b>never</b> apply due to an empty list of explicit hosts!") elif host_list[-1] != ALL_HOSTS[0]: tt_list = [] for h in host_list:

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 317fa97156d649af0c9291ebf54eaf333af1cb9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=317fa97156d649… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 15 16:02:50 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: fixed crash in iReport plugin on empty livestatus columns

by Andreas Boesl

Module: check_mk Branch: master Commit: 96b70f77aca82c14869d65cee6b8d0ae824b3cbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96b70f77aca82c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 15 16:02:46 2013 +0100 fixed crash in iReport plugin on empty livestatus columns --- .../classes/livestatus/LivestatusDatasource.class | Bin 3658 -> 3565 bytes .../livestatus/LivestatusFieldsProvider.class | Bin 3304 -> 3584 bytes .../livestatus/LivestatusQueryExecuter.class | Bin 5356 -> 7050 bytes .../LivestatusQueryExecuterFactory.class | Bin 847 -> 1117 bytes doc/jasperreports/livestatus.jar | Bin 10341 -> 8488 bytes doc/jasperreports/src/LivestatusDatasource.java | 2 +- .../src/LivestatusFieldsProvider.java | 2 - doc/jasperreports/src/LivestatusQueryExecuter.java | 42 ++++++++++++-------- 8 files changed, 26 insertions(+), 20 deletions(-) diff --git a/doc/jasperreports/classes/livestatus/LivestatusDatasource.class b/doc/jasperreports/classes/livestatus/LivestatusDatasource.class index 9479d59..d1d73b9 100644 Binary files a/doc/jasperreports/classes/livestatus/LivestatusDatasource.class and b/doc/jasperreports/classes/livestatus/LivestatusDatasource.class differ diff --git a/doc/jasperreports/classes/livestatus/LivestatusFieldsProvider.class b/doc/jasperreports/classes/livestatus/LivestatusFieldsProvider.class index 342f9a7..7a5fac7 100644 Binary files a/doc/jasperreports/classes/livestatus/LivestatusFieldsProvider.class and b/doc/jasperreports/classes/livestatus/LivestatusFieldsProvider.class differ diff --git a/doc/jasperreports/classes/livestatus/LivestatusQueryExecuter.class b/doc/jasperreports/classes/livestatus/LivestatusQueryExecuter.class index 120c792..666a83b 100644 Binary files a/doc/jasperreports/classes/livestatus/LivestatusQueryExecuter.class and b/doc/jasperreports/classes/livestatus/LivestatusQueryExecuter.class differ diff --git a/doc/jasperreports/classes/livestatus/LivestatusQueryExecuterFactory.class b/doc/jasperreports/classes/livestatus/LivestatusQueryExecuterFactory.class index f5ffb0d..cfb8bfe 100644 Binary files a/doc/jasperreports/classes/livestatus/LivestatusQueryExecuterFactory.class and b/doc/jasperreports/classes/livestatus/LivestatusQueryExecuterFactory.class differ diff --git a/doc/jasperreports/livestatus.jar b/doc/jasperreports/livestatus.jar index f42084a..f6c48bd 100644 Binary files a/doc/jasperreports/livestatus.jar and b/doc/jasperreports/livestatus.jar differ diff --git a/doc/jasperreports/src/LivestatusDatasource.java b/doc/jasperreports/src/LivestatusDatasource.java index b64c026..5170e43 100644 --- a/doc/jasperreports/src/LivestatusDatasource.java +++ b/doc/jasperreports/src/LivestatusDatasource.java @@ -60,7 +60,7 @@ public class LivestatusDatasource implements JRDataSource, JRRewindableDataSourc if( column < 0 || column >= data.get(0).size() ) { throw new JRException("Unknown Field:" + fieldname); } - + String value = (data.get(m_nIdx)).get(column); // Cast string value according to type if( map_fieldtypes.containsKey(fieldname) ){ diff --git a/doc/jasperreports/src/LivestatusFieldsProvider.java b/doc/jasperreports/src/LivestatusFieldsProvider.java index e85763d..0d5218a 100644 --- a/doc/jasperreports/src/LivestatusFieldsProvider.java +++ b/doc/jasperreports/src/LivestatusFieldsProvider.java @@ -1,14 +1,12 @@ package livestatus; import java.util.ArrayList; -import java.util.Iterator; import java.util.Map; import java.util.Vector; import net.sf.jasperreports.engine.JRDataset; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JRField; -import net.sf.jasperreports.engine.JRValueParameter; import net.sf.jasperreports.engine.design.JRDesignField; import com.jaspersoft.ireport.designer.FieldsProvider; diff --git a/doc/jasperreports/src/LivestatusQueryExecuter.java b/doc/jasperreports/src/LivestatusQueryExecuter.java index d465e28..93279f5 100644 --- a/doc/jasperreports/src/LivestatusQueryExecuter.java +++ b/doc/jasperreports/src/LivestatusQueryExecuter.java @@ -40,17 +40,25 @@ public class LivestatusQueryExecuter implements JRQueryExecuter{ public static void main(String[] args){ try { //new LivestatusQueryExecuter("localhost 6561\nGET services\nColumns: host_name check_command").createDatasource(); - String query = "localhost 6561\n"+ - "GET statehist\n" + - "Columns: host_name service_description\n"+ - "Filter: time >= 1344195720\n"+ - "Filter: time <= 1344195776\n"+ - "Filter: host_name = localhost\n"+ - "Stats: sum duration_ok\n"+ - "Stats: sum duration_warning\n"+ - "Stats: sum duration_critical"; - +// String query = "localhost 6557\n"+ +// "GET statehist\n" + +// "Columns: host_name service_description\n"+ +// "Filter: time >= 1344195720\n"+ +// "Filter: time <= 1344195776\n"+ +// "Filter: host_name = localhost\n"+ +// "Stats: sum duration_ok\n"+ +// "Stats: sum duration_warning\n"+ +// "Stats: sum duration_critical"; + String query = "localhost 6557\n"+ + "GET statehist\n" + + "Columns: service_description time state duration duration_part log_output\n" + +// "Filter: service_description ~ /fshome" + + "Filter: time >= 1351724400"; + + JRDataSource sourci = new LivestatusQueryExecuter(query, null).createDatasource(); + + } catch (JRException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -61,12 +69,13 @@ public class LivestatusQueryExecuter implements JRQueryExecuter{ public LivestatusQueryExecuter(String query, Map parameters) { this.jasper_query = query; this.parameters = new HashMap<String,String>(); - for ( Object key : parameters.keySet() ) { - if ( parameters.get(key) == null ) { - continue; + if (parameters != null) + for ( Object key : parameters.keySet() ) { + if ( parameters.get(key) == null ) { + continue; + } + this.parameters.put(key.toString(), parameters.get(key).toString()); } - this.parameters.put(key.toString(), parameters.get(key).toString()); - } // LivestatusQueryExecuterFactory.logFile(this.jasper_query); // for (String key : this.parameters.keySet()) @@ -161,7 +170,6 @@ public class LivestatusQueryExecuter implements JRQueryExecuter{ // setup socket and in/output streams setupSocket(); - // query the column types and their descriptions String table_name = livestatus_query.split("\n")[0].split(" ")[1]; String desc_query = String.format("GET columns\nFilter: table = %s\nColumnHeaders: off\nResponseHeader: fixed16\nOutputFormat: csv\nSeparators: 10 1 44 124\nKeepAlive: on\n\n", table_name); @@ -219,7 +227,7 @@ public class LivestatusQueryExecuter implements JRQueryExecuter{ if( line == null ) break; ArrayList<String> tmp_array = new ArrayList<String>(); - for( String field : line.split("\001") ){ + for( String field : line.split("\001",-1) ){ tmp_array.add(field); } livestatus_data.add(tmp_array);

11 years, 7 months

Check_MK Git: check_mk: Removed old alert() artifact

by Lars Michelsen

Module: check_mk Branch: master Commit: 7b517a94707974f5347f3a02893a162fea883689 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b517a94707974… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 15:35:55 2013 +0100 Removed old alert() artifact --- web/htdocs/js/search.js | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js index d98ab35..88c35a1 100644 --- a/web/htdocs/js/search.js +++ b/web/htdocs/js/search.js @@ -396,7 +396,6 @@ function mkSearch(e, oField) { var aSearchObjects = mkSearchGetSearchObjects(objType); if (!aSearchObjects || !aSearchObjects[0]) { - // alert("No objects to search for"); return; }

11 years, 7 months

Check_MK Git: check_mk: Removed debug code (commented out print statements)

by Lars Michelsen

Module: check_mk Branch: master Commit: 66235ad11fc4e3c35105776b6ecbeafd89525a0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66235ad11fc4e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 15:39:03 2013 +0100 Removed debug code (commented out print statements) --- checks/h3c_lanswitch_sensors | 1 - checks/vmware_state | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/checks/h3c_lanswitch_sensors b/checks/h3c_lanswitch_sensors index f0f9aea..20b4b76 100644 --- a/checks/h3c_lanswitch_sensors +++ b/checks/h3c_lanswitch_sensors @@ -46,7 +46,6 @@ check_info["h3c_lanswitch_sensors"] = (check_h3c_lanswitch_sensors, "%s", 0, inv def h3c_lanswitch_genitem(endoid): deviceclass, one, id = endoid.split(".") -# print ("%s %s %s" % (deviceclass, one, id)) if deviceclass == "1": hwLswdev = "Fan" else: diff --git a/checks/vmware_state b/checks/vmware_state index 5515c17..2f29a17 100644 --- a/checks/vmware_state +++ b/checks/vmware_state @@ -47,7 +47,6 @@ def inventory_vmware_state(info): inventory = [] for line in info: - # print "LINE IS %s" % line[0] if line[0].startswith("name:"): vm_name = line[0][5:] if line[0].startswith("ipaddr:"):

11 years, 7 months

Check_MK Git: check_mk: Fixed pnp template for apc_symmetra check

by Lars Michelsen

Module: check_mk Branch: master Commit: 3334ca7b34e1ef7b18effb8c854da87bb4231d0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3334ca7b34e1ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 15:09:20 2013 +0100 Fixed pnp template for apc_symmetra check --- ChangeLog | 1 + pnp-templates/check_mk-apc_symmetra.php | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80ec012..e2377f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ Checks & Agents: * FIX: Fixed date parsing code ignoring the seconds value in several checks (ad_replication, cups_queues, heartbeat_crm, mssql_backup, smbios_sel) + * FIX: Fixed pnp template for apc_symmetra check when using multiple rrds Multisite: * FIX: Removed uuid module dependency to be compatible to python < 2.5 diff --git a/pnp-templates/check_mk-apc_symmetra.php b/pnp-templates/check_mk-apc_symmetra.php index 43fe9ed..fe18dc2 100644 --- a/pnp-templates/check_mk-apc_symmetra.php +++ b/pnp-templates/check_mk-apc_symmetra.php @@ -23,7 +23,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -$opt[1] = "--vertical-label \"Celsius\" -l 0 -u 60 --title \"Battery temperature\" "; +$opt[1] = "--vertical-label \"Celsius\" -l 0 -u 60 --title \"Battery temperature\" "; $color = sprintf("ff%02x80", $ACT[2] * 3, $ACT[2] * 2); @@ -44,21 +44,20 @@ $def[2] .= "GPRINT:var2:MAX:\"(Max\: %2.0lf%%,\" "; $def[2] .= "GPRINT:var2:AVERAGE:\"Avg\: %2.0lf%%)\" "; $def[2] .= "HRULE:$CRIT[1]#FF0000:\"Critical\: $CRIT[1]%\" "; -$opt[3] = "--vertical-label \"Ampere\" -l -0.5 --title \"Currencies\" "; -$def[3] = "DEF:batcur=$RRDFILE[1]:$DS[3]:MAX "; -$def[3] .= "DEF:outcur=$RRDFILE[1]:$DS[5]:MAX "; +$opt[3] = "--vertical-label \"Ampere\" -l -0 --title \"Currencies\" "; +$def[3] = "DEF:batcur=$RRDFILE[3]:$DS[3]:MAX "; +$def[3] .= "DEF:outcur=$RRDFILE[5]:$DS[5]:MAX "; $def[3] .= "LINE:batcur#c0c000:\"Battery Currency\:\" "; $def[3] .= "GPRINT:batcur:LAST:\"%2.0lfA\" "; $def[3] .= "LINE:outcur#00c0c0:\"Output Currency\:\" "; $def[3] .= "GPRINT:outcur:LAST:\"%2.0lfA\" "; $opt[4] = "--vertical-label \"Volt\" -l 0 -u 250 --title \"Output Voltage\" "; -$def[4] = "DEF:volt=$RRDFILE[1]:$DS[4]:MIN "; +$def[4] = "DEF:volt=$RRDFILE[4]:$DS[4]:MIN "; $def[4] .= "GPRINT:volt:LAST:\"%2.0lfV\" "; $def[4] .= "LINE1:volt#408040:\"\" "; $def[4] .= "GPRINT:volt:MIN:\"(min\: %2.0lfV,\" "; $def[4] .= "GPRINT:volt:AVERAGE:\"avg\: %2.0lfV)\" "; $def[4] .= "HRULE:$CRIT[4]#FF0000:\"Critical\: $CRIT[4]V\" "; - ?>

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0900

by Lars Michelsen

Module: check_mk Branch: master Commit: ce0393b3b3eb47cd3f4bbfc27c2f781388f56ba1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce0393b3b3eb47… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 14:37:09 2013 +0100 Updated bug entries #0900 --- .bugs/900 | 42 ++++++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.bugs/900 b/.bugs/900 index 5546662..3dc9cfe 100644 --- a/.bugs/900 +++ b/.bugs/900 @@ -1,12 +1,34 @@ -Title: Make multisite optional username from configured environment vars +Title: Check_MK does not handle interval_length != 60 correctly Component: multisite State: open -Date: 2013-01-22 14:49:10 -Targetversion: 1.4.0 -Class: feature - -For example X_FORWARDED_USER or REMOTE_USER should be usable as "user" within -multisite. At the moment we only use req.user, which seem only to be set, when -one really authenticated with the local webserver. -In case of some reverse proxy setups and single sign on environments, this is -not possible. Make it configurable, disabled by default! +Date: 2013-02-15 14:30:58 +Targetversion: future +Class: nastiness + +Reveived via feedback@: + +I'm normally using Nagios with the parameter "interval_length" set to +"1". Despite the warnings in the config file I haven't expected problems +with Nagios at all after adjusting all relevant parameters to reflect +this change - but I'm now able to check services at a higher rate then +only 1 minute. + +But IMHO check_mk does not reflect this change when displaying the +service details. It seems that the values for " Service normal/retry +check interval" are not correctly multiplied with the configured value +for "interval_length" but (hardcoded?) with the default value of "60". +So in my environment all values are too high as by factor 60: + +Example given: + +interval_length = 1 + +check_interval = 10--> check every 10 seconds + +retry_interval = 3--> retry after 3 seconds + +results in display within check_mk GUI: + +Service normal/retry check interval600s/180s + +It seems to be a bug in the display only, checks are running correctly.

11 years, 7 months

Check_MK Git: check_mk: FIX: Fixed date parsing code ignoring the seconds value in several checks ( ad_replication, cups_queues, heartbeat_crm, mssql_backup, smbios_sel)

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ad83fc73146044581b18bd7095a128ac49de4a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ad83fc7314604… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 15:02:31 2013 +0100 FIX: Fixed date parsing code ignoring the seconds value in several checks (ad_replication, cups_queues, heartbeat_crm, mssql_backup, smbios_sel) --- ChangeLog | 4 ++++ checks/ad_replication | 2 +- checks/cups_queues | 2 +- checks/heartbeat_crm | 2 +- checks/mssql_backup | 2 +- checks/smbios_sel | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e314a58..80ec012 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,10 @@ * Add: Monitoring of ESX (VMware) Hosts 1.2.2b3 + Checks & Agents: + * FIX: Fixed date parsing code ignoring the seconds value in several checks + (ad_replication, cups_queues, heartbeat_crm, mssql_backup, smbios_sel) + Multisite: * FIX: Removed uuid module dependency to be compatible to python < 2.5 * FIX: remove Javascript debug popup from multi-string input fields diff --git a/checks/ad_replication b/checks/ad_replication index af0f004..08a24e4 100644 --- a/checks/ad_replication +++ b/checks/ad_replication @@ -44,7 +44,7 @@ def parse_ad_replication_dates(s): if s == '0' or s == '(never)': return None else: - return datetime.datetime(*time.strptime(s, '%Y-%m-%d %H:%M:%S')[0:5]) + return datetime.datetime(*time.strptime(s, '%Y-%m-%d %H:%M:%S')[:6]) def parse_ad_replication_info(info): lines = [] diff --git a/checks/cups_queues b/checks/cups_queues index 24724b0..827b0bf 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -82,7 +82,7 @@ def check_cups_queues(item, params, info): elif line[0].startswith(item+'-'): # This is a queue item count the number of items and check the max age numJobs += 1 - dt = datetime.datetime(*time.strptime(' '.join(line[3:]), '%a %b %d %H:%M:%S %Y')[0:5]) + dt = datetime.datetime(*time.strptime(' '.join(line[3:]), '%a %b %d %H:%M:%S %Y')[:6]) if dt < oldest: oldest = dt diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index 90d3351..032b56c 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -95,7 +95,7 @@ def check_heartbeat_crm(item, params, info): # Check the freshness of the crm_mon output and terminate with CRITICAL # when too old information are found - dt = int(datetime.datetime(*time.strptime(lastUpdated, '%a %b %d %H:%M:%S %Y')[0:5]).strftime("%s")) + dt = int(datetime.datetime(*time.strptime(lastUpdated, '%a %b %d %H:%M:%S %Y')[:6]).strftime("%s")) now = time.time() delta = now - dt if delta > param_max_age: diff --git a/checks/mssql_backup b/checks/mssql_backup index 9b966f0..20de1ed 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -40,7 +40,7 @@ def check_mssql_backup(item, params, info): for line in info: inst, tablespace, last_backup_date, last_backup_time = line if item == inst + ' ' + tablespace: - dt = datetime.datetime(*time.strptime(last_backup_date + ' ' + last_backup_time, '%Y-%m-%d %H:%M:%S')[0:5]) + dt = datetime.datetime(*time.strptime(last_backup_date + ' ' + last_backup_time, '%Y-%m-%d %H:%M:%S')[:6]) state = 0 # Would be so nice to use delta.total_seconds(). But we must care about python < 2.7 diff --git a/checks/smbios_sel b/checks/smbios_sel index 862d8fc..98d36c7 100644 --- a/checks/smbios_sel +++ b/checks/smbios_sel @@ -143,7 +143,7 @@ def check_smbios_sel(_no_item, _no_params, info): sum_status = smbios_sel_msg_types[type][1] # Save the date when the current entry is newer - dt = datetime.datetime(*time.strptime(isodate, "%Y-%m-%d %H:%M:%S")[0:5]) + dt = datetime.datetime(*time.strptime(isodate, "%Y-%m-%d %H:%M:%S")[:6]) if smbios_sel_msg_types[type][3] == None or smbios_sel_msg_types[type][3] < dt: smbios_sel_msg_types[type][3] = dt; else:

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits