Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: livecheck: install, compile without diet

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f6ac0442018758a2fc79676bf784f333cc3d4a49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6ac0442018758… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 11 13:41:35 2011 +0100 livecheck: install, compile without diet --- livestatus/src/Makefile.am | 7 ++++++- livestatus/src/livecheck.c | 13 ++++++++----- livestatus/src/strutil.cc | 2 +- scripts/setup.sh | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 6ee10cf..d44d961 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -52,7 +52,12 @@ livestatus_so_SOURCES = \ ContactgroupsColumn.cc opids.cc auth.cc livechecking.c livecheck: livecheck.c strutil.cc - diet gcc -I.. -s -o $@ $^ + @if type diet >/dev/null 2>&1 ; then \ + echo "You have no dietlibc install. We won't be able to create a static binary." ; \ + diet $(CC) $(CFLAGS) -I.. -s -o $@ $^ ; \ + else \ + $(CC) $(CFLAGS) -I.. -s -o $@ $^ ; \ + fi livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC livestatus_so_CFLAGS = $(livestatus_so_CXXFLAGS) diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c index 9d79dfd..40ad282 100644 --- a/livestatus/src/livecheck.c +++ b/livestatus/src/livecheck.c @@ -28,6 +28,8 @@ #include <sys/timeb.h> #include <stdlib.h> #include <fcntl.h> +#include <string.h> + #include "strutil.h" int main(int argc, char **argv) @@ -42,12 +44,13 @@ int main(int argc, char **argv) while (1) { write(1, "*", 1); // Signal Nagios that we are finished - if (NULL == fgets(host, sizeof(host), stdin)) { + if (NULL == fgets(host, sizeof(host), stdin) + || NULL == fgets(service, sizeof(service), stdin) + || NULL == fgets(latency, sizeof(latency), stdin) + || NULL == fgets(command, sizeof(command), stdin)) + { exit(0); } - fgets(service, sizeof(service), stdin); - fgets(latency, sizeof(latency), stdin); - fgets(command, sizeof(command), stdin); int fd[2]; pipe(fd); @@ -113,7 +116,7 @@ int main(int argc, char **argv) ftime(&end); char template[256]; snprintf(template, sizeof(template), "%s/cXXXXXX", check_result_path); - mktemp(template); + char *foo = mktemp(template); FILE *checkfile = fopen(template, "w"); fprintf(checkfile, "host_name=%s", host); if (service[0] != '\n') diff --git a/livestatus/src/strutil.cc b/livestatus/src/strutil.cc index feceb37..24cada2 100644 --- a/livestatus/src/strutil.cc +++ b/livestatus/src/strutil.cc @@ -93,7 +93,7 @@ char *save_next_token(char **c, char delim) { char *result = next_token(c, delim); if (result == 0) - return ""; + return (char *)""; else return result; } diff --git a/scripts/setup.sh b/scripts/setup.sh index 6e9215a..52ee58d 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -556,7 +556,7 @@ EOF make -j 8 2>&1 && strip src/livestatus.o && mkdir -p $DESTDIR$libdir && - install -m 755 src/livestatus.o $DESTDIR$libdir/livestatus.o && + install -m 755 src/livecheck src/livestatus.o $DESTDIR$libdir/livestatus.o && mkdir -p $DESTDIR$bindir && install -m 755 src/unixcat $DESTDIR$bindir && popd

12 years, 10 months

Check_MK Git: check_mk: livecheck: install into lib/ not bin/

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd4d130ff78db6e5a0a7c3fe9e2d8027de5f62d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd4d130ff78db6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 11 13:45:09 2011 +0100 livecheck: install into lib/ not bin/ --- livestatus/src/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index d44d961..e57b6d0 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -22,10 +22,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -bin_PROGRAMS = unixcat livecheck +bin_PROGRAMS = unixcat unixcat_SOURCES = unixcat.c unixcat_LDADD = -lpthread +pkglib_PROGRAMS = livecheck livecheck_SOURCES = livecheck.c strutil.cc pkglib_LIBRARIES = livestatus.so

12 years, 10 months

Check_MK Git: check_mk: FIX: fix handling of empty suboids

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6707ea3c5d8ab5530910d9d3fc1a2ae92c42b23f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6707ea3c5d8ab5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 10 14:19:43 2011 +0100 FIX: fix handling of empty suboids --- ChangeLog | 3 +++ modules/snmp.py | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd456ae..5c35025 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,9 @@ * extra_buttons can now register a function to gather the URL to link to 1.1.12p2: + Core, Setup, etc.: + * FIX: fix handling of empty suboids + Checks & Agents: * FIX: mem.win: Default levels now works, check not always OK * FIX: blade_health: fix OID specification diff --git a/modules/snmp.py b/modules/snmp.py index 211a164..0bcee8c 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -121,10 +121,14 @@ def extract_end_oid(prefix, complete): return complete[len(prefix):].lstrip('.') # sort OID strings numerically +def oid_to_intlist(oid): + if oid: + return map(int, oid.split('.')) + else: + return [] + def cmp_oids(o1, o2): - i1 = map(int, o1.split('.')) - i2 = map(int, o2.split('.')) - return cmp(i1, i2) + return cmp(oid_to_intlist(o1), oid_to_intlist(o2)) def get_snmp_table(hostname, ip, oid_info): # oid_info is either ( oid, columns ) or

12 years, 10 months

Check_MK Git: check_mk: FIX: blade_health: fix OID specification

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7a1dce1794cc3820442a5ca0f078c097eca029d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a1dce1794cc38… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 10 14:19:00 2011 +0100 FIX: blade_health: fix OID specification --- ChangeLog | 1 + checks/blade_health | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6297de8..fd456ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ 1.1.12p2: Checks & Agents: * FIX: mem.win: Default levels now works, check not always OK + * FIX: blade_health: fix OID specification Multisite: * FIX: Fixed encoding problem when opening dashboard diff --git a/checks/blade_health b/checks/blade_health index 3ad1f6d..1ab2751 100644 --- a/checks/blade_health +++ b/checks/blade_health @@ -24,6 +24,14 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Example excerpt from SNMP data: +# .1.3.6.1.4.1.2.3.51.2.2.7.1.0 255 +# .1.3.6.1.4.1.2.3.51.2.2.7.2.1.1.1 1 +# .1.3.6.1.4.1.2.3.51.2.2.7.2.1.2.1 "Good" +# .1.3.6.1.4.1.2.3.51.2.2.7.2.1.3.1 "No critical or warning events" +# .1.3.6.1.4.1.2.3.51.2.2.7.2.1.4.1 "No timestamp" + + def inventory_blade_health(info): if len(info) == 1: return [(None, None, None)] @@ -48,7 +56,7 @@ def check_blade_health(_no_item, _no_params, info): check_info['blade_health'] = ( check_blade_health, "Summary health state", 0, inventory_blade_health) -snmp_info['blade_health'] = ( ".1.3.6.1.4.1.2.3.51.2.2.7", [ '1', '2.1.3.1' ]) +snmp_info['blade_health'] = ( ".1.3.6.1.4.1.2.3.51.2.2.7", [ '1.0', '2.1.3.1' ]) snmp_scan_functions['blade_health'] = \ lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0"))

12 years, 10 months

Check_MK Git: check_mk: FIX: blade_bays: fix naming of item and man page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f50b4a83690a00cc3299f37ce85a13c85349c43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f50b4a83690a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 10 14:54:51 2011 +0100 FIX: blade_bays: fix naming of item and man page --- ChangeLog | 1 + checkman/blade_bays | 9 +++------ checks/blade_bays | 26 ++++++++++++++++++++++---- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c35025..08b2f3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ Checks & Agents: * FIX: mem.win: Default levels now works, check not always OK * FIX: blade_health: fix OID specification + * FIX: blade_bays: fix naming of item and man page Multisite: * FIX: Fixed encoding problem when opening dashboard diff --git a/checkman/blade_bays b/checkman/blade_bays index 28c5996..ccb66ee 100644 --- a/checkman/blade_bays +++ b/checkman/blade_bays @@ -10,12 +10,9 @@ description: in a critical check result. item: - Number of the bay (as string, not int). - -examples: - checks += [ - ( "hostabc", "blade_bays", "8", None) - ] + A string with the format "PD{A} {B}" where {A} is the number + of the power domain (1 or 2) and {B} is the name of the bay + (e.g. {Midplane}). inventory: All bays with the state 1 (present and OK) are automatically diff --git a/checks/blade_bays b/checks/blade_bays index 0be3318..e7cf0f1 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -31,13 +31,27 @@ blade_bays_module_state = { 255: 'notApplicable', } +def blade_bays_make_item(line): + # "3.IO Module 5" + pd, name = line[0].split(".", 1) + if pd == '2': + power_domain = 1 + else: + power_domain = 2 + return "PD%d %s" % (power_domain, name) + def inventory_blade_bays(info): # find only modules that are present and switched on or standby - return [ (line[0], '', line[1]) for line in info if line[1] in [ '0', '1' ] ] + inventory = [] + for line in info: + if line[1] in [ '0', '1' ]: + item = blade_bays_make_item(line) + inventory.append((item, None)) + return inventory -def check_blade_bays(item, params, info): +def check_blade_bays(item, _no_params, info): for line in info: - if line[0] == item: + if item == blade_bays_make_item(line): state = saveint(line[1]) type = line[2].split('(')[0] if state == 1: @@ -52,7 +66,11 @@ def check_blade_bays(item, params, info): return (3, "UNKNOWN - no data for '%s' in SNMP info" % item) check_info['blade_bays'] = (check_blade_bays, "BAY %s", 0, inventory_blade_bays) -snmp_info['blade_bays'] = ( ".1.3.6.1.4.1.2.3.51.2.2.10", ["2.1.1", "3.1.1"], [ 5, 6, 2, 1 ] ) # BLADE-MIB +snmp_info['blade_bays'] = ( + ".1.3.6.1.4.1.2.3.51.2.2.10", [ + "2", # powerDomain1 + "3", # powerDomain2 + ], [ "1.1.5", "1.1.6", "1.1.2", "1.1.1" ] ) # BLADE-MIB snmp_scan_functions['blade_bays'] = \ lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0"))

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0435

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 829f10d54a77f12167751fa1d219cd59d21d4a3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=829f10d54a77f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 11 08:07:41 2011 +0100 Updated bug entries #0435 --- .bugs/435 | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/.bugs/435 b/.bugs/435 new file mode 100644 index 0000000..943392d --- /dev/null +++ b/.bugs/435 @@ -0,0 +1,16 @@ +Title: Provide monitoring data of Livestatus threads +Component: livestatus +Benefit: 1 +State: open +Cost: 1 +Date: 2011-11-10 17:11:19 +Targetversion: future +Class: feature + +In order to make capacity planning of Livestatus possible +we need to monitor the number of currently active Livestatus +client threads. We can add this as a number for the status +table. Each client thread simply adds 1 to a global variable +during its active phase (secured by a semaphore or critical +region). We also could provide statistics about the usage +and sizes of the OutputBuffers.

12 years, 10 months

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: 61d6f5a19a111db6c29d27bc2606877e6ba598c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61d6f5a19a111d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 11 08:08:23 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 10 months

Check_MK Git: check_mk: Cleaned up ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0b0f8d93a054b081831b822b69ed953f6ca554f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b0f8d93a054b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 10 13:44:08 2011 +0100 Cleaned up ChangeLog --- .bugs/434 | 17 +++++++++++++++++ ChangeLog | 32 +++++++++++++++++--------------- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/.bugs/434 b/.bugs/434 new file mode 100644 index 0000000..4689ee9 --- /dev/null +++ b/.bugs/434 @@ -0,0 +1,17 @@ +Title: cmk --cleanup should remove obsolete files +Component: core +Benefit: 1 +State: open +Cost: 2 +Date: 2011-11-10 12:30:47 +Targetversion: 1.2.0 +Class: feature + +We need a cleanup function that removes all files belonging +to hosts that do not longer exist. Maybe we need to make +a distinction between hosts not monitored but contained +in all_hosts (due to only_hosts). We also could remove +the RRD files via an option. + +We could do this automatically on each cmk -R, maybe +via an option in main.mk diff --git a/ChangeLog b/ChangeLog index cb898e1..6297de8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,21 @@ 1.1.13i1: + Core, Setup, etc.: + * New configuration variable static_checks[] (used by WATO) + * New configuration variable checkgroup_parameters (mainly for WATO) + + Checks & Agents: + * if/if64: new ruleset if_disable_if64_hosts, that force if on + hosts the seem to support if64 + * Windows agent: new config variable "sections" in [global], that + allows to configure which sections are being output. + * Windows agent: in [logwatch] you can now configure which logfiles + to process and which levels of messages to send. + * Windows agent: new config variable "host" in all sections that + restricts the folling entries to certain hosts. + + Multisite: + * New nifty sidebar snapin "Speed-O-Meter" + WATO: * Evolved to full featured monitoring configuration tool! * Major internal code cleanup @@ -17,26 +34,11 @@ * Added option to download "latest" snapshot * extra_buttons can now register a function to gather the URL to link to - Core, Setup, etc.: - * New configuration variable static_checks[] (used by WATO) - * New configuration variable checkgroup_parameters (mainly for WATO) - - Checks & Agents: - * if/if64: new ruleset if_disable_if64_hosts, that force if on - hosts the seem to support if64 - * Windows agent: new config variable "sections" in [global], that - allows to configure which sections are being output. - * Windows agent: in [logwatch] you can now configure which logfiles - to process and which levels of messages to send. - * Windows agent: new config variable "host" in all sections that - restricts the folling entries to certain hosts. - 1.1.12p2: Checks & Agents: * FIX: mem.win: Default levels now works, check not always OK Multisite: - * New nifty sidebar snapin "Speed-O-Meter" * FIX: Fixed encoding problem when opening dashboard * FIX: Fixed styling of view header in older IE browsers

12 years, 10 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4c1c70be192c2754897734806ec9bebd7c97800a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c1c70be192c27… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 10 11:56:38 2011 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index e828e5d..1e6fd03 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -434 +444

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0432

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d65dda525f7a266656d574b22a2b48ba53a05e1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d65dda525f7a26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 10 09:24:53 2011 +0100 Updated bug entries #0432 --- .bugs/432 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/432 b/.bugs/432 new file mode 100644 index 0000000..dd9e865 --- /dev/null +++ b/.bugs/432 @@ -0,0 +1,11 @@ +Title: cmctc.temp service description +Component: checks +Benefit: 1 +State: open +Cost: 1 +Date: 2011-11-10 09:23:51 +Targetversion: 1.2.0 +Class: cleanup + +Change the service description to Temperature %s, like the +others.

12 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits