Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: Handle new option --split-rrds needed for CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: d140b8f5c58ee07fa84b380fb146dd4152e11aee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d140b8f5c58ee0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 15 15:37:15 2014 +0200 Handle new option --split-rrds needed for CMC --- modules/check_mk.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index e8f3164..1fd6522 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3572,8 +3572,6 @@ no_inventory_possible = None # | that is used by the official Check_MK documentation ("nowiki"). | # '----------------------------------------------------------------------' -opt_nowiki = False - def get_tty_size(): import termios,struct,fcntl try: @@ -4735,7 +4733,7 @@ def usage(): cmk --localize COMMAND do localization operations cmk --notify used to send notifications from core cmk --create-rrd [--keepalive|SPEC] create round robin database (only CMC) - cmk --convert-rrds [HOST1 HOST2...] convert exiting RRD to new format (only CMC) + cmk --convert-rrds [--split] [H...] convert exiting RRD to new format (only CMC) cmk -i, --inventory [HOST1 HOST2...] Do a HW/SW-Inventory of some ar all hosts cmk --inventory-as-check HOST Do HW/SW-Inventory, behave like check plugin cmk -A, --bake-agents [-f] [H1 H2..] Bake agents for hosts (not in all versions) @@ -4859,7 +4857,8 @@ NOTES: to the new structure as configured via the rulesets cmc_host_rrd_config and cmc_service_rrd_config. If you do not specify hosts, then all RRDs will be converted. Conversion just takes place if the configuration - of the RRDs has changed. + of the RRDs has changed. The option --split will activate conversion + from exising RRDs in PNP storage type SINGLE to MULTIPLE. """ % (check_mk_configfile, @@ -5949,6 +5948,10 @@ def output_profile(): # | Main entry point and option parsing. Here is where all begins. | # '----------------------------------------------------------------------' +opt_nowiki = False +opt_split_rrds = False + + # Do option parsing and execute main function - # if check_mk is not called as module if __name__ == "__main__": @@ -5959,7 +5962,7 @@ if __name__ == "__main__": "snmptranslate", "bake-agents", "force", "usewalk", "scan-parents", "procs=", "automation=", "notify", "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", - "convert-rrds", + "convert-rrds", "split-rrds", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "paths", "checks=", "inventory", "inventory-as-check=", @@ -6030,6 +6033,8 @@ if __name__ == "__main__": check_types = a.split(",") elif o == "--cmc-file": opt_cmc_relfilename = a + elif o == "--split-rrds": + opt_split_rrds = True # Perform actions (major modes) try:

9 years, 11 months

Check_MK Git: check_mk: #1126 FIX bluecat_ntp: check no longer crashes on evaluating sysLeap values higher than 1

by Andreas Boesl

Module: check_mk Branch: master Commit: 41c61be2cd60fb9c650bc40b35dac51404baa30d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41c61be2cd60fb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 15 15:33:00 2014 +0200 #1126 FIX bluecat_ntp: check no longer crashes on evaluating sysLeap values higher than 1 The oid sysLeap is specificied as bitfield. The 4 possible values are reported as <ul> <li>0: no warning</li> <li>1: add second</li> <li>10: subtract second</li> <li>11: Alarm</li> </ul> <br> The previous implementation was incorrected, because it expected the numbers 0-3. --- .werks/1126 | 20 ++++++++++++++++++++ ChangeLog | 1 + checks/bluecat_ntp | 13 +++++++------ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/.werks/1126 b/.werks/1126 new file mode 100644 index 0000000..c15dc7d --- /dev/null +++ b/.werks/1126 @@ -0,0 +1,20 @@ +Title: bluecat_ntp: check no longer crashes on evaluating sysLeap values higher than 1 +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1413379702 +Class: fix + +The oid sysLeap is specificied as bitfield. +The 4 possible values are reported as + +<ul> +<li>0: no warning</li> +<li>1: add second</li> +<li>10: subtract second</li> +<li>11: Alarm</li> +</ul> +<br> + +The previous implementation was incorrected, because it expected the numbers 0-3. diff --git a/ChangeLog b/ChangeLog index 21e8864..9c23b35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,7 @@ * 1184 FIX: cisco_power: Fixed detection of item. In some cases the status information was part of the item... NOTE: Please refer to the migration notes! * 1078 FIX: Fix compensation for daylight safing time in prediction + * 1126 FIX: bluecat_ntp: check no longer crashes on evaluating sysLeap values higher than 1... Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/bluecat_ntp b/checks/bluecat_ntp index 4b3b50c..7f90e00 100644 --- a/checks/bluecat_ntp +++ b/checks/bluecat_ntp @@ -45,6 +45,7 @@ def check_bluecat_ntp(item, params, info): 5 : "fault" } + state = 0 if oper_state in params['oper_states']['warning']: state = 1 @@ -53,15 +54,15 @@ def check_bluecat_ntp(item, params, info): yield state, "Process is %s" % oper_states[oper_state] sys_leap_states = { - 0 : 'no Warning', - 1 : 'add second', - 2 : 'subtract second', - 3 : 'Alarm' + 0 : 'no Warning', + 1 : 'add second', + 10 : 'subtract second', + 11 : 'Alarm' } state = 0 - if sys_leap == 3: + if sys_leap == 11: state = 2 - elif sys_leap in [ 1, 2 ]: + elif sys_leap in [ 1, 10 ]: state = 1 yield state, "Sys Leap: %s" % sys_leap_states[sys_leap]

9 years, 11 months

Check_MK Git: check_mk: #0660 mk_inventory-ps1: new uses the Install Location as path for win_reg_uninstall

by Goetz Golla

Module: check_mk Branch: master Commit: 0901a0eea97211607e306b550c40c0b4095fa307 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0901a0eea97211… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Oct 15 14:47:15 2014 +0200 #0660 mk_inventory-ps1: new uses the Install Location as path for win_reg_uninstall --- .werks/660 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.ps1 | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/660 b/.werks/660 new file mode 100644 index 0000000..d9b0532 --- /dev/null +++ b/.werks/660 @@ -0,0 +1,9 @@ +Title: mk_inventory-ps1: new uses the Install Location as path for win_reg_uninstall +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.5i6 +Date: 1413377179 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 21e8864..284746f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -172,6 +172,7 @@ * 0652 windows software inventory gives some more details about OS and installed software... NOTE: Please refer to the migration notes! * 0653 script to extract hw/sw inventory data in csv format... + * 0660 mk_inventory-ps1: new uses the Install Location as path for win_reg_uninstall * 0655 FIX: win_cpuinfo and mk_inventory.ps1 agent: unit of CPU speed fixed, fixes for long output lines in agent * 1379 FIX: Fixed filter "Host has inventory data"... diff --git a/agents/windows/plugins/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 index 53f76f2..c2f028d 100644 --- a/agents/windows/plugins/mk_inventory.ps1 +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -79,7 +79,7 @@ write-host "<<<win_reg_uninstall:sep(124):persist($until)>>>" $paths = @("HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall") foreach ($path in $paths) { Get-ChildItem $path -Recurse | foreach-object { $path2 = $path+"\"+$_.PSChildName; get-ItemProperty -path $path2 | - foreach-object { write-host -separator $separator $_.DisplayName, $_.Publisher, $path, $_.PSChildName, $_.DisplayVersion, $_.EstimatedSize, $_.InstallDate }} + foreach-object { write-host -separator $separator $_.DisplayName, $_.Publisher, $_.InstallLocation, $_.PSChildName, $_.DisplayVersion, $_.EstimatedSize, $_.InstallDate }} } # Search exes

9 years, 11 months

Check_MK Git: check_mk: cisco_temp_perf: Fixed item detection in the same way like in cisco_power

by Bastian Kuhn

Module: check_mk Branch: master Commit: 35bfda77f4f9f36c2b7b40942fa749fea9aa7161 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35bfda77f4f9f3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 15 12:32:14 2014 +0200 cisco_temp_perf: Fixed item detection in the same way like in cisco_power --- checks/cisco_temp_perf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index 94541bc..5a0ede5 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -58,7 +58,10 @@ cisco_temp_perf_envmon_states = { def inventory_cisco_temp_perf(info): inventory = [] for line in info: - name = line[0] + try: + name = line[0].split(',')[0] + except: + name = line[0] if name == "": name = line[4] inventory.append((name, None)) @@ -66,7 +69,11 @@ def inventory_cisco_temp_perf(info): def check_cisco_temp_perf(item, _no_params, info): for line in info: - if line[0] == item or line[4] == item: + try: + name = line[0].split(',')[0] + except: + name = line[0] + if name == item or line[4] == item: temp = saveint(line[1]) if temp != 0: perfdata = [("temp", temp, None, saveint(line[2]) )]

9 years, 11 months

Check_MK Git: check_mk: moved builtin EC views into mkeventd folder. they are only loaded if MKEVENTD is enabled

by Andreas Boesl

Module: check_mk Branch: master Commit: 7f9dd072ef3a169ed17e414b26cd30087a0caf1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f9dd072ef3a16… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 15 12:06:55 2014 +0200 moved builtin EC views into mkeventd folder. they are only loaded if MKEVENTD is enabled --- mkeventd/web/plugins/views/mkeventd.py | 111 ++++++++++++++++++++++++++++++++ web/plugins/views/mobile.py | 110 ------------------------------- 2 files changed, 111 insertions(+), 110 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7f9dd072ef…

9 years, 11 months

Check_MK Git: check_mk: msi-update: fixed incorrect default build version

by Andreas Boesl

Module: check_mk Branch: master Commit: 20c92beb62a43445314079289d3842ae7330290d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20c92beb62a434… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 15 11:18:21 2014 +0200 msi-update: fixed incorrect default build version --- agents/windows/msibuild/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index 9633f9c..4ecc076 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -25,7 +25,7 @@ MSITOOLS = msitools-0.93 MSITOOLS_FILE = $(MSITOOLS).tar.xz -BUILD_VERSION = 1.0.1 +BUILD_VERSION = 1 CHECK_MK_VERSION = TESTVERSION all: exchange_msi_files

9 years, 11 months

Check_MK Git: check_mk: #0659 domino_tasks: new check to monitor tasks on a lotus domino server via snmp

by Goetz Golla

Module: check_mk Branch: master Commit: 0502eac094cca50a0b2a7672772125a22fa07ba3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0502eac094cca5… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Oct 15 09:39:42 2014 +0200 #0659 domino_tasks: new check to monitor tasks on a lotus domino server via snmp --- .werks/659 | 9 +++ ChangeLog | 1 + checkman/domino_tasks | 93 ++++++++++++++++++++++ checks/domino_tasks | 66 ++++++++++++++++ web/plugins/wato/check_parameters.py | 143 ++++++++++++++++++++++++++++++++++ 5 files changed, 312 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0502eac094…

9 years, 11 months

Check_MK Git: check_mk: ps.include: make common inventory function more robust if inventory rule parameters are missing

by Goetz Golla

Module: check_mk Branch: master Commit: a2d065679b4b6bfe4cab4553deddb279f1d655fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2d065679b4b6b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Oct 14 18:47:00 2014 +0200 ps.include: make common inventory function more robust if inventory rule parameters are missing --- checks/ps.include | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/checks/ps.include b/checks/ps.include index 47608b4..995bef3 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -69,8 +69,15 @@ def inventory_ps_common(invdata, invrules, info, with_perfdata = False): v = rule[0] + # set values for user und perfdata to None if they dont exist + d_user = v.get('user') + v['user'] = d_user + d_perfdata = v.get('perfdata') + v['perfdata'] = d_perfdata + # Make ps skip rules for ps.perf and vice versa - if with_perfdata != v['perfdata']: + # Ignore if perfdata key is not set + if v.get('perfdata') and with_perfdata != v.get('perfdata'): continue extra_options = []

9 years, 11 months

Check_MK Git: check_mk: Handle new option --convert-rrds, needed for CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: 7b07d2598dc4c6a5ff022acbcca73e99ec90b15f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b07d2598dc4c6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 14 17:48:20 2014 +0200 Handle new option --convert-rrds, needed for CMC --- modules/check_mk.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 40acf4b..e8f3164 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4734,7 +4734,8 @@ def usage(): cmk -P, --package COMMAND do package operations cmk --localize COMMAND do localization operations cmk --notify used to send notifications from core - cmk --create-rrd [--keepalive|SPEC] create round robin database + cmk --create-rrd [--keepalive|SPEC] create round robin database (only CMC) + cmk --convert-rrds [HOST1 HOST2...] convert exiting RRD to new format (only CMC) cmk -i, --inventory [HOST1 HOST2...] Do a HW/SW-Inventory of some ar all hosts cmk --inventory-as-check HOST Do HW/SW-Inventory, behave like check plugin cmk -A, --bake-agents [-f] [H1 H2..] Bake agents for hosts (not in all versions) @@ -4854,6 +4855,12 @@ NOTES: already exists. Note: baking agents is only contained in the subscription version of Check_MK. + --convert-rrds converts the internal structure of existing RRDs + to the new structure as configured via the rulesets cmc_host_rrd_config + and cmc_service_rrd_config. If you do not specify hosts, then all + RRDs will be converted. Conversion just takes place if the configuration + of the RRDs has changed. + """ % (check_mk_configfile, precompiled_hostchecks_dir, @@ -5952,6 +5959,7 @@ if __name__ == "__main__": "snmptranslate", "bake-agents", "force", "usewalk", "scan-parents", "procs=", "automation=", "notify", "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", + "convert-rrds", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "paths", "checks=", "inventory", "inventory-as-check=", @@ -5959,7 +5967,7 @@ if __name__ == "__main__": non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', '--notify', '--man', '-V', '--version' ,'-h', '--help', '--automation', - '--create-rrd' ] + '--create-rrd', '--convert-rrds' ] try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) @@ -6157,6 +6165,11 @@ if __name__ == "__main__": execfile(modules_dir + "/rrd.py") do_create_rrd(args) done = True + elif o == '--convert-rrds': + read_config_files(False, True) + execfile(modules_dir + "/rrd.py") + do_convert_rrds(args) + done = True elif o in [ '-A', '--bake-agents' ]: if 'do_bake_agents' not in globals(): sys.stderr.write("Agent baking is not implemented in your version of Check_MK. Sorry.\n")

9 years, 11 months

Check_MK Git: check_mk: ps: moved inventory_processes_rules from include file to main check file

by Goetz Golla

Module: check_mk Branch: master Commit: 87e8a2bd2a11f21c921162bd71c201d880179dcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87e8a2bd2a11f2… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Oct 14 17:06:58 2014 +0200 ps: moved inventory_processes_rules from include file to main check file --- checks/ps | 4 ++-- checks/ps.include | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/ps b/checks/ps index 919fcbb..5d3a14b 100644 --- a/checks/ps +++ b/checks/ps @@ -146,11 +146,11 @@ def ps_parse_info(info): def inventory_ps(info): cpu_cores, info = ps_parse_info(info) # parse windows wmic information - return inventory_ps_common(inventory_processes, info) + return inventory_ps_common(inventory_processes, inventory_processes_rules, info) def inventory_ps_perf(info): cpu_cores, info = ps_parse_info(info) # parse windows wmic information - return inventory_ps_common(inventory_processes_perf, info, with_perfdata = True) + return inventory_ps_common(inventory_processes_perf, inventory_processes_rules, info, with_perfdata = True) def check_ps(item, params, info, with_perfdata): cpu_cores, info = ps_parse_info(info) # parse windows wmic information diff --git a/checks/ps.include b/checks/ps.include index f8b162c..47608b4 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. -def inventory_ps_common(invdata, info, with_perfdata = False): +def inventory_ps_common(invdata, invrules, info, with_perfdata = False): inventory = [] entries = [] @@ -54,8 +54,8 @@ def inventory_ps_common(invdata, info, with_perfdata = False): entries.append(inventry) - # Handle new wato style inventory_processes_rules - for rule in inventory_processes_rules: + # Handle new wato style inventory rules + for rule in invrules: taglist, hostlist = rule[1:3] if len(rule) >= 4: options = rule[3]

9 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014