Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: heartbeat_crm: fix exception in case of no output by old agent

by Mathias Kettner

Module: check_mk Branch: master Commit: f2c59fc368b78b869baf214942341c78a86ff141 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2c59fc368b78b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 8 09:16:23 2015 +0200 heartbeat_crm: fix exception in case of no output by old agent --- checks/heartbeat_crm | 20 ++++++++++++-------- checks/ipmi | 24 ++++++++++-------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index da1be84..9fbc7ff 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -72,7 +72,10 @@ factory_settings["heartbeat_crm_default_levels"] = { } def heartbeat_crm_parse_general(info): - dc, num_nodes, num_resources = None, None, None + last_updated = None + dc = None + num_nodes = None + num_resources = None for line in info: if ' '.join(line[0:2]) == 'Last updated:': last_updated = ' '.join(line[2:]) @@ -98,13 +101,14 @@ def inventory_heartbeat_crm(info): # - Check the age of "last updated" settings = host_extra_conf_merged(g_hostname, inventory_heartbeat_crm_rules) last_updated, dc, num_nodes, num_resources = heartbeat_crm_parse_general(info) - params = { - 'num_nodes' : num_nodes, - 'num_resources' : num_resources, - } - if settings.get('naildown_dc', False): - params['dc'] = dc - return [(None, params)] + if last_updated: + params = { + 'num_nodes' : num_nodes, + 'num_resources' : num_resources, + } + if settings.get('naildown_dc', False): + params['dc'] = dc + return [(None, params)] def check_heartbeat_crm(item, params, info): if len(info) > 0: diff --git a/checks/ipmi b/checks/ipmi index 82a6012..0bcc4a5 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -121,20 +121,16 @@ def check_ipmi(item, params, info): return check_ipmi_detailed(item, info) def check_ipmi_detailed(item, info): - try: - for name, val, unit, status, unrec_low, crit_low, \ - warn_low, warn_high, crit_high, unrec_high in info: - if name == item: - perfdata = [ (name, val + unit) ] # TODO: add warn and crit levels - if status == 'ok': - return (0, "%s is %s %s" % (name, val, unit), perfdata) - elif status == 'nc': - return (1, "%s is %s %s" % (name, val, unit), perfdata) - else: - return (2, "%s is %s %s" % (name, val, unit), perfdata) - return (3, 'item %s not found' % item) - except: - return (3, "invalid or incomplete output from agent") + for name, val, unit, status, unrec_low, crit_low, \ + warn_low, warn_high, crit_high, unrec_high in info: + if name == item: + perfdata = [ (name, val + unit) ] # TODO: add warn and crit levels + if status == 'ok': + return (0, "%s is %s %s" % (name, val, unit), perfdata) + elif status == 'nc': + return (1, "%s is %s %s" % (name, val, unit), perfdata) + else: + return (2, "%s is %s %s" % (name, val, unit), perfdata) def check_ipmi_summarized(info): worst_status = 0

9 years, 2 months

Check_MK Git: check_mk: changed physical precision from 4 to 6 in unit ' bar' in metrics/check_mk.py

by Simon Betz

Module: check_mk Branch: master Commit: 4435c539d54a734ed706d662739698a921c786e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4435c539d54a73… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 7 15:33:17 2015 +0200 changed physical precision from 4 to 6 in unit 'bar' in metrics/check_mk.py --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 6c90206..92e973d 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -179,7 +179,7 @@ unit_info["%/m"] = { unit_info["bar"] = { "title" : _("Bar"), "symbol" : _("bar"), - "render" : lambda v: physical_precision(v, 4, _("bar")), + "render" : lambda v: physical_precision(v, 6, _("bar")), } #.

9 years, 2 months

Check_MK Git: check_mk: edited printer_pages.include: some ricoh-printer have only standard oid

by Simon Betz

Module: check_mk Branch: master Commit: 0572b9111336d18fa3f80321e6915b5ea3e870e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0572b9111336d1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 7 15:36:57 2015 +0200 edited printer_pages.include: some ricoh-printer have only standard oid --- checks/printer_pages.include | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/printer_pages.include b/checks/printer_pages.include index 04f4d10..27298cb 100644 --- a/checks/printer_pages.include +++ b/checks/printer_pages.include @@ -31,7 +31,8 @@ # Scan functions for some special printers that have their own MIBS def scan_ricoh_printer(oid): - return ".1.3.6.1.4.1.367.1.1" in oid(".1.3.6.1.2.1.1.2.0") + return ".1.3.6.1.4.1.367.1.1" in oid(".1.3.6.1.2.1.1.2.0") \ + and oid(".1.3.6.1.4.1.367.3.2.1.2.19.5.1.5.1") != None def scan_canon_printer(oid): return "canon" in oid(".1.3.6.1.2.1.1.1.0").lower() \

9 years, 2 months

Check_MK Git: check_mk: #1264 FIX ad_replication: Fixed handling of agent output without Destination DC entry

by Bastian Kuhn

Module: check_mk Branch: master Commit: 5ee509ac50adfd298e5cd2c4f56c42aa57a07817 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ee509ac50adfd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 7 09:59:38 2015 +0200 #1264 FIX ad_replication: Fixed handling of agent output without Destination DC entry --- .werks/1264 | 10 ++++++++++ ChangeLog | 1 + checks/ad_replication | 19 +++++++++++++++---- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.werks/1264 b/.werks/1264 new file mode 100644 index 0000000..9640fa1 --- /dev/null +++ b/.werks/1264 @@ -0,0 +1,10 @@ +Title: ad_replication: Fixed handling of agent output without Destination DC entry +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1436255904 + + diff --git a/ChangeLog b/ChangeLog index 3827b52..4bcd8bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 2321 FIX: process discovery: fixed exception during service discovery when no explicit process matching was set... * 2394 FIX: megaraid_ldisks: Is now supporting LSI CacheCade drives * 2449 FIX: db2_mem: Fixed scaling of perfdata... + * 1264 FIX: ad_replication: Fixed handling of agent output without Destination DC entry Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/ad_replication b/checks/ad_replication index ac429fd..c89a740 100644 --- a/checks/ad_replication +++ b/checks/ad_replication @@ -55,7 +55,13 @@ def parse_ad_replication_info(info): def inventory_ad_replication(info): inv = [] for line in parse_ad_replication_info(info): - entry = ('%s/%s' % (line[4], line[5]), 'ad_replication_default_params') + if len(line) == 11: + sourceSite = line[4] + sourceDC = line[5] + elif len(line) == 10: + sourceSite = line[3] + sourceDC = line[4] + entry = ('%s/%s' % (sourceSite, sourceDC), 'ad_replication_default_params') if line[0] == 'showrepl_INFO' and entry not in inv: inv.append(entry) return inv @@ -67,9 +73,14 @@ def check_ad_replication(item, params, info): foundLine = False for l in parse_ad_replication_info(info): - (lineType, destSite, destDC, namingContext, sourceSite, sourceDC, - transport, numFailures, timeLastFailure, timeLastSuccess, - statusLastFailure ) = l + if len(l) == 11: + (lineType, destSite, destDC, namingContext, sourceSite, sourceDC, + transport, numFailures, timeLastFailure, timeLastSuccess, + statusLastFailure ) = l + elif len(l) == 10: + (lineType, destSite, namingContext, sourceSite, sourceDC, + transport, numFailures, timeLastFailure, timeLastSuccess, + statusLastFailure ) = l if lineType == 'showrepl_INFO' and sourceSite+'/'+sourceDC == item: foundLine = True

9 years, 2 months

Check_MK Git: check_mk: #1263 FIX Fixed handling of urls in views

by Bastian Kuhn

Module: check_mk Branch: master Commit: 900a006ba2b0bb0aaa590f673ef0d6ff765a2641 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=900a006ba2b0bb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 6 13:10:11 2015 +0200 #1263 FIX Fixed handling of urls in views Commas after an url are now not longer part of the url. --- .werks/1263 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/lib.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1263 b/.werks/1263 new file mode 100644 index 0000000..bdaa52d --- /dev/null +++ b/.werks/1263 @@ -0,0 +1,11 @@ +Title: Fixed handling of urls in views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1436180901 + +Commas after an url are now not longer part of the url. + diff --git a/ChangeLog b/ChangeLog index e754917..f49966b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * 2379 FIX: Plugin-Output: Fixed handling of URLs within output of check_http... * 2380 FIX: Custom Host Notes painter was showing service notes when used in service based views * 2393 FIX: Fixed exception "user_confdir" not set in case of exceptions during login + * 1263 FIX: Fixed handling of urls in views... WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 6893990..89da4cd 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -341,7 +341,7 @@ def format_plugin_output(output, row = None): output = output[:a] + "running on " + h + output[e+1:] if config.escape_plugin_output: - output = re.sub("http[s]?://[^\"'>\t\s\n]+", + output = re.sub("http[s]?://[^\"'>\t\s\n,]+", lambda p: '<a href="%s"><img class=pluginurl align=absmiddle title="%s" src="images/pluginurl.png"></a>' % (p.group(0).replace('"', ''), p.group(0).replace('"', '')), output)

9 years, 2 months

Check_MK Git: check_mk: edited werk 2254

by Simon Betz

Module: check_mk Branch: master Commit: 11cdf176524bdc8239690392a86482206c4e047e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11cdf176524bdc… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 7 08:01:32 2015 +0200 edited werk 2254 --- .werks/2284 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/2284 b/.werks/2284 index 108a97d..16d914e 100644 --- a/.werks/2284 +++ b/.werks/2284 @@ -1,4 +1,4 @@ -Title: kaspersky_av_client, mcafee_av_client: New Checks, Monitoring Signature and Fullscan Age +Title: kaspersky_av_client, mcafee_av_client: New Checks and agent plugins for monitoring signature and fullscan age Level: 1 Component: checks Compatible: compat @@ -8,5 +8,5 @@ Class: feature The kaspersky_av_client-check monitors the signature and fullscan age, the mcafee_av_client-check monitors the signature age on a windows client. -Both can be configured in WATO +Both can be configured in WATO.

9 years, 2 months

Check_MK Git: check_mk: manpage for printer_pages_ricoh

by Simon Betz

Module: check_mk Branch: master Commit: 54166efd43f52f54ffaec799ef5bf81494c5c6e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54166efd43f52f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 6 15:23:02 2015 +0200 manpage for printer_pages_ricoh --- checkman/printer_pages_ricoh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/checkman/printer_pages_ricoh b/checkman/printer_pages_ricoh new file mode 100644 index 0000000..f03c108 --- /dev/null +++ b/checkman/printer_pages_ricoh @@ -0,0 +1,15 @@ +title: Ricoh Color Printers: Number of printed pages. +agents: snmp +catalog: hw/printer +license: GPL +distribution: check_mk +description: + This checks shows the total count of printed pages, the count of black/white prints + and the count of color prints. + The status is always OK. + +perfdata: + The number of printed pages: total prints, black/white prints color prints. + +inventory: + One service is created for each printer.

9 years, 2 months

Check_MK Git: check_mk: changed colors of printer_pages,

by Simon Betz

adapted printer_supply_ricoh Message-ID: <559b6eb4./qek347mKmxFd9us%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: af3af0e0f615ec988eb1b41f08a84d2436c861ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af3af0e0f615ec… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 6 15:16:42 2015 +0200 changed colors of printer_pages, adapted printer_supply_ricoh --- checks/printer_supply_ricoh | 106 ++++++++++++++++++++++++++++++--------- web/plugins/metrics/check_mk.py | 43 +++++++++++----- 2 files changed, 112 insertions(+), 37 deletions(-) diff --git a/checks/printer_supply_ricoh b/checks/printer_supply_ricoh index f7384f1..e4e9996 100644 --- a/checks/printer_supply_ricoh +++ b/checks/printer_supply_ricoh @@ -25,33 +25,89 @@ # Boston, MA 02110-1301 USA. -printer_supply_ricoh_default = ( 20, 10 ) - -def inventory_printer_supply_ricoh(info): - return [ (x[0], "printer_supply_ricoh_default") for x in info ] - -def check_printer_supply_ricoh(item, params, info): - warn, crit = params - for line in info: - if item == line[0]: - state = 0 - level = saveint(line[1]) - if level < crit: +# .1.3.6.1.4.1.367.3.2.1.2.24.1.1.2.1 Black Toner +# .1.3.6.1.4.1.367.3.2.1.2.24.1.1.2.2 Cyan Toner +# .1.3.6.1.4.1.367.3.2.1.2.24.1.1.2.3 Magenta Toner +# .1.3.6.1.4.1.367.3.2.1.2.24.1.1.2.4 Yellow Toner +# .1.3.6.1.4.1.367.3.2.1.2.24.1.1.5.1 30 +# .1.3.6.1.4.1.367.3.2.1.2.24.1.1.5.2 20 +# .1.3.6.1.4.1.367.3.2.1.2.24.1.1.5.3 30 +# .1.3.6.1.4.1.367.3.2.1.2.24.1.1.5.4 -100 + +# some data may look like +# .1.3.6.1.4.1.367.3.2.1.2.24.1.1.2.1 Toner +# .1.3.6.1.4.1.367.3.2.1.2.24.1.1.5.1 30 + + +factory_settings["printer_supply_ricoh_default_levels"] = { + "levels" : ( 20.0, 10.0 ) +} + + +def parse_printer_supply_ricoh(info): + parsed = {} + for what, pages_text in info: + name_reversed = what.split(" ") + + if len(name_reversed) == 2: + name_reversed.reverse() + + name = " ".join(name_reversed) + parsed[name] = int(pages_text) + return parsed + + +def inventory_printer_supply_ricoh(parsed): + return [ (key, {}) for key in parsed ] + + +def check_printer_supply_ricoh(item, params, parsed): + if type(params) == tuple: + params = { "levels" : params } + + warn, crit = params["levels"] + + for name, supply_level in parsed.items(): + if item == name: + if supply_level < 0: + supply_level = 0 + + infotext = "%.0f%%" % supply_level + + if supply_level <= crit: state = 2 - elif level < warn: + elif supply_level <= warn: state = 1 - message = "Remaining: %s%% (levels at %d%%/%d%%) " % (level, warn, crit) - perfdata = [ ("level", level, warn, crit, 0, 100)] - return (state, message, perfdata) - return(3, "Supply information not found") + else: + state = 0 -check_info['printer_supply_ricoh'] = { - "inventory_function" : inventory_printer_supply_ricoh, - "check_function" : check_printer_supply_ricoh, - "service_description" : "Supply %s", - "has_perfdata" : True, - "group" : "printer_supply", - "snmp_info" : ( ".1.3.6.1.4.1.367.3.2.1.2.24.1.1", [ 2, 5 ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.367.1.1" ] + if state > 0: + infotext += " (levels at %.0f%%/%.0f%%)" % (warn, crit) + if "black" in name.lower(): + perf_type = "black" + elif "cyan" in name.lower(): + perf_type = "cyan" + elif "magenta" in name.lower(): + perf_type = "magenta" + elif "yellow" in name.lower(): + perf_type = "yellow" + else: + perf_type = "other" + + perfdata = [ ("supply_toner_" + perf_type, supply_level, warn, crit, 0, 100) ] + + return state, infotext, perfdata + + +check_info['printer_supply_ricoh'] = { + "parse_function" : parse_printer_supply_ricoh, + "inventory_function" : inventory_printer_supply_ricoh, + "check_function" : check_printer_supply_ricoh, + "service_description" : "Supply %s", + "has_perfdata" : True, + "group" : "printer_supply", + "snmp_info" : ( ".1.3.6.1.4.1.367.3.2.1.2.24.1.1", [ 2, 5 ] ), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.367.1.1" ], + "default_levels_variable" : "printer_supply_ricoh_default_levels", } diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 52184f2..b331b27 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1840,7 +1840,7 @@ metric_info["mail_queue_active_length"] = { metric_info["pages_total"] = { "title" : _("Total printed pages"), "unit" : "count", - "color" : "#939393", + "color" : "46/a", } metric_info["pages_color"] = { @@ -1852,67 +1852,73 @@ metric_info["pages_color"] = { metric_info["pages_bw"] = { "title" : _("B/W"), "unit" : "count", - "color" : "#111111", + "color" : "51/a", } metric_info["pages_a4"] = { "title" : _("A4"), "unit" : "count", - "color" : "#45f1ff", + "color" : "31/a", } metric_info["pages_a3"] = { "title" : _("A3"), "unit" : "count", - "color" : "#48c9fb", + "color" : "31/b", } metric_info["pages_color_a4"] = { "title" : _("Color A4"), "unit" : "count", - "color" : "#007ff4", + "color" : "41/a", } metric_info["pages_bw_a4"] = { "title" : _("B/W A4"), "unit" : "count", - "color" : "#2f2f2f", + "color" : "51/b", } metric_info["pages_color_a3"] = { "title" : _("Color A3"), "unit" : "count", - "color" : "#138eff", + "color" : "44/a", } metric_info["pages_bw_a3"] = { "title" : _("B/W A3"), "unit" : "count", - "color" : "#3c3c3c", + "color" : "52/a", } metric_info["supply_toner_cyan"] = { "title" : _("Supply toner cyan"), "unit" : "%", - "color" : "#00ffff", + "color" : "34/a", } metric_info["supply_toner_magenta"] = { "title" : _("Supply toner magenta"), "unit" : "%", - "color" : "#ff00ff", + "color" : "12/a", } metric_info["supply_toner_yellow"] = { "title" : _("Supply toner yellow"), "unit" : "%", - "color" : "#ffff00", + "color" : "23/a", } metric_info["supply_toner_black"] = { "title" : _("Supply toner black"), "unit" : "%", - "color" : "#000000", + "color" : "51/a", +} + +metric_info["supply_toner_other"] = { + "title" : _("Supply toner"), + "unit" : "%", + "color" : "52/a", } metric_info["pressure"] = { @@ -3836,6 +3842,12 @@ perfometer_info.append({ }) perfometer_info.append({ + "type" : "linear", + "segments" : [ "supply_toner_other" ], + "total" : 100.0, +}) + +perfometer_info.append({ "type" : "linear", "segments" : [ "smoke_ppm" ], "total" : 10, @@ -4587,6 +4599,13 @@ graph_info.append({ "range" : (0, 100), }) +graph_info.append({ + "metrics" : [ + ( "supply_toner_other", "area" ) + ], + "range" : (0, 100), +}) + graph_info.append({ "title" : _( "Printed pages" ),

9 years, 2 months

Check_MK Git: check_mk: added license header to kaspersky_av_client and mcafee_av_client windows plugins

by Simon Betz

Module: check_mk Branch: master Commit: 368228e1ee3aa6fa234e5b64818bae077819de68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=368228e1ee3aa6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 7 08:08:17 2015 +0200 added license header to kaspersky_av_client and mcafee_av_client windows plugins --- agents/windows/plugins/kaspersky_av_client.vbs | 57 ++++++++++++++++++++++++ agents/windows/plugins/mcafee_av_client.bat | 15 +++++++ 2 files changed, 72 insertions(+) diff --git a/agents/windows/plugins/kaspersky_av_client.vbs b/agents/windows/plugins/kaspersky_av_client.vbs new file mode 100644 index 0000000..83973f5 --- /dev/null +++ b/agents/windows/plugins/kaspersky_av_client.vbs @@ -0,0 +1,57 @@ +' ----------------------------------------------------------------------------- +' Check_MK windows agent plugin to gather information abount fullscan age and +' signature date of Kaspersky Anti-Virus software. +' ----------------------------------------------------------------------------- + +Option Explicit +dim strRegLoc, strStatisticsLoc, strSignDateLoc, strKasUpdateLoc, strKasFullscanLoc, strKasFullscanStateLoc, strKasRes +dim objShell, objStdOut +dim strBIASLoc, strBIAS +dim value + + +Set objShell = CreateObject("WScript.Shell") + +Function UTC2Local(TimeStamp) + UTC2Local = DateAdd("n", strBIAS, CDate(TimeStamp)) +End Function + +Function Kasp2Win(TimeStamp) + dim strTimeStampRepl + strTimeStampRepl = Replace(TimeStamp, "-", ".", 1, 2) + Kasp2Win = Replace(strTimeStampRepl, "-", ":") +End Function + +strBIASLoc = "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\TimeZoneInformation\ActiveTimeBias" +strStatisticsLoc = "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\KasperskyLab\Components\34\1103\1.0.0.0\Statistics\AVState\" +strSignDateLoc = strStatisticsLoc & "Protection_BasesDate" + +on error resume next +value = objShell.regread ( "HKLM\SOFTWARE\Wow6432Node\KasperskyLab\protected\AVP80\Data\LastSuccessfulFullScan" ) +if err.number = 0 then + strRegLoc = "HKLM\SOFTWARE\Wow6432Node\KasperskyLab\protected\AVP80\Data\" +else + err.number = 0 + value = objShell.regread ( "HKLM\SOFTWARE\Wow6432Node\KasperskyLab\protected\KES8\Data\LastSuccessfulFullScan" ) + if err.number = 0 then + strRegLoc = "HKLM\SOFTWARE\Wow6432Node\KasperskyLab\protected\KES8\Data\" + else + Set fso = CreateObject ("Scripting.FileSystemObject") + Set stderr = fso.GetStandardStream (2) + stderr.WriteLine "Kaspersky version not compatible with this plugin, check registry path." + end if + +end if + +'The following registry key just contains the information when the signatures were synced from the admin server: +'strKasUpdateLoc = strRegLoc & "LastSuccessfulUpdate" +strKasFullscanLoc = strRegLoc & "LastSuccessfulFullScan" +strKasFullscanStateLoc = strRegLoc & "LastFullScanState" + + +strBIAS = -objShell.RegRead(strBIASLoc) +strKasRes = objShell.RegRead(strSignDateLoc) +WScript.Echo("<<<kaspersky_av_client>>>") +WScript.Echo("Signatures " & UTC2Local(Kasp2Win(strKasRes))) +strKasRes = objShell.RegRead(strKasFullscanLoc) +WScript.Echo("Fullscan " & UTC2Local(Unix2Win(strKasRes)) & " " & objShell.RegRead(strKasFullscanStateLoc)) diff --git a/agents/windows/plugins/mcafee_av_client.bat b/agents/windows/plugins/mcafee_av_client.bat new file mode 100644 index 0000000..ee324c2 --- /dev/null +++ b/agents/windows/plugins/mcafee_av_client.bat @@ -0,0 +1,15 @@ +@echo off +rem # ----------------------------------------------------------------------------- +rem # Check_MK windows agent plugin to gather information about signature date +rem # of Mcafee Anti-Virus software. +rem # ----------------------------------------------------------------------------- + + +setlocal enableDelayedExpansion +set dateval= + +for /f "tokens=3" %%a in ('reg query "HKLM\SOFTWARE\McAfee\AvEngine" ^|find "AVDatDate" ^|find "REG_SZ"') do @set dateval=%%a +if not "%dateval%"=="" ( + echo ^<^<^<mcafee_av_client^>^>^> + echo %dateval% +)

9 years, 2 months

Check_MK Git: check_mk: #2285 Modified checks for printer pages: canon_pages, printer_pages, printer_pages_ricoh, printer_pages.include

by Simon Betz

Module: check_mk Branch: master Commit: 807077390a0c7e198db0b5d4c88cc06ced8efccd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=807077390a0c7e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 7 08:15:45 2015 +0200 #2285 Modified checks for printer pages: canon_pages, printer_pages, printer_pages_ricoh, printer_pages.include The printer pages checks monitor the printed pages (total, color, black/white) in one service. --- .werks/2285 | 9 +++++++++ ChangeLog | 2 ++ 2 files changed, 11 insertions(+) diff --git a/.werks/2285 b/.werks/2285 new file mode 100644 index 0000000..45e51f9 --- /dev/null +++ b/.werks/2285 @@ -0,0 +1,9 @@ +Title: Modified checks for printer pages: canon_pages, printer_pages, printer_pages_ricoh, printer_pages.include +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i3 +Date: 1436249584 +Class: feature + +The printer pages checks monitor the printed pages (total, color, black/white) in one service. diff --git a/ChangeLog b/ChangeLog index f7d101d..9c063de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ * 2399 agent_vsphere/esx_vsphere_counters.if: now also reports interface state, bandwidth and mac address... * 1262 check_dns, check_ldap, check_smtp: It is now possible to customize the service descriptions of this checks.... * 2127 haproxy.frontend, haproxy.server: new checks and agent plugin for HAProxy + * 2285 Modified checks for printer pages: canon_pages, printer_pages, printer_pages_ricoh, printer_pages.include... + NOTE: Please refer to the migration notes! * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space...

9 years, 2 months

← Newer
1
...
18
19
20
21
22
23
24
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015