Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64655 discussions

Check_MK Git: check_mk: Removed some trailing spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: d29bf8410aac5a4f1580ba3f38136de36d424448 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d29bf8410aac5a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 8 11:01:33 2014 +0200 Removed some trailing spaces --- checks/docsis_channels_upstream | 2 +- checks/hivemanager_devices | 4 ++-- web/plugins/wato/check_parameters.py | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/checks/docsis_channels_upstream b/checks/docsis_channels_upstream index 2e25d57..f93350f 100644 --- a/checks/docsis_channels_upstream +++ b/checks/docsis_channels_upstream @@ -52,7 +52,7 @@ def docsis_channels_upstream_convert(info): def inventory_docsis_channels_upstream(info): parsed = docsis_channels_upstream_convert(info) for cid, entry in parsed.items(): - if entry[2] != '0' and entry[5] != '0': + if entry[2] != '0' and entry[5] != '0': yield cid, {} def check_docsis_channels_upstream(item, params, info): diff --git a/checks/hivemanager_devices b/checks/hivemanager_devices index e0451ec..e3ca09d 100644 --- a/checks/hivemanager_devices +++ b/checks/hivemanager_devices @@ -56,7 +56,7 @@ def check_hivemanager_devices(item, params, info): if params['alert_on_loss']: if connection == 'False': yield 2, "Connection lost" - + # The number of clients number_of_clients = int(clients) warn, crit = params['max_clients'] @@ -101,6 +101,6 @@ check_info["hivemanager_devices"] = { "default_levels_variable" : "hivemanger_devices", "group" : "hivemanager_devices", "has_perfdata" : True, - + } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 465ea15..12db48b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1553,7 +1553,7 @@ register_check_parameters( Tuple( title = _("Maximum uptime of Device"), elements = [ - Age(title = _("Warning if above")), + Age(title = _("Warning if above")), Age(title = _("Critical if above")), ] )), @@ -1811,7 +1811,7 @@ def transform_msx_queues(params): if type(params) == tuple: return { "levels" : ( params[0], params[1] ) } return params - + register_check_parameters( subgroup_applications, @@ -1821,7 +1821,7 @@ register_check_parameters( Dictionary( title = _("Set Levels"), elements = [ - ( 'levels', + ( 'levels', Tuple( title = _("Maximum Number of E-Mails in Queue"), help = _("This rule applies to the number of E-Mails in the various Exchange Message Queues"), @@ -1830,12 +1830,12 @@ register_check_parameters( Integer(title = _("Critical if above"), unit = _("E-Mails")) ]), ), - ('offset', - Integer( + ('offset', + Integer( title = _("Offset"), help = _("Use this only if you want to overwrite the postion of the information in the agent " "Output. Also refer to the rule Microsoft Exchange Queues Inventory ") - ) + ) ), ], optional_keys = [ "offset" ],

10 years, 1 month

Check_MK Git: check_mk: MSI creation: cleaned up script

by Mathias Kettner

Module: check_mk Branch: master Commit: 479e715fbf270c5c2e696e3ca5dabddb78cff470 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=479e715fbf270c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 8 10:42:41 2014 +0200 MSI creation: cleaned up script --- agents/windows/msibuild/Makefile | 2 +- .../msibuild/{update_msi_file.py => msi-update} | 100 ++++++++++++++------ 2 files changed, 70 insertions(+), 32 deletions(-) diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index 9ff6582..8445fd4 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -51,5 +51,5 @@ msibuild: exchange_msi_files: msibuild mkdir -p work sources cp ../check_mk_agent.exe ../check_mk_agent-64.exe ../check_mk.example.ini sources - ./update_msi_file.py msi_container.msi $(BUILD_VERSION) $(CHECK_MK_VERSION) + ./msi-update -v msi_container.msi sources $(BUILD_VERSION) $(CHECK_MK_VERSION) rm -rf work sources diff --git a/agents/windows/msibuild/update_msi_file.py b/agents/windows/msibuild/msi-update similarity index 57% rename from agents/windows/msibuild/update_msi_file.py rename to agents/windows/msibuild/msi-update index aaf96cb..6626d3c 100755 --- a/agents/windows/msibuild/update_msi_file.py +++ b/agents/windows/msibuild/msi-update @@ -24,39 +24,76 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import os, sys, uuid +import os, sys, uuid, tempfile -# MSI container to modify -msi_file = sys.argv[1] -# Version formatted, e.g. 1.2.4.99 -new_version_build = "1.0.%s" % sys.argv[2] -# Official version name, e.g 1.2.5i4p1 -new_version_name = sys.argv[3] +def verbose(text): + if opt_verbose: + sys.stdout.write(text + "\n") + +def bail_out(text): + sys.stderr.write("ERROR: %s\n" % text) + sys.exit(1) + + +try: + if sys.argv[1] == '-v': + opt_verbose = True + del sys.argv[1] + else: + opt_verbose = False + + # MSI container to modify + msi_file = sys.argv[1] + + # Directory where the sources are contained + source_dir = sys.argv[2] + + # Version formatted, e.g. 1.2.4.99 + new_version_build = "1.0.%s" % sys.argv[3] + + # Official version name, e.g 1.2.5i4p1 + new_version_name = sys.argv[4] +except: + bail_out("Usage: %s MSIFILE.msi SOURCEDIR BUILDNUMBER VERSION" % sys.argv[0]) + + +if "OMD_ROOT" in os.environ: + path_prefix = "" + tmp_dir = os.environ("OMD_ROOT") +else: + path_prefix = "./" + tmp_dir = "." new_msi_file = "check_mk_agent.msi" +work_dir = tempfile.mkdtemp(prefix = tmp_dir + "/msi-update.") + +# When this script is run in the build environment then we need to specify +# paths to the msitools. When running in an OMD site, these tools are in +# our path # Export required idt files into work dir for entry in [ "File", "Upgrade", "Property" ]: - print "Export table %s from file %s" % (entry, msi_file) - os.system("./msiinfo export %(msi_file)s %(property)s > work/%(property)s.idt" % { "msi_file": msi_file, "property": entry }) + verbose("Export table %s from file %s" % (entry, msi_file)) + os.system((path_prefix + "msiinfo export %(msi_file)s %(property)s > %(work_dir)s/%(property)s.idt") % \ + { "work_dir" : work_dir, "msi_file": msi_file, "property": entry }) -print "Modify extracted files.." +verbose("Modify extracted files..") # ============================================== # Modify File.idt # HACK: the 64 bit agent is msi internally handled as check_mk_agent64.exe -os.rename("sources/check_mk_agent-64.exe", "sources/check_mk_agent64.exe") +os.rename(source_dir + "/check_mk_agent-64.exe", source_dir + "/check_mk_agent64.exe") -lines_file_idt = file("work/File.idt").readlines() -file_idt_new = file("work/File.idt.new", "w") +lines_file_idt = file(work_dir + "/File.idt").readlines() +file_idt_new = file(work_dir + "/File.idt.new", "w") file_idt_new.write("".join(lines_file_idt[:3])) for line in lines_file_idt[3:]: tokens = line.split("\t") filename = tokens[0] - file_stats = os.stat("sources/%s" % filename) + file_stats = os.stat(source_dir + "/" + filename) new_size = file_stats.st_size tokens[3] = str(new_size) # The version of this file is different from the msi installer version ! @@ -69,8 +106,8 @@ file_idt_new.close() # ============================================== # Modify Upgrade.idt -lines_upgrade_idt = file("work/Upgrade.idt").readlines() -upgrade_idt_new = file("work/Upgrade.idt.new", "w") +lines_upgrade_idt = file(work_dir + "/Upgrade.idt").readlines() +upgrade_idt_new = file(work_dir + "/Upgrade.idt.new", "w") upgrade_idt_new.write("".join(lines_upgrade_idt[:3])) for idx, token_offset in [ (3, 1), (4, 2) ]: @@ -86,8 +123,8 @@ upgrade_idt_new.close() # Modify Property.idt product_code = ("{%s}\r\n" % uuid.uuid1()).upper() upgrade_code = ("{%s}\r\n" % uuid.uuid1()).upper() -lines_property_idt = file("work/Property.idt").readlines() -property_idt_new = file("work/Property.idt.new", "w") +lines_property_idt = file(work_dir + "/Property.idt").readlines() +property_idt_new = file(work_dir + "/Property.idt.new", "w") property_idt_new.write("".join(lines_property_idt[:3])) for line in lines_property_idt[3:]: @@ -107,36 +144,37 @@ property_idt_new.close() -print "Creating copy of original file %s -> %s" % (msi_file, new_msi_file) +verbose("Creating copy of original file %s -> %s" % (msi_file, new_msi_file)) # Make a copy os.system("cp %(msi_file)s %(new_msi_file)s" % { "msi_file": msi_file, "new_msi_file": new_msi_file}) # Rename modified tables for entry in [ "Property", "File", "Upgrade" ]: - os.rename("work/%s.idt.new" % entry , "work/%s.idt" % entry) + os.rename(work_dir + "/%s.idt.new" % entry , work_dir + "/%s.idt" % entry) for entry in [ "Property", "File", "Upgrade" ]: - os.system("./msibuild %(new_msi_file)s -i work/%(file)s.idt" % { "new_msi_file": new_msi_file, "file": entry }) + os.system((path_prefix + "msibuild %(new_msi_file)s -i %(work_dir)s/%(file)s.idt") % \ + { "work_dir" : work_dir, "new_msi_file": new_msi_file, "file": entry }) # Update summary info with new uid package_code = ("{%s}" % uuid.uuid1()).upper() -os.system('./msibuild %(new_msi_file)s -s "Check_MK 32/64 bit MSI installer" "Mathias Kettner GmbH" "Intel;1033" "%(code)s"' %\ +os.system((path_prefix + 'msibuild %(new_msi_file)s -s "Check_MK 32/64 bit MSI installer" "Mathias Kettner GmbH" "Intel;1033" "%(code)s"') %\ {"code": package_code, "new_msi_file": new_msi_file}) # Remove original product.cab from stream -print "Removing product.cab from %s" % new_msi_file -os.system("./msibuild %(new_msi_file)s -q \"DELETE FROM _Streams where Name = 'product.cab'\"" % { "new_msi_file": new_msi_file } ) +verbose("Removing product.cab from %s" % new_msi_file) +os.system((path_prefix + "msibuild %(new_msi_file)s -q \"DELETE FROM _Streams where Name = 'product.cab'\"") % { "new_msi_file": new_msi_file } ) # Prepare product.cab file -print "Generating new product.cab" -os.system("lcab -n sources/check_mk.example.ini sources/check_mk_agent.exe sources/check_mk_agent64.exe work/product.cab") +verbose("Generating new product.cab") +os.system("lcab -n %(source_dir)s/check_mk.example.ini %(source_dir)s/check_mk_agent.exe " + "%(source_dir)s/check_mk_agent64.exe %(work_dir)s/product.cab" % globals()) # Add modified product.cab -print "Add modified product.cab" -os.system("./msibuild %(new_msi_file)s -a product.cab work/product.cab" % { "new_msi_file": new_msi_file }) - -print "Successfully created file", new_msi_file - +verbose("Add modified product.cab") +os.system((path_prefix + "msibuild %(new_msi_file)s -a product.cab %(work_dir)s/product.cab") % \ + { "work_dir" : work_dir, "new_msi_file": new_msi_file }) +verbose("Successfully created file " + new_msi_file)

10 years, 1 month

Check_MK Git: check_mk: Remove useless sync

by Mathias Kettner

Module: check_mk Branch: master Commit: 46e8d167938f87e3cc73bc8414b60d4103b47911 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46e8d167938f87… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 8 10:19:33 2014 +0200 Remove useless sync --- agents/windows/msibuild/update_msi_file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/msibuild/update_msi_file.py b/agents/windows/msibuild/update_msi_file.py index d881dd1..aaf96cb 100755 --- a/agents/windows/msibuild/update_msi_file.py +++ b/agents/windows/msibuild/update_msi_file.py @@ -130,7 +130,7 @@ os.system("./msibuild %(new_msi_file)s -q \"DELETE FROM _Streams where Name = 'p # Prepare product.cab file print "Generating new product.cab" -os.system("lcab -n sources/check_mk.example.ini sources/check_mk_agent.exe sources/check_mk_agent64.exe work/product.cab ; sync") +os.system("lcab -n sources/check_mk.example.ini sources/check_mk_agent.exe sources/check_mk_agent64.exe work/product.cab") # Add modified product.cab print "Add modified product.cab"

10 years, 1 month

Check_MK Git: check_mk: fixed i18n

by Andreas Boesl

Module: check_mk Branch: master Commit: fcd7d783b93ffc1e4b0930959904057199e84fe5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcd7d783b93ffc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 8 09:52:23 2014 +0200 fixed i18n --- web/plugins/wato/check_mk_configuration.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 47a3236..6107bae 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -621,10 +621,10 @@ register_configvar(group, 'information are too old.'), default_value = [ 'wato_users', 'page', 'wato_pre_activate_changes', 'wato_snapshot_pushed' ], choices = [ - ('page', 'During regular page processing'), - ('wato_users', 'When opening the users configuration page'), - ('wato_pre_activate_changes', 'Before activating the changed configuration'), - ('wato_snapshot_pushed', 'On a remote site, when it receives a new configuration'), + ('page', _('During regular page processing')), + ('wato_users', _('When opening the users configuration page')), + ('wato_pre_activate_changes', _('Before activating the changed configuration')), + ('wato_snapshot_pushed', _('On a remote site, when it receives a new configuration')), ], allow_empty = True, ),

10 years, 1 month

Check_MK Git: check_mk: Hivemanger: use ip instead of hostaname to connect to the hivemanager

by Bastian Kuhn

Module: check_mk Branch: master Commit: 292d29f825daa717b937eb67f9a18399bac88f29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=292d29f825daa7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 5 16:34:39 2014 +0200 Hivemanger: use ip instead of hostaname to connect to the hivemanager --- agents/special/agent_hivemanager | 6 +++--- checks/agent_hivemanager | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/special/agent_hivemanager b/agents/special/agent_hivemanager index e6cae61..80bfb40 100755 --- a/agents/special/agent_hivemanager +++ b/agents/special/agent_hivemanager @@ -29,11 +29,11 @@ from urllib2 import urlopen import urllib2, base64, json try: - host = sys.argv[1] + ip = sys.argv[1] user = sys.argv[2] password = sys.argv[3] except: - print "Usage: agent_hivemanager <HOST> <USERNAME> <PASSWORD>" + print "Usage: agent_hivemanager <IP> <USERNAME> <PASSWORD>" sys.exit(2) def get_url(address): @@ -52,7 +52,7 @@ print "Version: 1.2.5" print "AgentOs: Hivemanager" print "<<<hivemanager_devices:sep(124)>>>" -address = "https://%s/hm/api/v1/devices" % host +address = "https://%s/hm/api/v1/devices" % ip for line in json.loads(get_url(address).read()): if line['upTime'] == '': line['upTime'] = "down" diff --git a/checks/agent_hivemanager b/checks/agent_hivemanager index 5cfe427..4cfd87d 100644 --- a/checks/agent_hivemanager +++ b/checks/agent_hivemanager @@ -26,6 +26,6 @@ def agent_hivemanager_arguments(params, hostname, ipaddress): # User, Password - return "'%s' %s %s" % ( hostname, quote_shell_string(params[0]), quote_shell_string(params[1]) ) + return "'%s' %s %s" % ( ipaddress, quote_shell_string(params[0]), quote_shell_string(params[1]) ) special_agent_info['hivemanager'] = agent_hivemanager_arguments

10 years, 1 month

Check_MK Git: check_mk: hivemanager_devices: Also add offline devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 47ddf885ae0445d15621cebc0d0b9e0467c5131a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47ddf885ae0445… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 5 14:59:11 2014 +0200 hivemanager_devices: Also add offline devices --- checks/hivemanager_devices | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/hivemanager_devices b/checks/hivemanager_devices index 7c3edf7..e0451ec 100644 --- a/checks/hivemanager_devices +++ b/checks/hivemanager_devices @@ -39,8 +39,7 @@ factory_settings['hivemanger_devices'] = { def inventory_hivemanager_devices(info): for hostname, clients, alarm, connection, uptime in info: - if connection == "True": - yield hostname, {} + yield hostname, {} def check_hivemanager_devices(item, params, info): for hostname, clients, alarm, connection, uptime in info:

10 years, 1 month

Check_MK Git: check_mk: arris_cmts_cpu: Fixed typo

by Bastian Kuhn

Module: check_mk Branch: master Commit: e71bc49d676c96204a9b9f48f5cee9b18c5ce103 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e71bc49d676c96… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 5 13:48:08 2014 +0200 arris_cmts_cpu: Fixed typo --- agents/special/agent_hivemanager | 9 +++++---- checks/agent_hivemanager | 2 +- checks/arris_cmts_cpu | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/agents/special/agent_hivemanager b/agents/special/agent_hivemanager index b4145cd..e6cae61 100755 --- a/agents/special/agent_hivemanager +++ b/agents/special/agent_hivemanager @@ -29,10 +29,11 @@ from urllib2 import urlopen import urllib2, base64, json try: - user = sys.argv[1] - password = sys.argv[2] + host = sys.argv[1] + user = sys.argv[2] + password = sys.argv[3] except: - print "Usage: agent_hivemanager <USERNAME> <PASSWORD>" + print "Usage: agent_hivemanager <HOST> <USERNAME> <PASSWORD>" sys.exit(2) def get_url(address): @@ -51,7 +52,7 @@ print "Version: 1.2.5" print "AgentOs: Hivemanager" print "<<<hivemanager_devices:sep(124)>>>" -address = "https://login.hivemanager.ch/hm/api/v1/devices" +address = "https://%s/hm/api/v1/devices" % host for line in json.loads(get_url(address).read()): if line['upTime'] == '': line['upTime'] = "down" diff --git a/checks/agent_hivemanager b/checks/agent_hivemanager index cbdd5f0..5cfe427 100644 --- a/checks/agent_hivemanager +++ b/checks/agent_hivemanager @@ -26,6 +26,6 @@ def agent_hivemanager_arguments(params, hostname, ipaddress): # User, Password - return "%s %s" % ( quote_shell_string(params[0]), quote_shell_string(params[1]) ) + return "'%s' %s %s" % ( hostname, quote_shell_string(params[0]), quote_shell_string(params[1]) ) special_agent_info['hivemanager'] = agent_hivemanager_arguments diff --git a/checks/arris_cmts_cpu b/checks/arris_cmts_cpu index b66aef9..fa74fb2 100644 --- a/checks/arris_cmts_cpu +++ b/checks/arris_cmts_cpu @@ -50,7 +50,7 @@ def check_arris_cmts_cpu(item, params, info): cpu_util = 100 - int(cpu_idle_util) warn, crit = params infotext = "Current utilization is: %d %% " % cpu_util - levels = " (warn/crit at %.1f/%.1f °C)" % (warn, crit) + levels = " (warn/crit at %.1f/%.1f %%)" % (warn, crit) perfdata = [ ( "util", cpu_util, warn, crit ) ] if cpu_util >= crit: yield 2, infotext + levels, perfdata

10 years, 1 month

Check_MK Git: check_mk: TextAscii: Attrencode is now default True

by Bastian Kuhn

Module: check_mk Branch: master Commit: 90d0e70c8faf7276738811bc2f9b7517cef12689 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90d0e70c8faf72… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 5 12:29:03 2014 +0200 TextAscii: Attrencode is now default True --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e27f392..593f59b 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -323,7 +323,7 @@ class TextAscii(ValueSpec): self._size = kwargs.get("size", 25) # also possible: "max" self._cssclass = kwargs.get("cssclass", "text") self._strip = kwargs.get("strip", True) - self._attrencode = kwargs.get("attrencode", False) + self._attrencode = kwargs.get("attrencode", True) self._allow_empty = kwargs.get("allow_empty", _("none")) self._empty_text = kwargs.get("empty_text", "") self._read_only = kwargs.get("read_only")

10 years, 1 month

Check_MK Git: check_mk: #1396 FIX Fix default setting of Enable sounds in views

by Mathias Kettner

Module: check_mk Branch: master Commit: 4468a4fb091a5f1937e01702e6569ba7deba139a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4468a4fb091a5f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 5 12:22:50 2014 +0200 #1396 FIX Fix default setting of Enable sounds in views The global settings in WATO displayed the default value for the setting Enable sounds in views as on. If fact the default is off. So as long as you did not switch this once back and forth no sounds were being played. This has been fixed now and the default settings is correctly being displayed as off. --- .werks/1396 | 13 +++++++++++++ ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/1396 b/.werks/1396 new file mode 100644 index 0000000..2684bf7 --- /dev/null +++ b/.werks/1396 @@ -0,0 +1,13 @@ +Title: Fix default setting of Enable sounds in views +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1409912476 +Class: fix + +The global settings in WATO displayed the default value for the setting +Enable sounds in views as on. If fact the default is +off. So as long as you did not switch this once back and forth no +sounds were being played. This has been fixed now and the default settings +is correctly being displayed as off. diff --git a/ChangeLog b/ChangeLog index 03a5fe7..ccc7bf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ * 0201 FIX: Fixed error message in Rulelist of RBN... * 1100 FIX: WATO backup domains: fixed bug were excluded files still got deleted on snapshot restore... * 1101 FIX: WATO check parameter: renamed 'Nominal Voltages' to 'Voltage Levels..' + * 1396 FIX: Fix default setting of Enable sounds in views... Notifications: * 1151 Add variables (HOST/SERVICE)ACK(AUTHOR/COMMENT) to notification context... diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 716a1cb..47a3236 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -113,13 +113,13 @@ register_configvar(group, register_configvar(group, "enable_sounds", - Checkbox(title = _("Enabled sounds in views"), + Checkbox(title = _("Enable sounds in views"), label = _("enable sounds"), help = _("If sounds are enabled then the user will be alarmed by problems shown " "in a Multisite status view if that view has been configured for sounds. " "From the views shipped in with Multisite all problem views have sounds " "enabled."), - default_value = True), + default_value = False), domain = "multisite") register_configvar(group,

10 years, 1 month

Check_MK Git: check_mk: docsis_channels_upstream: make compatible with more devices, add Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: d7a68dbecca11173492aa182dd76130ded9c84b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7a68dbecca111… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 5 10:54:41 2014 +0200 docsis_channels_upstream: make compatible with more devices, add Perf-O-Meter --- checks/docsis_channels_upstream | 151 ++++++++++++++++++++++-------------- web/plugins/perfometer/check_mk.py | 6 ++ 2 files changed, 100 insertions(+), 57 deletions(-) diff --git a/checks/docsis_channels_upstream b/checks/docsis_channels_upstream index 2a7f30a..2e25d57 100644 --- a/checks/docsis_channels_upstream +++ b/checks/docsis_channels_upstream @@ -19,7 +19,7 @@ # 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 +# tails. 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. @@ -28,44 +28,74 @@ factory_settings["docsis_channels_upstream_default_levels"] = { "signal_noise" : ( 10.0, 5.0 ), # dB } +def docsis_channels_upstream_convert(info): + parsed = {} + freq_info, sig_info, cm_info = info + if len(freq_info) == 1 and len(sig_info) == 1 and \ + freq_info[0][0] != sig_info[0][0]: # Probably ARRIS modem + cid = freq_info[0][0] + parsed[cid] = freq_info[0][1:] + sig_info[0][1:] + if len(cm_info) == 1: # Never seen + parsed[cid] += cm_info[0] + + else: + sig_info_dict = dict([ (x[0], x[1:]) for x in sig_info]) + cm_info_dict = dict([ (x[0], x[1:]) for x in cm_info]) + for line in freq_info: + endoid = line[0] + cid = line[1] + if line[2] != '0': + parsed[cid] = line[1:] + sig_info_dict[endoid] + cm_info_dict.get(endoid, []) + + return parsed + def inventory_docsis_channels_upstream(info): - for line in info: - if line[1] != '0': - yield line[0], {} + parsed = docsis_channels_upstream_convert(info) + for cid, entry in parsed.items(): + if entry[2] != '0' and entry[5] != '0': + yield cid, {} def check_docsis_channels_upstream(item, params, info): - for channel_id, mhz, total, active, registered, avg_util, \ - unerroreds, correcteds, uncorrectables, signal_noise in info: - if channel_id == item: - for varname, value, title, form, unit in [ - ( "frequency", float(mhz) / 1000000, "Frequency", "%.2f", " MHz"), + parsed = docsis_channels_upstream_convert(info) + if item in parsed: + entry = parsed[item] + + channel_id, mhz, unerroreds, correcteds, uncorrectables, signal_noise = entry[:6] + + # Signal Noise + noise_db = float(signal_noise) / 10 + infotext = "Signal/Noise ratio: %.2f dB" % noise_db + warn, crit = params['signal_noise'] + levels = " (warn/crit at %.1f/%.1f dB)" % ( warn, crit ) + state = 0 + if noise_db <= crit: + state = 2 + infotext += levels + elif noise_db <= warn: + state = 1 + infotext += levels + yield state, infotext, [ ('signal_noise', noise_db, warn, crit ) ] + + fields = [ + ( "frequency", float(mhz) / 1000000, "Frequency", "%.2f", " MHz"), + ( "unerroreds", int(unerroreds), "codewords without errors", "%d", "" ), + ( "correcteds", int(correcteds), "corrected errors", "%d", "" ), + ( "uncorrectables", int(uncorrectables), "uncorrectable errors", "%d", "" ), + ] + if len(entry) >= 10: + total, active, registered, avg_util = entry[6:10] + fields += [ ( "total", int(total), "Modems total", "%d", "" ), ( "active", int(active), "active", "%d", "" ), ( "registered", int(registered), "registered", "%d", "" ), ( "util", int(avg_util), "average utilization", "%d", "%" ), + ] - # Replace with counters later - ( "unerroreds", int(unerroreds), "codewords without errors", "%d", "" ), - ( "correcteds", int(correcteds), "corrected errors", "%d", "" ), - ( "uncorrectables", int(uncorrectables), "uncorrectable errors", "%d", "" ), - ]: - yield 0, title + ": " + (form + "%s") % (value, unit), [ (varname, value) ] - - # Signal Noise - noise_db = float(signal_noise) / 10 - infotext = "Signal/Noise ratio: %.2f dB" % noise_db - warn, crit = params['signal_noise'] - levels = " (warn/crit at %.1f/%.1f dB)" % ( warn, crit ) - state = 0 - if noise_db <= crit: - state = 2 - infotext += levels - elif noise_db <= warn: - state = 1 - infotext += levels - yield state, infotext, [ ('signal_noise', noise_db, warn, crit ) ] - - return + for varname, value, title, form, unit in fields: + yield 0, title + ": " + (form + "%s") % (value, unit), [ (varname, value) ] + + + return yield 3, "Channel information not found in SNMP data" @@ -77,32 +107,39 @@ check_info["docsis_channels_upstream"] = { "service_description" : "Upstream Channel %s", "has_perfdata" : True, "snmp_scan_function" : docsis_scan_function, - "snmp_info" : ( - ".1.3.6.1", [ - "2.1.10.127.1.1.2.1.1", # docsIfUpChannelId - "2.1.10.127.1.1.2.1.2", # docsIfUpChannelFrequency - "4.1.9.9.116.1.4.1.1.3", # cdxIfUpChannelCmTotal - "4.1.9.9.116.1.4.1.1.4", # cdxIfUpChannelCmActive - "4.1.9.9.116.1.4.1.1.5", # cdxIfUpChannelCmRegistered - "4.1.9.9.116.1.4.1.1.7", # cdxIfUpChannelAvgUtil - - "2.1.10.127.1.1.4.1.2", # docsIfSigQUnerroreds: - # "Codewords received on this channel without error. - # This includes all codewords, whether or not they - # were part of frames destined for this device." - - "2.1.10.127.1.1.4.1.3", # docsIfSigQCorrecteds: - # "Codewords received on this channel with correctable - # errors. This includes all codewords, whether or not - # they were part of frames destined for this device." - - "2.1.10.127.1.1.4.1.4", # docsIfSigQUncorrectables: - # "Codewords received on this channel with uncorrectable - # errors. This includes all codewords, whether or not - # they were part of frames destined for this device." - - "2.1.10.127.1.1.4.1.5", # docsIfSigQSignalNoise - ]), + "snmp_info" : [ + ( ".1.3.6.1.2.1.10.127.1.1.2.1", [ + OID_END, + "1", # docsIfUpChannelId + "2", # docsIfUpChannelFrequency + ]), + ( ".1.3.6.1.2.1.10.127.1.1.4.1", [ + OID_END, + "2", # docsIfSigQUnerroreds: + # "Codewords received on this channel without error. + # This includes all codewords, whether or not they + # were part of frames destined for this device." + + "3", # docsIfSigQCorrecteds: + # "Codewords received on this channel with correctable + # errors. This includes all codewords, whether or not + # they were part of frames destined for this device." + + "4", # docsIfSigQUncorrectables: + # "Codewords received on this channel with uncorrectable + # errors. This includes all codewords, whether or not + # they were part of frames destined for this device." + + "5", # docsIfSigQSignalNoise + ]), + ( ".1.3.6.1.4.1.9.9.116.1.4.1.1" , [ + OID_END, + "3", # cdxIfUpChannelCmTotal + "4", # cdxIfUpChannelCmActive + "5", # cdxIfUpChannelCmRegistered + "7", # cdxIfUpChannelAvgUtil + ]), + ], "default_levels_variable" : "docsis_channels_upstream_default_levels", "group" : "docsis_channels_upstream", "includes" : [ "docsis.include" ], diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index dff9aac..0c4286c 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1163,3 +1163,9 @@ def perfometer_dbmv(row, check_command, perf_data): return "%.1f dBmV" % dbmv, perfometer_logarithmic(dbmv, 50, 2, "#da6") perfometers["check_mk-docsis_channels_downstream"] = perfometer_dbmv + +def perfometer_docsis_snr(row, check_command, perf_data): + dbmv = float(perf_data[0][1]) + return "%.1f dB" % dbmv, perfometer_logarithmic(dbmv, 50, 2, "#ad6") + +perfometers["check_mk-docsis_channels_upstream"] = perfometer_docsis_snr

10 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits