Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: Bugfix: Fixed javascript error when doing replication in distributed

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6f4631a4c3fe81b99b196c76df399af13942c4bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f4631a4c3fe81… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 14:03:43 2011 +0100 Bugfix: Fixed javascript error when doing replication in distributed wato environments when not having the sidebar open --- ChangeLog | 2 +- web/htdocs/htmllib.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 484706a..d5a9901 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,7 @@ folder inventory * NagVis auhtorization file generation is also executed on activate_changes * Bugfix: Calling activate_changes hook also in distributed WATO setups - * Bugfix: Fixed javascript error when doing replication in distributed + * Bugfix: Fixed javascript errors when doing replication in distributed wato environments when not having the sidebar open 1.1.13i1: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index b0db912..9ef5b01 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -822,7 +822,7 @@ class html: def reload_sidebar(self): if not self.has_var("_ajaxid"): - self.javascript("parent.frames[0].location.reload();"); + self.javascript("if(parent && parent.frames[0]) parent.frames[0].location.reload();"); # Get next transaction id for that user def current_transid(self):

12 years, 9 months

Check_MK Git: check_mk: Fix syntax error in ChangeLog

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: d902d9cad38e37d1f9ab0bd7359ede0c7b818210 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d902d9cad38e37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 21 15:04:20 2011 +0100 Fix syntax error in ChangeLog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d55f6bf..b873606 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -1.1.13i2 +1.1.13i2: Core, Setup, etc.: * cmk -I: accept host tags and cluster names

12 years, 9 months

Check_MK Git: check_mk: FIX: fixed man pages of h3c_lanswitch_sensors and statgrab_cpu

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8ea6d41ffd542f89b56376731c6a9109762beab8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ea6d41ffd542f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 21 14:57:26 2011 +0100 FIX: fixed man pages of h3c_lanswitch_sensors and statgrab_cpu --- ChangeLog | 4 ++++ checkman/h3c_lanswitch_sensors | 13 +++++++++---- checkman/statgrab_cpu | 6 ------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f15fe7..d55f6bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,10 @@ * printer_alerts: added further state codes (thanks to Matthew Stew) * Solaris agent: changed shell to /usr/bin/bash (fixes problems with LC_ALL=C) +1.1.12p7: + Checks & Agents: + * FIX: fixed man pages of h3c_lanswitch_sensors and statgrab_cpu + 1.1.12p6: Checks & Agents: * FIX: lnx_if: remove debug output (left over from 1.1.12p5) diff --git a/checkman/h3c_lanswitch_sensors b/checkman/h3c_lanswitch_sensors index 2a741f6..54095d0 100644 --- a/checkman/h3c_lanswitch_sensors +++ b/checkman/h3c_lanswitch_sensors @@ -4,11 +4,16 @@ author: Florian Heigl <fh(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This Check queries the CPU utilization for various switches made by 3Com and H3C, either standalone or that of the CPUs of all units in the stack. By default it will handle 3com Superstack 4 switches, but it should work with all devices defined in the "Lsw" lanswitch Mibs. -Note some of these switches don't handle snmp well and might generate up to 90% cpu load while queried. -To accomodate for this you should lower the frequency of SNMP based checks with them. -The CPU usage ratio returned by the check is the average load of the last 60 seconds. + This Check queries the CPU utilization for various switches made by 3Com + and H3C, either standalone or that of the CPUs of all units in the stack. By + default it will handle 3com Superstack 4 switches, but it should work with + all devices defined in the "Lsw" lanswitch Mibs. + + Please note: some of these switches don't handle SNMP well and might generate + up to 90% CPU load while queried. To accomodate for this you should lower + the frequency of SNMP based checks with them. The CPU usage ratio returned + by the check is the average load of the last 60 seconds. inventory: The check will add one service per Unit/CPU in a stack. diff --git a/checkman/statgrab_cpu b/checkman/statgrab_cpu index 9c24221..faf075d 100644 --- a/checkman/statgrab_cpu +++ b/checkman/statgrab_cpu @@ -15,9 +15,3 @@ perfdata: inventory: One check per host is created if the agent contains a {statgrab_cpu} section containing cpu information. - -[parameters] - The check has no parameters. - -[configuration] - The check is not configurable.

12 years, 9 months

Check_MK Git: check_mk: Optimized wraps in host lists tag column

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: eebc8edb99a856957d6427955d2f8777910755bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eebc8edb99a856… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 11:55:08 2011 +0100 Optimized wraps in host lists tag column --- ChangeLog | 3 +++ web/htdocs/wato.py | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac58691..7f15fe7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ * dell_powerconnect_cpu: renamed service from CPU to "CPU utilization", in order to be consistent with other checks + WATO: + * Optimized wraps in host lists tag column + 1.1.13i1: Multisite: * New nifty sidebar snapin "Speed-O-Meter" diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 86e8364..f2c7740 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1119,7 +1119,12 @@ def show_hosts(folder): html.write('<td><img class=icon src="images/icon_%s.png" title="%s"></td>' % (icon, title)) # Raw tags - html.write("<td>%s</td>" % "|".join(host[".tags"])) + # + # Optimize wraps: + # 1. add round the single tags to prevent wrap within tags + # 2. add "zero width space" () + html.write("<td>%s</td>" % "|".join( + [ '%s' % t for t in host[".tags"] ])) # Show attributes for attr, topic in host_attributes:

12 years, 9 months

Check_MK Git: check_mk: Removed executable flag from mobile.py

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ca659eb34a7b4b7ff99f7d9235ec332251a33c54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca659eb34a7b4b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 14:15:40 2011 +0100 Removed executable flag from mobile.py --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py old mode 100755 new mode 100644

12 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 02b8cf8d90278f33f3169bc7841d72afc4d748aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02b8cf8d90278f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 18:42:18 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Remove trailing spaces from more codelines

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b1ed14249c67066c82402581096d31324397dd7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1ed14249c6706… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 21:43:16 2011 +0100 Remove trailing spaces from more codelines --- Makefile | 2 +- web/htdocs/check_mk.css | 14 +++--- web/htdocs/dashboard.css | 20 ++++---- web/htdocs/js/bi.js | 6 +- web/htdocs/js/check_mk.js | 58 ++++++++++---------- web/htdocs/js/dashboard.js | 6 +- web/htdocs/js/hover.js | 2 +- web/htdocs/js/search.js | 34 ++++++------ web/htdocs/js/sidebar.js | 64 ++++++++++++------------ web/htdocs/js/wato.js | 48 +++++++++--------- web/htdocs/mobile.css | 6 +- web/htdocs/pages.css | 52 +++++++++--------- web/htdocs/sidebar.css | 16 +++--- web/htdocs/status.css | 122 ++++++++++++++++++++++---------------------- web/htdocs/views.css | 2 +- web/htdocs/wato.css | 62 +++++++++++----------- 16 files changed, 257 insertions(+), 257 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b1ed14249c…

12 years, 9 months

Check_MK Git: check_mk: Remove trailing spaces from even more codelines

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 614ecc07c1ce98d7683ef7860eca8606da207dbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=614ecc07c1ce98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 21:45:38 2011 +0100 Remove trailing spaces from even more codelines --- Makefile | 3 ++- doc/helpers/df_magic_number.py | 2 +- doc/helpers/headrify | 2 +- doc/helpers/listtar | 6 +++--- doc/helpers/wato-migrate-1.2.0.sh | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a490ee4..f850053 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,8 @@ check: healspaces: @echo "Removing trailing spaces from code lines..." @sed -ri 's/[ ]+$$//g' checkman/* modules/* checks/* $$(find -name Makefile) \ - livestatus/src/*{cc,c,h} web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py + livestatus/src/*{cc,c,h} web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ + doc/helpers/* $(find -type f pnp-templates/*.php) setup: $(MAKE) dist diff --git a/doc/helpers/df_magic_number.py b/doc/helpers/df_magic_number.py index c13aba2..b290dbc 100755 --- a/doc/helpers/df_magic_number.py +++ b/doc/helpers/df_magic_number.py @@ -47,6 +47,6 @@ for level in [ .80, .85, .90, .95 ]: print_levels(exp) sys.stdout.write("-" * 80) sys.stdout.write("\n") - + diff --git a/doc/helpers/headrify b/doc/helpers/headrify index 350d44f..4690902 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -73,7 +73,7 @@ headrify () thirdline="$(sed -n 3p < $file)" shouldbe="$comment+---------------------------------------------------" endline='.*Boston, MA 02110-1301 USA.' - + if [ -n "$lastline" ] ; then endline="${lastline//\//\/}" ; fi if [ "${firstline:0:20}" = "${shouldbe:0:20}" \ -o "${secondline:0:20}" = "${shouldbe:0:20}" \ diff --git a/doc/helpers/listtar b/doc/helpers/listtar index 8b85371..dc1cd3e 100755 --- a/doc/helpers/listtar +++ b/doc/helpers/listtar @@ -3,7 +3,7 @@ VERSION=$(sed -n '/^VERSION.*= *$.*$/s//\1/p' < Makefile) TAR=${1:-check_mk-$VERSION.tar.gz} -if [ ! -e "$TAR" ] ; then +if [ ! -e "$TAR" ] ; then echo "Usage: $0 check_mk-...tar.gz" >&2 exit 1 fi @@ -14,11 +14,11 @@ do echo -n "$filename" if [ "${filename:(-7)}" = ".tar.gz" ] ; then echo : - tar xzf $TAR --to-stdout "$filename" | tar tzvf - + tar xzf $TAR --to-stdout "$filename" | tar tzvf - echo elif [ "${filename:(-4)}" = ".tar" ] ; then echo : - tar xzf $TAR --to-stdout "$filename" | tar tvf - + tar xzf $TAR --to-stdout "$filename" | tar tvf - echo else echo diff --git a/doc/helpers/wato-migrate-1.2.0.sh b/doc/helpers/wato-migrate-1.2.0.sh index 4578a80..8bb937a 100755 --- a/doc/helpers/wato-migrate-1.2.0.sh +++ b/doc/helpers/wato-migrate-1.2.0.sh @@ -78,7 +78,7 @@ do rmdir -v "$thedir" 2>/dev/null || true done - + if which tree > /dev/null then echo "-----------------------------------------"

12 years, 9 months

Check_MK Git: check_mk: Removed test code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0765e75ee71a0aa8e287b4ab3c569d23d5517fa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0765e75ee71a0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 21:51:58 2011 +0100 Removed test code --- livestatus/src/Column.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index 054cace..004847d 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -53,8 +53,8 @@ public: virtual ~Column() {} const char *name() const { return _name.c_str(); } const char *description() const { return _description.c_str(); } - virtual string valueAsString(void *data __attribute__ ((__unused__)), Query *) = 0; - // { return "invalid"; } + virtual string valueAsString(void *data __attribute__ ((__unused__)), Query *) + { return "invalid"; } virtual int type() = 0; virtual void output(void *data, Query *) = 0; virtual Filter *createFilter(int opid __attribute__ ((__unused__)), char *value __attribute__ ((__unused__))) { return 0; }

12 years, 9 months

Check_MK Git: check_mk: Internal file cleanup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6a858e36f7b92bfa732339cea1f6aadeb495560f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a858e36f7b92b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 21:07:06 2011 +0100 Internal file cleanup --- LIESMICH.benutzer | 25 ------------------------- TODO | 31 ------------------------------- listtar => doc/helpers/listtar | 0 3 files changed, 0 insertions(+), 56 deletions(-) diff --git a/LIESMICH.benutzer b/LIESMICH.benutzer deleted file mode 100644 index b1152fe..0000000 --- a/LIESMICH.benutzer +++ /dev/null @@ -1,25 +0,0 @@ -Konzept für Verwaltung von Benutzern und Rollen ------------------------------------------------ -Was jetzt noch fehlt: -MS5: Beim Löschen von Objekten Bezüge sicherstellen. Im config-Dialog - könnte man darauf hinweisen, dass es Bezüge gibt und diese - automatisch entfernen. Oder soll man eher sperren? Das wäre einfacher. - * Das Löschen von Rollen ist schon entsprechend Umgesetzt - * Löschen von Kontaktgruppen. Diese haben Bezüge zu Hosts, Services - Foldern und Usern. An allen vier Stellen muss gelöscht werden. - * Löschen von Timeperiods. Entsprechende Regeln müssen bearbeitet werden. -MS6: Login-Maske für Multisite - diese optional machen (Default is - HTTP-Auth). In OMD per Config einen Schalter dafür einbauen. -MS6: NagVis und PNP so erweitern, dass eine zentral Auth funktioniert. -MS6: Spracheinstellung pro Benutzer -MS5: custom_links Snapin muss evtl. repariert werden. -MS5/6: Email-Notifikation einrichten. Da sollte ein Befehl in die - Standardtemplates von Check_MK rein. Am besten wäre wahrscheinlich - ein cmk --notify, das als Argument Service und Host und Contact bekommt und - evtl. noch ein paar Variablen und dann den Rest per Livestatus rauszieht? - Eigentlich sollte das gehen, da ja der Notifizieren auch in einer Multisite- - Umgebung immer lokal erfolgt. Die Rechte hat man auch immer, weil man ja - von Nagios aufgerufen wird. - cmk --notify zieht sich dann alles per Livestatus raus und packt nach - Belieben alles in die Mail rein, bis zu Auszügen aus Logwatch und PNP-Graphen. - diff --git a/TODO b/TODO deleted file mode 100644 index 777913c..0000000 --- a/TODO +++ /dev/null @@ -1,31 +0,0 @@ -Zu tun bei wato-ng: - -[modules] -* checkgroup ausgeben bei cmk -L, cmk -M. -* cmk -M soll Check-Parameterbeschreibungen automatisch auslesen - -[web] -* Diagnosefunktion: wenn man eine Regelkette sieht kann man diese - per Knopfdruck durchrechnen lassen und sieht dann, welche - hosts von welcher Regel erfasst werden. -* Verlinkung von Service zu Regelkette, Knopf für "Ausnahme für diesen - Service erstellen" -* class Alternative: Die Radiobuttons sollen <div>s unsichtbar werden - lassen von den nicht genutzten Alternativen. -* Konfiguration von Timeperiods -* Value-Editor für die Auswahl einer Timeperiod. -* Wie bekomme ich es hin, dass man keine TP löschen kann, die noch in - einer Regel benannt wird? - -[decl] -* Alle Checkgruppen deklarieren, die für LC-Checks gebraucht werden. - -[optional] -* Auch multisite.mk-Variablen steuerbar machen -* (nur OMD): auch ausgewählte Nagios-Variablen configurierbar machen - -Ganz ferne Zukunft (Brauch LC und DK nicht): -=================== -- Explizite Checks (checks += ) -- Cluster -- Host Tags diff --git a/listtar b/doc/helpers/listtar similarity index 100% rename from listtar rename to doc/helpers/listtar

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits