Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: Logwatch: Windows agent with logwatch support

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4b4a345be7c8a5a10a20431ed91a3fa4406bb517 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b4a345be7c8a5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 26 16:38:47 2012 +0200 Logwatch: Windows agent with logwatch support --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 453 ++++++++++++++++++++++++++++++++++++- agents/windows/check_mk_agent.exe | Bin 105472 -> 109056 bytes agents/windows/install_agent.exe | Bin 126319 -> 129818 bytes checks/logwatch | 3 +- 5 files changed, 451 insertions(+), 6 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4b4a345be7…

11 years, 10 months

Check_MK Git: check_mk: livecheck: fix escaping of \ in nagios checkresults file

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d38333cf99c50a82ede79e73ba584d6b31e8017f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d38333cf99c50a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 26 16:08:49 2012 +0200 livecheck: fix escaping of \ in nagios checkresults file --- ChangeLog | 1 + livestatus/src/livecheck.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4268d5b..8dcc939 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,7 @@ * FIX: close inherited unused filedescriptors after fork() * FIX: kill process group of called plugin if timeout is reached -> preventing possible freeze of livecheck + * FIX: correct escaping of character / in nagios checkresult file Checks & Agents: * FIX: Linux mk_logwatch: iregex Parameter was never used diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c index 9659404..461a08a 100644 --- a/livestatus/src/livecheck.c +++ b/livestatus/src/livecheck.c @@ -224,9 +224,14 @@ int main(int argc, char **argv) fputs(ptr_output, checkfile); fputs("\\n", checkfile); ptr_output = ptr_walk + 1; - if (*ptr_output == 0) - break; + } else if (*ptr_walk == '\\') { + *ptr_walk = 0; + fputs(ptr_output, checkfile); + fputs("\\\\", checkfile); + ptr_output = ptr_walk + 1; } + if (*ptr_output == 0) + break; ptr_walk++; } fputs("\n", checkfile);

11 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: 897f5ec0e9dc299589815aac784a57bbbe46e43e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=897f5ec0e9dc29… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 26 13:13:53 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Windows Update check now with caching,

by git＠mathias-kettner.de

thanks to Phil and Patrick User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: application/octet-stream Content-Transfer-Encoding: base64 TW9kdWxlOiBjaGVja19tawpCcmFuY2g6IG1hc3RlcgpDb21taXQ6IDk2ZTNmM2Y0MzliZjli YmQ0NmE2YmNhZTQ1Yjk0NWU5YTIxZDg0ZjYKVVJMOiAgICBodHRwOi8vZ2l0Lm1hdGhpYXMt a2V0dG5lci5kZS9naXQvP3A9Y2hlY2tfbWsuZ2l0O2E9Y29tbWl0O2g9OTZlM2YzZjQzOWJm OWJiZDQ2YTZiY2FlNDViOTQ1ZTlhMjFkODRmNgoKQXV0aG9yOiBCYXN0aWFuIEt1aG4gPGJr QG1hdGhpYXMta2V0dG5lci5kZT4KRGF0ZTogICBGcmkgT2N0IDI2IDEzOjEzOjM5IDIwMTIg KzAyMDAKCldpbmRvd3MgVXBkYXRlIGNoZWNrIG5vdyB3aXRoIGNhY2hpbmcsIHRoYW5rcyB0 byBQaGlsIGFuZCBQYXRyaWNrCgotLS0KCiBDaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgICAxICsKIGFnZW50cy93aW5kb3dzL3BsdWdpbnMvd2luZG93 c191cGRhdGVzLnZicyB8ICAyNjIgKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMiBm aWxlcyBjaGFuZ2VkLCAxMTIgaW5zZXJ0aW9ucygrKSwgMTUxIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBlNGRhMWRjLi40MjY4ZDVi IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC04NCw2ICs4NCw3 IEBACiAgICAgICBtZWNoYW5pc21zIGFuZCBHVUlzIGluc3RlYWQgb2YgdGhlIGNsYXNzaWMg bG9nd2F0Y2ggR1VJLiBJdCBjYW4gYmUgCiAgICAgICBlbmFibGVkIG9uICJHbG9iYWwgU2V0 dGluZ3MiIHBhZ2UgaW4gV0FUTyBmb3IgeW91ciB3aG9sZSBpbnN0YWxsYXRpb24uCiAgICAg ICBBZnRlciBlbmFibGluZyBpdCB5b3UgbmVlZCB0byByZWludmVudG9yaXplIHlvdXIgaG9z dHMuCisgICAgKiBXaW5kb3dzIFVwZGF0ZSBDaGVjazogTm93IHdpdGggY2FjaGluZywgVGhh bmtzIHRvIFBoaWwgUmFuZGFsIGFuZCBQYXRyaWNrIFNjaGzDvHRlcgogCiAxLjIuMHAzOgog ICAgIE11bGl0aXNpdGUKZGlmZiAtLWdpdCBhL2FnZW50cy93aW5kb3dzL3BsdWdpbnMvd2lu ZG93c191cGRhdGVzLnZicyBiL2FnZW50cy93aW5kb3dzL3BsdWdpbnMvd2luZG93c191cGRh dGVzLnZicwppbmRleCA0NTEzOTVkLi41Mzg0NTFiIDEwMDY0NAotLS0gYS9hZ2VudHMvd2lu ZG93cy9wbHVnaW5zL3dpbmRvd3NfdXBkYXRlcy52YnMKKysrIGIvYWdlbnRzL3dpbmRvd3Mv cGx1Z2lucy93aW5kb3dzX3VwZGF0ZXMudmJzCkBAIC0xLDE1MSArMSwxMTEgQEAKLScgLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0NCi0nIHdpbmRvd3NfdXBkYXRlcy52YnMgLSBjaGVja19t ayBhZ2VudCBwbHVnaW4gdG8gbW9uaXRvciBwZW5kaW5nIHdpbmRvd3MgdXBkYXRlcw0KLScN Ci0nIFRvIHVzZSB0aGlzIGp1c3QgcGxhY2UgaXQgaW4gdGhlIHBsdWdpbnMvIGRpcmVjdG9y eSBiZWxvdyB0aGUgcGF0aCBvZiB0aGUNCi0nIGNoZWNrX21rX2FnZW50LiBBZnRlciB0aGF0 IGFuIGludmVudG9yeSBydW4gb24gdGhlIE5hZ2lvcyBob3N0IHNob3VsZCBsZWFkDQotJyB0 byBhIG5ldyBpbnZlbnRvcml6ZWQgc2VydmljZS4NCi0nDQotJyBBdXRob3I6IExhcnMgTWlj aGVsc2VuIDxsbUBtYXRoaWFzLWtldHRuZXIuZGU+LCAyMDExLTAzLTIxDQotJyAtLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQ0KLQ0KLU9wdGlvbiBFeHBsaWNpdA0KLQ0KLURpbSByZXN1bHQs IHJlYm9vdCwgbnVtSW1wLCBudW1PcHQsIGltcG9ydGFudCwgb3B0aQ0KLURpbSB3aW5kb3dz X3VwZGF0ZV9tYXhhZ2UsIHRlbXBfZmlsZSwgbmV3X2ZpbGUNCi1EaW0gdXBkdFNlYXJjaGVy LCBjb2xEb3dubG9hZHMsIG9iakVudHJ5LCBvYmpGUywgb2JqU2hlbGwsIG9iakZpbGUNCi0N Ci1JZiBDcmVhdGVPYmplY3QoIk1pY3Jvc29mdC5VcGRhdGUuQXV0b1VwZGF0ZSIpLkRldGVj dE5vdyA8PiAwIFRoZW4NCi0gIFdTY3JpcHQuRWNobyAiPDw8d2luZG93c191cGRhdGVzPj4+ Ig0KLSAgV1NjcmlwdC5RdWl0KDApDQotRW5kIElmDQotDQotJyBHYXRoZXJpbmcgdGhlIGlu c3RhbGxlZCB1cGRhdGVzIG1pZ2h0IHRha2UgYSBsb3Qgb2YgdGltZSwgdGh1cyB0aGlzDQot JyBjaGVjayBtYWtlcyB1c2Ugb2YgYSBjYWNoZS4gVGhlIGNhY2hlIHNhdmVzIGFuZCB1c2Vz IHRoZSBjdXJyZW50IHVwZGF0ZSANCi0nIGluZm9ybWF0aW9uIGZvciB3aW5kb3dzX3VwZGF0 ZXNfbWF4YWdlIHNlY29uZHMuIEFmdGVyIHRoZSBmaWxlIGlzIHRvbyBvbGQNCi0nIHRoZSBp bmZvcm1hdGlvbiBhcmUgcmVmcmVzaGVkLiBUaGUgY2hlY2sgaXMgZXhlY3V0ZWQgaW4gInJl ZnJlc2giIG1vZGUgdG8NCi0nIHVwZGF0ZSB0aGUgZGF0YSBpbiBiYWNrZ3JvdW5kIHdoaWxl IHRoZSByZWd1bGFyIGNoZWNrIHN0aWxsIHVzZXMgdGhlIGN1cnJlbnQNCi0nIGluZm9ybWF0 aW9uLiBPbmNlIHRoZSB1cGRhdGUgZmluaXNoZWQgaW4gdGhlIGJhY2tncm91bmQgam9iLCB0 aGUgbmV3IGRhdGENCi0nIGlzIHVzZWQuDQotDQotJyBHYXRoZXIgbW9kZSBvZiB0aGUgY3Vy cmVudCBzY3JpcHQgcnVuDQotRGltIG1vZGUNCi1tb2RlID0gImNoZWNrIg0KLUlmIFdzY3Jp cHQuQXJndW1lbnRzLkNvdW50ID0gMSBUaGVuDQotCUlmIFdzY3JpcHQuQXJndW1lbnRzLkl0 ZW0oMCkgPSAidXBkYXRlIiBUaGVuDQotCQltb2RlID0gInVwZGF0ZSINCi0JRW5kIElmDQot RW5kIElmDQotDQotJyBLZWVwIHRlbXBvcmFyeSBmaWxlIGZvciAzMCBtaW51dGVzDQotd2lu ZG93c191cGRhdGVfbWF4YWdlID0gMTgwMA0KLQ0KLVNldCBvYmpTaGVsbCA9IENyZWF0ZU9i amVjdCgiV1NjcmlwdC5TaGVsbCIpDQotU2V0IG9iakZTID0gQ3JlYXRlT2JqZWN0KCJTY3Jp cHRpbmcuRmlsZVN5c3RlbU9iamVjdCIpDQotDQotdGVtcF9maWxlID0gb2JqU2hlbGwuRXhw YW5kRW52aXJvbm1lbnRTdHJpbmdzKCIlVGVtcCUiKSAmICJcY21rX3dpbmRvd3NfdXBkYXRl c19jYWNoZS50eHQiDQotbmV3X2ZpbGUgPSBvYmpTaGVsbC5FeHBhbmRFbnZpcm9ubWVudFN0 cmluZ3MoIiVUZW1wJSIpICYgIlxjbWtfd2luZG93c191cGRhdGVzX2NhY2hlX25ldy50eHQi DQotDQotU3ViIHByaW50X2ZpbGUocGF0aCkNCi0gICAgU2V0IG9iakZpbGUgPSBvYmpGUy5P cGVuVGV4dEZpbGUocGF0aCwgMSkNCi0gICAgRG8gVW50aWwgb2JqRmlsZS5BdEVuZE9mU3Ry ZWFtDQotICAgICAgICB3c2NyaXB0LmVjaG8gb2JqRmlsZS5SZWFkTGluZQ0KLSAgICBMb29w DQotICAgIG9iakZpbGUuQ2xvc2UNCi0gICAgU2V0IG9iakZpbGUgPSBub3RoaW5nDQotRW5k IFN1Yg0KLQ0KLVN1YiBzdGFydF91cGRhdGUoKQ0KLQknIEZpcnN0IGNyZWF0ZSB0aGUgbmV3 IHRlbXAgZmlsZSAobG9ja3MhKQ0KLSAgICBTZXQgb2JqRmlsZSA9IG9iakZTLkNyZWF0ZVRl eHRGaWxlKG5ld19maWxlLCBUcnVlKQ0KLSAgICBvYmpGaWxlLkNsb3NlDQotICAgIFNldCBv YmpGaWxlID0gbm90aGluZw0KLQkNCi0JJyBOb3cgc3RhcnQgdGhlIHVwZGF0ZSBpbiBiYWNr Z3JvdW5kICgwOiBoaWRlIHdpbmRvdywgRmFsc2U6IGRvbnQgd2FpdCkNCi0gICAgb2JqU2hl bGwuUnVuIFdzY3JpcHQuU2NyaXB0RnVsbE5hbWUgKyAiIHVwZGF0ZSIsIDAsIEZhbHNlDQot RW5kIFN1Yg0KLQ0KLVN1YiB1cGRhdGUoKQ0KLSAgICBTZXQgb2JqRmlsZSA9IG9iakZTLkNy ZWF0ZVRleHRGaWxlKG5ld19maWxlLCBUcnVlKQ0KLQlTZXQgdXBkdFNlYXJjaGVyID0gQ3Jl YXRlT2JqZWN0KCJNaWNyb3NvZnQuVXBkYXRlLlNlc3Npb24iKS5DcmVhdGVVcGRhdGVTZWFy Y2hlcg0KLQ0KLQlyZWJvb3QgPSAwDQotCW51bUltcCA9IDANCi0JbnVtT3B0ID0gMA0KLQ0K LQlJZiBDcmVhdGVPYmplY3QoIk1pY3Jvc29mdC5VcGRhdGUuU3lzdGVtSW5mbyIpLlJlYm9v dFJlcXVpcmVkIFRoZW4NCi0JICByZWJvb3QgPSAxDQotCUVuZCBJZg0KLQ0KLQlTZXQgcmVz dWx0ID0gdXBkdFNlYXJjaGVyLlNlYXJjaCgiSXNJbnN0YWxsZWQgPSAwIGFuZCBJc0hpZGRl biA9IDAiKQ0KLQlTZXQgY29sRG93bmxvYWRzID0gcmVzdWx0LlVwZGF0ZXMNCi0NCi0JRm9y IEVhY2ggb2JqRW50cnkgaW4gY29sRG93bmxvYWRzDQotCSAgaWYgb2JqRW50cnkuQXV0b1Nl bGVjdE9uV2ViU2l0ZXMgVGhlbg0KLQkJaWYgbnVtSW1wID0gMCBUaGVuDQotCQkgIGltcG9y dGFudCA9IG9iakVudHJ5LlRpdGxlDQotCQllbHNlDQotCQkgIGltcG9ydGFudCA9IGltcG9y dGFudCAmICI7ICIgJiBvYmpFbnRyeS5UaXRsZQ0KLQkJRW5kIElmDQotCQludW1JbXAgPSBu dW1JbXAgKyAxDQotCSAgRWxzZQ0KLQkJSWYgbnVtT3B0ID0gMCBUaGVuDQotCQkgIG9wdGkg PSBvYmpFbnRyeS5UaXRsZQ0KLQkJRWxzZQ0KLQkJICBvcHRpID0gb3B0aSAmICI7ICIgJiBv YmpFbnRyeS5UaXRsZQ0KLQkJRW5kIElmDQotCQludW1PcHQgPSBudW1PcHQgKyAxDQotCSAg RW5kIElmDQotCU5leHQNCi0NCi0Jb2JqRmlsZS53cml0ZSgiPDw8d2luZG93c191cGRhdGVz Pj4+IiAmIHZiQ3JMZikNCi0Jb2JqRmlsZS53cml0ZShyZWJvb3QgJiAiICIgJiBudW1JbXAg JiAiICIgJiBudW1PcHQgJiB2YkNyTGYpDQotCW9iakZpbGUud3JpdGUoaW1wb3J0YW50ICYg dmJDckxmKQ0KLQlvYmpGaWxlLndyaXRlKG9wdGkpDQotCQ0KLSAgICBvYmpGaWxlLkNsb3Nl KCkNCi0gICAgU2V0IG9iakZpbGUgPSBub3RoaW5nDQotCQ0KLQknIEFmdGVyIGNvbXBsZXRp b24sIG1vdmUgdGhlIGZpbGUNCi0JSWYgb2JqRlMuRmlsZUV4aXN0cyh0ZW1wX2ZpbGUpIFRo ZW4NCi0JCW9iakZTLkRlbGV0ZUZpbGUodGVtcF9maWxlKQ0KLQlFbmQgSWYNCi0Jb2JqRlMu TW92ZUZpbGUgbmV3X2ZpbGUsIHRlbXBfZmlsZQ0KLUVuZCBTdWINCi0NCi0nIEhhbmRsZSB0 aGUgdXBkYXRlIG1vZGUgb2YgdGhpcyBzY3JpcHQuIEluIHRoaXMgbW9kZSB0aGUgbmV3IGlu Zm9ybWF0aW9uDQotJyBhcmUgZmV0Y2hlZCB2aWEgV01JLiBUaGlzIHNob3VsZCBvbmx5IGJl IGNhbGxlZCBpbiBhc3luYyBtb2RlIGJlY2F1c2UNCi0nIHRoaXMgbWlnaHQgdGFrZSBhIGxv dCBvZiB0aW1lIGRlcGVuZGVudCBvbiBob3cgbWFueSBzb2Z0d2FyZSBpcyBpbnN0YWxsZWQu DQotSWYgbW9kZSA9ICJ1cGRhdGUiIFRoZW4NCi0JdXBkYXRlKCkNCi0gICAgV1NjcmlwdC5R dWl0KDApDQotRW5kIElmDQotDQotSWYgb2JqRlMuRmlsZUV4aXN0cyh0ZW1wX2ZpbGUpIFRo ZW4NCi0gICAgSWYgRGF0ZURpZmYoInMiLCBvYmpGUy5HZXRGaWxlKHRlbXBfZmlsZSkuRGF0 ZUxhc3RNb2RpZmllZCwgTm93KCkpID4gd2luZG93c191cGRhdGVfbWF4YWdlIFRoZW4NCi0g ICAgICAgICcgVG9vIG9sZCENCi0gICAgICAgIElmIE5vdCBvYmpGUy5GaWxlRXhpc3RzKG5l d19maWxlKSBUaGVuDQotICAgICAgICAgICAgJyBTdGFydCBmZXRjaGluZyBuZXcgZGF0YSBp biB0aGUgYmFrZ3JvdW5kDQotICAgICAgICAgICAgc3RhcnRfdXBkYXRlKCkNCi0gICAgICAg IEVuZCBJZg0KLSAgICBFbmQgSWYNCi0NCi0gICAgJyBPdXRwdXQgY3VycmVudCBkYXRhIGlm DQotICAgICcgYSkgVGhlIHRlbXBfZmlsZSBpcyBuZXcgZW5vdWdoDQotICAgICcgYikgVGhl IHRlbXBfZmlsZSBpcyB0b28gb2xkIGJ1dCBuZXcgZGF0YSBpcyBiZWluZyBmZXRjaGVkIG5v dw0KLSAgICBwcmludF9maWxlIHRlbXBfZmlsZQ0KLSAgICBXU2NyaXB0LlF1aXQoMCkNCi1F bHNlDQotICAgICcgTm8gZGF0YSBmZXRjaGVkIHlldCwNCi0gICAgSWYgTm90IG9iakZTLkZp bGVFeGlzdHMobmV3X2ZpbGUpIFRoZW4NCi0gICAgICAgICcgU3RhcnQgZmV0Y2hpbmcgbmV3 IGRhdGEgaW4gYmFja2dyb3VuZA0KLSAgICAgICAgc3RhcnRfdXBkYXRlKCkNCi0gICAgRW5k IElmDQotDQotICAgICcgUmV0dXJuIGVtcHR5DQotICAgIFdTY3JpcHQuRWNobyAiPDw8d2lu ZG93c191cGRhdGVzPj4+Ig0KLSAgICBXU2NyaXB0LlF1aXQoMCkNCi1FbmQgSWYNCi0NCi1T ZXQgb2JqRlMgPSBub3RoaW5nDQotU2V0IG9ialNoZWxsID0gbm90aGluZw0KLVdTY3JpcHQu UXVpdCgpClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorJyAtLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQorJyB3aW5kb3dzX3VwZGF0ZXMudmJzIC0gY2hlY2tfbWsg YWdlbnQgcGx1Z2luIHRvIG1vbml0b3IgcGVuZGluZyB3aW5kb3dzIHVwZGF0ZXMgaW5kaXJl Y3RseQorJworJyBUbyB1c2UgdGhpcyBqdXN0IHBsYWNlIGl0IGluIHRoZSBwbHVnaW5zLyBk aXJlY3RvcnkgYmVsb3cgdGhlIHBhdGggb2YgdGhlCisnIGNoZWNrX21rX2FnZW50LiBBZnRl ciB0aGF0IGFuIGludmVudG9yeSBydW4gb24gdGhlIE5hZ2lvcyBob3N0IHNob3VsZCBsZWFk CisnIHRvIGEgbmV3IGludmVudG9yaXplZCBzZXJ2aWNlLgorJworJyBBdXRob3I6IExhcnMg TWljaGVsc2VuIDxsbUBtYXRoaWFzLWtldHRuZXIuZGU+LCAyMDExLTAzLTIxCisnIEVkaXRv cjogUGF0cmljayBTY2hs/HRlciA8cHNAcGR2LXN5c3RlbWUuZGU+LCAyMDExLTA4LTIxCisn CisnIFVwZGF0ZWQgYnkgUGhpbCBSYW5kYWwsIDIwMTItMDktMjEsIHRvIGNhY2hlIHJlc3Vs dHMgdXNpbmcgYSByYW5kb21pc2VkIGNoZWNrIGludGVydmFsCisnIG9mIDE2IHRvIDI0IGhv dXJzCisnIEJhc2VkIG9uIGNvZGUgaGVyZTogaHR0cDovL3d3dy5tb25pdG9yaW5nLXBvcnRh bC5vcmcvd2JiL2luZGV4LnBocD9wYWdlPVRocmVhZCZ0aHJlYWRJRD0yMzUwOQorJyBTcGF3 bmluZyBhIHNlcGFyYXRlIHByb2Nlc3MgdG8gcHJvZHVjZSBjYWNoZWQgcmVzdWx0IChhcyBp biBhYm92ZSBmb3J1bSBkaXNjdXNzaW9uKSBjYXVzZWQgbWUKKycgc29tZSBpc3N1ZXMsIHNv IEkgd2VudCBmb3IgYSBzaW1wbGVyIHNvbHV0aW9uIHVzaW5nIG9ubHkgb25lIHNjcmlwdAor JyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorCitPcHRpb24gRXhwbGlj aXQKKworRGltIHJlc3VsdCwgcmVib290LCBudW1JbXAsIG51bU9wdCwgaW1wb3J0YW50LCBv cHRpCitEaW0gdXBkdFNlYXJjaGVyLCBjb2xEb3dubG9hZHMsIG9iakVudHJ5CisKK0RpbSBv YmpGU08sIG9iakZpbGUgCitTZXQgb2JqRlNPID0gV1NjcmlwdC5DcmVhdGVPYmplY3QoIlNj cmlwdGluZy5GaWxlU3lzdGVtT2JqZWN0IikKKworRGltIGxhc3RNb2RpZmljYXRpb25EYXRl CitEaW0gdXBkYXRlTmVlZGVkCit1cGRhdGVOZWVkZWQgPSBUcnVlCisKK0RpbSBXU0hTaGVs bAorU2V0IFdTSFNoZWxsID0gQ3JlYXRlT2JqZWN0KCJXU2NyaXB0LlNoZWxsIikKKworRGlt IHNjcmlwdG5hbWUsIHNjcmlwdHBhdGgsIHN0ckZvbGRlcgorCitzY3JpcHRuYW1lID0gV3Nj cmlwdC5TY3JpcHRGdWxsTmFtZQorc2NyaXB0cGF0aCA9IG9iakZTTy5nZXRwYXJlbnRmb2xk ZXJuYW1lKHNjcmlwdG5hbWUpCisKK3N0ckZvbGRlciA9IHNjcmlwdHBhdGggJiAiXHdpbmRv d3MtdXBkYXRlIgorc2V0IG9iakZTTyA9IGNyZWF0ZW9iamVjdCgiU2NyaXB0aW5nLkZpbGVT eXN0ZW1PYmplY3QiKQorCitpZiBvYmpGU08uRm9sZGVyRXhpc3RzKHN0ckZvbGRlcikgPSBG YWxzZSB0aGVuCisJb2JqRlNPLkNyZWF0ZUZvbGRlciBzdHJGb2xkZXIKK2VuZCBpZgorCitE aW0gdHMsIFRleHRMaW5lCitEaW0gcm5kRnVkZ2UKKworUmFuZG9taXplCitybmRGdWRnZSA9 IEludCg4ICogNjAgKiBSbmQpICcgcmFuZG9tIGZ1ZGdlIGZhY3RvciBmb3IgdGVzdCAoMCB0 byA4IGhycykgCisKK0lmIG9iakZTTy5GaWxlRXhpc3RzKHNjcmlwdHBhdGggJiJcd2luZG93 cy11cGRhdGVcd2luZG93c191cGRhdGVzLWxvZy50eHQiKSBUaGVuCisJbGFzdE1vZGlmaWNh dGlvbkRhdGUgPSBvYmpGU08uR2V0RmlsZShzY3JpcHRwYXRoICYiXHdpbmRvd3MtdXBkYXRl XHdpbmRvd3NfdXBkYXRlcy1sb2cudHh0IikuRGF0ZUxhc3RNb2RpZmllZAorCUlmIERhdGVE aWZmKCJuIiwgbGFzdE1vZGlmaWNhdGlvbkRhdGUsIG5vdykgPCAoKDYwKjI0KS1ybmRGdWRn ZSkgVGhlbiAnIDEgZGF5IG1pbnVzIDAgdG8gOCBob3VycworCSAgdXBkYXRlTmVlZGVkID0g RmFsc2UKKwlFbmQgSWYKK0VuZCBJZgorCitJZiB1cGRhdGVOZWVkZWQgVGhlbiAKKyAgICBT ZXQgb2JqRmlsZSA9IG9iakZTTy5DcmVhdGVUZXh0RmlsZShzY3JpcHRwYXRoICYiXHdpbmRv d3MtdXBkYXRlXHdpbmRvd3NfdXBkYXRlcy1sb2cudHh0IikKKworICAgIElmIENyZWF0ZU9i amVjdCgiTWljcm9zb2Z0LlVwZGF0ZS5BdXRvVXBkYXRlIikuRGV0ZWN0Tm93IDw+IDAgVGhl bgorICAgICAgb2JqRmlsZS5Xcml0ZUxpbmUoIjw8PHdpbmRvd3NfdXBkYXRlcz4+PiIpCisg ICAgICBXU2NyaXB0LlF1aXQoKQorICAgIEVuZCBJZgorCisgICAgU2V0IHVwZHRTZWFyY2hl ciA9IENyZWF0ZU9iamVjdCgiTWljcm9zb2Z0LlVwZGF0ZS5TZXNzaW9uIikuQ3JlYXRlVXBk YXRlU2VhcmNoZXIKKworICAgIHJlYm9vdCA9IDAKKyAgICBudW1JbXAgPSAwCisgICAgbnVt T3B0ID0gMAorCisgICAgSWYgQ3JlYXRlT2JqZWN0KCJNaWNyb3NvZnQuVXBkYXRlLlN5c3Rl bUluZm8iKS5SZWJvb3RSZXF1aXJlZCBUaGVuCisgICAgICAgIHJlYm9vdCA9IDEKKyAgICBF bmQgSWYKKworICAgIFNldCByZXN1bHQgPSB1cGR0U2VhcmNoZXIuU2VhcmNoKCJJc0luc3Rh bGxlZCA9IDAgYW5kIElzSGlkZGVuID0gMCIpCisgICAgU2V0IGNvbERvd25sb2FkcyA9IHJl c3VsdC5VcGRhdGVzCisKKyAgICBGb3IgRWFjaCBvYmpFbnRyeSBpbiBjb2xEb3dubG9hZHMK KyAgICAgICAgaWYgb2JqRW50cnkuQXV0b1NlbGVjdE9uV2ViU2l0ZXMgVGhlbgorCSAgICAg ICAgaWYgbnVtSW1wID0gMCBUaGVuCisgIAkgICAgICAgICAgICBpbXBvcnRhbnQgPSBvYmpF bnRyeS5UaXRsZQorCSAgICAgICAgZWxzZQorICAJICAgICAgICAgICAgaW1wb3J0YW50ID0g aW1wb3J0YW50ICYgIjsgIiAmIG9iakVudHJ5LlRpdGxlCisJICAgICAgICBFbmQgSWYKKwkg ICAgICAgIG51bUltcCA9IG51bUltcCArIDEKKyAgICAgICAgRWxzZQorCSAgICAgICAgSWYg bnVtT3B0ID0gMCBUaGVuCisgIAkgICAgICAgICAgICBvcHRpID0gb2JqRW50cnkuVGl0bGUK KwkgICAgICAgIEVsc2UKKyAgCSAgICAgICAgICAgIG9wdGkgPSBvcHRpICYgIjsgIiAmIG9i akVudHJ5LlRpdGxlCisJICAgICAgICBFbmQgSWYKKwkgICAgICAgIG51bU9wdCA9IG51bU9w dCArIDEKKyAgICAgICAgRW5kIElmCisgICAgTmV4dAorCisgICAgb2JqRmlsZS5Xcml0ZUxp bmUoIjw8PHdpbmRvd3NfdXBkYXRlcz4+PiIpCisgICAgb2JqRmlsZS5Xcml0ZUxpbmUocmVi b290ICYgIiAiICYgbnVtSW1wICYgIiAiICYgbnVtT3B0KQorICAgIG9iakZpbGUuV3JpdGVM aW5lKGltcG9ydGFudCkKKyAgICBvYmpGaWxlLldyaXRlTGluZShvcHRpKQorICAgIG9iakZp bGUuQ2xvc2UKKworRW5kIElmCisKK1NldCB0cyA9IG9iakZTTy5HZXRGaWxlKHNjcmlwdHBh dGggJiJcd2luZG93cy11cGRhdGVcd2luZG93c191cGRhdGVzLWxvZy50eHQiKS5PcGVuQXNU ZXh0U3RyZWFtKDEsIC0yKQorRG8gV2hpbGUgdHMuQXRFbmRPZlN0cmVhbSA8PiBUcnVlCisJ CVdTY3JpcHQuRWNobyB0cy5SZWFkTGluZQorTG9vcAordHMuQ2xvc2UKKworV1NjcmlwdC5R dWl0KCkKCg==

11 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0821

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8c33a5ffad83291cecead4b9857df870ea231a81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c33a5ffad8329… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 25 09:54:23 2012 +0200 Updated bug entries #0821 --- .bugs/821 | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.bugs/821 b/.bugs/821 index db9326f..ebd6039 100644 --- a/.bugs/821 +++ b/.bugs/821 @@ -1,14 +1,24 @@ -Title: bugs in postgresql_sessions and mk_postgres +Title: Logwatch and Logfiles with colon in name Component: checks State: open -Date: 2012-10-24 09:49:37 +Date: 2012-10-25 09:49:17 Targetversion: future -Class: bug +Class: nastiness - postgresql_sessions: -wrong parsing when query from agent returned only one line with, e.g. -"f 1" -than I've got an error when run "cmk -v /dev/null ; then" +When a logfile has a colon in name inventory doesent work: osTicket 999212 -on Debian there is only a user "postgres" not "pgsql" - maybe double -checks (postgres & pgsql) will do? (because of different distros) +Our 3rd party software has logs with ":" present in the name...XPHUB_OA_SWITCH_20121024_00:30:03 + +In share/check_mk/checks/logwatch, I believe the inventory function assumes that if there is a ":" in the line that it is because mk_logwatch on the client is returning "[[[:cannotopen]]]". This is causing our log to not get inventoried. + +.. /share/check_mk/checks/logwatch +def process_logfile(logfile, patterns): +# Look at which file offset we have finished scanning +# the logfile last time. If we have never seen this file +# before, we set the offset to -1 +offset, prev_inode = status.get(logfile, (-1, -1)) +try: +fl = os.open(logfile, os.O_RDONLY) +inode = os.fstat(fl)[1] # 1 = st_ino +except: +----> print "[[[%s:cannotopen]]]" % logfile if len(line) > 6 and line[0:3] == "[[[" and line[-3:] == "]]]" and ':' not in line:

11 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: dbec1cd8f073cfbbf2371eb6099c14dab48fa373 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbec1cd8f073cf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 26 11:03:33 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0662

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4fb4c16f2c3a0a438a7c94e15de5913e9bae9070 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fb4c16f2c3a0a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 26 10:58:31 2012 +0200 Updated bug entries #0662 --- .bugs/662 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/662 b/.bugs/662 new file mode 100644 index 0000000..850773b --- /dev/null +++ b/.bugs/662 @@ -0,0 +1,13 @@ +Title: "Remove All" downtimes command button selection problem +Component: multisite +State: open +Date: 2012-10-26 10:55:14 +Targetversion: 1.2.0 +Class: bug + +Set a downtime for multiple services within a view + +Try to remove these downtimes with the "Remove all" button, but additionally select some services with no +downtime set -> Shows error "Sorry. This function is not implemented" + +Select exactly the services in downtime and press "Remove all" -> working

11 years, 10 months

Check_MK Git: check_mk: mkeventd: log prio/facility at rule hits

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b2225e7ac87455abcd2093921989994f4995587d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2225e7ac87455… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 26 10:56:25 2012 +0200 mkeventd: log prio/facility at rule hits --- mkeventd/bin/mkeventd | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 2dc4b98..a6e54ea 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -952,7 +952,10 @@ class EventServer: g_event_status.count_rule_match(rule["id"]) if g_config["log_rulehits"]: - log("Rule %s hit by message '%s'." % (event["text"], rule["id"])) + log("Rule %s hit by message %s/%s - '%s'." % ( + rule["id"], + syslog_facilities[event["facility"]], syslog_priorities[event["priority"]], + event["text"])) if rule.get("drop"): self.count("drops") return

11 years, 10 months

Check_MK Git: check_mk: mkeventd: log statistics of facilities/

by git＠mathias-kettner.de

priorities at program an User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: d3811a9790416fb3d56784e74bf815ea85824051 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3811a9790416f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 25 17:41:28 2012 +0200 mkeventd: log statistics of facilities/priorities at program an --- mkeventd/bin/mkeventd | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 4afaa84..2dc4b98 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -512,6 +512,9 @@ class EventServer: self._rates = {} self._average_rates = {} self._average_processing_time = 0.0 + self._hash_stats = [] + for facility in range(24): + self._hash_stats.append([ 0 ] * 8 ) def count(self, counter): self._perfcounters[counter] += 1 @@ -910,6 +913,22 @@ class EventServer: if need: prio_hash.setdefault(prio, []).append(rule) + def output_hash_stats(self): + log("Top 20 of facility/priority:") + entries = [] + total_count = 0 + for facility in range(24): + for priority in range(8): + count = self._hash_stats[facility][priority] + if count: + total_count += count + entries.append((count, (facility, priority))) + entries.sort() + entries.reverse() + for count, (facility, priority) in entries[:20]: + log(" %s/%s - %d (%.2f%%)" % ( + syslog_facilities[facility], syslog_priorities[priority], count, + (100.0 * count / float(total_count)))) def process_event(self, line): if g_config["debug_rules"]: @@ -918,11 +937,8 @@ class EventServer: # Rule optimizer if g_config["rule_optimizer"]: + self._hash_stats[event["facility"]][event["priority"]] += 1 rule_candidates = self._rule_hash.get(event["facility"], {}).get(event["priority"], []) - if opt_debug: - log("Optimizer: %s.%s - need to check only %d out of %d rules" % ( - event["facility"], event["priority"], - len(rule_candidates), len(self._rules))) else: rule_candidates = self._rules @@ -2170,6 +2186,8 @@ try: os.remove(g_socket_path) os.remove(g_pid_file) + g_event_server.output_hash_stats() + log("Successfully shut down.") sys.exit(0)

11 years, 10 months

Check_MK Git: check_mk: mkeventd: show syslog facility/ priority in rule list

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: db7af8c95a11aac6f174e59fb99139553177c5c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db7af8c95a11aa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 25 17:07:28 2012 +0200 mkeventd: show syslog facility/priority in rule list --- mkeventd/web/plugins/wato/mkeventd.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 1ec46b2..d9529f0 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -780,6 +780,8 @@ def mode_mkeventd_rules(phase): html.write("<th></th>") html.write("<th>%s</th>" % _("ID")) html.write("<th>%s</th>" % _("State")) + html.write("<th>%s</th>" % _("Priority")) + html.write("<th>%s</th>" % _("Facility")) html.write("<th>%s</th>" % _("Service Level")) if defaults.omd_root: html.write("<th>%s</th>" % _("Hits")) @@ -848,6 +850,26 @@ def mode_mkeventd_rules(phase): else: html.write('<td class="state state%d">%s</td>' % (rule["state"], {0:_("OK"), 1:_("WARN"), 2:_("CRIT"), 3:_("UNKNOWN"), -1:_("(syslog)")}[rule["state"]])) + + # Syslog priority + if "match_priority" in rule: + prio_from, prio_to = rule["match_priority"] + if prio_from == prio_to: + prio_text = mkeventd.syslog_priorities[prio_from][1] + else: + prio_text = mkeventd.syslog_priorities[prio_from][1][:2] + ".." + \ + mkeventd.syslog_priorities[prio_to][1][:2] + else: + prio_text = "" + html.write("<td>%s</td>" % prio_text) + + # Syslog Facility + if "match_facility" in rule: + facnr = rule["match_facility"] + html.write("<td>%s</td>" % mkeventd.syslog_facilities[facnr][1]) + else: + html.write("<td></td>") + html.write('<td>%s</td>' % dict(mkeventd.service_levels()).get(rule["sl"], rule["sl"])) if defaults.omd_root: hits = rule.get('hits')

11 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012