Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: Checked in missing images

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 48cb89fe7e9ee3b962c099772119eae21d4bf045 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48cb89fe7e9ee3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 16 11:37:00 2012 +0200 Checked in missing images --- web/htdocs/images/white_10percent.png | Bin 0 -> 157 bytes web/htdocs/images/white_20percent.png | Bin 0 -> 157 bytes web/htdocs/images/white_30percent.png | Bin 0 -> 157 bytes web/htdocs/images/white_40percent.png | Bin 0 -> 157 bytes web/htdocs/images/white_50percent.png | Bin 0 -> 157 bytes web/htdocs/images/white_60percent.png | Bin 0 -> 158 bytes web/htdocs/images/white_70percent.png | Bin 0 -> 158 bytes web/htdocs/images/white_80percent.png | Bin 0 -> 158 bytes web/htdocs/images/white_90percent.png | Bin 0 -> 158 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/white_10percent.png b/web/htdocs/images/white_10percent.png new file mode 100644 index 0000000..57c3398 Binary files /dev/null and b/web/htdocs/images/white_10percent.png differ diff --git a/web/htdocs/images/white_20percent.png b/web/htdocs/images/white_20percent.png new file mode 100644 index 0000000..1eea617 Binary files /dev/null and b/web/htdocs/images/white_20percent.png differ diff --git a/web/htdocs/images/white_30percent.png b/web/htdocs/images/white_30percent.png new file mode 100644 index 0000000..693ef53 Binary files /dev/null and b/web/htdocs/images/white_30percent.png differ diff --git a/web/htdocs/images/white_40percent.png b/web/htdocs/images/white_40percent.png new file mode 100644 index 0000000..926db8c Binary files /dev/null and b/web/htdocs/images/white_40percent.png differ diff --git a/web/htdocs/images/white_50percent.png b/web/htdocs/images/white_50percent.png new file mode 100644 index 0000000..b7af5de Binary files /dev/null and b/web/htdocs/images/white_50percent.png differ diff --git a/web/htdocs/images/white_60percent.png b/web/htdocs/images/white_60percent.png new file mode 100644 index 0000000..8a6152d Binary files /dev/null and b/web/htdocs/images/white_60percent.png differ diff --git a/web/htdocs/images/white_70percent.png b/web/htdocs/images/white_70percent.png new file mode 100644 index 0000000..040a317 Binary files /dev/null and b/web/htdocs/images/white_70percent.png differ diff --git a/web/htdocs/images/white_80percent.png b/web/htdocs/images/white_80percent.png new file mode 100644 index 0000000..20efae4 Binary files /dev/null and b/web/htdocs/images/white_80percent.png differ diff --git a/web/htdocs/images/white_90percent.png b/web/htdocs/images/white_90percent.png new file mode 100644 index 0000000..b0f8106 Binary files /dev/null and b/web/htdocs/images/white_90percent.png differ

12 years, 3 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: 0f00265f0b10d28fc22b613a9c52e029e25350e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f00265f0b10d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 16 10:57:09 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: New layout and new internal implementation of input forms

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2fa9bd2a740c50670b9bbebaf67dcf3313c59fdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fa9bd2a740c50… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 16 10:57:05 2012 +0200 New layout and new internal implementation of input forms --- ChangeLog | 1 + web/htdocs/check_mk.css | 15 +- web/htdocs/forms.py | 59 ++++ web/htdocs/htmllib.py | 49 ++-- web/htdocs/js/checkmk.js | 30 ++- web/htdocs/js/wato.js | 13 +- web/htdocs/pages.css | 87 +++++- web/htdocs/valuespec.py | 36 ++- web/htdocs/wato.css | 9 +- web/htdocs/wato.py | 849 ++++++++++++++++------------------------------ 10 files changed, 548 insertions(+), 600 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2fa9bd2a74…

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0751

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f9cbffe154bdfb74365bf77f790ebd3097afb2d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9cbffe154bdfb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 16 05:44:45 2012 +0200 Updated bug entries #0751 --- .bugs/751 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/751 b/.bugs/751 new file mode 100644 index 0000000..27ca54e --- /dev/null +++ b/.bugs/751 @@ -0,0 +1,11 @@ +Title: CascadingDropdown: visibility broken in case of complain +Component: multisite +State: open +Date: 2012-05-16 05:43:37 +Targetversion: 1.2.0 +Class: bug + +If the validate_value raises an exception, the sub-vs will +not be visible. Try this out: got the the details of one +multisite connection, select "Connect via TCP", leave the +host field empty and save.

12 years, 3 months

Check_MK Git: check_mk: AIX Agent: Send TCP Connection stats

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 609262b5a578ebd4b61c21a42bad6467dc507012 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=609262b5a578eb… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 16 09:22:26 2012 +0200 AIX Agent: Send TCP Connection stats --- agents/check_mk_agent.aix | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 51b7e2a..ce429a7 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -85,15 +85,18 @@ do done -echo '<<<ntp>>>' if which ntpq > /dev/null 2>&1 ; then if [ $(lssrc -s xntpd|grep -c active) -gt 0 ] ; then - # remote heading, make first column space separated + echo '<<<ntp>>>' ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' fi fi +echo '<<<tcp_conn_stats>>>' +netstat -ntfinet | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; } }' + + if cd $PLUGINSDIR 2>/dev/null then for skript in $(ls)

12 years, 3 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: e943a47be8f86f5b813a1fe4bc96d80fb533bdd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e943a47be8f86f… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 16 09:31:37 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 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: 484e705c1cc30630c496afbe0629fb4fe066a9e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=484e705c1cc306… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 16 09:19:45 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: FIX: Reimplemented correct behaviour of the logwatch pattern "ignore"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c17ecdf242f026c49f6da14bd08d68465c0e984 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c17ecdf242f02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 16 09:15:59 2012 +0200 FIX: Reimplemented correct behaviour of the logwatch pattern "ignore" state which is used to drop the matching log lines --- ChangeLog | 2 + checks/logwatch | 52 ++++++++++++++++++++------------- web/plugins/wato/check_parameters.py | 7 +++- 3 files changed, 38 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26286c1..eddc74a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,8 @@ to their defaults (didn't work for start_url, etc. * FIX: Fixed editing of ListOf in valuespec editors (e.g. used in logwatch pattern editor) + * FIX: Reimplemented correct behaviour of the logwatch pattern "ignore" + state which is used to drop the matching log lines Multisite: * FIX: fixed filter of recent event views (4 hours didn't catch) diff --git a/checks/logwatch b/checks/logwatch index 4154102..c98b65d 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -84,10 +84,12 @@ def logwatch_state(state): def logwatch_level_name(level): if level == 'W': return 'WARN' elif level == 'C': return 'CRIT' - else: return 'OK' + elif level == 'O': return 'OK' + else: return 'IGN' def logwatch_level_worst(worst, level): - if level == 'W': return max(worst, 1) + if level == 'O': return max(worst, 0) + elif level == 'W': return max(worst, 1) elif level == 'C': return max(worst, 2) else: return worst @@ -223,18 +225,20 @@ def check_logwatch(item, params, info): # Write out new log lines (no reclassify here. It is done later in general for all logs) # if len(loglines) > 0: - worst = 0 + worst = -1 for line in loglines: worst = logwatch_level_worst(worst, logwatch_parse_line(line)[0]) - try: - logarch = file(logfile, "a+") - logarch.write(time.strftime("<<<%Y-%m-%d %H:%M:%S " + logwatch_state(worst) + ">>>\n")) - logarch.write("\n".join(loglines) + "\n") - logarch.close() - except Exception, e: - raise MKGeneralException("User %s cannot create logfile: %s" % \ - (username(), e)) + # Ignore log lines which result in an "I" -> "Ignore" state + if worst > -1: + try: + logarch = file(logfile, "a+") + logarch.write(time.strftime("<<<%Y-%m-%d %H:%M:%S " + logwatch_state(worst) + ">>>\n")) + logarch.write("\n".join(loglines) + "\n") + logarch.close() + except Exception, e: + raise MKGeneralException("User %s cannot create logfile: %s" % \ + (username(), e)) # Get the patterns (either compile or reuse the precompiled ones) # Check_MK creates an empty string if the precompile function has @@ -263,7 +267,7 @@ def check_logwatch(item, params, info): counts = {} # for counting number of matches of a certain pattern state_counts = {} # for counting number of blocks with a certain state block_header = None - block_worst = 0 + block_worst = -1 block_lines = [] block_last_worst_line = '' @@ -279,15 +283,17 @@ def check_logwatch(item, params, info): continue if line.startswith('<<<') and line.endswith('>>>'): if block_header: - # The section is finished here. Add it to the list of reclassified lines - reclassified_lines += finish_block(block_header, block_worst, block_lines) + # The section is finished here. Add it to the list of reclassified lines if the + # state of the block is not "I" -> "ignore" + if block_worst > -1: + reclassified_lines += finish_block(block_header, block_worst, block_lines) - if block_worst >= worst: - worst = block_worst - last_worst_line = block_last_worst_line + if block_worst >= worst: + worst = block_worst + last_worst_line = block_last_worst_line block_lines = [] - block_worst = 0 + block_worst = -1 block_header = line counts = {} else: @@ -313,8 +319,9 @@ def check_logwatch(item, params, info): block_lines.append(level + ' ' + text) - if block_header: - # The last section is finished here. + # The last section is finished here. Add it to the list of reclassified lines if the + # state of the block is not "I" -> "ignore" + if block_header and block_worst > -1: reclassified_lines += finish_block(block_header, block_worst, block_lines) if block_worst >= worst: @@ -324,7 +331,10 @@ def check_logwatch(item, params, info): # Only rewrite the lines if at least one line has been reclassified if reclassified: - file(logfile, 'w').write('\n'.join(reclassified_lines) + '\n') + if reclassified_lines: + file(logfile, 'w').write('\n'.join(reclassified_lines) + '\n') + else: + os.unlink(logfile) # # Render output diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e280f1e..7ac2ef5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -105,6 +105,7 @@ register_rule(group + '/' + subgroup_applications, choices = [ ('C', _('CRITICAL')), ('W', _('WARNING')), + ('O', _('OK')), ('I', _('IGNORE')), ], ), @@ -117,12 +118,14 @@ register_rule(group + '/' + subgroup_applications, ), ] ), - help = _('You can define one or several patterns (regular expressions) in each logfile pattern rule. ' + help = _('<p>You can define one or several patterns (regular expressions) in each logfile pattern rule. ' 'These patterns are applied to the selected logfiles to reclassify the ' 'matching log messages. The first pattern which matches a line will ' 'be used for reclassifying a message. You can use the ' '<a href="wato.py?mode=pattern_editor">Logfile Pattern Analyzer</a> ' - 'to test the rules you defined here.'), + 'to test the rules you defined here.</p>' + '<p>Select "Ignore" as state to get the matching logs deleted. Other states will keep the ' + 'log entries but reclassify the state of them.</p>'), add_label = _("Add pattern"), ), itemtype = 'item',

12 years, 3 months

Check_MK Git: check_mk: HP-UX Agent: Prepare kcusage monitoring

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ecc949643cd4415a524550bd94f1fd8ca7cb6d67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecc949643cd441… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 16 08:56:11 2012 +0200 HP-UX Agent: Prepare kcusage monitoring --- agents/check_mk_agent.hpux | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 570f2ea..96c4e5b 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -103,6 +103,11 @@ echo '<<<ntp>>>' ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' +echo '<<<hpux_tunables>>>' +if which kcusage > /dev/null ; then + kcusage -l +fi + # Einbinden von lokalen Plugins, die eine eigene Sektion ausgeben if cd $PLUGINSDIR

12 years, 3 months

Check_MK Git: check_mk: HP-UX Agent: Add plugin for statgrab support

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7ec90660efb92a479f4aa4ba54fe864cc1c154b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ec90660efb92a… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 16 08:26:16 2012 +0200 HP-UX Agent: Add plugin for statgrab support --- agents/hpux/statgrab | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/agents/hpux/statgrab b/agents/hpux/statgrab new file mode 100644 index 0000000..0306a92 --- /dev/null +++ b/agents/hpux/statgrab @@ -0,0 +1,25 @@ +#!/bin/sh + +# this is for users who compiled statgrab on hp-ux. +# note you'll need a 0.18 version, from their github page at +# https://github.com/i-scream/libstatgrab +# flags used for compiling - disable documentation, examples and set*id + + +if which statgrab > /dev/null ; then + # You need statgrab to be installed. You'll find it + # here: http://www.i-scream.org/libstatgrab/ + if statgrab const. cpu. disk. general. load. mem. net. page. proc. swap. user. > /tmp/statgrab.$$ 2>/dev/null + then + for s in proc cpu net load disk page + do + echo "<<<statgrab_$s>>>" + cat /tmp/statgrab.$$ | grep "^$s\." | cut -d. -f2-99 | sed 's/ *= */ /' + done + + echo '<<<statgrab_mem>>>' + cat /tmp/statgrab.$$ | egrep "^(swap|mem)\." | sed 's/ *= */ /' + + fi + [ -f /tmp/statgrab.$$ ] && rm -f /tmp/statgrab.$$ +fi

12 years, 3 months

← Newer
1
...
25
26
27
28
29
30
31
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012