Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65243 discussions

Check_MK Git: check_mk: Fixed up ChangeLog

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4b46173eb7f23b4d6d94f8e325e9fb2e90500adc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b46173eb7f23b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 23 18:25:49 2010 +0100 Fixed up ChangeLog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 838aecf..af97e19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ Please use display_options instead. * Finally removed deprecated filesystem_levels. Please use check_parameters instead. * Livestatus: The StatsGroupBy: header is still working but now deprecated. - Please simply use Columns: instead. If your query contains at least one Stats: + Please simply use Columns: instead. If your query contains at least one Stats:- header than Columns: has the meaning of the old StatsGroupBy: header Core, Setup, etc.:

13 years, 10 months

Check_MK Git: check_mk: Recopmile Windows agent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 475b077c5b9359bd3885f6239e186e7ad446b353 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=475b077c5b9359… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 23 18:23:05 2010 +0100 Recopmile Windows agent --- agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 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 e2681b1..4691058 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index cdc4516..dc96b21 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ

13 years, 10 months

Check_MK Git: check_mk: Fixed RPM/DEB packaging

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ef9740e578698a7176f6b94c5593bc20004b20f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef9740e578698a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 23 18:19:46 2010 +0100 Fixed RPM/DEB packaging --- check_mk.spec | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/check_mk.spec b/check_mk.spec index 4e3963e..72ef3de 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -124,6 +124,8 @@ rm -rf $RPM_BUILD_ROOT /etc/check_mk/conf.d/README %config(noreplace) /etc/nagios/objects/* /usr/bin/check_mk +/usr/bin/cmk +/usr/bin/mkp %dir /usr/share/check_mk /usr/share/check_mk/agents /usr/share/check_mk/checks

13 years, 10 months

Check_MK Git: check_mk: setup.sh: several cleanups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ccca32fce1e9356f9e8118615c713859211e059c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccca32fce1e935… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 23 18:14:32 2010 +0100 setup.sh: several cleanups --- scripts/setup.sh | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 840867b..cd54855 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -164,17 +164,25 @@ ask_title () if [ -z "$YES" ] ; then cat <<EOF -[1;44;37m _ _ _ [0m -[1;44;37m ___| |__ ___ ___| | __ _ __ ___ | | __ [0m -[1;44;37m / __| '_ \ / _ \/ __| |/ / | '_ \` _ \| |/ / [0m -[1;44;37m | (__| | | | __/ (__| < | | | | | | < [0m -[1;44;37m \___|_| |_|\___|\___|_|\_\___|_| |_| |_|_|\_\ [0m -[1;44;37m |_____| [0m + + + + + + + + +[1;44;37m ____ _ _ __ __ _ __ [0m +[1;44;37m / ___| |__ ___ ___| | __ | \/ | |/ / [0m +[1;44;37m | | | '_ \ / _ \/ __| |/ / | |\/| | ' / [0m +[1;44;37m | |___| | | | __/ (__| < | | | | . \ [0m +[1;44;37m \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ [0m +[1;44;37m |_____| [0m [1;44;37m [0m -[1;45;37m check_mk setup $(printf "%32s" Version:' '$VERSION) [0m +[1;45;37m Check_MK setup $(printf "%32s" Version:' '$VERSION) [0m -Welcome to check_mk. This setup will install check_mk into user defined +Welcome to Check_MK. This setup will install Check_MK into user defined directories. If you run this script as root, installation paths below /usr will be suggested. If you run this script as non-root user paths in your home directory will be suggested. You may override the default @@ -234,17 +242,13 @@ ask_dir modulesdir /usr/share/$NAME/modules $HOMEBASEDIR/modules "check_mk modul also create a file 'defaults' in that directory that reflects all settings you are doing right now" -ask_dir web_dir /usr/share/$NAME/web $HOMEBASEDIR/web "check_mk's web pages" \ - "Directory where Check_mk's web pages should be installed. Currently these -web pages allow you to search in all of Nagios services and send several -different commands to all found services. That directory should [4;1mnot[0m be +ask_dir web_dir /usr/share/$NAME/web $HOMEBASEDIR/web "Check_MK Multisite GUI" \ + "Directory where Check_mk's Multisite GUI should be installed. Multisite is +an optional replacement for the Nagios GUI, but is also needed for the +logwatch extension. That directory should [4;1mnot[0m be in your WWW document root. A separate apache configuration file will be installed that maps the directory into your URL schema" -ask_dir mibsdir /usr/share/snmp/mibs $HOMEBASEDIR/mibs "SNMP mibs" \ - "Directory for SNMP MIB files (for copyright reasons we currently do -not ship any MIB files, though...)" - ask_dir docdir /usr/share/doc/$NAME $HOMEBASEDIR/doc "documentation" \ "Some documentation about check_mk will be installed here. Please note, however, that most of check_mk's documentation is available only online at @@ -614,10 +618,6 @@ do tar xzf $SRCDIR/doc.tar.gz -C $DESTDIR$docdir && mkdir -p $DESTDIR$checkmandir && tar xzf $SRCDIR/checkman.tar.gz -C $DESTDIR$checkmandir && - if [ -e $SRCDIR/mibs.tar.gz ] ; then - mkdir -p $DESTDIR$mibsdir && - tar xzf $SRCDIR/mibs.tar.gz -C $DESTDIR$mibsdir - fi && mkdir -p $DESTDIR$agentsdir && tar xzf $SRCDIR/agents.tar.gz -C $DESTDIR$agentsdir && for agent in $DESTDIR/$agentsdir/check_mk_*agent.* $DESTDIR/$agentsdir/mk_logwatch ; do @@ -664,7 +664,7 @@ do rm -f $DESTDIR$bindir/check_mk && echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py "'"$@"' > $DESTDIR$bindir/check_mk && chmod 755 $DESTDIR$bindir/check_mk && - ln -s $DESTDIR$bindir/check_mk cmk && + ln -s check_mk $DESTDIR$bindir/cmk && echo -e "#!/bin/sh\nexec python $modulesdir/check_mk.py -P "'"$@"' > $DESTDIR$bindir/mkp && chmod 755 $DESTDIR$bindir/mkp && sed -i "s#@BINDIR@#$bindir#g" $DESTDIR$docdir/check_mk_templates.cfg &&

13 years, 10 months

Check_MK Git: check_mk: install_nagios.sh: new option -m

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 624876025abc06e26582a796f1b0d74d80a91092 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=624876025abc06… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 23 18:00:40 2010 +0100 install_nagios.sh: new option -m --- .bugs/85 | 45 +++++++++++++++++++++++++++++++++++++++++++++ scripts/install_nagios.sh | 16 +++++++++++----- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/.bugs/85 b/.bugs/85 new file mode 100644 index 0000000..fe689d4 --- /dev/null +++ b/.bugs/85 @@ -0,0 +1,45 @@ +Title: Modulare Agenten +Component: core +Benefit: 6 +State: open +Cost: 5 +Date: 2010-12-23 08:40:16 +Class: feature + +Die Checks sollen den Code für die Agenten selbst mitbringen. +Die Agenten werden dann auf Wunsch dynamisch zusammengebaut. + +Eine Idee ist z.B., dass jeder Check sich selbst einklassifiziert +in essential/extended/full. In essential sind nur die +absolut wichtigen Checks enthalten. So kann man dann einen +Agenten einer bestimmten Ausbaustufe bauen. + +Umsetzung: + +Erstmal die bestehenden Agenten auseinanderpflücken und in +die Checks einbauen. Das gleiche dann auch für den Windows-Agenten +machen. Gemeinsamer kann auch hier evtl. nach win.include geschoben +werden, aber nicht der generelle Rumpfteil. + +Dann muss man in Check_MK einen Befehl einbauen, um die Agenten +zu erzeugen: cmk -A. Hier gibt es viele denkbare Aufrufvarianten: + +* Angabe des Betriebssystems (windows, linux, aix, hpux, freebsd, solaris). +* Angabe der Wichtigkeit (essential, extended, full). +* beides kombiniert + +Die fertigen Agenten gehen dann nach var/check_mk/agents. Im Falle von +Unix sind es die Shellskripten. Im Falle von Windows ist es der Quellcode, +der natürlich erst noch übersetzt werden muss. + +Im Buildsystem muss ich jetzt darauf achten, dass bei einem 'make' +auch immer alle Agenten gebaut werden. + +Der nächste Schritt wäre dann die Möglichkeit, per main.mk spezifische +Agenten zu bauen, in dem man irgendwie angibt, welche Checks (genauer: +Sektionen) rein sollen. Beispiel: + +# Agent 'hirn' ist wie essential, aber ohne fs, aber mit ntp +agents["hirn"] = [ '@essential', '!fs', 'ntp' ] +agents["hirn2"] = [ '@hirn', '!df', 'depp' ] + diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index bdebe80..a55dcd3 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -54,12 +54,12 @@ exec > >(tee $LOGFILE) 2>&1 set -e -NAGIOS_VERSION=3.2.2 +NAGIOS_VERSION=3.2.3 PLUGINS_VERSION=1.4.15 -RRDTOOL_VERSION=1.4.3 +RRDTOOL_VERSION=1.4.4 CHECK_MK_VERSION=1.1.9i3 PNP_VERSION=0.6.6 -NAGVIS_VERSION=1.5.1 +NAGVIS_VERSION=1.5.6 SOURCEFORGE_MIRROR=dfn NAGIOS_URL="http://downloads.sourceforge.net/project/nagios/nagios-3.x/nagios-$NAGIOS_V…" @@ -148,11 +148,16 @@ esac # Process command line options if [ $# -gt 0 ]; then - while getopts "s:y" options $OPTS; do + while getopts "s:ym" options $OPTS; do case $options in y) YES=1 ;; + m) + WITHOUT_MK=1 + NOTICE=" +Setting up without Check_MK!" + ;; s) SITE=$OPTARG ;; @@ -190,6 +195,7 @@ Check_MK on a freshly installed Linux system. It will: The output of this script is logged into $LOGFILE. No user interaction is neccesary. +$NOTICE EOF if [ -z "$YES" ]; then @@ -985,7 +991,7 @@ killall nagios || true /etc/init.d/nagios start activate_initd nagios || true -if [ "$CHECK_MK_VERSION" ] +if [ "$CHECK_MK_VERSION" -a -z "$WITHOUT_MK" ] then # ----------------------------------------------------------------------------- heading "Check_MK"

13 years, 10 months

Check_MK Git: check_mk: Livestatus: write timeperiod transitions to logfile

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5245b99b018b592b30d8a4ff29b17fbd7c076596 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5245b99b018b59… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 22 16:27:08 2010 +0100 Livestatus: write timeperiod transitions to logfile --- .bugs/7 | 25 ++++++++++++++++++++++--- ChangeLog | 3 +++ livestatus/src/TimeperiodsCache.cc | 21 +++++++++++++++++++-- livestatus/src/TimeperiodsCache.h | 2 ++ livestatus/src/module.c | 26 ++++++++++++++------------ 5 files changed, 60 insertions(+), 17 deletions(-) diff --git a/.bugs/7 b/.bugs/7 index 030a6bf..8112cfd 100644 --- a/.bugs/7 +++ b/.bugs/7 @@ -1,10 +1,11 @@ Title: Timeperiod-Übergänge ins Nagios-Log schreiben Component: livestatus +State: done +Class: feature +Date: 2010-12-21 10:56:28 Benefit: 3 -State: open Cost: 1 -Date: 2010-12-21 10:56:28 -Class: feature +Fun: 0 Livestatus hält ja ohnehin einen Cache der Timeperiods. Immer wenn eine umschaltet, sollte ein Logeintrag gemacht werden. @@ -12,3 +13,21 @@ Auch initial beim Starten des Systems. Anhand dieser Einträge ist es später viel einfacher, die Verfügbarkeiten zu berechnen. Das sollte man recht bald programmieren, damit die Leute schon Gelegenheit haben, Daten zu sammeln. + +2010-12-22 16:13:20: changed state open -> done +Ist erledigt. Jetzt wird immer ein Eintrag +gemacht. Beim Starten von Nagios: + +[1293030598] TIMEPERIOD TRANSITION: 24X7;-1;1 +[1293030598] TIMEPERIOD TRANSITION: 24x7;-1;1 +[1293030598] TIMEPERIOD TRANSITION: hirni10;-1;1 +[1293030598] TIMEPERIOD TRANSITION: hirni11;-1;1 +[1293030598] TIMEPERIOD TRANSITION: hirni9;-1;0 +[1293030598] TIMEPERIOD TRANSITION: none;-1;0 +[1293030598] TIMEPERIOD TRANSITION: workhours;-1;1 + +Später dann: + +[1293030660] TIMEPERIOD TRANSITION: hirni10;1;0 + +Doku von Livestatus is auch bereits aktualisiert. diff --git a/ChangeLog b/ChangeLog index 5715a30..838aecf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,9 @@ * Allow more than one column for StatsGroupBy: * Do not use function is_contact_member_of_contactgroup anymore (get compatible with Nagios CVS) + * Livestatus: log timeperiod transitions (active <-> inactive) into Nagios + log file. This will enable us to create availability reports more simple + in future. 1.1.9i2: Checks & Agents: diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index 089c277..ed94aba 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -57,14 +57,24 @@ void TimeperiodsCache::update(time_t now) } _cache_time = minutes; - _cache.clear(); // Loop over all timeperiods and compute if we are // currently in timeperiod *tp = timeperiod_list; while (tp) { bool is_in = 0 == check_time_against_period(now, tp); - _cache.insert(std::make_pair(tp, is_in)); + + // check previous state and log transition if state has changed + _cache_t::iterator it = _cache.find(tp); + if (it == _cache.end()) { // first entry + logTransition(tp->name, -1, is_in ? 1 : 0); + _cache.insert(std::make_pair(tp, is_in)); + } + else if (it->second != is_in) { + logTransition(tp->name, it->second ? 1 : 0, is_in ? 1 : 0); + it->second = is_in; + } + tp = tp->next; } pthread_mutex_unlock(&_cache_lock); @@ -87,3 +97,10 @@ bool TimeperiodsCache::inTimeperiod(timeperiod *tp) return is_in; } + +void TimeperiodsCache::logTransition(char *name, int from, int to) +{ + char buffer[64]; + snprintf(buffer, sizeof(buffer), "TIMEPERIOD TRANSITION: %s;%d;%d", name, from, to); + write_to_all_logs(buffer, LOG_INFO); +} diff --git a/livestatus/src/TimeperiodsCache.h b/livestatus/src/TimeperiodsCache.h index e3d070e..5a3d2a4 100644 --- a/livestatus/src/TimeperiodsCache.h +++ b/livestatus/src/TimeperiodsCache.h @@ -40,6 +40,8 @@ public: ~TimeperiodsCache(); void update(time_t now); bool inTimeperiod(timeperiod *tp); +private: + void logTransition(char *name, int from, int to); }; #endif // _TimeperiodsCache_h diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 87449bc..46c2e81 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -386,54 +386,56 @@ int broker_event(int event_type, void *data) int broker_process(int event_type, void *data) { struct nebstruct_process_struct *ps = (struct nebstruct_process_struct *)data; - if (ps->type == NEBTYPE_PROCESS_EVENTLOOPSTART) + if (ps->type == NEBTYPE_PROCESS_EVENTLOOPSTART) { + update_timeperiods_cache(time(0)); start_threads(); + } } int verify_event_broker_options() { int errors = 0; - if(!(event_broker_options & BROKER_PROGRAM_STATE)) { + if (!(event_broker_options & BROKER_PROGRAM_STATE)) { logger( LG_CRIT, "need BROKER_PROGRAM_STATE (%i) event_broker_option enabled to work.", BROKER_PROGRAM_STATE ); errors++; } - if(!(event_broker_options & BROKER_TIMED_EVENTS)) { + if (!(event_broker_options & BROKER_TIMED_EVENTS)) { logger( LG_CRIT, "need BROKER_TIMED_EVENTS (%i) event_broker_option enabled to work.", BROKER_TIMED_EVENTS ); errors++; } - if(!(event_broker_options & BROKER_SERVICE_CHECKS)) { + if (!(event_broker_options & BROKER_SERVICE_CHECKS)) { logger( LG_CRIT, "need BROKER_SERVICE_CHECKS (%i) event_broker_option enabled to work.", BROKER_SERVICE_CHECKS ); errors++; } - if(!(event_broker_options & BROKER_HOST_CHECKS)) { + if (!(event_broker_options & BROKER_HOST_CHECKS)) { logger( LG_CRIT, "need BROKER_HOST_CHECKS (%i) event_broker_option enabled to work.", BROKER_HOST_CHECKS ); errors++; } - if(!(event_broker_options & BROKER_LOGGED_DATA)) { + if (!(event_broker_options & BROKER_LOGGED_DATA)) { logger( LG_CRIT, "need BROKER_LOGGED_DATA (%i) event_broker_option enabled to work.", BROKER_LOGGED_DATA ); errors++; } - if(!(event_broker_options & BROKER_COMMENT_DATA)) { + if (!(event_broker_options & BROKER_COMMENT_DATA)) { logger( LG_CRIT, "need BROKER_COMMENT_DATA (%i) event_broker_option enabled to work.", BROKER_COMMENT_DATA ); errors++; } - if(!(event_broker_options & BROKER_DOWNTIME_DATA)) { + if (!(event_broker_options & BROKER_DOWNTIME_DATA)) { logger( LG_CRIT, "need BROKER_DOWNTIME_DATA (%i) event_broker_option enabled to work.", BROKER_DOWNTIME_DATA ); errors++; } - if(!(event_broker_options & BROKER_STATUS_DATA)) { + if (!(event_broker_options & BROKER_STATUS_DATA)) { logger( LG_CRIT, "need BROKER_STATUS_DATA (%i) event_broker_option enabled to work.", BROKER_STATUS_DATA ); errors++; } - if(!(event_broker_options & BROKER_ADAPTIVE_DATA)) { + if (!(event_broker_options & BROKER_ADAPTIVE_DATA)) { logger( LG_CRIT, "need BROKER_ADAPTIVE_DATA (%i) event_broker_option enabled to work.", BROKER_ADAPTIVE_DATA ); errors++; } - if(!(event_broker_options & BROKER_EXTERNALCOMMAND_DATA)) { + if (!(event_broker_options & BROKER_EXTERNALCOMMAND_DATA)) { logger( LG_CRIT, "need BROKER_EXTERNALCOMMAND_DATA (%i) event_broker_option enabled to work.", BROKER_EXTERNALCOMMAND_DATA ); errors++; } - if(!(event_broker_options & BROKER_STATECHANGE_DATA)) { + if (!(event_broker_options & BROKER_STATECHANGE_DATA)) { logger( LG_CRIT, "need BROKER_STATECHANGE_DATA (%i) event_broker_option enabled to work.", BROKER_STATECHANGE_DATA ); errors++; }

13 years, 10 months

Check_MK Git: check_mk: gb: output and sort after benefit and cost

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 94fc2fea96bdb7abb7e90bba32ddce4002164447 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94fc2fea96bdb7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 22 15:37:47 2010 +0100 gb: output and sort after benefit and cost --- .bugs/78 | 2 +- gb | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 95 insertions(+), 13 deletions(-) diff --git a/.bugs/78 b/.bugs/78 index 92ab8cc..84f410c 100644 --- a/.bugs/78 +++ b/.bugs/78 @@ -1,4 +1,4 @@ -Title: local-Struktur: Doppeltes importieren von config +Title: local-Struktur: doppeltes Importieren von config Component: multisite Benefit: 1 State: open diff --git a/gb b/gb index 47902c3..a4afeb7 100755 --- a/gb +++ b/gb @@ -15,10 +15,13 @@ if sys.stdout.isatty(): tty_bgyellow = '\033[43m' tty_bgblue = '\033[44m' tty_bgmagenta = '\033[45m' + tty_bgcyan = '\033[46m' tty_bgwhite = '\033[47m' tty_bold = '\033[1m' tty_underline = '\033[4m' tty_normal = '\033[0m' + def tty_colors(codes): + return '\033[%sm' % (';'.join([str(c) for c in codes])) else: tty_red = '' tty_green = '' @@ -29,10 +32,13 @@ else: tty_white = '' tty_bgblue = '' tty_bgmagenta = '' + tty_bgcyan = '' tty_bold = '' tty_underline = '' tty_normal = '' tty_ok = 'OK' + def tty_colors(c): + return "" grep_color = tty_bold + tty_green @@ -58,6 +64,7 @@ def load_config(): def load_bugs(): global g_bugs g_bugs = {} + check_modified() for entry in os.listdir("."): try: bugid = int(entry) @@ -68,6 +75,20 @@ def load_bugs(): except: continue +def check_modified(): + global g_modified + g_modified = set([]) + for line in os.popen("git status --porcelain"): + if line.startswith("M") and ".bugs/" in line: + try: + id = line.rsplit("/", 1)[-1].strip() + g_modified.add(int(id)) + except: + pass + +def bug_is_modified(bugid): + return bugid in g_modified + def load_bug(bugid): bug = { @@ -127,13 +148,13 @@ def usage(): where COMMAND is one of: - list [STATE] - list bugs - new - create a new bug - show [# #..] - show several bugs (or all open) - resolve ID - change a bugs state - delete #.. - delete bug(s) - grep WHAT... - grep in titles and descriptions - edit [#] - open bug # in editor (or newest bug) + list [-g] [-r] [STATE] - list bugs (-g: sort after gain, -r: reverse) + new - create a new bug + show [# #..] - show several bugs (or all open) + resolve ID - change a bugs state + delete #.. - delete bug(s) + grep WHAT... - grep in titles and descriptions + edit [#] - open bug # in editor (or newest bug) """) sys.exit(1) @@ -142,10 +163,43 @@ def bug_state(bug): state = bug["state"] return "%s%-7s%s" % (tty_bold + states.get(state, ""), state, tty_normal) +def num_color(n, colors, inverse): + if inverse: + b = 40 + else: + b = 30 + + c = colors[n-1] + return tty_colors([b + c, 1]) + +def bug_gain(bug): + cost = int(bug["cost"]) + benefit = int(bug["benefit"]) + gain = benefit - cost + if gain >= 2: + color = 2 + elif gain > 0: + color = 6 + elif gain <= -3: + color = 1 + elif gain <= -2: + color = 5 + elif gain < 0: + color = 3 + else: + color = 4 + return "%s%d%s%d%s" % ( + tty_colors([40 + color, 1]), cost, tty_colors([0, 30 + color, 1]), benefit, tty_normal) + def list_bug(bug): - sys.stdout.write("%s#%04d%s %-6s %-9s %-10s %-60s\n" % - (tty_bold, int(bug["id"]), tty_normal, bug_state(bug), - bug["class"], bug["component"], bug["title"])) + if bug_is_modified(bug["id"]): + bold = tty_bold + tty_cyan + "(*) " + else: + bold = "" + sys.stdout.write("#%04d %s %-6s %-9s %-10s %s%-60s%s\n" % + (int(bug["id"]), + bug_gain(bug), bug_state(bug), + bug["class"], bug["component"], bold, bug["title"], tty_normal)) def show_bug(bug): list_bug(bug) @@ -153,10 +207,26 @@ def show_bug(bug): def main_list(args): bugs = g_bugs.values() + # arguments are tags from state, component and class. Multiple values # in one class are orred. Multiple types are anded. filters = {} + def cmp_gain(a, b): + ga = int(a["benefit"]) - int(a["cost"]) + gb = int(b["benefit"]) - int(b["cost"]) + return ga - gb + + sort = None + reverse = False for a in args: + if a == '-g': + sort = cmp_gain + continue + + if a == '-r': + reverse = True + continue + hit = False for tp, values in [ ( "component", components ), ( "state", states ), ( "class", classes ), ]: @@ -172,7 +242,8 @@ def main_list(args): if not hit: bail_out("No such component, state or class: %s" % a) - # sort + # Filter + newbugs = [] for bug in bugs: skip = False for tp, entries in filters.items(): @@ -180,7 +251,18 @@ def main_list(args): skip = True break if not skip: - list_bug(bug) + newbugs.append(bug) + bugs = newbugs + + # Sort + if sort: + newbugs.sort(sort) + if reverse: + newbugs.reverse() + + # Output + for bug in bugs: + list_bug(bug) def main_show(args):

13 years, 10 months

Check_MK Git: check_mk: gb: fix implementation of grep

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8a8a2d971f592b4f6bb66e7f9911a3bf63d67f01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a8a2d971f592b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 22 15:50:37 2010 +0100 gb: fix implementation of grep --- gb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/gb b/gb index a4afeb7..0d4de22 100755 --- a/gb +++ b/gb @@ -384,6 +384,7 @@ def main_grep(args): match = grep(bug["title"], kw) if match: bug["title"] = match + didmatch = True lines = bug["description"].split("\n") bodylines = "" for line in lines:

13 years, 10 months

Check_MK Git: check_mk: Livestatus: do not use is_contact_member_of_contactgroup anymore

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2c7f7cd78cb14aa8ef3d3ca6f9ed5e051dd3e490 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c7f7cd78cb14a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 22 15:52:16 2010 +0100 Livestatus: do not use is_contact_member_of_contactgroup anymore --- .bugs/6 | 10 +++++++--- ChangeLog | 2 ++ livestatus/src/ContactgroupsMemberColumn.cc | 9 +++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.bugs/6 b/.bugs/6 index 08f6291..e6619fb 100644 --- a/.bugs/6 +++ b/.bugs/6 @@ -1,12 +1,16 @@ Title: is_contact_member_of_contactgroup selbst programmieren Component: livestatus +State: done +Class: todo +Date: 2010-12-21 10:55:19 Benefit: 5 -State: open Cost: 2 -Date: 2010-12-21 10:55:19 -Class: todo +Fun: 0 Diese Funktion ist im CVS schon weg und sehr leicht selbst zu programmieren. Sollte man bald mal machen, damit ein stabiles Livestatus schon bereit ist, wenn das neue Nagios kommt. + +2010-12-22 15:51:55: changed state open -> done +Ist umgesetzt. Sollte jetzt funktionieren. diff --git a/ChangeLog b/ChangeLog index f47fa0b..5715a30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,8 @@ column to work you need to specify the base directory of the PNP graphs with the module option pnp_path=, e.g. pnp_path=/omd/sites/wato/var/pnp4nagios/perfdata * Allow more than one column for StatsGroupBy: + * Do not use function is_contact_member_of_contactgroup anymore (get compatible + with Nagios CVS) 1.1.9i2: Checks & Agents: diff --git a/livestatus/src/ContactgroupsMemberColumn.cc b/livestatus/src/ContactgroupsMemberColumn.cc index d26b8ee..3811671 100644 --- a/livestatus/src/ContactgroupsMemberColumn.cc +++ b/livestatus/src/ContactgroupsMemberColumn.cc @@ -28,6 +28,11 @@ bool ContactgroupsMemberColumn::isNagiosMember(void *cg, void *ctc) { - return is_contact_member_of_contactgroup((contactgroup *)cg, (contact *)ctc); + contactsmember *mem; + for (mem = ((contactgroup *)cg)->members; mem != NULL; mem = mem->next) + { + if (mem->contact_ptr == ctc) + return true; + } + return false; } -

13 years, 10 months

Check_MK Git: check_mk: Finally resolved LIESMICH.zutun completely

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1ae20590c002cd453c2106239279e4b9af4c0c9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ae20590c002cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 22 11:27:49 2010 +0100 Finally resolved LIESMICH.zutun completely All bugs and ideas are now stored in .bugs/. Please use ./gb list for a complete list. ./gb shows a simple help of how to use gb alias "git bug" --- .bugs/40 | 2 +- .bugs/55 | 2 +- .bugs/70 | 20 +++++++++++++++++ .bugs/71 | 10 ++++++++ .bugs/72 | 11 +++++++++ .bugs/73 | 11 +++++++++ .bugs/74 | 24 ++++++++++++++++++++ .bugs/75 | 14 ++++++++++++ .bugs/76 | 14 ++++++++++++ .bugs/77 | 15 +++++++++++++ .bugs/78 | 19 ++++++++++++++++ .bugs/79 | 13 +++++++++++ .bugs/80 | 16 +++++++++++++ .bugs/81 | 14 ++++++++++++ .bugs/82 | 26 ++++++++++++++++++++++ .bugs/83 | 15 +++++++++++++ .bugs/84 | 18 +++++++++++++++ LIESMICH.zutun | 65 -------------------------------------------------------- 18 files changed, 242 insertions(+), 67 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1ae20590c0…

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits