Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: pnp template brocade_fcport: fixed incorrect display of avg values

by Andreas Boesl

Module: check_mk Branch: master Commit: 7b2d46d2a716fdcebf10a5c4963f9e4112d512ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b2d46d2a716fd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 10 15:33:41 2013 +0200 pnp template brocade_fcport: fixed incorrect display of avg values --- ChangeLog | 1 + pnp-templates/check_mk-brocade_fcport.php | 31 +++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index acfed14..2384586 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * Filtering in views by Hostalias is possible now too (however the filter is not displayed in any standard view - user needs to enable it by customizing the needed views himself) + * FIX: brocade_fcport pnp-template: fixed incorrect display of average values Livestatus-Proxy: * FIX: fix exception when printing error message diff --git a/pnp-templates/check_mk-brocade_fcport.php b/pnp-templates/check_mk-brocade_fcport.php index bb86618..4de80a4 100644 --- a/pnp-templates/check_mk-brocade_fcport.php +++ b/pnp-templates/check_mk-brocade_fcport.php @@ -29,11 +29,12 @@ # than with numbers. $RRD = array(); foreach ($NAME as $i => $n) { - $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; - $WARN[$n] = $WARN[$i]; - $CRIT[$n] = $CRIT[$i]; - $MIN[$n] = $MIN[$i]; - $MAX[$n] = $MAX[$i]; + $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $RRDAVG[$n] = "$RRDFILE[$i]:$DS[$i]:AVERAGE"; + $WARN[$n] = $WARN[$i]; + $CRIT[$n] = $CRIT[$i]; + $MIN[$n] = $MIN[$i]; + $MAX[$n] = $MAX[$i]; } @@ -45,18 +46,22 @@ $opt[1] = "--vertical-label \"MByte/sec\" -X0 -b 1024 --title \"Traffic for $ho $def[1] = "" . "HRULE:0#c0c0c0 " . "DEF:in=$RRD[in] " + . "DEF:inavg=$RRDAVG[in] " + . "DEF:outavg=$RRDAVG[out] " . "DEF:out=$RRD[out] " . "CDEF:inmb=in,1048576,/ " + . "CDEF:inmbavg=inavg,1048576,/ " + . "CDEF:outmbavg=outavg,1048576,/ " . "CDEF:outmb=out,1048576,/ " . "AREA:inmb#60a020:\"in \" " - . "GPRINT:inmb:LAST:\"%5.1lf MB/s last\" " - . "GPRINT:inmb:AVERAGE:\"%5.1lf MB/s avg\" " - . "GPRINT:inmb:MAX:\"%5.1lf MB/s max\\n\" " + . "GPRINT:inmb:LAST:\"%5.3lf MB/s last\" " + . "GPRINT:inmbavg:AVERAGE:\"%5.3lf MB/s avg\" " + . "GPRINT:inmb:MAX:\"%5.3lf MB/s max\\n\" " . "CDEF:out_draw=outmb,-1,* " . "AREA:out_draw#2060a0:\"out \" " - . "GPRINT:outmb:LAST:\"%5.1lf MB/s last\" " - . "GPRINT:outmb:AVERAGE:\"%5.1lf MB/s avg\" " - . "GPRINT:outmb:MAX:\"%5.1lf MB/s max\\n\" " + . "GPRINT:outmb:LAST:\"%5.3lf MB/s last\" " + . "GPRINT:outmbavg:AVERAGE:\"%5.3lf MB/s avg\" " + . "GPRINT:outmb:MAX:\"%5.3lf MB/s max\\n\" " ; if (isset($RRD['in_avg'])) { @@ -98,8 +103,8 @@ $ds_name[2] = 'Frames'; $opt[2] = "--vertical-label \"Frames/sec\" -b 1024 --title \"Frames per second\" "; $def[2] = "" . "HRULE:0#c0c0c0 " - . "DEF:in=$RRD[rxframes] " - . "DEF:out=$RRD[txframes] " + . "DEF:in=$RRDAVG[rxframes] " + . "DEF:out=$RRDAVG[txframes] " . "AREA:in#a0d040:\"in \" " . "GPRINT:in:LAST:\"%5.1lf/s last\" " . "GPRINT:in:AVERAGE:\"%5.1lf/s avg\" "

10 years, 11 months

Check_MK Git: check_mk: esx_vsphere_hostsystem: Fixed typo in check output

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 635c30b1b55dd09219ba2db3029c2bad897919cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=635c30b1b55dd0… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Oct 10 13:59:43 2013 +0200 esx_vsphere_hostsystem: Fixed typo in check output --- ChangeLog | 1 + checks/esx_vsphere_hostsystem | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 08806d4..acfed14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * FIX: winperf_phydisk: handle case where not performance counters are available * FIX: check_mk_agent.linux: limit Livestatus check to 3 seconds * FIX: esx_vsphere_vm: fixed exception when memory info for vm is missing + * FIX: esx_vsphere_hostsystem: Fixed typo in check output Multisite: * FIX: add missing service icons to view "All Services with this descr..." diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index c42905d..ae17b3d 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -175,7 +175,7 @@ def check_esx_vsphere_hostsystem_state(item, params, info): elif overallStatus in [ "red", "gray"]: state = 2 label['Satus'] = "(!!)" - messages.append("Enity state: %s%s" % (overallStatus, label['Status'])) + messages.append("Entity state: %s%s" % (overallStatus, label['Status'])) label['powerState'] = '' powerState = str(data['runtime.powerState'][0])

10 years, 11 months

Check_MK Git: check_mk: esx_vsphere_vm: fixed exception when memory info for vm is missing

by Andreas Boesl

Module: check_mk Branch: master Commit: 08367e81b68c8e87e426b6d17a1d79a9cf676cc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08367e81b68c8e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 10 12:30:07 2013 +0200 esx_vsphere_vm: fixed exception when memory info for vm is missing --- ChangeLog | 1 + checks/esx_vsphere_vm | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a841b6..08806d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * FIX: netapp_volumes: better output when volume is missing * FIX: winperf_phydisk: handle case where not performance counters are available * FIX: check_mk_agent.linux: limit Livestatus check to 3 seconds + * FIX: esx_vsphere_vm: fixed exception when memory info for vm is missing Multisite: * FIX: add missing service icons to view "All Services with this descr..." diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 7cdd45d..8813c0f 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -53,16 +53,20 @@ def check_esx_vsphere_vm_mem(_no_item, _no_params, info): if powerstate != "poweredOn": raise MKCounterWrapped("", "VM is %s, skipping this check" % powerstate) - #consumed host memory - host_memory_usage = savefloat(data["summary.quickStats.hostMemoryUsage"][0]) * 1024 * 1024 - #active guest memory - guest_memory_usage = savefloat(data["summary.quickStats.guestMemoryUsage"][0]) * 1024 * 1024 - #size of the balloon driver in the VM - ballooned_memory = savefloat(data["summary.quickStats.balloonedMemory"][0]) * 1024 * 1024 - #The portion of memory, in MB, that is granted to this VM from non-shared host memor(musst not be set) - shared_memory = savefloat(data["summary.quickStats.sharedMemory"][0]) * 1024 * 1024 - #The portion of memory, in MB, that is granted to this VM from host memory that is shared between VMs. - private_memory = savefloat(data.get("summary.quickStats.privateMemory",[0])[0]) * 1024 * 1024 + + try: + #consumed host memory + host_memory_usage = savefloat(data["summary.quickStats.hostMemoryUsage"][0]) * 1024 * 1024 + #active guest memory + guest_memory_usage = savefloat(data["summary.quickStats.guestMemoryUsage"][0]) * 1024 * 1024 + #size of the balloon driver in the VM + ballooned_memory = savefloat(data["summary.quickStats.balloonedMemory"][0]) * 1024 * 1024 + #The portion of memory, in MB, that is granted to this VM from non-shared host memor(musst not be set) + shared_memory = savefloat(data["summary.quickStats.sharedMemory"][0]) * 1024 * 1024 + #The portion of memory, in MB, that is granted to this VM from host memory that is shared between VMs. + private_memory = savefloat(data.get("summary.quickStats.privateMemory",[0])[0]) * 1024 * 1024 + except: + raise MKCounterWrapped("", "Hostsystem did not provide memory information (reason may be high load)") perf = [ ("host", host_memory_usage ),

10 years, 11 months

Check_MK Git: check_mk: FIX: check_ldap: Removed duplicate "-H" definition

by Lars Michelsen

Module: check_mk Branch: master Commit: acf822e48b38674d404e991e1353ed8fc4a2d7f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acf822e48b3867… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 10 10:51:22 2013 +0200 FIX: check_ldap: Removed duplicate "-H" definition Conflicts: ChangeLog --- ChangeLog | 1 + checks/check_ldap | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67b71d8..0a841b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -464,6 +464,7 @@ * FIX: fix exception and loss of hosts in a folder when deleting all site connections of a distributed WATO setup * FIX: avoid Python exception for invalid parameters even in debug mode + * FIX: check_ldap: Removed duplicate "-H" definition Event Console: * FIX: apply rewriting of application/hostname also when cancelling events diff --git a/checks/check_ldap b/checks/check_ldap index 7e1872f..352ce1a 100644 --- a/checks/check_ldap +++ b/checks/check_ldap @@ -58,8 +58,6 @@ def check_ldap_arguments(params): if settings.get("ssl"): args += ' --ssl' - args += ' -H $HOSTADDRESS$' - return args

10 years, 11 months

Check_MK Git: check_mk: services: Windows inventory now also matches against display names

by Mathias Kettner

Module: check_mk Branch: master Commit: 439491daaeb7bfbf96cadc981e77cec7ed9b3515 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=439491daaeb7bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 9 23:53:15 2013 +0200 services: Windows inventory now also matches against display names --- ChangeLog | 1 + checks/services | 25 +++++++++++++++---------- web/plugins/wato/check_parameters.py | 5 +++-- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b172afd..67b71d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * check_icmp: New WATO rule for custom PING checks * agent_vsphere: now able to handle < > & ' " in login credentials * if/if64 and friends: add 95% percentiles to graphs + * services: inventory now also matches against display names of services * FIX: windows_agent: fixed bug in cleanup of open thread handles * FIX: cups default printer is now monitored again in linux agent * FIX: host notification email in html format: fixed formating error diff --git a/checks/services b/checks/services index 6eb9b02..b08146f 100644 --- a/checks/services +++ b/checks/services @@ -67,7 +67,7 @@ inventory_services_rules = [] def inventory_windows_services(info): # Handle single entries (type str) - def add_matching_services(name, state, start_type, entry): + def add_matching_services(name, description, state, start_type, entry): if type(entry) == tuple: # New wato rule handling svc = entry[0] @@ -80,12 +80,14 @@ def inventory_windows_services(info): svc = entry statespec = "running" - # First match name (optional since rule based config option available) + # First match name or description (optional since rule based config option available) + use_as_item = None if svc: if svc.startswith("~"): - if not get_regex(svc[1:]).match(name): + r = get_regex(svc[1:]) + if not r.match(name) and not r.match(description): return [] - elif svc != name: + elif svc != name and svc != description: return [] if type(statespec) == tuple: @@ -102,7 +104,7 @@ def inventory_windows_services(info): return [(name, {})] # Handle entries like ( [ "term" ], ALL_HOSTS, [ "FooBar auto", ".*TEST running" ] ) - def add_services_with_tags(name, state, start_type, entry): + def add_services_with_tags(name, description, state, start_type, entry): matching = [] if len(entry) == 2: entry = ( [], ) + entry @@ -110,7 +112,7 @@ def inventory_windows_services(info): if hosttags_match_taglist(tags_of_host(g_hostname), taglist): if in_extraconf_hostlist(hostlist, g_hostname): for svc in svclist: - matching += add_matching_services(name, state, start_type, svc) + matching += add_matching_services(name, description, state, start_type, svc) return matching # Filter WATO compatible rules by tags/hostlist @@ -136,6 +138,7 @@ def inventory_windows_services(info): inventory = [] for line in info: name = line[1] + description = " ".join(line[3:]) if '/' in line[2]: state, start_type = line[2].split('/') else: @@ -147,9 +150,9 @@ def inventory_windows_services(info): # for entry in inventory_services: if type(entry) == str: - inventory += add_matching_services(name, state, start_type, entry) + inventory += add_matching_services(name, description, state, start_type, entry) elif type(entry) == tuple: - inventory += add_services_with_tags(name, state, start_type, entry) + inventory += add_services_with_tags(name, description, tate, start_type, entry) else: raise MKGeneralException("Invalid entry %r in inventory_services" % entry) @@ -158,7 +161,7 @@ def inventory_windows_services(info): # for rule in rules: - inventory += add_matching_services(name, state, start_type, rule) + inventory += add_matching_services(name, description, state, start_type, rule) return inventory @@ -180,7 +183,9 @@ def check_windows_services(item, params, info): # states found = [] for line in info: - if item == line[1]: + # allow to match agains the internal name or agains the display name + # of the service + if item == line[1] or item == " ".join(line[3:]): # newer agents also send start type as part of state, # e.g. running/auto if '/' in line[2]: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f37416f..db0ae8f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -107,8 +107,9 @@ register_rule(group + '/' + subgroup_inventory, elements = [ ('services', ListOfStrings( title = _("Services (Regular Expressions)"), - help = _('Matching the begining of the service names (regular expression). ' - 'If no service is given, this rule will match all services. The ' + help = _('Regular expressions matching the begining of the internal name ' + 'or the description of the service. ' + 'If no name is given then this rule will match all services. The ' 'match is done on the beginning of the service name. It ' 'is done case sensitive. You can do a case insensitive match ' 'by prefixing the regular expression with <tt>(?i)</tt>. Example: '

10 years, 11 months

Check_MK Git: check_mk: Better help text for windows service inventory

by Mathias Kettner

Module: check_mk Branch: master Commit: 13f07ef1c2dda98307b61ba599eddbeca82af898 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13f07ef1c2dda9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 9 23:09:06 2013 +0200 Better help text for windows service inventory --- web/plugins/wato/check_parameters.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 54f87be..f37416f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -108,7 +108,12 @@ register_rule(group + '/' + subgroup_inventory, ('services', ListOfStrings( title = _("Services (Regular Expressions)"), help = _('Matching the begining of the service names (regular expression). ' - 'If no service is given, this rule will match all services.'), + 'If no service is given, this rule will match all services. The ' + 'match is done on the beginning of the service name. It ' + 'is done case sensitive. You can do a case insensitive match ' + 'by prefixing the regular expression with <tt>(?i)</tt>. Example: ' + '<tt>(?i).*mssql</tt> matches all services that contain <tt>MSSQL</tt> ' + 'or <tt>MsSQL</tt> or <tt>mssql</tt> or...'), orientation = "horizontal", )), ('state', DropdownChoice(

10 years, 11 months

Check_MK Git: check_mk: liveproxyd: fixed exception in error message

by Mathias Kettner

Module: check_mk Branch: master Commit: 7ba8c587fb473a5db72ef33c0eb2648e5d9724ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ba8c587fb473a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 9 21:56:19 2013 +0200 liveproxyd: fixed exception in error message --- doc/treasures/liveproxy/liveproxyd | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index 11c857c..def77b3 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -390,7 +390,7 @@ def receive_response(sitename, channel): client = channel.get("client") # None -> client timed out before response! if not client: log("Response from timed-out client arrived lately on channel %s/%d" % - sitename, channel["socket"].fileno()) + (sitename, channel["socket"].fileno())) # We always assume fixed16 as response header! old_response = channel.get("response", "") try: @@ -447,6 +447,9 @@ def receive_response(sitename, channel): del client["channel"] try: + # ACHTUNG: Beim senden an den Client können wir blockieren, wenn + # der Empfänger uns ausbremst. Dürfen wir aber nicht. Wir brauchen + # eine Queue, müssen mit select() warten, usw. client["socket"].send(response) # log("HIRN: An client: [%s]" % response[16:80].replace("\n", "")) client["state"] = "idle"

10 years, 11 months

Check_MK Git: check_mk: FIX: liveproxyd: fix handing proxy for larger responses on RH6.4

by Mathias Kettner

Module: check_mk Branch: master Commit: a75f4f85f9a14f4ea32886fc05097447688f196b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a75f4f85f9a14f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 9 22:36:50 2013 +0200 FIX: liveproxyd: fix handing proxy for larger responses on RH6.4 --- ChangeLog | 1 + doc/treasures/liveproxy/liveproxyd | 59 +++++++++++++++++++++++++----------- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 267e43f..2221ff0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ Livestatus-Proxy: * FIX: fix exception when printing error message * FIX: honor wait time (now called cooling period) after failed TCP connection + * FIX: fix hanging if client cannot accept large chunks (seen on RH6.4) WATO: * Rule "State and count of processes": New configuration options: diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index def77b3..a5ff33b 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -81,6 +81,7 @@ def liveproxyd_run(): get_new_requests(readable) distribute_requests() get_responses(readable) # also heartbeats + send_responses(writable) handle_client_timeouts() garbage_collect_sockets() @@ -219,11 +220,15 @@ def do_select(timeout): # new client connections read_fds.append(sitestate["socket"]) - # new requests from existing clients for client in sitestate["clients"]: + # new requests from existing clients if client["state"] == "idle": read_fds.append(client["socket"]) + # clients ready to receive a response + if client["state"] == "response": + write_fds.append(client["socket"]) + # Responses from channels, also heartbeat responses for channel in sitestate["channels"]: if channel["state"] in [ "busy", "heartbeat" ]: @@ -242,7 +247,7 @@ def accept_new_clients(readable): try: s, addrinfo = sitestate["socket"].accept() s.setblocking(1) - log("Accepted new client %s/%d" % (sitename, s.fileno())) + # log("Accepted new client %s/%d" % (sitename, s.fileno())) sitestate["clients"].append({"socket" : s, "state" : "idle", "since" : time.time()}) except Exception, e: if opt_debug: @@ -367,7 +372,7 @@ def receive_request(sitename, client): raise if not chunk: - log("Client %s/%d closed connection." % (sitename, client["socket"].fileno())) + # log("Client %s/%d closed connection." % (sitename, client["socket"].fileno())) return None end = request.index("\n\n") client["nextrequest"] = request[end+2:] @@ -445,21 +450,41 @@ def receive_response(sitename, channel): if client: del channel["client"] del client["channel"] + client["response"] = response + client["response_offset"] = 0 + client["state"] = "response" - try: - # ACHTUNG: Beim senden an den Client können wir blockieren, wenn - # der Empfänger uns ausbremst. Dürfen wir aber nicht. Wir brauchen - # eine Queue, müssen mit select() warten, usw. - client["socket"].send(response) - # log("HIRN: An client: [%s]" % response[16:80].replace("\n", "")) - client["state"] = "idle" - client["request"] = "" - except Exception, e: - if opt_debug: - raise - log("Cannot forward response from client %s/%d to client %s/%d: %s", - (sitename, channel["socket"].fileno(), sitename, client["socket"].fileno(), e)) - client["state"] = "error" +def send_responses(writable): + for sitename, sitestatus in g_sites.items(): + for client in sitestatus["clients"]: + if client["state"] == "response" and client["socket"] in writable: + + try: + # ACHTUNG: Beim senden an den Client können wir blockieren, wenn + # der Empfänger uns ausbremst. Dürfen wir aber nicht. Wir brauchen + # eine Queue, müssen mit select() warten, usw. + offset = client["response_offset"] + chunk = client["response"][offset:offset + 8192] + client["socket"].setblocking(0) # TEST TEST TEST + bytes_sent = client["socket"].send(chunk) + client["socket"].setblocking(1) + if bytes_sent <= 0: + raise Exception("Could not send any bytes of response to client") + if offset + bytes_sent == len(client["response"]): + client["state"] = "idle" + del client["response"] + del client["response_offset"] + else: + client["response_offset"] += bytes_sent + + except Exception, e: + if opt_debug: + raise + log("Cannot forward next %d bytes of response to client %s/%d: %s" % + (len(chunk), sitename, client["socket"].fileno(), e)) + client["state"] = "error" + del client["response"] + del client["response_offset"] def receive_heartbeat(sitename, channel): sitestate = g_sites[sitename]

10 years, 11 months

Check_MK Git: check_mk: Bulk inventory: checkbox for skipping hosts where the agent is critical

by Mathias Kettner

Module: check_mk Branch: master Commit: bf4f960e97a07c67e931292892d5c51991f03052 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf4f960e97a07c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 9 22:39:32 2013 +0200 Bulk inventory: checkbox for skipping hosts where the agent is critical --- ChangeLog | 2 ++ web/htdocs/wato.py | 28 ++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2221ff0..b172afd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,8 @@ * Added title of tests to LDAP diagnose table * Bulk inventory: new checkbox to only include hosts that have a failed inventory check. + * Bulk inventory: yet another checkbox for skipping hosts where the + Check_MK service is currently critical * FIX: The rule "State and count of processes" is no longer available in "Parameters for inventorized check". This rule was solely intented for "Manual checks" configuration diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 34d6e0e..208afaf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2657,9 +2657,14 @@ def mode_bulk_inventory(phase): config.need_permission("wato.services") if html.get_checkbox("only_failed_invcheck"): - failed_invcheck_hosts = find_hosts_with_failed_inventory_check() + restrict_to_hosts = find_hosts_with_failed_inventory_check() else: - failed_invcheck_hosts = None + restrict_to_hosts = None + + if html.get_checkbox("only_ok_agent"): + skip_hosts = find_hosts_with_failed_agent() + else: + skip_hosts = [] # 'all' not set -> only inventorize checked hosts if not html.var("all"): @@ -2672,7 +2677,8 @@ def mode_bulk_inventory(phase): hostnames = get_hostnames_from_checkboxes(filterfunc) items = [ "%s|%s" % (g_folder[".path"], hostname) for hostname in hostnames - if (failed_invcheck_hosts == None or hostname in failed_invcheck_hosts) ] + if (restrict_to_hosts == None or hostname in restrict_to_hosts) and + hostname not in skip_hosts ] for hostname in hostnames: check_host_permissions(hostname) @@ -2683,7 +2689,9 @@ def mode_bulk_inventory(phase): items = [] hostnames = [] for hostname, folder in entries: - if failed_invcheck_hosts != None and hostname not in failed_invcheck_hosts: + if restrict_to_hosts != None and hostname not in restrict_to_hosts: + continue + if hostname in skip_hosts: continue check_host_permissions(hostname, folder=folder) items.append("%s|%s" % (folder[".path"], hostname)) @@ -2730,18 +2738,26 @@ def mode_bulk_inventory(phase): html.checkbox("only_failed", False, label=_("Only include hosts that failed on previous inventory")) html.write(" ") html.checkbox("only_failed_invcheck", False, label=_("Only include hosts with a failed inventory check")) + html.write(" ") + html.checkbox("only_ok_agent", False, label=_("Exclude hosts where the agent is unreachable")) # Start button forms.end() html.button("_start", _("Start")) def find_hosts_with_failed_inventory_check(): - hosts = html.live.query_column( + return html.live.query_column( "GET services\n" "Filter: description = Check_MK inventory\n" "Filter: state > 0\n" "Columns: host_name") - return hosts + +def find_hosts_with_failed_agent(): + return html.live.query_column( + "GET services\n" + "Filter: description = Check_MK\n" + "Filter: state >= 2\n" + "Columns: host_name") #. # .-Bulk-Edit------------------------------------------------------------.

10 years, 11 months

Check_MK Git: check_mk: agent_fritz: Agent now able to login

by Bastian Kuhn

Module: check_mk Branch: master Commit: 978be5e94faea456164cbde23cbf214285421c42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=978be5e94faea4… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 9 22:10:06 2013 +0200 agent_fritz: Agent now able to login --- agents/special/agent_fritz | 52 ++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/agents/special/agent_fritz b/agents/special/agent_fritz index 8160b42..df86197 100755 --- a/agents/special/agent_fritz +++ b/agents/special/agent_fritz @@ -1,31 +1,51 @@ #!/usr/bin/python +# encoding: utf-8 + from lxml import etree -import hashlib +import hashlib, sys import inspect, pprint +import urllib address = "http://fritz.box" username = '' -password = "test123" +password = u"test123" +sidfile = '/tmp/sid_cache' + +try: + """ + Session IDs are valid for 10minutes. + Cause of the limited number of Session IDs for a fritzbox, why + have to try to persist thes IDs + """ + sid = file(sidfile).read() +except IOError: + sid = "" -url = '%s/login_sid.lua' % address -login_page = etree.parse(url).getroot() +login_url = '%s/login_sid.lua' % address +# Try to login with old session id +login_page = etree.parse(login_url+"?sid="+sid).getroot() sid = login_page.findtext('SID') -block = login_page.findtext('BlockTime') +# If login with old session id not work, try to get a new one if sid == "0000000000000000": challenge = login_page.findtext('Challenge') - challenge = "123456z" - password = ".abc" - rep = challenge + '-' + password - rep = rep.encode('utf-16le') - print rep + rep = (challenge + '-' + password).encode('utf-16le') response = challenge + '-' + hashlib.md5(rep).hexdigest() + login_page = etree.parse(login_url+"?username=%s&response=%s" % (username, response)).getroot() + sid = login_page.findtext('SID') + #if still not possible to get an id, exit with error + if sid == "0000000000000000": + print "Canot get a session id. Please check passwort" + sys.exit(1) + file(sidfile,'w').write(sid) - print response +#Just testing yet: +urls = [ + "system/ecostat.lua", + "/net/home_auto_overview.lua" + +] + +print urllib.urlopen("%s/%s?sid=%s" % (address,urls[0], sid)).read() - login_page = etree.parse(url+"?username=%s&response=%s" % (username, response)).getroot() - print url+"?username=%s&response=%s" % (username, response) - sid = login_page.findtext('SID') - block = login_page.findtext('BlockTime') -print "SID: %s, Block: %s" % ( sid, block )

10 years, 11 months

← Newer
1
...
27
28
29
30
31
32
33
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013