Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65234 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e7654d7c98959fb025905a0859d460830ac946b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7654d7c98959f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 8 13:08:37 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog LIESMICH.zutun ---

13 years, 11 months

Check_MK Git: check_mk: base: new helper function for computing average

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b1f3ff12cbe4c7184856251108dca56574d85396 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1f3ff12cbe4c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 8 13:07:44 2010 +0100 base: new helper function for computing average --- modules/check_mk_base.py | 41 +++++++++++++++++++++++++++++++++-------- 1 files changed, 33 insertions(+), 8 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index e3ca5c5..d0f16bc 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import socket, os, sys, time, re, signal +import socket, os, sys, time, re, signal, math # Python 2.3 does not have 'set' in normal namespace. # But it can be imported from 'sets' @@ -583,13 +583,18 @@ def cachefile_age(filename): # netctr.eth.tx_collisions 112354335 818 def load_counters(hostname): global g_counters + filename = counters_directory + "/" + hostname try: - lines = file(counters_directory + "/" + hostname).readlines() - for line in lines: - line = line.split() - g_counters[' '.join(line[0:-2])] = ( int(line[-2]), int(line[-1]) ) + g_counters = eval(file(filename).read()) except: - g_counters = {} + # Try old syntax + try: + lines = file(filename).readlines() + for line in lines: + line = line.split() + g_counters[' '.join(line[0:-2])] = ( int(line[-2]), int(line[-1]) ) + except: + g_counters = {} def get_counter(countername, this_time, this_val): global g_counters @@ -629,6 +634,26 @@ def get_counter(countername, this_time, this_val): return timedif, per_sec +def get_average(itemname, this_time, this_val, backlog): + + # first call: take current value as average + if not itemname in g_counters: + g_counters[itemname] = (this_time, this_val) + return 1.0, this_val + + # Get previous value and time difference + last_time, last_val = g_counters.get(itemname) + timedif = this_time - last_time + timedif_min = timedif / 60.0 + + # compute weight, but how? + weight = math.e ** (-timedif_min / backlog) + + new_val = last_val * weight + this_val * (1 - weight) + g_counters[itemname] = (this_time, new_val) + return timedif, new_val + + def save_counters(hostname): if not opt_dont_submit and not i_am_root(): # never writer counters as root global g_counters @@ -636,11 +661,11 @@ def save_counters(hostname): try: if not os.path.exists(counters_directory): os.makedirs(counters_directory) - file(filename, "w").\ - writelines([ "%s %d %d\n" % (i[0], i[1][0], i[1][1]) for i in g_counters.items() ]) + file(filename, "w").write("%r\n" % g_counters) except Exception, e: raise MKGeneralException("User %s cannot write to %s: %s" % (username(), filename, e)) +# writelines([ "%s %d %d\n" % (i[0], i[1][0], i[1][1]) for i in g_counters.items() ]) # +----------------------------------------------------------------------+

13 years, 11 months

Check_MK Git: check_mk: Added bug description for WATO snapin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 582ffc0ab828d2e3f6896ac2998a6b919f2333ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=582ffc0ab828d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 6 09:33:56 2010 +0100 Added bug description for WATO snapin --- LIESMICH.zutun | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 15b8fa6..f07c2af 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -15,6 +15,11 @@ Inventurcheck: retry_interval evt. anders (kuerzer) einstellbar machen. -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 -------------------------------------------------------------------------------- +WATO Snapin: ajax-Code zum Ausgeben der Links stimmt nicht. Er nimmt +einfach die Site-ID als URL-Prefix. Das ist aber nicht immer korrekt. +Man kann in sites eine site "local" nennen, aber der URL-Prefix ist +z.B. /wato/. + ich bin mir nicht sicher ob das nun ein Thruk Problem oder ein Livestatus Problem ist. Vermutlich beides :-) Wenn ich im Thruk im Suchfenster einfach Enter drücke, kommt folgende Query bei raus: GET services @@ -519,3 +524,5 @@ Snapins: die letzten 10 Notifikationen, die letzten 10 Alerts (evtl. umschaltbar per Tabs) Acknowledgements: Ankreuzung, ob persistent oder nicht + +

13 years, 11 months

Check_MK Git: check_mk: Added reschedule bug

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 21b0f44040467f2f2301dc035e87e32c2f78db78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21b0f44040467f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 6 10:21:55 2010 +0100 Added reschedule bug --- LIESMICH.zutun | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index f07c2af..568a9d2 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -20,6 +20,13 @@ einfach die Site-ID als URL-Prefix. Das ist aber nicht immer korrekt. Man kann in sites eine site "local" nennen, aber der URL-Prefix ist z.B. /wato/. +WATO: Wenn ein Agent einen rauswird (leer Ausgabe), kommt im +WATO bei der Inventur keine sinnvolle Fehlermeldung. + +Reschedule icon: Auch hier ist scheinbar im Link der Sitename als +URL-Prefix angenommen. Das ist aber nicht unbedingt als gleich +anzunehmen - vor allem außerhalb von OMD. + ich bin mir nicht sicher ob das nun ein Thruk Problem oder ein Livestatus Problem ist. Vermutlich beides :-) Wenn ich im Thruk im Suchfenster einfach Enter drücke, kommt folgende Query bei raus: GET services

13 years, 11 months

Check_MK Git: check_mk: revert change to multisite.mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f34b7645688b0cd33486af5ed6d00383b3c7e09a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f34b7645688b0c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 6 11:59:20 2010 +0100 revert change to multisite.mk --- multisite.mk | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/multisite.mk b/multisite.mk index 52d4733..38780ba 100644 --- a/multisite.mk +++ b/multisite.mk @@ -18,12 +18,11 @@ admin_users = [ "nagiosadmin" ] # Sites to connect to. If this variable is unset, a single # connection to the local host is done. -sites = { - # connect to local Nagios - "wato" : { - "alias" : "Munich" - }, -} +#sites = { +# # connect to local Nagios +# "local" : { +# "alias" : "Munich" +# }, # # # connect to remote site (e.g. local OMD site 'paris') # "paris": {

13 years, 11 months

Check_MK Git: check_mk: new check check_mk.only_from: check IP access configuration

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 04a3dd971218faaa0c8a6a03c1a34ddfffc79a8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04a3dd971218fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 6 11:52:03 2010 +0100 new check check_mk.only_from: check IP access configuration --- ChangeLog | 4 +- agents/check_mk_agent.linux | 10 ++++ agents/windows/check_mk_agent.cc | 17 +++++++ agents/windows/check_mk_agent.exe | Bin 94720 -> 95232 bytes checkman/check_mk.only_from | 35 ++++++++++++++ checks/check_mk | 95 +++++++++++++++++++++++++++++++++++++ multisite.mk | 11 ++-- 7 files changed, 166 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f59d391..3f4bee3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,7 +92,9 @@ * printer_supply: In case of OKI c5900 devices the name of the supply units ins not unique. The color of the supply unit is reported in a dedicated OID and added to the check item name to have a unique name now. - * prnter_supply: Added simple pnp template to have better graph formating for the check results + * printer_supply: Added simple pnp template to have better graph formating for the check results + * check_mk.only_from: new check for monitoring the IP address access restriction of the + agent. The current Linux and Windows agents provide this information. Multisite: * The custom open/close states of custom links are now stored for each diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index ebcf520..1837e7d 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -55,6 +55,16 @@ fi echo '<<<check_mk>>>' echo Version: 1.1.9i1 echo AgentOS: linux +echo PluginsDirectory: $PLUGINSDIR +echo LocalDirectory: $LOCALDIR +echo AgentDirectory: $MK_CONFDIR + +# If we are called via xinetd, try to find only_from configuration +if [ -n "$REMOTE_HOST" ] +then + echo -n 'OnlyFrom: ' + sed -n '/^service[[:space:]]*check_mk/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1 +fi # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) # Achtung: NFS-Mounts werden grundsaetzlich ausgeblendet, um diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index a4f6ff3..143f962 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -94,6 +94,7 @@ char g_config_file[256]; struct ipspec { uint32_t address; uint32_t netmask; + int bits; }; #define MAX_ONLY_FROM 32 @@ -1050,6 +1051,21 @@ void section_check_mk(SOCKET &out) output(out, "AgentDirectory: %s\n", g_agent_directory); output(out, "PluginsDirectory: %s\n", g_plugins_dir); output(out, "LocalDirectory: %s\n", g_local_dir); + output(out, "OnlyFrom:"); + if (g_num_only_from == 0) + output(out, " 0.0.0.0/0\n"); + else { + for (unsigned i=0; i < g_num_only_from; i++) { + ipspec *is = &g_only_from[i]; + output(out, " %d.%d.%d.%d/%d", + is->address & 0xff, + is->address >> 8 & 0xff, + is->address >> 16 & 0xff, + is->address >> 24 & 0xff, + is->bits); + } + output(out, "\n"); + } } void output_data(SOCKET &out) @@ -1460,6 +1476,7 @@ void add_only_from(char *value) t[0] = s[3]; g_only_from[g_num_only_from].address = ip; g_only_from[g_num_only_from].netmask = mask; + g_only_from[g_num_only_from].bits = bits; if ((ip & mask) != ip) { fprintf(stderr, "Invalid only_hosts entry: host part not 0: %s/%u", diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 4f02124..be9b18a 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/checkman/check_mk.only_from b/checkman/check_mk.only_from new file mode 100644 index 0000000..f7bad0c --- /dev/null +++ b/checkman/check_mk.only_from @@ -0,0 +1,35 @@ +title: Check IP restriction of Check_MK agent +agents: linux, windows +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This checks makes sure that the Check_MK agent on the target system + has configured certain IP address based access restrictions. The check + needs the agent to be configured with those restrictions. The windows + agent is configured via an {.ini}-file. The Linux agent is configured + via {/etc/xinetd.d/check_mk}. + +examples: + # Expect agent to accecpt only localhost and one specific network + check_mk_only_from_default = [ "192.168.56.0/30", "127.0.0.1" ] + + # Hosts with the tag 'dmz' should have an different configuration + check_parameters += [ + ( [ "10.0.0.0/8" ], [ "dmz" ], ALL_HOSTS, [ "Check_MK Agent Access" ] ), + ] + +inventory: + One check is created per host, if {check_mk_only_from_default} is explicitely + set in {main.mk} and the agent provides an {OnlyFrom:} header in the section + {<<<check_mk>>>}. + +[parameters] +target_networks (list(string)): A python list of the allowed networks and IP addresses the + agent should be configured for. The order of the entries is not relevant. To host addresses + a {/32} will be appended automatically. + +[configuration] +check_mk_only_from_default (list(string)): Default IP access configuration expected from agents. + This variable must be set in order for the inventory to create checks, even if you configure more + more specific parameters via {check_parameters}. diff --git a/checks/check_mk b/checks/check_mk new file mode 100644 index 0000000..86dd884 --- /dev/null +++ b/checks/check_mk @@ -0,0 +1,95 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# 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 +# 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. +# Target + + +# Target value for agent's IP access configuration. Only if this +# is not None, the inventory will create services +check_mk_only_from_default = None + +def inventory_only_from(checkname, info): + if check_mk_only_from_default != None: + for line in info: + if line[0] == "OnlyFrom:": + return [(None, 'check_mk_only_from_default')] + +def check_mk_factorize_curly(n): + # factorize 10.0.0.{1,2,3} + if '{' in n: + result = [] + iprange = n[n.find('{') + 1:n.find('}')].split(',') + prefix = n[:n.find('{')] + for suffix in iprange: + result.append(prefix + suffix) + return result + else: + return [n] + +def check_mk_normalize_network(n): + if '/' in n: + return n + else: + return n + "/32" + + +def check_only_from(item, param, info): + if param == None: + return (1, "WARN - IP access restriction not monitored for this host") + for line in info: + if line[0] == "OnlyFrom:": + an = [] + for n in line[1:]: + an += check_mk_factorize_curly(n) + + allowed_nets = map(check_mk_normalize_network, an) + should_nets = map(check_mk_normalize_network, param) + + too_much = [] + too_few = [] + + for net in allowed_nets: + if net not in should_nets: + too_much.append(net) + for net in should_nets: + if net not in allowed_nets: + too_few.append(net) + status = 0 + infotexts = [] + if len(too_much) > 0: + status = 1 + infotexts.append("agent allows extra: %s" % (" ".join(too_much))) + if len(too_few) > 0: + status = 1 + infotexts.append("agent blocks: %s" % (" ".join(too_few))) + if status == 1: + return (1, "WARN - invalid access configuration: %s" % (", ".join(infotexts))) + else: + return (0, "OK - allowed IP ranges: %s" % (" ".join(allowed_nets))) + return (3, "UNKNOWN - Agent does not send OnlyFrom: header") + + +check_info['check_mk.only_from'] = (check_only_from, "Check_MK Agent Access", 0, inventory_only_from) + diff --git a/multisite.mk b/multisite.mk index 38780ba..52d4733 100644 --- a/multisite.mk +++ b/multisite.mk @@ -18,11 +18,12 @@ admin_users = [ "nagiosadmin" ] # Sites to connect to. If this variable is unset, a single # connection to the local host is done. -#sites = { -# # connect to local Nagios -# "local" : { -# "alias" : "Munich" -# }, +sites = { + # connect to local Nagios + "wato" : { + "alias" : "Munich" + }, +} # # # connect to remote site (e.g. local OMD site 'paris') # "paris": {

13 years, 11 months

Check_MK Git: check_mk: fc_brocade_port_detailed: configure states for port states

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7d5bce7b882b645985672131bc0a6bc6b35aebfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d5bce7b882b64… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 6 13:45:08 2010 +0100 fc_brocade_port_detailed: configure states for port states --- ChangeLog | 2 ++ checkman/fc_brocade_port_detailed | 37 ++++++++++++++++++++++++++++++------- checks/fc_brocade_port_detailed | 27 +++++++++++++++++++++------ 3 files changed, 53 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f4bee3..2360c70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,8 @@ per-host configuration Checks & Agents: + * fc_brocade_port_detailed: allow to specify port state combinations not + to be critical * megaraid_pdisks: Using the real enclosure number as check item now * if/if64: Added expected interface speed to warning output * if/if64: Allow to ignore speed setting (set target speed to None) diff --git a/checkman/fc_brocade_port_detailed b/checkman/fc_brocade_port_detailed index bc75a8b..c7a63ad 100644 --- a/checkman/fc_brocade_port_detailed +++ b/checkman/fc_brocade_port_detailed @@ -17,14 +17,26 @@ item: examples: # set levels for errors, not for in/out fc_brocade_port_detailed_default_levels = ( - ( 1, 500 ), # warn at 1, crit at 500 CRC errors per check intervall - ( 0.1, 10.0 ), # warn/crit if encout is more then 0.1 or 10% of packets + ( 1, 500 ), # warn at 1, crit at 500 CRC errors per check intervall + ( 0.1, 10.0 ), # warn/crit if encout is more then 0.1 or 10% of packets ( 101.0, 101.0 ) ) # do never alert C3 discards # Same, but warning if traffic more than 160MB/s on in or out, # no level for critical and assumed link baudrate of 2GBit/s fc_brocade_port_detailed_default_levels = ( - (1, 500), (0.1, 10.0), (101.0, 101.0), (2, 160, None)) + ( 1, 500), + ( 0.1, 10.0 ), + ( 101.0, 101.0 ), + ( 2, 160, None ) ) + + # Some, but additionally specify certain state-combinations to be + # only warning / not critical + fc_brocade_port_detailed_default_levels = ( + ( 1, 500), + ( 0.1, 10.0 ), + ( 101.0, 101.0 ), + ( 2, 160, None, [(1,6,2), (1,4,2)]) ) + perfdata: Five variables: the number of bytes received and transmitted, and the number @@ -43,15 +55,26 @@ crcerrors (number, number): A pair of levels for the CRC errors. If the level is to the total number of packets received in the last check cycle. encout (number, number): A pair of levels for the ENC out counter. c3discards (number, number): A pair of levels for the C3 discards. -inoutlevels (number, number, number): An optional triple used for - checking in- and outgoing traffic. The first argument is the assumed link speed - in GBit/sec. For inter switch links (ISL) the brocade MIB contains an +inoutlevels (number, number, number, list): An optional quadruple used for + checking in- and outgoing traffic and the possible port states. + The first argument is the assumed link speed + in GBit/sec. For inter-switch links (ISL) the brocade MIB contains an entry for the current speed - which is being used. If that is different from the assumed link speed, then the levels are adapted accordingly. If you set the assumed link speed to 2, the level to 160 and the detected - link speed is 4GBit/s, then the level is being raised to 320. The other + link speed is 4GBit/s, then the level is being raised to 320. The next two arguments are the levels for warning and critical in MB/s. Each of those may be set to {None} in order to disable that level. + The forth argument is optional and is a list of triples. This list + makes selected port states not result in a critical but in a user + defined state. Each triple is consists of ({exitcode}, {physical state}, + {opstate}). The possible exitcodes are {0} for OK, {1} for WARNING, {2} for + CRITICAL and {3} for UNKNOWN. The possible physical states are: {noCard(1)}, + {noTransceiver(2)}, {laserFault(3)}, {noLight(4)}, {noSync(5)}, {inSync(6)}, + {portFault(7)}, {diagFault(8)}, {lockRef(9)} The possible opstates are: + {online(1)}, {offline(2)}, {testing(3)}, {faulty(4)}. So if you want + {noLight/offline} to be OK and {inSync/testing} to be WARN, set the list to + {[(0,4,2),(1,6,3)]}. [configuration] fc_brocade_port_detailed_default_levels ( pair, pair, pair, triple ): diff --git a/checks/fc_brocade_port_detailed b/checks/fc_brocade_port_detailed index 5d38dad..dbbcb24 100644 --- a/checks/fc_brocade_port_detailed +++ b/checks/fc_brocade_port_detailed @@ -27,10 +27,12 @@ # targetstate is 1 (used) or 0 (unused) # info columns: INDEX PHYSTATE OPSTATE TXWORDS RXWORDS -brocade_pystate_names = ['', 'noCard', 'noTransceiver', 'laserFault', 'noLight', 'noSync', 'inSync', 'portFault', 'diagFault', 'lockRef'] -brocade_opstate_names = [ 'unknown', 'online', 'offline', 'testing', 'faulty'] +# 0 1 2 3 4 5 6 7 8 9 +brocade_phystate_names = [ '', 'noCard', 'noTransceiver', 'laserFault', 'noLight', 'noSync', 'inSync', 'portFault', 'diagFault', 'lockRef' ] +# 0 1 2 3 4 +brocade_opstate_names = [ 'unknown', 'online', 'offline', 'testing', 'faulty' ] -fc_brocade_port_detailed_default_levels = ( (1, 0.1), (1, 0.1), (1, 0.1), (2, 160, None) ) +fc_brocade_port_detailed_default_levels = ( (1, 0.1), (1, 0.1), (1, 0.1), (2, 160, None, []) ) def inventory_brocade_port(checkname, info): porttable, isltable = info @@ -62,6 +64,7 @@ def check_brocade_port(portno, params, info): portinfo = [ line[1:] for line in porttable if int(line[0]) == int(portno) + 1 ] if len(portinfo) < 1: return (3, "UNKNOWN - No port number %d present" % int(portno)) + phystate, opstate, txwords, rxwords, txframes, rxframes, crcerrors, encout, c3discards = map(int, portinfo[0]) baudrate = None baudinfo = "" @@ -75,8 +78,11 @@ def check_brocade_port(portno, params, info): baudrate = 1.0 * (float(brmult) / 16) baudinfo = ", ISL with baudrate: %gGBit/s" % (baudrate, ) + special_states = [] if len(params) >= 4: - assumed_baudrate, io_warn, io_crit = params[3] + assumed_baudrate, io_warn, io_crit = params[3][0:3] + if len(params[3]) >= 4: + special_states = params[3][3] if not baudinfo: baudinfo = ", assumed baudrate: %gGBit/s" % assumed_baudrate @@ -101,9 +107,18 @@ def check_brocade_port(portno, params, info): ] # First check if port has physical and logical link - state = phystate,opstate + state = phystate, opstate if state != (6,1): - return (2, "CRIT - physical state %s, opstate %s" % (brocade_pystate_names[phystate], brocade_opstate_names[opstate]), perfdata) + # If port is in one of the states that are especially configured in the parameters, + # the exit could is set by the admin + nagioscode = 2 + for ncode, phy, op in special_states: + if (phy,op) == (phystate, opstate): + nagioscode = ncode + break + return (nagioscode, "%s - physical state %s(%d), opstate %s(%d)" % ( + nagios_state_names[nagioscode], brocade_phystate_names[phystate], + phystate, brocade_opstate_names[opstate], opstate), perfdata) # Now check rates of various error counters this_time = time.time()

13 years, 11 months

Check_MK Git: check_mk: snmp_info check: Not using snmp_info_single anymore

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 79d2b9dfe4cb95189378309b89359e505c0eb696 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79d2b9dfe4cb95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 6 15:50:14 2010 +0100 snmp_info check: Not using snmp_info_single anymore --- checks/snmp_info | 8 ++++---- web/htdocs/actions.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/snmp_info b/checks/snmp_info index eb83c86..49b2c83 100644 --- a/checks/snmp_info +++ b/checks/snmp_info @@ -25,17 +25,17 @@ # Boston, MA 02110-1301 USA. def inventory_snmp_info(checktype, info): - if len(info) >= 4: + if len(info[0]) >= 4: return [ (None, None, None) ] def check_snmp_info(checktype, params, info): - if len(info) >= 4: - return (0, "OK - %s, %s, %s, %s" % (info[0][-1], info[2][-1], info[3][-1], info[1][-1])) + if len(info[0]) >= 4: + return (0, "OK - %s, %s, %s, %s" % (info[0][0], info[0][2], info[0][3], info[0][1])) else: return (3, "UNKNOWN - No data retrieved") check_info['snmp_info'] = (check_snmp_info, "SNMP Info", 0, inventory_snmp_info) -snmp_info_single['snmp_info'] = ( None, ".1.3.6.1.2.1.1", [ "1.0", "4.0", "5.0", "6.0" ] ) +snmp_info['snmp_info'] = ( ".1.3.6.1.2.1.1", [ '1.0', '4.0', '5.0', '6.0', ] ) # Do not use this check per default snmp_scan_functions['snmp_info'] = lambda oid: False diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index fc03700..9b49fa1 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -23,7 +23,7 @@ # 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. - + from lib import * import time import config @@ -44,7 +44,7 @@ def ajax_action(h): def action_reschedule(): if not config.may("action.reschedule"): raise MKGeneralException("You are not allowed to reschedule checks.") - + site = html.var("site") host = html.var("host", "") if not host:

13 years, 11 months

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 430f82564cb879b0cf259890d29b8c98bd07bb97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=430f82564cb879… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 6 15:50:53 2010 +0100 Updated changelog --- ChangeLog | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b5309a..9afc410 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,7 +93,8 @@ * printer_supply: In case of OKI c5900 devices the name of the supply units ins not unique. The color of the supply unit is reported in a dedicated OID and added to the check item name to have a unique name now. - * prnter_supply: Added simple pnp template to have better graph formating for the check results + * printer_supply: Added simple pnp template to have better graph formating for the check results + * snmp_info check: Recoded not to use snmp_info_single anymore Multisite: * The custom open/close states of custom links are now stored for each

13 years, 11 months

Check_MK Git: check_mk: wato: fixed links in wato snapin (reverted latest " fix")

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: db3dd53119bc69fa3ccbf192c1393dfe1b9891c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db3dd53119bc69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 6 11:02:57 2010 +0100 wato: fixed links in wato snapin (reverted latest "fix") --- web/plugins/sidebar/wato.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 86dc9e2..aeba3f7 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -19,7 +19,7 @@ def render_wato_files(): state = html.site_status[sitename]["state"] if state != "disabled": html.write("<h3>%s</h3>\n" % site["alias"]) - ajax_url = site["url_prefix"] + "check_mk/ajax_wato_files.py?site=" + sitename + ajax_url = site["url_prefix"] + "check_mk/ajax_wato_files.py" html.javascript("document.write(get_url_sync('%s'));" % ajax_url) else: ajax_wato_files(html) @@ -27,14 +27,10 @@ def render_wato_files(): def ajax_wato_files(h): global html html = h - sitename = html.var('site', '') if config.may("use_wato"): for filename, title, roles in config.config_files: if config.role in roles: - if sitename: - bulletlink(title, "/%s/check_mk/wato.py?filename=%s" % (sitename, filename)) - else: - bulletlink(title, "wato.py?filename=%s" % filename) + bulletlink(title, "wato.py?filename=%s" % filename) sidebar_snapins["wato"] = { @@ -44,5 +40,3 @@ sidebar_snapins["wato"] = { "render" : render_wato_files, "allowed" : [ "admin", "user" ], } - -

13 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits