Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

by Bastian Kuhn

Module: check_mk Branch: master Commit: ebad9014380b52e42bcdcdbf8782f0cd6aa2fa52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebad9014380b52… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 3 13:37:46 2015 +0100 merge conflict ---

8 years, 9 months

#2860 FIX mssql.vbs: Now really used the configuration file from the agent config directory

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f1c78142afac5e7651b580d5e6d93bd08c9e272 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f1c78142afac5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 3 11:09:03 2015 +0100 #2860 FIX mssql.vbs: Now really used the configuration file from the agent config directory --- .werks/2860 | 10 ++++++++++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2860 b/.werks/2860 new file mode 100644 index 0000000..468f263 --- /dev/null +++ b/.werks/2860 @@ -0,0 +1,10 @@ +Title: mssql.vbs: Now really used the configuration file from the agent config directory +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449137317 + + diff --git a/ChangeLog b/ChangeLog index b357cf7..04b6aae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -134,6 +134,7 @@ * 2806 FIX: oracle_rman: introduced missing WATO, allows configuration of backup age * 2883 FIX: default.php template: fixed id_string while creating default template, e.g. for custom checks * 2859 FIX: Check_MK Discovery/Inventory and HW/SW Inventory services are now always using caches (if available)... + * 2860 FIX: mssql.vbs: Now really used the configuration file from the agent config directory Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 856d06a..a387255 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -41,7 +41,7 @@ Set FSO = CreateObject("Scripting.FileSystemObject") Set SHO = CreateObject("WScript.Shell") hostname = SHO.ExpandEnvironmentStrings("%COMPUTERNAME%") -cfg_dir = "C:\check_mk_agent" 'SHO.ExpandEnvironmentStrings("%MK_CONFDIR%") +cfg_dir = SHO.ExpandEnvironmentStrings("%MK_CONFDIR%") output = "" Sub addOutput(text)

8 years, 9 months

The Check_MK services "Check_MK Discovery", "Check_MK Inventory" and " Check_MK HW/SW Inventory" need

by Lars Michelsen

Module: check_mk Branch: master Commit: e218b707d0feb15ac65e73471e66cd73fadfc6bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e218b707d0feb1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 3 11:07:02 2015 +0100 The Check_MK services "Check_MK Discovery", "Check_MK Inventory" and "Check_MK HW/SW Inventory" need data from the Check_MK agent on agent based hosts. These check were contacting the agent on their own on every execution which could lead to logwatch messages not being processed by the agent because they were already processed by the discovery/inventory checks. We now set these checks to use the agent cache (if available and if recent enough). This makes the checks only contact the agent when neccessary. This should never happen when the host is being monitored regularly because the regular monitoring ensures that the cache is available and up-to-date. Conflicts: ChangeLog modules/check_mk.py --- .werks/2859 | 17 +++++++++++++++++ ChangeLog | 3 ++- checks/check_cmk_inv | 2 +- modules/automation.py | 4 ++-- modules/check_mk.py | 26 +++++++++++++++++++++++++- modules/check_mk_base.py | 3 +-- modules/discovery.py | 6 ++---- modules/inventory.py | 3 +-- 8 files changed, 51 insertions(+), 13 deletions(-) diff --git a/.werks/2859 b/.werks/2859 new file mode 100644 index 0000000..cf3d7e2 --- /dev/null +++ b/.werks/2859 @@ -0,0 +1,17 @@ +Title: Check_MK Discovery/Inventory and HW/SW Inventory services are now always using caches (if available) +Level: 2 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449135634 + +The Check_MK services "Check_MK Discovery", "Check_MK Inventory" and "Check_MK HW/SW Inventory" need +data from the Check_MK agent on agent based hosts. These check were contacting the agent on their own +on every execution which could lead to logwatch messages not being processed by the agent because they +were already processed by the discovery/inventory checks. + +We now set these checks to use the agent cache (if available and if recent enough). This makes the +checks only contact the agent when neccessary. This should never happen when the host is being monitored +regularly because the regular monitoring ensures that the cache is available and up-to-date. diff --git a/ChangeLog b/ChangeLog index 5128363..b357cf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,8 +52,8 @@ * 2803 netapp_api_volumes: clustered volumes now longer show the current node name in the service description... NOTE: Please refer to the migration notes! * 2780 cisco_vss: detect this check on newer (15.1) devices - * 2866 ewon: Added support for monitoring Wagner OxyReduct devices with their data exposed through an ewon router... * 2874 netstat_an.bat: Restrict output of connections to TCP, safes performance + * 2866 ewon: Added support for monitoring Wagner OxyReduct devices with their data exposed through an ewon router... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... @@ -133,6 +133,7 @@ * 2876 FIX: mk_logwatch: Avoid parsing lines that are currently being written by application... * 2806 FIX: oracle_rman: introduced missing WATO, allows configuration of backup age * 2883 FIX: default.php template: fixed id_string while creating default template, e.g. for custom checks + * 2859 FIX: Check_MK Discovery/Inventory and HW/SW Inventory services are now always using caches (if available)... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/check_cmk_inv b/checks/check_cmk_inv index 642516b..b2e11a7 100644 --- a/checks/check_cmk_inv +++ b/checks/check_cmk_inv @@ -31,7 +31,7 @@ def check_cmk_inv(params): return "--hw-changes=%d --sw-changes=%d" % (params.get("hw_changes", 0), params.get("sw_changes", 0)) active_check_info['cmk_inv'] = { - "command_line" : 'cmk $ARG1$ --inventory-as-check $HOSTNAME$', + "command_line" : 'cmk $ARG1$ --cache --inventory-as-check $HOSTNAME$', "argument_function" : check_cmk_inv, "service_description" : lambda x: "Check_MK HW/SW Inventory", "has_perfdata" : False, diff --git a/modules/automation.py b/modules/automation.py index b11b83c..d43c575 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -180,8 +180,8 @@ def automation_try_discovery(args): # TODO: Remove this unlucky option opt_use_cachefile. At least do not # handle this option so deep in the code. It should only be handled # by top-level functions. - global opt_use_cachefile, check_max_cachefile_age - opt_use_cachefile = use_caches + set_use_cachefile(use_caches) + global check_max_cachefile_age if use_caches: check_max_cachefile_age = inventory_max_cachefile_age hostname = args[0] diff --git a/modules/check_mk.py b/modules/check_mk.py index f5fc03e..d39a585 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1345,10 +1345,26 @@ def agent_target_version(hostname): return spec # return the whole spec in case of an "at least version" config +# FIXME TODO: Cleanup the whole caching crap +orig_opt_use_cachefile = None orig_check_max_cachefile_age = None orig_cluster_max_cachefile_age = None orig_inventory_max_cachefile_age = None + +def set_use_cachefile(state=True): + global opt_use_cachefile, orig_opt_use_cachefile + orig_opt_use_cachefile = opt_use_cachefile + opt_use_cachefile = state + + +def restore_use_cachefile(): + global opt_use_cachefile, orig_opt_use_cachefile + if orig_opt_use_cachefile != None: + opt_use_cachefile = orig_opt_use_cachefile + orig_opt_use_cachefile = None + + # TODO: Why 1000000000? Can't we really clean this up to a global variable which can # be toggled to enforce the cache usage (if available). This way we would not need # to store the original values of the different caches and modify them etc. @@ -1369,11 +1385,17 @@ def enforce_using_agent_cache(): def restore_original_agent_caching_usage(): global check_max_cachefile_age, cluster_max_cachefile_age, inventory_max_cachefile_age + global orig_check_max_cachefile_age, orig_cluster_max_cachefile_age, \ + orig_inventory_max_cachefile_age + if orig_check_max_cachefile_age != None: check_max_cachefile_age = orig_check_max_cachefile_age cluster_max_cachefile_age = orig_cluster_max_cachefile_age inventory_max_cachefile_age = orig_inventory_max_cachefile_age + orig_check_max_cachefile_age = None + orig_cluster_max_cachefile_age = None + orig_inventory_max_cachefile_age = None #. # .--SNMP----------------------------------------------------------------. @@ -4536,6 +4558,7 @@ def do_check_keepalive(): args = cmdline.split() if '--cache' in args: args.remove('--cache') + set_use_cachefile() enforce_using_agent_cache() # FIXME: remove obsolete check-inventory @@ -4599,6 +4622,7 @@ def do_check_keepalive(): sys.stderr.flush() cleanup_globals() # Prepare for next check + restore_use_cachefile() restore_original_agent_caching_usage() # Check if all global variables are clean, but only in verbose logging mode @@ -5017,7 +5041,7 @@ for o,a in opts: sys.stderr.write("Please use the option -c separated by the other options.\n") sys.exit(1) elif o == '--cache': - opt_use_cachefile = True + set_use_cachefile() enforce_using_agent_cache() elif o == '--no-tcp': opt_no_tcp = True diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index fa86075..e25eae0 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -341,8 +341,7 @@ def get_host_info(hostname, ipaddress, checkname, max_cachefile_age=None, ignore info = [] at_least_one_without_exception = False exception_texts = [] - global opt_use_cachefile - opt_use_cachefile = True + set_use_cachefile() is_snmp_error = False for node in nodes: # If an error with the agent occurs, we still can (and must) diff --git a/modules/discovery.py b/modules/discovery.py index a5b729d..fc6e011 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -978,9 +978,7 @@ def get_check_preview(hostname, use_caches, do_snmp_scan, on_error): # Sorry. The whole caching stuff is the most horrible hack in # whole Check_MK. Nobody dares to clean it up, YET. But that # day is getting nearer... - global opt_use_cachefile - old_opt_use_cachefile = opt_use_cachefile - opt_use_cachefile = True + set_use_cachefile() opt_dont_submit = True # hack for get_realhost_info, avoid skipping because of check interval if check_type not in check_info: @@ -1013,7 +1011,7 @@ def get_check_preview(hostname, use_caches, do_snmp_scan, on_error): else: tcp_error = output - opt_use_cachefile = old_opt_use_cachefile + restore_use_cachefile() global g_check_type, g_checked_item g_check_type = check_type diff --git a/modules/inventory.py b/modules/inventory.py index ccada05..d6ded22 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -157,8 +157,7 @@ def do_inv(hostnames): # No hosts specified: do all hosts and force caching if hostnames == None: hostnames = all_active_realhosts() - global opt_use_cachefile - opt_use_cachefile = True + set_use_cachefile() errors = [] for hostname in hostnames:

8 years, 9 months

Removed dead code.

by Sven Panne

Module: check_mk Branch: master Commit: 8a9bd5e64c292f82042195d3f722a18ad5516de3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a9bd5e64c292f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 3 10:09:43 2015 +0100 Removed dead code. See http://blog.codinghorror.com/code-smells/ ;-) Note that there is still some code which is dead in livestatus, but actually used in cmc => design problem, solved later. At least cmc contains no zombies anymore now. --- livestatus/src/LogCache.cc | 11 --------- livestatus/src/LogCache.h | 1 - livestatus/src/Query.cc | 16 ------------- livestatus/src/Query.h | 1 - livestatus/src/TableStateHistory.cc | 45 ----------------------------------- livestatus/src/TableStateHistory.h | 1 - livestatus/src/module.c | 2 ++ 7 files changed, 2 insertions(+), 75 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index c433957..68f3189 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -183,17 +183,6 @@ void LogCache::scanLogfile(char *path, bool watch) delete logfile; } -void LogCache::dumpLogfiles() -{ - for (_logfiles_t::iterator it = _logfiles.begin(); - it != _logfiles.end(); - ++it) - { - Logfile *log = it->second; - debug("LOG %s from %d, %u messages, classes: 0x%04x", log->path(), log->since(), log->numEntries(), log->classesRead()); - } -} - /* This method is called each time a log message is loaded into memory. If the number of messages loaded in memory is to large, memory will be freed by flushing logfiles diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index 75505f5..0aa51d0 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -64,7 +64,6 @@ public: private: void scanLogfile(char *path, bool watch); _logfiles_t::iterator findLogfileStartingBefore(time_t); - void dumpLogfiles(); }; #endif // LogCache_h diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index adb49c5..57b5896 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -1096,22 +1096,6 @@ void Query::outputUnicodeEscape(unsigned value) _output->addBuffer(buf, 6); } -void Query::outputHostService(const char *host_name, const char *service_description) -{ - if (_output_format == OUTPUT_FORMAT_CSV) { - outputString(host_name); - _output->addBuffer(_host_service_separator.c_str(), _host_service_separator.size()); - outputString(service_description); - } - else { - _output->addChar('['); - outputString(host_name); - _output->addChar(','); - outputString(service_description); - _output->addChar(']'); - } -} - void Query::outputBlob(const char *buffer, int size) { if (_output_format != OUTPUT_FORMAT_CSV) diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 6936584..16b4201 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -120,7 +120,6 @@ public: void outputUnicodeEscape(unsigned value); void outputString(const char *, int size=-1); void outputBlob(const char *buffer, int size); - void outputHostService(const char *, const char *); void outputBeginList(); void outputListSeparator(); void outputEndList(); diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 12a6bc4..4c47ca6 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -23,8 +23,6 @@ // Boston, MA 02110-1301 USA. #include "TableStateHistory.h" -#include <stdarg.h> -#include <stdio.h> #include <stdlib.h> #include <string.h> #include <syslog.h> @@ -70,44 +68,6 @@ using std::string; int g_disable_statehist_filtering = 0; extern Store *g_store; -// Debugging logging is hard if debug messages are logged themselves... -void debug_statehist(const char *loginfo, ...) -{ - FILE *x = fopen("/tmp/livestatus_state.log", "a+"); - va_list ap; - va_start(ap, loginfo); - vfprintf(x, loginfo, ap); - fputc('\n', x); - va_end(ap); - fclose(x); -} - - -// Debug output of HostServiceState struct -void log_hst(HostServiceState *state) -{ - debug_statehist("\n++++++++++++++\nSTATE INFO"); - if (state->_host_name) - debug_statehist("host name %s", state->_host_name); - if (state->_service_description) - debug_statehist("svc description %s", state->_service_description); - - debug_statehist("time %d", state->_time); - debug_statehist("state %d", state->_state); - if (state->_log_output) - debug_statehist("check_output %s", state->_log_output); - if (state->_debug_info) - debug_statehist("debug_info %s", state->_debug_info); - if (state->_notification_period) - debug_statehist("notification period %s", state->_notification_period); - if (state->_service_period) - debug_statehist("service period %s", state->_service_period); - debug_statehist("from %d", state->_from); - debug_statehist("until %d", state->_until); - debug_statehist("duration %d", state->_duration); -} - - #ifndef CMC const char *getCustomVariable(customvariablesmember *cvm, const char *name) { @@ -647,11 +607,6 @@ void TableStateHistory::answerQuery(Query *query) object_blacklist.clear(); } -bool TableStateHistory::objectFilteredOut(Query *, void *) -{ - return false; -} - int TableStateHistory::updateHostServiceState(Query *query, const LogEntry *entry, HostServiceState *hs_state, const bool only_update){ int state_changed = 1; diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index 74850b8..5f93bef 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -77,7 +77,6 @@ private: LogEntry* getPreviousLogentry(); LogEntry* getNextLogentry(); void process(Query *query, HostServiceState *hs_state); - bool objectFilteredOut(Query *, void *entry); }; #endif // TableStateHistory_h diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 89574ad..518cde8 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -775,6 +775,7 @@ void omd_advertize() /* this function gets called when the module is loaded by the event broker */ +/* cppcheck-suppress unusedFunction */ int nebmodule_init(int flags __attribute__ ((__unused__)), char *args, void *handle) { g_nagios_handle = handle; @@ -814,6 +815,7 @@ int nebmodule_init(int flags __attribute__ ((__unused__)), char *args, void *han } +/* cppcheck-suppress unusedFunction */ int nebmodule_deinit(int flags __attribute__ ((__unused__)), int reason __attribute__ ((__unused__))) { logger(LG_INFO, "deinitializing");

8 years, 9 months

Added note about the parse_ps resulting format

by Lars Michelsen

Module: check_mk Branch: master Commit: 2c5619034c63d3a769e294fc654fbbf16dde55a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c5619034c63d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 3 09:55:26 2015 +0100 Added note about the parse_ps resulting format --- checks/ps | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/checks/ps b/checks/ps index e7bb97d..78da52d 100644 --- a/checks/ps +++ b/checks/ps @@ -177,6 +177,13 @@ def ps_parse_process_entries(parsed): return parsed +# Produces a list of lists where each sub list is built as follows: +# [ +# [None, (u'root', u'35156', u'4372', u'00:00:05/2-14:14:49', u'1'), u'/sbin/init'], +# ] +# First element: The node the data comes from in a cluster or None +# Second element: The process info tuple (see ps.include: check_ps_common() for details on the elements) +# Third element: The process command line def parse_ps(info): cpu_cores, parsed = ps_merge_wmic_info(info)

8 years, 9 months

Fixed typo

by Bastian Kuhn

Module: check_mk Branch: master Commit: 140a13084c2a47b1bcb824a63e87ce86f46eaa2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=140a13084c2a47… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 2 17:24:58 2015 +0100 Fixed typo --- web/plugins/wato/active_checks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index c64e2be..8f798f7 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -996,8 +996,8 @@ register_rule(group, ), ( "cert_host", TextAscii( - title = _("Check Cerficate of different IP / DNS Name"), - help = _("For each SSL cerficate on a host, a different IP address is needed. " + title = _("Check Certificate of different IP / DNS Name"), + help = _("For each SSL certificate on a host, a different IP address is needed. " "Here, you can specify the address if it differs from the " "address from the host primary address."), ),

8 years, 9 months

#2866 ewon: Added support for monitoring Wagner OxyReduct devices with their data exposed through an ewon router

by Sebastian Herbord

Module: check_mk Branch: master Commit: f1f593521634b3cbebd9ffb87de244ec89c27071 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1f593521634b3… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Dec 2 16:52:00 2015 +0100 #2866 ewon: Added support for monitoring Wagner OxyReduct devices with their data exposed through an ewon router The Wagner OxyReduct device (or chamber) can't be monitored directly but via the eWON 2005CD router their measurements can be exposed via snmp. This check monitors the OxyReduct through this channel and lays the groundwork for monitoring further devices exposed through the same router. --- .werks/2866 | 11 ++ ChangeLog | 1 + checkman/ewon | 26 ++++ checks/ewon | 237 ++++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 6 + web/plugins/wato/check_parameters.py | 19 +++ 6 files changed, 300 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f1f5935216…

8 years, 9 months

#2883 FIX default.php template: fixed id_string while creating default template, e.g. for custom checks

by Simon Betz

Module: check_mk Branch: master Commit: 76909d199f7d138bab74c8a987ed4fa1b3a26534 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76909d199f7d13… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 2 16:34:35 2015 +0100 #2883 FIX default.php template: fixed id_string while creating default template, e.g. for custom checks --- .werks/2883 | 9 +++++++++ ChangeLog | 1 + pnp-templates/default.php | 11 ++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/2883 b/.werks/2883 new file mode 100644 index 0000000..ffeedad --- /dev/null +++ b/.werks/2883 @@ -0,0 +1,9 @@ +Title: default.php template: fixed id_string while creating default template, e.g. for custom checks +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449070264 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 4011a4d..16a20d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ NOTE: Please refer to the migration notes! * 2876 FIX: mk_logwatch: Avoid parsing lines that are currently being written by application... * 2806 FIX: oracle_rman: introduced missing WATO, allows configuration of backup age + * 2883 FIX: default.php template: fixed id_string while creating default template, e.g. for custom checks Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/pnp-templates/default.php b/pnp-templates/default.php index 9151127..fdfb160 100644 --- a/pnp-templates/default.php +++ b/pnp-templates/default.php @@ -35,7 +35,16 @@ foreach ($NAME as $i => $n) { $perf_vars[] = $n; } sort($perf_vars); -$id_string = $NAGIOS_CHECK_COMMAND . ":" . implode(",", $perf_vars); +# We have to separate the check command name from the rest on +# the right place, i.d. the first "!", to prevent errors while +# creating the default template, e.g. for the custom check +# +# check-mk-custom!$USER2$/check_mssql_health_new --server $HOSTNAME$ --username=$USER6$ +# --password=$USER5$ --mode database-free --name filr --warning 20: --critical 10: --commit +# +# If no "!" exists then $CHECK_COMMAND = $NAGIOS_CHECK_COMMAND +$CHECK_COMMAND = explode("!", $NAGIOS_CHECK_COMMAND)[0]; +$id_string = $CHECK_COMMAND . ":" . implode(",", $perf_vars); # Get current state of previously cached template data for this ID $template_cache_path = $template_cache_dir . "/" . md5($id_string);

8 years, 9 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 7a04ec97f535f616511edcb1aed388cfebfb623a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a04ec97f535f6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 2 16:30:35 2015 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 538e144..a8eeb4f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2883 +2893

8 years, 9 months

#2806 FIX oracle_rman: introduced missing WATO, allows configuration of backup age

by Andreas Boesl

Module: check_mk Branch: master Commit: 712aae532ee4e32e892425031ad0dcd45fb87618 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=712aae532ee4e3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 2 16:29:13 2015 +0100 #2806 FIX oracle_rman: introduced missing WATO, allows configuration of backup age --- .werks/2806 | 9 +++++++++ ChangeLog | 1 + checkman/oracle_rman | 13 +++++++------ web/plugins/wato/check_parameters.py | 24 ++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/.werks/2806 b/.werks/2806 new file mode 100644 index 0000000..766b493 --- /dev/null +++ b/.werks/2806 @@ -0,0 +1,9 @@ +Title: oracle_rman: introduced missing WATO, allows configuration of backup age +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449070107 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index af6f820..4011a4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -130,6 +130,7 @@ * 2858 FIX: hp_proliant_da_phydrv: Adding disk controller to check items... NOTE: Please refer to the migration notes! * 2876 FIX: mk_logwatch: Avoid parsing lines that are currently being written by application... + * 2806 FIX: oracle_rman: introduced missing WATO, allows configuration of backup age Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checkman/oracle_rman b/checkman/oracle_rman index 5e5d1bb..b0d8fac 100644 --- a/checkman/oracle_rman +++ b/checkman/oracle_rman @@ -41,12 +41,6 @@ item: perfdata: One value: The time since the last successfull backup. -[parameters] -parameters (dict): - - "age": (int, int) - Maximum time in seconds for warn and crit - for the last RMAN Backup. - inventory: One separate check for each DB_INCR, DB_FULL, ARCHIVELOG and CONTROLFILE for each database. @@ -54,3 +48,10 @@ inventory: checkgroup_parameters['oracle_rman'] = [ ( {'backup_age': (10800, 21600)} , [], ALL_HOSTS, ALL_SERVICES ), + +[parameters] +parameters (dict): + + "backup_age": (int, int) - Maximum time in seconds for warn and crit + for the last RMAN Backup. + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b0f40f0..6f872a2 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4881,6 +4881,30 @@ register_check_parameters( register_check_parameters( subgroup_applications, + "oracle_rman", + _("Oracle RMAN Backups"), + Dictionary( + elements = [ + ("levels", + Tuple( + title = _("Maximum Age for RMAN backups"), + elements = [ + Age(title = _("warning if older than"), default_value = 1800), + Age(title = _("critical if older than"), default_value = 3600), + ] + ) + ) + ] + ), + TextAscii( + title = _("Database SID"), + size = 12, + allow_empty = False), + "dict", +) + +register_check_parameters( + subgroup_applications, "oracle_recovery_status", _("Oracle Recovery Status"), Dictionary(

8 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015