Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

4096 avaya_chassis_card, avaya_chassis_ps, avaya_chassis_temp:

by Konstantin Büttner

New checks for Avaya devices Message-ID: <58381293.t8D5vMic4NNX61aN%kb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: f3a47c9806505ca0801fd353f57b89a07f298dab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3a47c9806505c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 25 11:28:32 2016 +0100 4096 avaya_chassis_card, avaya_chassis_ps, avaya_chassis_temp: New checks for Avaya devices These checks monitor the operational state of passport modules and power supplies for Avaya devices as well as the chassis temperature. --- .werks/4096 | 10 ++++++++ ChangeLog | 1 + checkman/avaya_chassis_card | 15 ++++++++++++ checkman/avaya_chassis_ps | 15 ++++++++++++ checkman/avaya_chassis_temp | 14 +++++++++++ checks/avaya_chassis_card | 57 ++++++++++++++++++++++++++++++++++++++++++ checks/avaya_chassis_ps | 60 +++++++++++++++++++++++++++++++++++++++++++++ checks/avaya_chassis_temp | 52 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 224 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f3a47c9806…

7 years, 10 months

4093 FIX oracle_tablespaces: Werk 3907 broke the space calculation

by Simon Betz

Module: check_mk Branch: master Commit: 3e1144e9dcbec0c09fab1186c23e48d7772bb9e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e1144e9dcbec0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Nov 25 10:49:02 2016 +0100 4093 FIX oracle_tablespaces: Werk 3907 broke the space calculation The calculation of free and used space in Oracle is very complicated when autoextend is used due to some special situations. --- .werks/4093 | 11 +++++++++++ ChangeLog | 1 + checks/oracle_tablespaces | 16 ++++++---------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.werks/4093 b/.werks/4093 new file mode 100644 index 0000000..090c6f0 --- /dev/null +++ b/.werks/4093 @@ -0,0 +1,11 @@ +Title: oracle_tablespaces: Werk 3907 broke the space calculation +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1480067305 + +The calculation of free and used space in Oracle is very complicated +when autoextend is used due to some special situations. diff --git a/ChangeLog b/ChangeLog index d9711d2..cc8ecf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 4091 FIX: oracle_tablespace: Werk 3907 broke the detection of UNDO- and TEMP-Tablespaces * 4069 FIX: cmciii.phase: Fixed broken check with some devices... * 4092 FIX: if.include: fixed wrong calculated number of interfaces which are up in case of interface groups + * 4093 FIX: oracle_tablespaces: Werk 3907 broke the space calculation... Multisite: * 4070 Added a painter for the service check period diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index db179a1..c0ee1b5 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -270,7 +270,8 @@ def check_oracle_tablespaces(item, params, parsed): if df_size > df_max_size: max_size += df_size - free_extension = df_size - df_max_size # free extension space + # current file size > df_max_size => no more extents available + free_extension = 0 else: max_size += df_max_size free_extension = df_max_size - df_size # free extension space @@ -278,20 +279,15 @@ def check_oracle_tablespaces(item, params, parsed): if incsize == datafile["block_size"]: uses_default_increment = True - #incs, rest = divmod(free_extension, incsize) - #if rest: - # # ??? Was ist, wenn es nicht genau aufgeht und ein weiteres - # # increment max_size überschreiten würde? Das geht ja wohl - # # nicht oder?? - # # incs += 1 ### Dann würde max_size überschritten! incs = free_extension / incsize num_increments += incs increment_size += incsize * incs if db_version >= 11: - # The size of next extent in datafile is ignored when remaining - # free space is > then next extend. Oracle uses all space up to the maximum! - free_space += df_max_size - df_size + # Newer versions of Oracle uses every time the remaining space of the + # datafile. There is no need for calculation of remaing space with + # next extend anymore! + free_space += free_extension + df_free_space else: # The free space in this table is the current free space plus # the additional space that can be gathered by using all available

7 years, 10 months

Cleaned up some shell involving subprocess calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 100b1b58ef4a299fe90f67b2ed530c6beafc5de0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=100b1b58ef4a29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 24 21:38:03 2016 +0100 Cleaned up some shell involving subprocess calls --- web/htdocs/watolib.py | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index dd78315..79eea4d 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -43,6 +43,7 @@ # '----------------------------------------------------------------------' import os, shutil, subprocess, base64, pickle, pwd +import glob import traceback import ast import multiprocessing @@ -5830,18 +5831,13 @@ def unlock_exclusive(): def git_command(args): - encoded_args = " ".join([ a.encode("utf-8") for a in args ]) - command = "cd '%s' && git %s 2>&1" % (cmk.paths.default_config_dir, encoded_args) - p = os.popen(command) - output = p.read() - status = p.close() - if status != None: + command = [ "git" ] + [ a.encode("utf-8") for a in args ] + p = subprocess.Popen(command, cwd=cmk.paths.default_config_dir, + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + status = p.wait() + if status != 0: raise MKGeneralException(_("Error executing GIT command <tt>%s</tt>:<br><br>%s") % - (command.decode('utf-8'), output.replace("\n", "<br>\n"))) - - -def shell_quote(s): - return "'" + s.replace("'", "'\"'\"'") + "'" + (subprocess.list2cmdline(command), p.stdout.read().replace("\n", "<br>\n"))) def prepare_git_commit(): @@ -5850,7 +5846,7 @@ def prepare_git_commit(): def do_git_commit(): - author = shell_quote("%s <%s>" % (config.user.id, config.user.email)) + author = "%s <%s>" % (config.user.id, config.user.email) git_dir = cmk.paths.default_config_dir + "/.git" if not os.path.exists(git_dir): git_command(["init"]) @@ -5864,7 +5860,7 @@ def do_git_commit(): write_gitignore_files() git_add_files() git_command(["commit", "--untracked-files=no", "--author", author, "-m", - shell_quote(_("Initialized GIT for Check_MK"))]) + _("Initialized GIT for Check_MK")]) if git_has_pending_changes(): write_gitignore_files() @@ -5877,16 +5873,18 @@ def do_git_commit(): if not message: message = _("Unknown configuration change") - git_command(["commit", "--author", author, "-m", shell_quote(message)]) + git_command(["commit", "--author", author, "-m", message]) def git_add_files(): - git_command(["add", "--all", ".gitignore", "*.d/wato"]) + git_command(["add", "--all", ".gitignore"] + + glob.glob("%s/*.d/wato" % cmk.paths.default_config_dir)) def git_has_pending_changes(): - return os.popen("cd '%s' && git status --porcelain" % - cmk.paths.default_config_dir).read().strip() + return subprocess.Popen(["git", "status", "--porcelain"], + cwd=cmk.paths.default_config_dir, + stdout=subprocess.PIPE).stdout.read() != "" # Make sure that .gitignore-files are present and uptodate. Only files below the "wato" directories

7 years, 10 months

bandit scanner: Do not care about the scripts/ directory

by Lars Michelsen

Module: check_mk Branch: master Commit: 852c7d1d1b1f5bc85e35bbbce489c0ccadc71c89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=852c7d1d1b1f5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 24 21:16:08 2016 +0100 bandit scanner: Do not care about the scripts/ directory --- bandit.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/bandit.yaml b/bandit.yaml index b655c6b..986976a 100644 --- a/bandit.yaml +++ b/bandit.yaml @@ -5,6 +5,7 @@ exclude_dirs: - '/tests/' - '/doc/treasures/localchecks' - '/doc/treasures/notifications' + - '/scripts' ### Bandit config file generated from: # '/usr/local/bin/bandit-config-generator -o ../bandit.yaml'

7 years, 10 months

Tests: Use apache reload instead of restart during site creation

by Lars Michelsen

Module: check_mk Branch: master Commit: b9142cc443236bba62ff433bb7882be6efa01490 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9142cc443236b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 24 20:48:40 2016 +0100 Tests: Use apache reload instead of restart during site creation --- tests/testlib/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d479d74..d03fb05 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -220,7 +220,8 @@ class Site(object): raise Exception("The site %s already exists." % self.id) if not self.exists(): - assert omd(["-V", self.version.version_directory(), "create", self.id]) == 0 + assert omd(["-V", self.version.version_directory(), "create", + "--apache-reload", self.id]) == 0 assert os.path.exists("/omd/sites/%s" % self.id) if self.update_with_git:

7 years, 10 months

Moved backup_paths declaration out of configuration handling (

by Lars Michelsen

is no config option) Message-ID: <5837155a.cyW2cmSbwNxxI5+2%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 0474436b14ec10f06a2b8e0248dba63b1670429d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0474436b14ec10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 24 17:17:19 2016 +0100 Moved backup_paths declaration out of configuration handling (is no config option) --- modules/check_mk.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 5689bb9..7df2e00 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2547,13 +2547,27 @@ def pack_autochecks(): # | implemented here. | # '----------------------------------------------------------------------' + +def backup_paths(): + return [ + # tarname path canonical name description is_dir owned_by_nagios www_group + ('check_mk_configfile', cmk.paths.main_config_file, "main.mk", "Main configuration file", False, False, False ), + ('final_mk', cmk.paths.final_config_file, "final.mk", "Final configuration file final.mk", False, False, False ), + ('check_mk_configdir', cmk.paths.check_mk_config_dir, "", "Configuration sub files", True, False, False ), + ('autochecksdir', cmk.paths.autochecks_dir, "", "Automatically inventorized checks", True, False, False ), + ('counters_directory', cmk.paths.counters_dir, "", "Performance counters", True, True, False ), + ('tcp_cache_dir', cmk.paths.tcp_cache_dir, "", "Agent cache", True, True, False ), + ('logwatch_dir', cmk.paths.logwatch_dir, "", "Logwatch", True, True, True ), + ] + + def do_backup(tarname): import tarfile console.verbose("Creating backup file '%s'...\n", tarname) tar = tarfile.open(tarname, "w:gz") for name, path, canonical_name, descr, is_dir, \ - _unused_owned_by_nagios, _unused_group_www in backup_paths: + _unused_owned_by_nagios, _unused_group_www in backup_paths(): absdir = os.path.abspath(path) if os.path.exists(path): @@ -2593,7 +2607,7 @@ def do_restore(tarname): raise MKGeneralException("Unable to restore: File does not exist") # TODO: Cleanup owned_by_nagios and group_www handling - not needed in pure OMD env anymore - for name, path, canonical_name, descr, is_dir, owned_by_nagios, group_www in backup_paths: + for name, path, canonical_name, descr, is_dir, owned_by_nagios, group_www in backup_paths(): absdir = os.path.abspath(path) if is_dir: basedir = absdir @@ -4318,19 +4332,6 @@ def read_config_files(with_conf_d=True, validate_hosts=True): sys.stderr.write("If you use own helper variables, please prefix them with _.\n") sys.exit(1) - # Prepare information for --backup and --restore - global backup_paths - backup_paths = [ - # tarname path canonical name description is_dir owned_by_nagios www_group - ('check_mk_configfile', cmk.paths.main_config_file, "main.mk", "Main configuration file", False, False, False ), - ('final_mk', cmk.paths.final_config_file, "final.mk", "Final configuration file final.mk", False, False, False ), - ('check_mk_configdir', cmk.paths.check_mk_config_dir, "", "Configuration sub files", True, False, False ), - ('autochecksdir', cmk.paths.autochecks_dir, "", "Automatically inventorized checks", True, False, False ), - ('counters_directory', cmk.paths.counters_dir, "", "Performance counters", True, True, False ), - ('tcp_cache_dir', cmk.paths.tcp_cache_dir, "", "Agent cache", True, True, False ), - ('logwatch_dir', cmk.paths.logwatch_dir, "", "Logwatch", True, True, True ), - ] - def initialize_check_caches(): single_host_checks = cmk_base.config_cache.get_dict("single_host_checks")

7 years, 10 months

Moved hosttag initialization call to more abstract helper function

by Lars Michelsen

Module: check_mk Branch: master Commit: a034064b5d72abca33798eefe8edb9c60954b811 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a034064b5d72ab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 24 17:29:11 2016 +0100 Moved hosttag initialization call to more abstract helper function --- modules/check_mk.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 7df2e00..ed2ba6a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4253,7 +4253,7 @@ def read_config_files(with_conf_d=True, validate_hosts=True): else: interactive_abort("Cannot read in configuration file %s: %s" % (_f, e)) - collect_hosttags() + initialize_config_caches() global service_service_levels, host_service_levels service_service_levels = extra_service_conf.get("_ec_sl", []) @@ -4333,6 +4333,10 @@ def read_config_files(with_conf_d=True, validate_hosts=True): sys.exit(1) +def initialize_config_caches(): + collect_hosttags() + + def initialize_check_caches(): single_host_checks = cmk_base.config_cache.get_dict("single_host_checks") multi_host_checks = cmk_base.config_cache.get_list("multi_host_checks")

7 years, 10 months

Moved cap package format handling to cmk_base module

by Lars Michelsen

Module: check_mk Branch: master Commit: 841be7b98c74336d53ba2e8e0a6de3ae0a6fdb69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=841be7b98c7433… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 22 20:33:54 2016 +0100 Moved cap package format handling to cmk_base module --- cmk_base/cee | 1 + modules/check_mk.py | 8 +++++--- tests/conftest.py | 1 + tests/testlib/pylint_cmk.py | 1 - 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmk_base/cee b/cmk_base/cee new file mode 120000 index 0000000..8c843cc --- /dev/null +++ b/cmk_base/cee @@ -0,0 +1 @@ +../../cmc/cmk_base/cee \ No newline at end of file diff --git a/modules/check_mk.py b/modules/check_mk.py index 5af77ff..5689bb9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -271,7 +271,7 @@ config_variable_names = set(vars().keys()).difference(known_vars) # at check time (and many of what is also needed at administration time). try: modules = [ 'check_mk_base', 'discovery', 'snmp', 'notify', 'events', - 'alert_handling', 'cmc', 'inline_snmp', 'agent_bakery', 'cap' ] + 'alert_handling', 'cmc', 'inline_snmp', 'agent_bakery' ] for module in modules: if module_exists(module): load_module(module) @@ -4741,10 +4741,12 @@ try: done = True elif o == '--cap': - if 'do_cap' not in globals(): + try: + import cmk_base.cee.cap + except ImportError: raise MKBailOut("Agent packages are not supported by your version of Check_MK.") - do_cap(args) + cmk_base.cee.cap.do_cap(args) done = True elif o in [ '--show-snmp-stats' ]: diff --git a/tests/conftest.py b/tests/conftest.py index 79c83c2..7d9818c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -27,6 +27,7 @@ def add_python_paths(): sys.path.insert(0, os.path.dirname(__file__)) # make the repo directory available (cmk lib) sys.path.insert(0, cmk_path()) + sys.path.insert(0, cmc_path()) print("Import path: %s" % " ".join(sys.path)) diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index a21c22e..ba84684 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -32,7 +32,6 @@ def ordered_module_files(): "../cmc/modules/cmc.py", "../cmc/modules/inline_snmp.py", "../cmc/modules/agent_bakery.py", - "../cmc/modules/cap.py", "../cmc/modules/rrd.py", ]

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 55efeddd6c849ccefd08e438cd377ecc3befe00e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55efeddd6c849c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 24 15:27:12 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/IntFilter.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/livestatus/src/IntFilter.cc b/livestatus/src/IntFilter.cc index d95dc9a..61bfc7c 100644 --- a/livestatus/src/IntFilter.cc +++ b/livestatus/src/IntFilter.cc @@ -57,6 +57,10 @@ bool IntFilter::accepts(void *row, contact *auth_user, int timezone_offset) { return (act_value & ref_value) == ref_value; case RelationalOperator::doesnt_match: // not superset return (act_value & ref_value) != ref_value; + case RelationalOperator::equal_icase: // subset + return (act_value & ref_value) == act_value; + case RelationalOperator::not_equal_icase: // not subset + return (act_value & ref_value) != act_value; case RelationalOperator::matches_icase: // contains any return (act_value & ref_value) != 0; case RelationalOperator::doesnt_match_icase: // contains none of @@ -69,11 +73,6 @@ bool IntFilter::accepts(void *row, contact *auth_user, int timezone_offset) { return act_value > ref_value; case RelationalOperator::less_or_equal: return act_value <= ref_value; - case RelationalOperator::equal_icase: - case RelationalOperator::not_equal_icase: - Informational(logger()) << "Sorry. Operator " << _relOp - << " for integer columns not implemented."; - return false; } return false; // unreachable }

7 years, 10 months

3992 FIX netapp_api_connection: fixed GUI display bug when editing rules

by Andreas Boesl

Module: check_mk Branch: master Commit: 023f738bc7054ae52173190adea21091d245343a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=023f738bc7054a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 24 15:03:00 2016 +0100 3992 FIX netapp_api_connection: fixed GUI display bug when editing rules --- .werks/3992 | 9 +++++++++ ChangeLog | 3 ++- web/plugins/wato/check_parameters.py | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/3992 b/.werks/3992 new file mode 100644 index 0000000..53d8437 --- /dev/null +++ b/.werks/3992 @@ -0,0 +1,9 @@ +Title: netapp_api_connection: fixed GUI display bug when editing rules +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i3 +Date: 1479996147 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index bdf0b95..d9711d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,7 +22,7 @@ * 4090 FIX: apc_rackpdu_power, apc_symmetra, apc_symmetra_input, apc_symmetra_output: some fixes... * 4091 FIX: oracle_tablespace: Werk 3907 broke the detection of UNDO- and TEMP-Tablespaces * 4069 FIX: cmciii.phase: Fixed broken check with some devices... - * 4092 FIX: if.include: fixed wrong calculated number of interfaces which are up + * 4092 FIX: if.include: fixed wrong calculated number of interfaces which are up in case of interface groups Multisite: * 4070 Added a painter for the service check period @@ -44,6 +44,7 @@ * 3982 FIX: Some MKPs created with WATO could not be uploaded to the Check_MK Exchange * 4045 FIX: Tactical Overview: do not count OK events as problems * 4068 FIX: Fixed possible exception in case of wrong automation secrets between multiple sites... + * 3992 FIX: netapp_api_connection: fixed GUI display bug when editing rules Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 72f7a01..63f2243 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -10977,7 +10977,7 @@ register_check_parameters( add_label = _("Add warning") ), None, - "dict" + "first" ) register_check_parameters(

7 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016