Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: FIX check_mkevents: now able to resolve the hostname of the remote hosts

by Andreas Boesl

Module: check_mk Branch: master Commit: e28f764937b73bde4286b87a99cc15e0041c6059 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e28f764937b73b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 7 16:15:28 2014 +0200 FIX check_mkevents: now able to resolve the hostname of the remote hosts The check_mkevents plugin was not able to resolve remote hosts, which were specified with the FQDN. Conflicts: ChangeLog mkeventd/lib/check_mkevents.cc --- .werks/950 | 9 +++++++++ ChangeLog | 1 + mkeventd/lib/check_mkevents.cc | 24 ++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.werks/950 b/.werks/950 new file mode 100644 index 0000000..a56c38c --- /dev/null +++ b/.werks/950 @@ -0,0 +1,9 @@ +Title: check_mkevents: now able to resolve the hostname of the remote hosts +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1404742285 + +The check_mkevents plugin was not able to resolve remote hosts, which were specified with the FQDN. diff --git a/ChangeLog b/ChangeLog index 08679eb..ca4fb27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * 1043 FIX: printer_supply: fix value error in default parameters... * 0626 FIX: veeam_jobs: agent now supports output lines longer than 80 chars * 1072 FIX: printer_supply: fix colors of Perf-O-Meter on HP OfficeJet... + * 0950 FIX: check_mkevents: now able to resolve the hostname of the remote hosts... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc index 37f0a16..8f1ceb1 100644 --- a/mkeventd/lib/check_mkevents.cc +++ b/mkeventd/lib/check_mkevents.cc @@ -33,6 +33,8 @@ #include <unistd.h> #include <sstream> #include <vector> +#include <netdb.h> + using namespace std; #ifndef AF_LOCAL @@ -48,12 +50,14 @@ void usage() printf("\n -a do not take into account acknowledged events.\n"); } + int main(int argc, char** argv) { // Parse arguments char *host = NULL; char *remote_host = NULL; char *remote_hostaddress = NULL; + char remote_hostipaddress[64]; int remote_port = 6558; char *application = NULL; bool ignore_acknowledged = false; @@ -96,7 +100,21 @@ int main(int argc, char** argv) } if (remote_host) { + struct hostent *he; + struct in_addr **addr_list; + remote_hostaddress = strtok(remote_host, ":"); + if ( (he = gethostbyname( remote_hostaddress ) ) == NULL) + { + printf("UNKNOWN - Unable to resolve remote host address: %s\n", remote_hostaddress); + return 3; + } + addr_list = (struct in_addr **) he->h_addr_list; + for(int i = 0; addr_list[i] != NULL; i++) + { + strcpy(remote_hostipaddress, inet_ntoa(*addr_list[i]) ); + } + char *port_str = strtok(NULL, ":"); if (port_str) remote_port = atoi(port_str); @@ -109,17 +127,19 @@ int main(int argc, char** argv) sock = socket(AF_INET, SOCK_STREAM, 0); tv.tv_sec = 10; setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (struct timeval *)&tv, sizeof(struct timeval)); + // Right now, there is no send timeout.. + // setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (struct timeval *)&tv, sizeof(struct timeval)); struct sockaddr_in addr; memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - inet_aton(remote_hostaddress, &addr.sin_addr); + inet_aton(remote_hostipaddress, &addr.sin_addr); addr.sin_port = htons(remote_port); if (0 > connect(sock, (struct sockaddr*) &addr, sizeof(struct sockaddr_in))) { printf("UNKNOWN - Cannot connect to event daemon via TCP %s:%d (%s)\n", - remote_hostaddress, remote_port, strerror(errno)); + remote_hostipaddress, remote_port, strerror(errno)); exit(3); } }

10 years, 3 months

Check_MK Git: check_mk: raritan_pdu_inlet: now also monitors the three phases of the inlet

by Goetz Golla

Module: check_mk Branch: master Commit: 3a370ba38e913255a0d17daa98fa2cecfd84c336 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a370ba38e9132… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jul 7 13:04:23 2014 +0200 raritan_pdu_inlet: now also monitors the three phases of the inlet --- .werks/628 | 8 ++++ ChangeLog | 1 + checkman/raritan_pdu_inlet | 2 +- checks/raritan_pdu_inlet | 81 ++++++++++++++++++++++-------------- web/plugins/perfometer/check_mk.py | 16 +++---- 5 files changed, 68 insertions(+), 40 deletions(-) diff --git a/.werks/628 b/.werks/628 new file mode 100644 index 0000000..87badd3 --- /dev/null +++ b/.werks/628 @@ -0,0 +1,8 @@ +Title: raritan_pdu_inlet: now also monitors the three phases of the inlet +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1404731026 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d164279..57df62b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 0175 logwatch.groups: New logwatch subcheck who can be used to group logfiles together.... * 1041 aix_memory: new check for RAM and SWAP on AIX * 0998 ibm_imm_health: Trying to recognice newer versions of IBM IMM now too + * 0628 raritan_pdu_inlet: now also monitors the three phases of the inlet * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/checkman/raritan_pdu_inlet b/checkman/raritan_pdu_inlet index f615df8..146ff19 100644 --- a/checkman/raritan_pdu_inlet +++ b/checkman/raritan_pdu_inlet @@ -14,7 +14,7 @@ description: The state of the check reflects the state of the device. item: - The ID Number of the inlet and the sensor type. + The ID Number of the inlet and the sensor type, plus the phase. perfdata: Exactly one number: The measured value together with it's unit. diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet index bca7b73..2afedd8 100644 --- a/checks/raritan_pdu_inlet +++ b/checks/raritan_pdu_inlet @@ -76,47 +76,56 @@ states = { } def get_capability(cap_entry, id): + id = id - 1 bit = bin(ord(cap_entry))[2:][id] if bit == "1": return capabilities[id] def inventory_raritan_pdu_inlet(info): inventory = [] + i = 0 for line in info[1]: - i = int(line[0].split(".")[2]) -1 + i += 1 cap = get_capability(info[0][0][2][0],i) - if line[3] == "1" and cap: + if line[2] == "1" and cap: item = info[0][0][0] + "-" + cap inventory.append((item, None)) + item = info[0][0][0] + "-" + cap + "_L1" + inventory.append((item, None)) + item = info[0][0][0] + "-" + cap + "_L2" + inventory.append((item, None)) + item = info[0][0][0] + "-" + cap + "_L3" + inventory.append((item, None)) return inventory -def check_raritan_pdu_inlet(item, params, info): - state = 3 - message = "Sensor not found" - +def check_raritan_pdu_inlet(item, _no_params, info): + kinds = { "": 4, "_L1": 5, "_L2": 6, "_L3": 7 } label = info[0][0][0] name = info[0][0][1] + i = 0 for line in info[1]: - i = int(line[0].split(".")[2]) - 1 + i += 1 cap = get_capability(info[0][0][2][0],i) - if label + "-" + cap == item: - unit = units[int(line[1])] - digits = int(line[2]) - avail = line[3] - status = int(line[4]) - status_txt = states[status] - value = float(line[5]) / 10.0**digits - message = "sensor " + name - message += "status \"%s\", value %.2f %s" % (status_txt,value,unit) - perfdata = [ (cap, str(value)+unit) ] - if avail != "1" or status in ( 2, 6 ): - state = 2 - elif status == 4: - state = 0 - else: - state = 1 + for mark, index in kinds.iteritems(): + if cap and label + "-" + cap + mark == item: + unit = units[int(line[0])] + digits = int(line[1]) + avail = line[2] + status = int(line[3]) + status_txt = states[status] + value = float(line[index]) / 10.0**digits + message = "sensor " + name + message += "status \"%s\", value %.2f %s" % (status_txt,value,unit) + perfdata = [ (cap+mark, str(value)+unit) ] + if avail != "1" or status in ( 2, 6 ): + state = 2 + elif status == 4: + state = 0 + else: + state = 1 + return (state, message, perfdata) - return (state, message, perfdata) + return 3, "no such inlet data" check_info['raritan_pdu_inlet'] = { "inventory_function" : inventory_raritan_pdu_inlet, @@ -133,14 +142,24 @@ check_info['raritan_pdu_inlet'] = { ), ( ".1.3.6.1.4.1.13742.6", # Properties of the sensors [ - OID_END, - "3.3.4.1.6", # inletSensorUnits - "3.3.4.1.7", # inletDecimalDigits - "5.2.3.1.2", # inlet sensor availability - "5.2.3.1.3", # inlet sensor state - "5.2.3.1.4", # inlet sensor value + "3.3.4.1.6.1.1", # inletSensorUnits + "3.3.4.1.7.1.1", # inletDecimalDigits + "5.2.3.1.2.1.1", # inlet sensor availability + "5.2.3.1.3.1.1", # inlet sensor state + "5.2.3.1.4.1.1", # inlet sensor value + "5.2.4.1.4.1.1.1", # inlet sensor L1 value + "5.2.4.1.4.1.1.2", # inlet sensor L2 value + "5.2.4.1.4.1.1.3", # inlet sensor L3 value ] - )], + ), + #( ".1.3.6.1.4.1.13742.6.5.2.4.1.4.1.1", # Properties of the sensors + # [ + # "1", # inlet sensor values + # "2", # inlet sensor values + # "3", # inlet sensor values + # ] + #), + ], "snmp_scan_function" : lambda oid: \ oid(".1.3.6.1.4.1.13742.6.3.2.1.1.3.1").startswith("PX2-2") diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 5e35c6a..4ff230a 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1061,21 +1061,21 @@ def perfometer_raritan_pdu_inlet(row, check_command, perf_data): unit = perf_data[0][2] display_str = perf_data[0][1] + " " + unit - if cap == "rmsCurrent": + if cap.startswith("rmsCurrent"): return display_str, perfometer_logarithmic(value, 1, 2, display_color) - elif cap == "unbalancedCurrent": + elif cap.startswith("unbalancedCurrent"): return display_str, perfometer_linear(value, display_color) - elif cap == "rmsVoltage": + elif cap.startswith("rmsVoltage"): return display_str, perfometer_logarithmic(value, 500, 2, display_color) - elif cap == "activePower": + elif cap.startswith("activePower"): return display_str, perfometer_logarithmic(value, 20, 2, display_color) - elif cap == "apparentPower": + elif cap.startswith("apparentPower"): return display_str, perfometer_logarithmic(value, 20, 2, display_color) - elif cap == "powerFactor": + elif cap.startswith("powerFactor"): return display_str, perfometer_linear(value * 100, display_color) - elif cap == "activeEnergy": + elif cap.startswith("activeEnergy"): return display_str, perfometer_logarithmic(value, 100000, 2, display_color) - elif cap == "apparentEnergy": + elif cap.startswith("apparentEnergy"): return display_str, perfometer_logarithmic(value, 100000, 2, display_color) return "unimplemented" , perfometer_linear(0, "#ffffff")

10 years, 3 months

Check_MK Git: check_mk: FIX printer_supply: fix colors of Perf-O-Meter on HP OfficeJet

by Mathias Kettner

Module: check_mk Branch: master Commit: 5f87e9078d2cc752bc122fc7f8fa7156bb39f96e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f87e9078d2cc7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 7 11:54:50 2014 +0200 FIX printer_supply: fix colors of Perf-O-Meter on HP OfficeJet All Perf-O-Meters were black, because the description ended with <tt>k</tt>, because of the word <tt>ink</tt>. This has been fixed. --- .werks/1072 | 10 ++++++++++ ChangeLog | 2 +- web/plugins/perfometer/check_mk.py | 12 ++++++------ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.werks/1072 b/.werks/1072 new file mode 100644 index 0000000..53756e9 --- /dev/null +++ b/.werks/1072 @@ -0,0 +1,10 @@ +Title: printer_supply: fix colors of Perf-O-Meter on HP OfficeJet +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1404726833 + +All Perf-O-Meters were black, because the description ended with <tt>k</tt>, +because of the word <tt>ink</tt>. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 2660aa4..38ab9db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,7 +32,7 @@ * 0827 FIX: lnx_thermal: Not checking active trip points (e.g. cooling device triggers) anymore * 1043 FIX: printer_supply: fix value error in default parameters... * 0626 FIX: veeam_jobs: agent now supports output lines longer than 80 chars - + * 1072 FIX: printer_supply: fix colors of Perf-O-Meter on HP OfficeJet... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 5e35c6a..d563e64 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -668,18 +668,18 @@ def perfometer_check_mk_printer_supply(row, check_command, perf_data): s = row['service_description'].lower() fg_color = '#000000' - if 'black' in s or s[-1] == 'k': + if 'black' in s or ("ink" not in s and s[-1] == 'k'): colors = [ '#000000', '#6E6F00', '#6F0000' ] if left >= 60: - fg_color = '#ffffff' + fg_color = '#FFFFFF' elif 'magenta' in s or s[-1] == 'm': - colors = [ '#fc00ff', '#FC7FFF', '#FEDFFF' ] + colors = [ '#FC00FF', '#FC7FFF', '#FEDFFF' ] elif 'yellow' in s or s[-1] == 'y': - colors = [ '#ffff00', '#FEFF7F', '#FFFFCF' ] + colors = [ '#FFFF00', '#FEFF7F', '#FFFFCF' ] elif 'cyan' in s or s[-1] == 'c': - colors = [ '#00ffff', '#7FFFFF', '#DFFFFF' ] + colors = [ '#00FFFF', '#7FFFFF', '#DFFFFF' ] else: - colors = [ '#cccccc', '#ffff00', '#ff0000' ] + colors = [ '#CCCCCC', '#ffff00', '#ff0000' ] st = min(2, row['service_state']) color = colors[st]

10 years, 3 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: c1936e984dcf98d63639274fdc048c076a6dae85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1936e984dcf98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 7 11:53:43 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e255a85..6d5177e 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1072 +1082

10 years, 3 months

Check_MK Git: check_mk: Werk aktualisiert

by Mathias Kettner

Module: check_mk Branch: master Commit: 597ef2032c1a0427e41c28ad10ba0712039d7675 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=597ef2032c1a04… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 7 09:49:52 2014 +0200 Werk aktualisiert --- .werks/885 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/885 b/.werks/885 index 3cbae30..e0cdbba 100644 --- a/.werks/885 +++ b/.werks/885 @@ -7,7 +7,7 @@ Class: feature The new Event Console global option <i>Syslog-like message logging</i> will enable logging of <b>all</b> incoming events into logfiles that have syslog format. -These files will be stored below <tt>var/check_mk/mkeventd/messages</tt> and will +These files will be stored below <tt>var/mkeventd/messages</tt> and will be named with the same scheme as the history logfiles. They will adopt the same rotation principle as the history files.

10 years, 3 months

Check_MK Git: check_mk: testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 931b0b0248291a64dd9f5c37c58c7de895edffb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=931b0b0248291a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 7 09:32:04 2014 +0200 testcommit --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index dbc1476..2660aa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * 1043 FIX: printer_supply: fix value error in default parameters... * 0626 FIX: veeam_jobs: agent now supports output lines longer than 80 chars + Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... * 1033 New Mutisite filter for the number of services a host has...

10 years, 3 months

Check_MK Git: check_mk: testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 929063d86fc0e57c5d6e54174697199583a6823e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=929063d86fc0e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 7 09:29:36 2014 +0200 testcommit --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2660aa4..dbc1476 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,7 +33,6 @@ * 1043 FIX: printer_supply: fix value error in default parameters... * 0626 FIX: veeam_jobs: agent now supports output lines longer than 80 chars - Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... * 1033 New Mutisite filter for the number of services a host has...

10 years, 3 months

Check_MK Git: check_mk: Removed debug code from check

by Lars Michelsen

Module: check_mk Branch: master Commit: 585a28b72ae0124cd44162a18020899ca5c5cb83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=585a28b72ae012… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 7 08:24:50 2014 +0200 Removed debug code from check --- checks/ibm_imm_health | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/ibm_imm_health b/checks/ibm_imm_health index 1b0cafd..a009608 100644 --- a/checks/ibm_imm_health +++ b/checks/ibm_imm_health @@ -27,7 +27,6 @@ # Author: Michael Nieporte <micha.nieporte(a)gmail.com> - Based on rsa_health by Mathias Kettner def ibm_imm_health_scan(oid): - print "running" if oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips") or \ oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" sh4a"): return True

10 years, 3 months

Check_MK Git: check_mk: Fixed events check always being reporting OK state

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e161de099054ec61562b21b2ed7b711efcac3bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e161de099054e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 7 08:24:09 2014 +0200 Fixed events check always being reporting OK state Had been introduced here: commit 6dfcbb60e3be64dcd701aa6abbc1378d4f4a1f3e Date: Wed Jul 2 10:09:02 2014 +0200 --- mkeventd/lib/check_mkevents.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc index f9401c5..37f0a16 100644 --- a/mkeventd/lib/check_mkevents.cc +++ b/mkeventd/lib/check_mkevents.cc @@ -255,5 +255,5 @@ int main(int argc, char** argv) printf(", worst state is %s (Last line: %s)", state_text, worst_row_event_text.c_str()); printf("\n"); } - return 0; + return worst_state; }

10 years, 3 months

Check_MK Git: check_mk: FIX Fixed events check always being reporting OK state

by Lars Michelsen

Module: check_mk Branch: master Commit: 1c0478af9c2466d5c39a4bd0fdea9ebbf616f6af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c0478af9c2466… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 7 08:31:46 2014 +0200 FIX Fixed events check always being reporting OK state The "Events .*" checks were always displayed as OK. Had been introduced here: commit 6dfcbb60e3be64dcd701aa6abbc1378d4f4a1f3e Date: Wed Jul 2 10:09:02 2014 +0200 --- .werks/1053 | 13 +++++++++++++ ChangeLog | 1 + 2 files changed, 14 insertions(+) diff --git a/.werks/1053 b/.werks/1053 new file mode 100644 index 0000000..1eb3ace --- /dev/null +++ b/.werks/1053 @@ -0,0 +1,13 @@ +Title: Fixed events check always being reporting OK state +Level: 2 +Component: core +Version: 1.2.5i5 +Date: 1404714657 +Class: fix + +The "Events .*" checks were always displayed as OK. + +Had been introduced here: + +commit 6dfcbb60e3be64dcd701aa6abbc1378d4f4a1f3e +Date: Wed Jul 2 10:09:02 2014 +0200 diff --git a/ChangeLog b/ChangeLog index d164279..dbc1476 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 1038 Massive speedup of cmk --snmptranslate * 1035 FIX: Do not fail on errors in *.mk files anymore - except in interactive mode... * 0174 FIX: Fixed appending of --keepalive-fd parameters to checkhelpers... + * 1053 FIX: Fixed events check always being reporting OK state... Checks & Agents: * 0168 f5_bigip_pool: Added Wato configuration...

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