Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64650 discussions

Check_MK Git: check_mk: FIX doc/treasures/downtime: fix --url option, better error output

by Mathias Kettner

Module: check_mk Branch: master Commit: 4a6654ea49b3161c60a6123403bf0576e76dc498 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a6654ea49b316… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 1 11:30:23 2014 +0200 FIX doc/treasures/downtime: fix --url option, better error output --- .werks/1036 | 8 ++++++++ ChangeLog | 1 + doc/treasures/downtime | 50 +++++++++++++++++++++++++++++------------------- 3 files changed, 39 insertions(+), 20 deletions(-) diff --git a/.werks/1036 b/.werks/1036 new file mode 100644 index 0000000..1273d43 --- /dev/null +++ b/.werks/1036 @@ -0,0 +1,8 @@ +Title: doc/treasures/downtime: fix --url option, better error output +Level: 1 +Component: multisite +Version: 1.2.5i5 +Date: 1404206990 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 55da1ba..a0cce65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... * 1033 New Mutisite filter for the number of services a host has... * 0945 FIX: Sidebar snapin "Problem hosts": Now excludes hosts and services in downtime + * 1036 FIX: doc/treasures/downtime: fix --url option, better error output WATO: * 0990 FIX: Fix HTTP error handling in bulk inventory... diff --git a/doc/treasures/downtime b/doc/treasures/downtime index 99a0a75..8374419 100755 --- a/doc/treasures/downtime +++ b/doc/treasures/downtime @@ -41,40 +41,40 @@ the script only supports cookie based login - no HTTP basic authentication. Before you use this script, please read: -http://mathias-kettner.de/checkmk_multisite_automation.html -You need to create an automation user - best with the name 'automation' -- and make sure that this user either has the admin role or is contact +http://mathias-kettner.de/checkmk_multisite_automation.html +You need to create an automation user - best with the name 'automation' +- and make sure that this user either has the admin role or is contact for all relevant objects. Options: - -v, --verbose Show what's going on + -v, --verbose Show what's going on (specify twice for more verbose output) -s, --set Set downtime (this is the default and thus optional) -r, --remove Remove all downtimes from that host/service -c, --comment Comment for the downtime (otherwise "Automatic downtime") -d, --duration Duration of the downtime in minutes (default: 120) -h, --help Show this help and exit -u, --user Name of automation user (default: "automation") - -S, --secret Automation secret (default: read from user settings) + -S, --secret Automation secret (default: read from user settings) -U, --url Base-URL of Multisite (default: guess local OMD site) -a, --all Include all services when setting/removing host downtime """) -short_options = 'vhrsc:d:u:S:a' -long_options = [ "help", "set", "remove", "comment=", +short_options = 'vhrsc:d:u:S:aU:' +long_options = [ "help", "set", "remove", "comment=", "url=", "duration=", "user=", "secret=", "all" ] -opt_all = False -opt_verbose = False -opt_mode = 'set' -opt_command = "Automatic downtime" -opt_user = "automation" -opt_secret = None -opt_url = None +opt_all = False +opt_verbose = 0 +opt_mode = 'set' +opt_comment = "Automatic downtime" +opt_user = "automation" +opt_secret = None +opt_url = None opt_duration = 120 -if omd_site: - opt_url = "http://localhost/" + omd_site + "/check_mk/" +if omd_site: + opt_url = "http://localhost/" + omd_site + "/check_mk/" try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) except getopt.GetoptError, err: @@ -90,7 +90,7 @@ for o,a in opts: # Modifiers elif o in [ '-v', '--verbose']: - opt_verbose = True + opt_verbose += 1 elif o in [ '-a', '--all']: opt_all = True elif o in [ '-s', '--set']: @@ -116,6 +116,10 @@ if omd_site and not opt_secret: bail_out("Cannot read automation secret from user %s: %s" % (opt_user, e)) +elif not omd_site and not opt_secret: + bail_out("Please specify the automation secret for the user '%s'!" % opt_user) + + if not opt_url: bail_out("Please specify the URL to Check_MK Multisite with -U.") @@ -138,7 +142,7 @@ if arg_services: verbose("Services: " + " ".join(arg_services)) verbose("Multisite-URL: " + opt_url) verbose("User: " + opt_user) -verbose("Secret: " + opt_secret) +verbose("Secret: " + (opt_secret or "(none specified)")) def make_url(base, variables): vartext = "&".join([ "%s=%s" % e for e in variables ]) @@ -174,8 +178,14 @@ def set_downtime(variables, add_vars): verbose("URL: " + url) try: pipe = urllib.urlopen(url) - l = len(pipe.readlines()) - verbose(" --> Got %d lines of response" % l) + lines = pipe.readlines() + verbose(" --> Got %d lines of response" % len(lines)) + if opt_verbose > 1: + for line in lines: + verbose("OUTPUT: %s" % line.rstrip()) + for line in lines: + if line.startswith('<div class=error>'): + bail_out(line[17:].split('<')[0]) except Exception, e: bail_out("Cannot call Multisite URL: %s" % e)

10 years, 3 months

Check_MK Git: check_mk: FIX apc_symmetra_test: Handle unknown date of last self test as intended

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 8c14ba411f46e88b73d8ab3f414d34e460f4c383 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c14ba411f46e8… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Jun 30 13:07:03 2014 +0200 FIX apc_symmetra_test: Handle unknown date of last self test as intended If the date of last self test is reported to be unknown, up to now the check broke. Now unknow status is handled as intended. --- .werks/996 | 9 +++++++++ ChangeLog | 1 + checks/apc_symmetra_test | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/996 b/.werks/996 new file mode 100644 index 0000000..fdacbda --- /dev/null +++ b/.werks/996 @@ -0,0 +1,9 @@ +Title: apc_symmetra_test: Handle unknown date of last self test as intended +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1404126301 +Class: fix + +If the date of last self test is reported to be unknown, up to now +the check broke. Now unknow status is handled as intended. diff --git a/ChangeLog b/ChangeLog index 39fba89..57cfc1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 0944 FIX: oracle_tablespaces: fixed calculation of space left and number of remaining increments... * 1032 FIX: check_traceroute: Fix option Use DNS, worked vice versa * 0171 FIX: hp_blade_psu: Fixed pnp template... + * 0996 FIX: apc_symmetra_test: Handle unknown date of last self test as intended... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/apc_symmetra_test b/checks/apc_symmetra_test index 7392ed6..c2946c2 100644 --- a/checks/apc_symmetra_test +++ b/checks/apc_symmetra_test @@ -64,8 +64,8 @@ def check_apc_test(item, params, info): DiagnosticsResults = saveint(line[0]) LastDiagnosticsDate = line[1] - if LastDiagnosticsDate == 'Unkown': - return 3, "Date of last self test is unkown" + if LastDiagnosticsDate == 'Unknown': + return 3, "Date of last self test is unknown" month, day, year = map(saveint, LastDiagnosticsDate.split('/')) last_diag_date = datetime.date( year, month, day)

10 years, 3 months

Check_MK Git: check_mk: FIX Do not fail on errors in *. mk files anymore - except in interactive mode

by Mathias Kettner

Module: check_mk Branch: master Commit: 2e60ca5fca090138c35688101190e49f9abfd42c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e60ca5fca0901… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 30 11:54:40 2014 +0200 FIX Do not fail on errors in *.mk files anymore - except in interactive mode If a syntax error in <tt>main.mk</tt> or other <tt>*.mk</tt> files occurs, Check_MK used to abort any operation. This is nasty when for example a new variable that has been introduced in a new version is not known in an older version of Check_MK and thus after a version downgrade the configuration cannot be activated any more. The behaviour has now changed so that in case of such an error Check_MK will only abort in <i>interactive</i> mode, i.e. if the standard output is a terminal. That means that WATO will always try to activate Changes. You can force the old behaviour by adding the new option <tt>--interactive</tt>. Conflicts: ChangeLog modules/check_mk.py --- .werks/1035 | 18 ++++++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 22 +++++++++++++++++----- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/.werks/1035 b/.werks/1035 new file mode 100644 index 0000000..4975cee --- /dev/null +++ b/.werks/1035 @@ -0,0 +1,18 @@ +Title: Do not fail on errors in *.mk files anymore - except in interactive mode +Level: 2 +Component: core +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1404121324 + +If a syntax error in <tt>main.mk</tt> or other <tt>*.mk</tt> files occurs, +Check_MK used to abort any operation. This is nasty when for example a new +variable that has been introduced in a new version is not known in an older +version of Check_MK and thus after a version downgrade the configuration +cannot be activated any more. + +The behaviour has now changed so that in case of such an error Check_MK will only +abort in <i>interactive</i> mode, i.e. if the standard output is a terminal. +That means that WATO will always try to activate Changes. You can force the +old behaviour by adding the new option <tt>--interactive</tt>. diff --git a/ChangeLog b/ChangeLog index 39fba89..3d199fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 1012 Fix quoting of backslashes in custom checks with nagios core... NOTE: Please refer to the migration notes! + * 1035 FIX: Do not fail on errors in *.mk files anymore - except in interactive mode... Checks & Agents: * 0168 f5_bigip_pool: Added Wato configuration... diff --git a/modules/check_mk.py b/modules/check_mk.py index 78c4403..9e943f5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -37,6 +37,7 @@ g_profile_path = 'profile.out' if __name__ == "__main__": opt_debug = '--debug' in sys.argv[1:] + opt_interactive = '--interactive' in sys.argv[1:] opt_verbose = '-v' in sys.argv[1:] or '--verbose' in sys.argv[1:] if '--profile' in sys.argv[1:]: import cProfile @@ -48,6 +49,7 @@ if __name__ == "__main__": else: opt_verbose = False opt_debug = False + opt_interactive = False #. # .--Pathnames-----------------------------------------------------------. @@ -122,6 +124,12 @@ def verbose(t): sys.stderr.write(t) sys.stderr.flush() +# Abort after an error, but only in interactive mode. +def interactive_abort(error): + if sys.stdout.isatty() or opt_interactive: + sys.stderr.write(error + "\n") + sys.exit(1) + # During setup a file called defaults is created in the modules # directory. In this file all directories are configured. We need to @@ -4741,6 +4749,9 @@ OPTIONS: prevents DNS lookups. --usewalk use snmpwalk stored with --snmpwalk --debug never catch Python exceptions + --interactive Some errors are only reported in interactive mode, i.e. if stdout + is a TTY. This option forces interactive mode even if the output + is directed into a pipe or file. --procs N start up to N processes in parallel during --scan-parents --checks A,.. restrict checks/inventory to specified checks (tcp/snmp/check type) --keepalive used by Check_MK Mirco Core: run check and --notify in continous @@ -5615,11 +5626,10 @@ def read_config_files(with_autochecks=True, with_conf_d=True): marks_hosts_with_path(_old_all_hosts, all_hosts, _f) marks_hosts_with_path(_old_clusters, clusters.keys(), _f) except Exception, e: - sys.stderr.write("Cannot read in configuration file %s:\n%s\n" % (_f, e)) - if __name__ == "__main__": - sys.exit(3) - else: + if opt_debug: raise + else: + interactive_abort("Cannot read in configuration file %s: %s" % (_f, e)) # Strip off host tags from the list of all_hosts. Host tags can be # appended to the hostnames in all_hosts, separated by pipe symbols, @@ -5878,7 +5888,7 @@ def output_profile(): # if check_mk is not called as module if __name__ == "__main__": short_options = 'ASHVLCURODMmd:Ic:nhvpXPNBil' - long_options = [ "help", "version", "verbose", "compile", "debug", + long_options = [ "help", "version", "verbose", "compile", "debug", "interactive", "list-checks", "list-hosts", "list-tag", "no-tcp", "cache", "flush", "package", "localize", "donate", "snmpwalk", "oid=", "extraoid=", "snmptranslate", "bake-agents", @@ -5944,6 +5954,8 @@ if __name__ == "__main__": opt_nowiki = True elif o == '--debug': opt_debug = True + elif o == '--interactive': + opt_interactive = True elif o == '-I': seen_I += 1 elif o == "--checks":

10 years, 3 months

Check_MK Git: check_mk: Windows agent: do not ship source files with binary distribution

by Mathias Kettner

Module: check_mk Branch: master Commit: 343685518bad5190369ed033052567a365cce5a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=343685518bad51… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 30 10:08:31 2014 +0200 Windows agent: do not ship source files with binary distribution --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5cd80d8..442a73a 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,22 @@ dist: mk-livestatus mk-eventd cp multisite.mk multisite.mk-$(VERSION) tar czf $(DISTNAME)/conf.tar.gz $(TAROPTS) main.mk-$(VERSION) multisite.mk-$(VERSION) rm -f main.mk-$(VERSION) multisite.mk-$(VERSION) - tar czf $(DISTNAME)/agents.tar.gz $(TAROPTS) -C agents --exclude "*~" --exclude .f12 $$(cd agents ; ls) + tar czf $(DISTNAME)/agents.tar.gz $(TAROPTS) -C agents \ + --exclude "build_version" \ + --exclude "*.rc" \ + --exclude "*.rc.in" \ + --exclude "bin_replace" \ + --exclude "*.nsi" \ + --exclude "*.ico" \ + --exclude "endless.bat" \ + --exclude "logstate.txt" \ + --exclude "*.unversioned.exe" \ + --exclude "*.cc" \ + --exclude "*.res" \ + --exclude "*~" \ + --exclude "Makefile" \ + --exclude "crash.exe" \ + --exclude .f12 $$(cd agents ; ls) cd $(DISTNAME) ; ../make_package_info $(VERSION) > package_info install -m 755 scripts/*.{sh,py} $(DISTNAME) install -m 644 COPYING AUTHORS ChangeLog $(DISTNAME)

10 years, 3 months

Check_MK Git: check_mk: FIX hp_blade_psu: Fixed pnp template

by Bastian Kuhn

Module: check_mk Branch: master Commit: db4d58c1d31d28a9f99145d11bfa8bfc1be9cebd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db4d58c1d31d28… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jun 27 16:44:28 2014 +0200 FIX hp_blade_psu: Fixed pnp template Fixed pnp template in order to work with rrd storage type multipe --- .werks/171 | 8 ++++++++ ChangeLog | 3 ++- pnp-templates/check_mk-hp_blade_psu.php | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/171 b/.werks/171 new file mode 100644 index 0000000..585bf46 --- /dev/null +++ b/.werks/171 @@ -0,0 +1,8 @@ +Title: hp_blade_psu: Fixed pnp template +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1403880223 +Class: fix + +Fixed pnp template in order to work with rrd storage type multipe diff --git a/ChangeLog b/ChangeLog index 4918135..40a70aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,13 +7,14 @@ * 0168 f5_bigip_pool: Added Wato configuration... * 0995 raritan_pdu_outletcount: new check for outlet count of Raritan PX-2000 family PDUs * 0169 websphere_mq_channels,ebsphere_mq_queues: New Checks to monitor IBM Websphere MQ Queues and Channels... - * 0170 hp_proliant_power: New check to monitor the Power Meter on Prolaint Servers and iLO Boards * 1034 Always provide also 64 bit version of Windows agent + * 0170 hp_proliant_power: New check to monitor the Power Meter on Prolaint Servers and iLO Boards * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... * 0944 FIX: oracle_tablespaces: fixed calculation of space left and number of remaining increments... * 1032 FIX: check_traceroute: Fix option Use DNS, worked vice versa + * 0171 FIX: hp_blade_psu: Fixed pnp template... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/pnp-templates/check_mk-hp_blade_psu.php b/pnp-templates/check_mk-hp_blade_psu.php index 9a6e77d..e8ff6d0 100644 --- a/pnp-templates/check_mk-hp_blade_psu.php +++ b/pnp-templates/check_mk-hp_blade_psu.php @@ -34,7 +34,7 @@ function getAllPsuFiles($path) { $files = array(); if($h = opendir($path)) { while(($file = readdir($h)) !== false) { - if(preg_match('/^PSU_[0-9]+\.rrd$/', $file, $aRet)) + if(preg_match('/^PSU_[0-9]+_output\.rrd$/', $file, $aRet)) $files[] = $aRet[0]; } natcasesort($files);

10 years, 3 months

Check_MK Git: check_mk: FIX WATO snapshots: fixed missing files on restoring nagvis backup domains

by Andreas Boesl

Module: check_mk Branch: master Commit: e38214b77c6d113e1350d75cb5ac61e41b8ed0c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e38214b77c6d11… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 27 16:30:23 2014 +0200 FIX WATO snapshots: fixed missing files on restoring nagvis backup domains --- .werks/947 | 9 +++++++++ ChangeLog | 3 ++- web/htdocs/multitar.py | 40 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/.werks/947 b/.werks/947 new file mode 100644 index 0000000..efe8bae --- /dev/null +++ b/.werks/947 @@ -0,0 +1,9 @@ +Title: WATO snapshots: fixed missing files on restoring nagvis backup domains +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1403879357 + + diff --git a/ChangeLog b/ChangeLog index 4918135..504013f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,8 +7,8 @@ * 0168 f5_bigip_pool: Added Wato configuration... * 0995 raritan_pdu_outletcount: new check for outlet count of Raritan PX-2000 family PDUs * 0169 websphere_mq_channels,ebsphere_mq_queues: New Checks to monitor IBM Websphere MQ Queues and Channels... - * 0170 hp_proliant_power: New check to monitor the Power Meter on Prolaint Servers and iLO Boards * 1034 Always provide also 64 bit version of Windows agent + * 0170 hp_proliant_power: New check to monitor the Power Meter on Prolaint Servers and iLO Boards * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... @@ -23,6 +23,7 @@ WATO: * 0990 FIX: Fix HTTP error handling in bulk inventory... * 1004 FIX: Fix exception when saving rules, caused by empty item + * 0947 FIX: WATO snapshots: fixed missing files on restoring nagvis backup domains Reporting & Availability: * 0991 FIX: Availability: optionally show time stamps as UNIX epoch time... diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index 241f4bd..d9ddd53 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -105,6 +105,7 @@ def get_file_content(the_tarfile, filename): tar = tarfile.open(the_tarfile, "r") return tar.extractfile(filename).read() + def extract_domains(tar, domains): import subprocess tar_domains = {} @@ -180,7 +181,14 @@ def extract_domains(tar, domains): full_path = "%s/%s" % (domain["prefix"], path) if os.path.exists(full_path): if what == "dir": - wipe_directory(full_path) + exclude_files = [] + for pattern in domain.get("exclude", []): + if "*" in pattern: + import glob + exclude_files.extend(glob.glob("%s/%s/%s" % (domain["prefix"], path, pattern))) + else: + exclude_files.append("%s/%s/%s" % (domain["prefix"], path, pattern)) + cleanup_dir(full_path, exclude_files) else: os.remove(full_path) return [] @@ -219,6 +227,7 @@ def extract_domains(tar, domains): return domain["post_restore"]() return [] + total_errors = [] for what, abort_on_error, handler in [ ("Permissions", True, lambda domain, tar_member: check_domain(domain, tar_member)), @@ -276,6 +285,35 @@ def extract(tar, components): subtar = tarfile.open(fileobj = subtarstream) subtar.extractall(target_dir) +# Try to cleanup everything starting from the root_path +# except the specific exclude files +def cleanup_dir(root_path, exclude_files = []): + paths_to_remove = [] + files_to_remove = [] + for path, dirnames, filenames in os.walk(root_path): + for dirname in dirnames: + pathname = "%s/%s" % (path, dirname) + for entry in exclude_files: + if entry.startswith(pathname): + break + else: + paths_to_remove.append(pathname) + for filename in filenames: + filepath = "%s/%s" % (path, filename) + if filepath not in exclude_files: + files_to_remove.append(filepath) + + paths_to_remove.sort() + files_to_remove.sort() + + for path in paths_to_remove: + if os.path.exists(path) and os.path.isdir(path): + shutil.rmtree(path) + + for filename in files_to_remove: + if os.path.dirname(filename) not in paths_to_remove: + os.remove(filename) + def wipe_directory(path): for entry in os.listdir(path): if entry not in [ '.', '..' ]:

10 years, 3 months

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2e6943d193e471ba14ed0d0d38001dc6c1285220 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e6943d193e471… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jun 27 14:26:16 2014 +0200 merge conflict ---

10 years, 3 months

Check_MK Git: check_mk: hp_proliant_power: New check to monitor the Power Meter on Prolaint Servers and iLO Boards

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8b6f717760b25c7ef374324ce3abbbbf271eb30c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b6f717760b25c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jun 27 14:25:37 2014 +0200 hp_proliant_power: New check to monitor the Power Meter on Prolaint Servers and iLO Boards --- .werks/170 | 8 +++++ ChangeLog | 1 + checkman/hp_proliant_power | 16 +++++++++ checks/hp_proliant_power | 68 ++++++++++++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 1 + 5 files changed, 94 insertions(+) diff --git a/.werks/170 b/.werks/170 new file mode 100644 index 0000000..9ce90f1 --- /dev/null +++ b/.werks/170 @@ -0,0 +1,8 @@ +Title: hp_proliant_power: New check to monitor the Power Meter on Prolaint Servers and iLO Boards +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1403871902 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 7bb5f9c..2cdb7ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 0168 f5_bigip_pool: Added Wato configuration... * 0995 raritan_pdu_outletcount: new check for outlet count of Raritan PX-2000 family PDUs * 0169 websphere_mq_channels,ebsphere_mq_queues: New Checks to monitor IBM Websphere MQ Queues and Channels... + * 0170 hp_proliant_power: New check to monitor the Power Meter on Prolaint Servers and iLO Boards * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/checkman/hp_proliant_power b/checkman/hp_proliant_power new file mode 100644 index 0000000..51f6ab7 --- /dev/null +++ b/checkman/hp_proliant_power @@ -0,0 +1,16 @@ +title: HP Proliant Servers: Power Meter +agents: snmp +catalog: hw/server/hp +license: GPL +distribution: check_mk +description: + This check connects to the SNMP agent installed on an operating system + on a HP Proliant server (or iLO Board) and reads the information from the {CPQHLTH-MIB} + MIB. + The systems SNMP agent is extended by the HP Management Agents which need + to be installed on the monitored systems. + + The check monitors the state of the power meter and his current reading in Watt. + +inventory: + One check is automatically created. diff --git a/checks/hp_proliant_power b/checks/hp_proliant_power new file mode 100755 index 0000000..f4cf877 --- /dev/null +++ b/checks/hp_proliant_power @@ -0,0 +1,68 @@ +#!/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. + +hp_prolaint_power_default_levels = ( 300, 400 ) + +def inventory_hp_proliant_power(info): + if len(info) > 0: + return [ ( None, 'hp_prolaint_power_default_levels') ] + +def check_hp_proliant_power(item, params, info): + status_table = { + 1 : "other", + 3 : "absent", + } + status, reading = map(saveint, info[0]) + if status != 2: + return 2, "Power Meter state: %s" % ( status_table[status] ) + warn, crit = params + state = 0 + levels = '' + if reading > crit: + state = 2 + levels = '( Warning/Critical %s/%s )' % ( warn, crit ) + elif reading > warn: + state = 1 + levels = '( Warning/Critical %s/%s )' % ( warn, crit ) + + perf = [ ('watt', reading, warn, crit ) ] + return state, "Current reading: %d Watt" % reading + levels, perf + +check_info["hp_proliant_power"] = { + 'group' : 'epower', + 'check_function' : check_hp_proliant_power, + 'inventory_function' : inventory_hp_proliant_power, + 'service_description' : 'HW Power Meter', + 'snmp_info': ( + ".1.3.6.1.4.1.232.6.2.15", [ + "2", # cpqHePowerMeterStatus + "3", # cpqHePowerMeterCurrReading + ] + ), + 'snmp_scan_function' : \ + lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0").lower(), + 'has_perfdata' : True +} diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index dd8eba1..28951d8 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -375,6 +375,7 @@ def perfometer_power(row, check_command, perf_data): perfometers["check_mk-dell_poweredge_amperage.power"] = perfometer_power perfometers["check_mk-dell_chassis_power"] = perfometer_power perfometers["check_mk-dell_chassis_powersupplies"] = perfometer_power +perfometers["check_mk-hp-proliant_power"] = perfometer_power def perfometer_users(row, check_command, perf_data): state = row["service_state"]

10 years, 3 months

Check_MK Git: check_mk: Windows agent: avoid recompiling on version number change

by Mathias Kettner

Module: check_mk Branch: master Commit: cbef3f4cf034a195f64003e3935c37b17cfe785c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbef3f4cf034a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 27 14:06:47 2014 +0200 Windows agent: avoid recompiling on version number change --- agents/windows/Makefile | 74 ++++++++++++++-------- agents/windows/bin_replace | 29 +++++++++ agents/windows/build_version | 1 + agents/windows/check_mk_agent-64.exe | Bin 0 -> 207360 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 0 -> 207360 bytes agents/windows/check_mk_agent.cc | 12 ++-- agents/windows/check_mk_agent.exe | Bin 184320 -> 176640 bytes agents/windows/check_mk_agent.rc.in | 20 +++--- agents/windows/check_mk_agent.unversioned.exe | Bin 0 -> 176640 bytes agents/windows/crash.exe | Bin 20365 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 0 -> 159342 bytes agents/windows/install_agent.exe | Bin 152864 -> 156399 bytes agents/windows/nowin.exe | Bin 22852 -> 22511 bytes 13 files changed, 93 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cbef3f4cf0…

10 years, 3 months

Check_MK Git: check_mk: Always provide also 64 bit version of Windows agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 4ab2b75da7cd3b1eae2a43666584801296d7dac1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ab2b75da7cd3b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 27 14:24:10 2014 +0200 Always provide also 64 bit version of Windows agent --- .werks/1034 | 8 ++++++++ ChangeLog | 1 + Makefile | 3 +-- agents/windows/Makefile | 18 +++++++++++++----- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 207360 -> 207360 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 207360 -> 207360 bytes agents/windows/check_mk_agent.exe | Bin 176640 -> 176640 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 176640 -> 176640 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 159342 -> 159344 bytes agents/windows/install_agent.exe | Bin 156399 -> 156401 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 13 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.werks/1034 b/.werks/1034 new file mode 100644 index 0000000..84f5860 --- /dev/null +++ b/.werks/1034 @@ -0,0 +1,8 @@ +Title: Always provide also 64 bit version of Windows agent +Level: 2 +Component: checks +Version: 1.2.5i5 +Date: 1403871810 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 7bb5f9c..fe71d5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 0168 f5_bigip_pool: Added Wato configuration... * 0995 raritan_pdu_outletcount: new check for outlet count of Raritan PX-2000 family PDUs * 0169 websphere_mq_channels,ebsphere_mq_queues: New Checks to monitor IBM Websphere MQ Queues and Channels... + * 1034 Always provide also 64 bit version of Windows agent * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/Makefile b/Makefile index e3cb5d3..5cd80d8 100644 --- a/Makefile +++ b/Makefile @@ -154,7 +154,6 @@ setversion: fi ; \ done ; \ sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agents/check_mk_agent.openvms - sed -i 's/#define CHECK_MK_VERSION .*/#define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/check_mk_agent.cc ; \ sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer.nsi ; \ sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" agents/windows/Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ @@ -162,7 +161,7 @@ setversion: sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' doc/treasures/mknotifyd ; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ - cd agents/windows ; rm *.exe ; make ; cd ../.. ; \ + cd agents/windows ; rm check_mk_agent.exe check_mk_agent-64.exe ; make ; cd ../.. ; \ cp agents/windows/install_agent.exe check-mk-agent-$(NEW_VERSION).exe headers: diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 692cfa1..98a1538 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -38,16 +38,20 @@ endif all: install_agent.exe install_agent-64.exe +.PHONY: inc_build_version + + # ----------------------------------------------------------------------------- # 1. Create ressource files with version and product information. Note: That file # contains a dummy version number, which is later being replaced with the # actual version number, during 'make version' # ----------------------------------------------------------------------------- -check_mk_agent.rc: check_mk_agent.rc.in - BUILD_VERSION=$$(cat build_version ; echo $$(( $$(cat build_version) + 1 )) > build_version.new && mv build_version.new build_version) ; \ +inc_build_version: + echo $$(( $$(cat build_version) + 1 )) > build_version.new && mv build_version.new build_version + BUILD_VERSION=$$(cat build_version) ; \ sed -e "s/%VERSION%/$(VERSION_DUMMY)/g" \ -e "s/%YEAR%/$$(date +%Y)/g" \ - -e "s/%BUILD_VERSION%/$$BUILD_VERSION/g" $< > $@ + -e "s/%BUILD_VERSION%/$$BUILD_VERSION/g" check_mk_agent.rc.in > check_mk_agent.rc check_mk_agent.res: check_mk_agent.rc $(WINDRES) $< -O coff -o $@ @@ -60,10 +64,14 @@ check_mk_agent-64.res: check_mk_agent.rc # 2. Compile the Windows agent from the sources, without a specific version # number. Instead a placeholder is being used as version. # ----------------------------------------------------------------------------- -check_mk_agent.unversioned.exe: check_mk_agent.cc check_mk_agent.res +check_mk_agent.unversioned.exe: check_mk_agent.cc + $(MAKE) inc_build_version + $(MAKE) check_mk_agent.res $(CXX) $(COPTIONS) -o $@ $< check_mk_agent.res -lwsock32 -check_mk_agent-64.unversioned.exe: check_mk_agent.cc check_mk_agent-64.res +check_mk_agent-64.unversioned.exe: check_mk_agent.cc + $(MAKE) inc_build_version + $(MAKE) check_mk_agent-64.res $(CXX_64) $(COPTIONS) -o $@ $< check_mk_agent-64.res -lwsock32 diff --git a/agents/windows/build_version b/agents/windows/build_version index d00491f..b4de394 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1 +11 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 302c273..b16a42e 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 94f6bc8..44ae5ef 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 9ad7c18..734fc3f 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 8451748..d569119 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 6e383bf..2581c99 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 2dab775..535aa55 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 765e81a..85e13c4 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 92b3f05..bc04e04 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

10 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits