Checkmk git commits September 2014

checkmk-commits@lists.checkmk.com

5 participants
195 discussions

Check_MK Git: check_mk: more features of extract script

by Goetz Golla

Module: check_mk Branch: master Commit: 1901c140d30d4d7a70780f8f8cd5ff541ccb2714 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1901c140d30d4d… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 1 16:46:01 2014 +0200 more features of extract script --- doc/treasures/inventory/extract_inventory.py | 98 ++++++++++++++++++-------- 1 file changed, 69 insertions(+), 29 deletions(-) diff --git a/doc/treasures/inventory/extract_inventory.py b/doc/treasures/inventory/extract_inventory.py index a4f75d5..6d2bfe9 100755 --- a/doc/treasures/inventory/extract_inventory.py +++ b/doc/treasures/inventory/extract_inventory.py @@ -37,26 +37,36 @@ relations = { ( "hardware.system.family", "device_model" ), ( "hardware.system.serial", "serial_number" ), ( "software.os.name", "operating_system" ), - ( "software.os.install_date", "installation date" ), + ( "@inventory_date", "inventory_date" ), + ( "software.os.install_date", "installation_date" ), + ( "hardware.cpu.sockets", "cpu_socket_count" ), ( "hardware.cpu.cpus", "cpu_chip_count" ), ( "hardware.cpu.cores", "cpu_core_count" ), ( "hardware.cpu.max_speed", "cpu_speed" ), ( "hardware.cpu.model", "cpu_name" ), ), "filter": {}, + "converter": { + "software.os.install_date": lambda val: time.strftime("%Y-%m-%d", time.localtime(val)), + "@inventory_date": lambda val: time.strftime("%Y-%m-%d", time.localtime(val)), + "hardware.cpu.max_speed": lambda val: val/1000000, # hz in mhz + }, }, "inv_raw_arp": { "columns": ( ( "software.packages:*.vendor", "publisher" ), ( "software.packages:*.summary", "product" ), ( "software.packages:*.version", "product_version" ), + ( "@hostname", "import_device_id" ), ), "filter": { "software.packages:*.package_type": "reg_uninstall", # nur aus registry }, + "converter": {}, }, "inv_raw_file": { "columns": ( + ( "@hostname", "import_device_id" ), ( "software.packages:*.name", "file_name" ), ( "software.packages:*.size", "file_size" ), ( "software.packages:*.path", "file_path" ), @@ -67,25 +77,29 @@ relations = { "filter": { "software.packages:*.package_type": "exe", # nur exe files }, + "converter": {}, }, "inv_raw_generic(OS)": { "columns": ( ( "software.os.name", "generic_key" ), ), "filter": {}, + "converter": {}, }, "inv_raw_generic(Linux)": { "columns": ( ( "software.packages:*.name", "name" ), ( "software.packages:*.version", "product_version" ), + ( "@hostname", "import_device_id" ), ), "filter": { "software.packages:*.package_type": "deb", # nur exe files }, + "converter": {}, }, } -import os, sys, re +import os, sys, re, time omd_root = os.environ["OMD_ROOT"] @@ -99,13 +113,18 @@ if not omd_root: def is_list(relation): list_start = "" - if type(relation) == dict: # filter is a dict + if type(relation) == dict: # filter and converter are dicts, check them too relation = relation.keys() - is_list = (":*" in relation[0]) - if is_list: - list_start = relation[0].split(":")[0] for field in relation: - if is_list != (":*" in field) or not field.startswith(list_start): + if not field.startswith("@"): + if ":*" in field: + is_list = True + list_start = field.split(":")[0] + else: + is_list = False + break + for field in relation: + if ( is_list != (":*" in field) or not field.startswith(list_start) ) and not field.startswith("@"): print "bad definition of relation, must be list or dict, not both" sys.exit(1) return list_start @@ -126,27 +145,43 @@ def filt_it(package, relation): return False return True -def print_line(out_rel, hostname, items): - out_rel.write("\"%s\"" % hostname) - for item in items: - out_rel.write(", \"%s\"" % item) - out_rel.write("\n") +def convert_it(c_relation, item, field): + for c_field in c_relation.keys(): + if c_field == field: + item = c_relation[field](item) # apply the function defined to item + return item + +def print_line(out_rel, items): + outtxt = "\", \"".join(map(str,items)) + out_rel.write("\"") + out_rel.write("%s" % outtxt) + out_rel.write("\"\n") +# special values starting with a "@" +def special_value(item, hostname): + if item == "@hostname": + return hostname + elif item == "@inventory_date": + return inventory_date[hostname] + else: + return "" # extract all data all_data = {} +inventory_date = {} for hostname in os.listdir(inv_dir): fn = inv_dir + hostname if os.path.isfile(fn): a = eval(open(fn,'r').read()) all_data[hostname] = a + inventory_date[hostname] = os.path.getmtime(fn) # loop over all relations, create an output file for each relation for ofs in relations: ofn = out_dir + ofs out_rel = open(ofn,'w') titles = [col[1] for col in relations[ofs]["columns"]] - print_line(out_rel, "hostname", titles) + print_line(out_rel, titles) elements = [col[0] for col in relations[ofs]["columns"]] list_start = is_list(elements) print "starting", ofn @@ -157,16 +192,20 @@ for ofs in relations: if field: subtree = all_data[hostname] for item in field.split("."): - try: - subtree = subtree[item] - except: - items.append("") - break + if item.startswith("@"): # take subtree vom special_value + subtree = special_value(item,hostname) + else: + try: + subtree = subtree[item] + except: + items.append("") + break if type(subtree) in (str, int, float): - items.append(subtree) + converted = convert_it(relations[ofs]['converter'], subtree,field) + items.append(converted) else: items.append("") - print_line(out_rel, hostname, items) + print_line(out_rel, items) out_rel.close() else: for hostname in all_data: @@ -175,8 +214,7 @@ for ofs in relations: try: subtree = subtree[item] except: - print "does not exist" - sys.exit(1) + print " %s does not exist in database of host" % item if type(subtree) == list: for package in subtree: if filt_it(package, relations[ofs]): @@ -186,15 +224,17 @@ for ofs in relations: if field: field = re.sub(list_start+":\*.", "", field) for item in field.split("."): - try: - value = package[item] - except: - items.append("") - break + if item.startswith("@"): # take subtree vom special_value + value = special_value(item,hostname) + else: + try: + value = package[item] + except: + items.append("") + break if type(value) in (str, int, float): items.append(value) else: items.append("") - print_line(out_rel, hostname, items) - #out_rel.write("\n") + print_line(out_rel, items) out_rel.close()

10 years, 3 months

Check_MK Git: check_mk: #0655 FIX win_cpuinfo and mk_inventory.ps1 agent: unit of CPU speed fixed, fixes for long output lines in agent

by Goetz Golla

Module: check_mk Branch: master Commit: f2c32c4ba6f6f91386fd39636523909827ae17a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2c32c4ba6f6f9… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 1 16:45:14 2014 +0200 #0655 FIX win_cpuinfo and mk_inventory.ps1 agent: unit of CPU speed fixed, fixes for long output lines in agent --- .werks/655 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.ps1 | 23 ++++++++++++++++------- inventory/win_cpuinfo | 2 +- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.werks/655 b/.werks/655 new file mode 100644 index 0000000..c68934d --- /dev/null +++ b/.werks/655 @@ -0,0 +1,9 @@ +Title: win_cpuinfo and mk_inventory.ps1 agent: unit of CPU speed fixed, fixes for long output lines in agent +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.5i6 +Date: 1409582610 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 529707a..234a3f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,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... + * 0655 FIX: win_cpuinfo and mk_inventory.ps1 agent: unit of CPU speed fixed, fixes for long output lines in agent 1.2.5i5: diff --git a/agents/windows/plugins/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 index 8882b5a..97b8b3d 100644 --- a/agents/windows/plugins/mk_inventory.ps1 +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -27,7 +27,9 @@ $until = [int]($epoch -replace ",.*", "") + $delay + 600 # Processor write-host "<<<win_cpuinfo:sep(58):persist($until)>>>" -Get-WmiObject Win32_Processor -ComputerName $name | Select Name,Manufacturer,Caption,DeviceID,MaxClockSpeed,AddressWidth,L2CacheSize,L3CacheSize,Architecture,NumberOfCores,NumberOfLogicalProcessors,CurrentVoltage,Status +$cpu = Get-WmiObject Win32_Processor -ComputerName $name +$cpu_vars = @( "Name","Manufacturer","Caption","DeviceID","MaxClockSpeed","AddressWidth","L2CacheSize","L3CacheSize","Architecture","NumberOfCores","NumberOfLogicalProcessors","CurrentVoltage","Status" ) +foreach ( $entry in $cpu ) { foreach ( $item in $cpu_vars) { write-host $item ":" $entry.$item } } # OS Version write-host "<<<win_os:sep(124):persist($until)>>>" @@ -38,20 +40,27 @@ Get-WmiObject Win32_OperatingSystem -ComputerName $name -Recurse | foreach-objec # BIOS write-host "<<<win_bios:sep(58):persist($until)>>>" -Get-WmiObject win32_bios -ComputerName $name | Select Manufacturer,Name,SerialNumber,InstallDate,BIOSVersion,ListOfLanguages,PrimaryBIOS,ReleaseDate,SMBIOSBIOSVersion,SMBIOSMajorVersion,SMBIOSMinorVersion +$bios = Get-WmiObject win32_bios -ComputerName $name +$bios_vars= @( "Manufacturer","Name","SerialNumber","InstallDate","BIOSVersion","ListOfLanguages","PrimaryBIOS","ReleaseDate","SMBIOSBIOSVersion","SMBIOSMajorVersion","SMBIOSMinorVersion" ) +foreach ( $entry in $bios ) { foreach ( $item in $bios_vars) { write-host $item ":" $entry.$item } } # System write-host "<<<win_system:sep(58):persist($until)>>>" -Get-WmiObject Win32_SystemEnclosure -ComputerName $name | Select Manufacturer,Name,Model,HotSwappable,InstallDate,PartNumber,SerialNumber +$system = Get-WmiObject Win32_SystemEnclosure -ComputerName $name +$system_vars = @( "Manufacturer","Name","Model","HotSwappable","InstallDate","PartNumber","SerialNumber" ) +foreach ( $entry in $system ) { foreach ( $item in $system_vars) { write-host $item ":" $entry.$item } } # Hard-Disk write-host "<<<win_disks:sep(58):persist($until)>>>" -Get-WmiObject win32_diskDrive -ComputerName $name | select Manufacturer,InterfaceType,Model,Name,SerialNumber,Size,MediaType,Signature +$disk = Get-WmiObject win32_diskDrive -ComputerName $name +$disk_vars = @( "Manufacturer","InterfaceType","Model","Name","SerialNumber","Size","MediaType","Signature" ) +foreach ( $entry in $disk ) { foreach ( $item in $disk_vars) { write-host $item ":" $entry.$item } } # Graphics Adapter write-host "<<<win_video:sep(58):persist($until)>>>" -Get-WmiObject Win32_VideoController -ComputerName $name | Select Name, Description, Caption, AdapterCompatibility, VideoModeDescription, VideoProcessor, DriverVersion, DriverDate, MaxMemorySupported - +$adapters=Get-WmiObject Win32_VideoController -ComputerName $name +$adapter_vars = @( "Name", "Description", "Caption", "AdapterCompatibility", "VideoModeDescription", "VideoProcessor", "DriverVersion", "DriverDate", "MaxMemorySupported") +foreach ( $entry in $adapters ) { foreach ( $item in $adapter_vars) { write-host $item ":" $entry.$item } } # Installed Software write-host "<<<win_wmi_software:sep(124):persist($until)>>>" @@ -67,7 +76,7 @@ foreach ($path in $paths) { # Search exes write-host "<<<win_exefiles:sep(124):persist($until)>>>" -$paths = @("d:\", "c:\Program Files", "c:\Program Files (x86)", "c:\Progs") +$paths = @("c:\Program Files (x86)") foreach ($item in $paths) { if ((Test-Path $item -pathType container)) diff --git a/inventory/win_cpuinfo b/inventory/win_cpuinfo index 94dac5b..96600ab 100644 --- a/inventory/win_cpuinfo +++ b/inventory/win_cpuinfo @@ -44,7 +44,7 @@ def win_cpuinfo_parse_speed(v): # into Hz (float) return None parts = v.split() if len(parts) == 1: - return float(parts[0]) + return float(parts[0]) * 1000000.0 # seems to be in MHz as default elif parts[1] == "GHz": return float(parts[0]) * 1000000000.0 elif parts[1] == "MHz":

10 years, 3 months

Check_MK Git: check_mk: #1176 winperf_msx_queues: The list of counters for inventory can now be configured host based using wato

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8551bd841338a862a38975fe6374f010f9d87eb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8551bd841338a8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 1 15:17:16 2014 +0200 #1176 winperf_msx_queues: The list of counters for inventory can now be configured host based using wato --- .werks/1176 | 9 +++++++++ ChangeLog | 1 + checks/winperf_msx_queues | 10 ++++++++++ web/plugins/wato/check_parameters.py | 24 ++++++++++++++++++++++++ 4 files changed, 44 insertions(+) diff --git a/.werks/1176 b/.werks/1176 new file mode 100644 index 0000000..9bf1175 --- /dev/null +++ b/.werks/1176 @@ -0,0 +1,9 @@ +Title: winperf_msx_queues: The list of counters for inventory can now be configured host based using wato +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1409577386 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 529707a..02982da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 1103 windows agent: now able to omit context text of logfiles... * 1150 netstat: new check for monitoring TCP/UDP connections and Linux and AIX... * 0654 oracle_instance: now also monitors the log mode + * 1176 winperf_msx_queues: The list of counters for inventory can now be configured host based using wato * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checks/winperf_msx_queues b/checks/winperf_msx_queues index fabe7cd..c7a8f18 100644 --- a/checks/winperf_msx_queues +++ b/checks/winperf_msx_queues @@ -64,9 +64,19 @@ winperf_msx_queues = { "Poison Queue Length" : "44", } +winperf_msx_queues_inventory = [] + def inventory_winperf_msx_queues(info): num_instances = int(info[1][0]) if num_instances > 0: + # Its possible to set the wanted queues via wato + inventory_rules = {} + for rulset in host_extra_conf(g_hostname, winperf_msx_queues_inventory): + inventory_rules.update(dict(rulset)) + # In case that rules for this host are set, + # only use this rules + if inventory_rules: + winperf_msx_queues = inventory_rules return [ (name, "msx_queues_default_levels") for name in winperf_msx_queues ] def check_winperf_msx_queues(item, params, info): diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index db81a77..dee31e8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3955,6 +3955,30 @@ register_rule(group + '/' + subgroup_networking, match = 'all', ) +register_rule(group + '/' + subgroup_inventory, + varname = "winperf_msx_queues_inventory", + title = _('Microsoft Exchange Queues Inventory'), + help = _('Per default all Counters a preconfigured in the check. ' + 'It needed it is possible to overwrite that with this rule. ' + 'To do that, knowledge about the Agent Output is needed. '), + valuespec = ListOf( + Tuple( + elements = [ + TextAscii( + title = _("Name of Counter"), + help = _("Name of the Counter to be monitored."), + allow_empty = False, + ), + Integer( + title = _("Offset"), + help = _("The Offset of the information relative to counter base"), + allow_empty = False, + ), + ]), + add_label = _("Add Counter")), + match = 'all', +) + register_check_parameters( subgroup_applications, "mailqueue_length",

10 years, 3 months

Check_MK Git: check_mk: plugins/views.py fixed missing i18n

by Bastian Kuhn

Module: check_mk Branch: master Commit: 848d1aa081e1ee26cbfc51c8ca6025946240eaad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=848d1aa081e1ee… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 1 13:27:14 2014 +0200 plugins/views.py fixed missing i18n --- web/plugins/views/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 6697a0d..1d5d26e 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1781,7 +1781,7 @@ multisite_builtin_views.update({ 'public': True, 'show_filters': [], 'sorters': [('site_host', False), ('svcdescr', False)], - 'title': u'Stale services', + 'title': _('Stale services'), 'topic': _('Problems'), 'user_sortable': 'on'}, 'events': {'browser_reload': 0,

10 years, 3 months

Check_MK Git: check_mk: mkeventd views. fixed missing i18n

by Andreas Boesl

Module: check_mk Branch: master Commit: 68ac7458efabf8dc4ab9d1d0ca4187751bbdfd94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68ac7458efabf8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 1 10:25:54 2014 +0200 mkeventd views. fixed missing i18n --- mkeventd/web/plugins/views/mkeventd.py | 35 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index ac2b4b1..0b79fb9 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -894,7 +894,7 @@ if mkeventd_enabled: def mkeventd_view(d): x = { - 'topic': u'Event Console', + 'topic': _('Event Console'), 'browser_reload': 60, 'column_headers': 'pergroup', 'icon': 'mkeventd', @@ -918,8 +918,8 @@ if mkeventd_enabled: # Table of all open events multisite_builtin_views['ec_events'] = mkeventd_view({ - 'title': u'Events', - 'description': u'Table of all currently open events (handled and unhandled)', + 'title': _('Events'), + 'description': _('Table of all currently open events (handled and unhandled)'), 'datasource': 'mkeventd_events', 'layout': 'table', 'painters': [ @@ -962,8 +962,8 @@ if mkeventd_enabled: }) multisite_builtin_views['ec_events_of_monhost'] = mkeventd_view({ - 'title': u'Events of Monitored Host', - 'description': u'Currently open events of a host that is monitored', + 'title': _('Events of Monitored Host'), + 'description': _('Currently open events of a host that is monitored'), 'datasource': 'mkeventd_events', 'layout': 'table', 'hidden': True, @@ -1001,8 +1001,8 @@ if mkeventd_enabled: ], }) multisite_builtin_views['ec_events_of_host'] = mkeventd_view({ - 'title': u'Events of Host', - 'description': u'Currently open events of one specific host', + 'title': _('Events of Host'), + 'description': _('Currently open events of one specific host'), 'datasource': 'mkeventd_events', 'layout': 'table', 'hidden': True, @@ -1041,8 +1041,8 @@ if mkeventd_enabled: }) multisite_builtin_views['ec_event'] = mkeventd_view({ - 'title': u'Event Details', - 'description': u'Details about one event', + 'title': _('Event Details'), + 'description': _('Details about one event'), 'linktitle': 'Event Details', 'datasource': 'mkeventd_events', 'layout': 'dataset', @@ -1080,9 +1080,8 @@ if mkeventd_enabled: }) multisite_builtin_views['ec_history_recent'] = mkeventd_view({ - 'title': u'Recent Event History', - 'description': u'Information about events and actions on events during the ' - u'recent 24 hours.', + 'title': _('Recent Event History'), + 'description': _('Information about events and actions on events during the recent 24 hours.'), 'datasource': 'mkeventd_history', 'layout': 'table', @@ -1134,8 +1133,8 @@ if mkeventd_enabled: }) multisite_builtin_views['ec_historyentry'] = mkeventd_view({ - 'title': u'Event History Entry', - 'description': u'Details about a historical event history entry', + 'title': _('Event History Entry'), + 'description': _('Details about a historical event history entry'), 'datasource': 'mkeventd_history', 'layout': 'dataset', @@ -1175,8 +1174,8 @@ if mkeventd_enabled: }) multisite_builtin_views['ec_history_of_event'] = mkeventd_view({ - 'title': u'History of Event', - 'description': u'History entries of one specific event', + 'title': _('History of Event'), + 'description': _('History entries of one specific event'), 'datasource': 'mkeventd_history', 'layout': 'table', 'columns': 1, @@ -1209,8 +1208,8 @@ if mkeventd_enabled: }) multisite_builtin_views['ec_history_of_host'] = mkeventd_view({ - 'title': u'Event History of Host', - 'description': u'History entries of one specific host', + 'title': _('Event History of Host'), + 'description': _('History entries of one specific host'), 'datasource': 'mkeventd_history', 'layout': 'table', 'columns': 1,

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 September 2014