Checkmk git commits November 2012

checkmk-commits@lists.checkmk.com

3 participants
219 discussions

Check_MK Git: check_mk: OpenBSD Agent: Handle bug in OpenBSD ksh, better NIC support allowing more than 15interfaces. Thanks to Dave Josephsen <dave@...>

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: df265bfb188626f92f3e12f1350c32dc72f4a981 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df265bfb188626… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Nov 2 12:25:25 2012 +0100 OpenBSD Agent: Handle bug in OpenBSD ksh, better NIC support allowing more than 15interfaces. Thanks to Dave Josephsen <dave@...> --- agents/check_mk_agent.openbsd | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index c230ed6..fd6b0b9 100644 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -86,12 +86,16 @@ echo '<<<netctr>>>' # BO= Bytes out # PO= Packets out # CO= Colls +# NI= number of interfaces Z1=1 Z2=p +NI=$(netstat -in | grep 'Link' | wc -l) +[ "${NI}" -ge 1 ] || NI=15 + date +%s -while [ $Z1 -lt 15 ] +while [ $Z1 -lt $NI ] do BI=$( netstat -inb | egrep -v Name | grep Link | awk '{print $1" "$5}' | sed -ne $Z1$Z2 ) PI=$( netstat -in | egrep -v Name | grep Link | awk '{print $5}' | sed -ne $Z1$Z2 ) @@ -102,7 +106,7 @@ while [ $Z1 -lt 15 ] EO=$( netstat -in | egrep -v Name | grep Link | awk '{print $8}' | sed -ne $Z1$Z2 ) CO=$( netstat -in | egrep -v Name | grep Link | awk '{print $9}' | sed -ne $Z1$Z2 ) FF2="0 0" - if [ "$PI" -gt "0" ] + if [ "$(echo ${PI} | cut -c 1-3)" -gt 0 ] then echo $BI $PI $EI $FF1 $BO $PO $EO $FF2 $CO $FF2 fi

11 years, 7 months

Check_MK Git: check_mk: Update Changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 35706c5f505f06206286fb9ef021cc6e0907404a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35706c5f505f06… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Oct 29 17:24:42 2012 +0100 Update Changelog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7831a6..123de2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,8 @@ After enabling it you need to reinventorize your hosts. * Windows Update Check: Now with caching, Thanks to Phil Randal and Patrick Schlüter * Windows Check_MK Agent: Now able to parse textfiles for logwatch output + * Added new Checks sni_octopuse_cpu, sni_octopuse_status, sni_octopuse_trunks: These + allow monitoring Siemens HiPath 3000/5000 series PBX. 1.2.0p3: Mulitisite

11 years, 7 months

Check_MK Git: check_mk: Check manual pages for Siemens HiPath checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8469a9419437be47ed74c51c029620df47a2a81b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8469a9419437be… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Oct 29 17:22:10 2012 +0100 Check manual pages for Siemens HiPath checks --- checkman/sni_octopuse_cpu | 15 +++++++++++++++ checkman/sni_octopuse_status | 18 ++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/checkman/sni_octopuse_cpu b/checkman/sni_octopuse_cpu new file mode 100644 index 0000000..7389dfa --- /dev/null +++ b/checkman/sni_octopuse_cpu @@ -0,0 +1,15 @@ +title: Siemens Octopus E CPU Check +agents: snmp +author: Florian Heigl <fh(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors the cpu usage of a local PBXs supporting the SNI-OCTOPUS-E Mib. + Most common example is the Siemens HiPath 3000 and 5000 series. + A high CPU load is not known to cause issues, so the check does not have configurable levels. + +inventory: + There is one service created on inventory. + +perfdata: + current utilization diff --git a/checkman/sni_octopuse_status b/checkman/sni_octopuse_status new file mode 100644 index 0000000..62dec0b --- /dev/null +++ b/checkman/sni_octopuse_status @@ -0,0 +1,18 @@ +title: Siemens Octopus E global status +agents: snmp +author: Florian Heigl <fh(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check queries the global status of local PBX supporting the + SNI-OCTOPUS-E Mib. + Most common example is the Siemens HiPath 3000 and 5000 series. + The device uses this status to reflect the worst state of all parts that do + report such a status. (It is not documented which those are) + It knows 5 different states ranging from "normal" to "critical", which are + mapped into corresponding Nagios states. + + + +inventory: + There is one service created on inventory named "Global Status"

11 years, 7 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 41b05e0f3af9a74438dcb30f1dbef954c3a8b487 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41b05e0f3af9a7… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Nov 2 12:28:15 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: windows agent: more logging output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 74e568fa7d55d0bd7e5ab1eacab3b147c7749ca7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74e568fa7d55d0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 2 12:03:41 2012 +0100 windows agent: more logging output --- agents/windows/check_mk_agent.cc | 4 ++++ agents/windows/check_mk_agent.exe | Bin 109568 -> 109568 bytes agents/windows/install_agent.exe | Bin 129945 -> 129960 bytes 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 3d7fc69..53e59c9 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1427,6 +1427,7 @@ void update_or_create_logwatch_textfile(const char *full_filename, pattern_conta logwatch_textfile *textfile; if ((textfile = get_logwatch_textfile(full_filename)) != NULL) { + printf("File already exists %s\n", full_filename); HANDLE hFile = CreateFile(textfile->path,// file to open GENERIC_READ, // open for reading FILE_SHARE_READ, // share for reading @@ -1459,7 +1460,10 @@ void update_or_create_logwatch_textfile(const char *full_filename, pattern_conta textfile->missing = false; } CloseHandle(hFile); + } else { + printf("Cant open file with CreateFile\n"); } + } else add_new_logwatch_textfile(full_filename, patterns); // Add new file diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 05bdcf9..8de1f7a 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index e34e830..1c78a11 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 7 months

Check_MK Git: check_mk: windows agent: add debug output for logfiles

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0cf521ec3a1e918622ac138b2e2a1433af32478c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cf521ec3a1e91… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 2 11:34:15 2012 +0100 windows agent: add debug output for logfiles --- agents/windows/check_mk_agent.cc | 7 ++++++- agents/windows/check_mk_agent.exe | Bin 109056 -> 109568 bytes agents/windows/install_agent.exe | Bin 129863 -> 129945 bytes 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index c9d988f..3d7fc69 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1448,10 +1448,13 @@ void update_or_create_logwatch_textfile(const char *full_filename, pattern_conta (((unsigned long long)fileinfo.nFileSizeHigh) << 32); if (file_id != textfile->file_id) { // file has been changed + printf("File id has been changed %s\n", full_filename); textfile->offset = 0; textfile->file_id = file_id; - } else if (textfile->file_size < textfile->offset) // file has been truncated + } else if (textfile->file_size < textfile->offset) { // file has been truncated + printf("File has been truncated %s\n", full_filename); textfile->offset = 0; + } textfile->missing = false; } @@ -1597,6 +1600,7 @@ void cleanup_logwatch() bool process_textfile(FILE *file, logwatch_textfile* textfile, SOCKET &out, bool write_output) { char line[4096]; condition_pattern *pattern = 0; + printf("Checking file %s\n", textfile->path); while (!feof(file)) { if (!fgets(line, sizeof(line), file)) break; @@ -2823,6 +2827,7 @@ void read_config_file() } } fclose(file); + print_logwatch_config(); } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 7a57f13..05bdcf9 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index e9ebd19..e34e830 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 7 months

Check_MK Git: check_mk: windows agent: missed .exe file commit

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6f95ad9d82638cb9267aecd81323cf14748730c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f95ad9d82638c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 2 09:43:10 2012 +0100 windows agent: missed .exe file commit --- agents/windows/check_mk_agent.exe | Bin 109056 -> 109056 bytes agents/windows/install_agent.exe | Bin 129818 -> 129863 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 058743f..7a57f13 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 2fbd1cc..e9ebd19 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 7 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: 1fe5bccde87777d0e0772961096823920498346e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fe5bccde87777… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 2 09:41:01 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: logwatch: windows agent now with ok pattern support

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cbdf4cf13414c5d83eaa7674542ad4091b886c53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbdf4cf13414c5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 2 09:40:57 2012 +0100 logwatch: windows agent now with ok pattern support --- agents/windows/check_mk_agent.cc | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 75cd8f8..c9d988f 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1514,14 +1514,16 @@ void add_globline(char *value) // Split globline into tokens if (value != 0) { char *copy = strdup(value); - char *token = strtok(copy, " "); + char *token = strtok(copy, "|"); while (token) { + token = lstrip(token); new_globline->token[new_globline->num_tokens] = new glob_token(); new_globline->token[new_globline->num_tokens]->pattern = strdup(token); process_glob_expression(new_globline->token[new_globline->num_tokens], new_globline->patterns); - token = strtok(NULL, " "); + token = strtok(NULL, "|"); new_globline->num_tokens++; } + free(copy); } } @@ -1599,22 +1601,22 @@ bool process_textfile(FILE *file, logwatch_textfile* textfile, SOCKET &out, bool if (!fgets(line, sizeof(line), file)) break; + if (line[strlen(line)-1] == '\n') + line[strlen(line)-1] = 0; + char state = '.'; for (int j=0; j < textfile->patterns->num_patterns; j++) { pattern = textfile->patterns->patterns[j]; if (globmatch(pattern->glob_pattern, line)){ - if (!write_output && (pattern->state == 'C' || pattern->state == 'W')) + if (!write_output && (pattern->state == 'C' || pattern->state == 'W' || pattern->state == 'O')) return true; state = pattern->state; break; } } - if (write_output) - output(out, "%c %s", state, line); + if (write_output && strlen(line) > 0) + output(out, "%c %s\n", state == 'O' ? 'I' : state, line); } - // add an extra \n if the last logline was missing a newline character - if (write_output && line[strlen(line)] != '\n') - output(out, "\n"); return false; } @@ -2604,9 +2606,14 @@ bool handle_logfiles_config_variable(char *var, char *value) if (value != 0) add_condition_pattern('I', value); return true; + }else if (!strcmp(var, "ok")) { + if (value != 0) + add_condition_pattern('O', value); + return true; } return false; } + bool handle_logwatch_config_variable(char *var, char *value) { if (!strncmp(var, "logfile ", 8)) {

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2012