Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64478 discussions

Check_MK Git: check_mk: wato integration of check_sql

by Götz Golla

Module: check_mk Branch: master Commit: aa1337e130b9057165ae2caf1cbbaf6deebefcd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa1337e130b905… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 30 15:32:54 2013 +0200 wato integration of check_sql --- web/plugins/wato/active_checks.py | 45 +++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index a8473f8..1ca1dae 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -33,7 +33,7 @@ register_rule(group, "active_checks:dns", Tuple( title = _("Check DNS service"), - help = _("Check the resultion of a hostname into an IP address by a DNS server. " + help = _("Check the resolution of a hostname into an IP address by a DNS server. " "This check uses <tt>check_dns</tt> from the standard Nagios plugins."), elements = [ TextAscii(title = _("Hostname"), allow_empty = False, @@ -88,10 +88,51 @@ register_rule(group, match = 'all') register_rule(group, + "active_checks:sql", + Tuple( + title = _("Check SQL DB"), + help = _("This check connects to the specified database, sends a custom sql-statement " + "and checks that the result has a defined format containing three columns, a " + "number, a text, and performance data. Upper or lower levels may be defined " + "here. If they are not defined the number is taken as the state of the check." + "This check uses the active check <tt>check_sql</tt>."), + elements = [ + TextAscii(title = _("Hostname"), allow_empty = False, + help = _('The hostname or address you want to query')), + TextAscii(title = _("DBMS"), allow_empty = False, + help = _('The database management system you want to query')), + TextAscii(title = _("DB-Name"), allow_empty = False, + help = _('The name of the database on the DBMS')), + TextAscii(title = _("SQL-Statement"), allow_empty = False, + help = _('The SQL-Statement which is sent to the DBMS')), + Dictionary( + title = _("Optional parameters"), + elements = [ + ( "upperlevels", + Tuple( + title = _("Upper levels for first output item"), + elements = [ + Float( title = _("Warning if above")), + Float( title = _("Critical if above")) + ]) + ), + ( "lowerlevels", + Tuple( + title = _("Lower levels for first output item"), + elements = [ + Float( title = _("Warning if below")), + Float( title = _("Critical if below")) + ])), + ]), + ] + ), + match = 'all') + +register_rule(group, "active_checks:tcp", Tuple( title = _("Check connecting to a TCP port"), - help = _("This check test the connection to a TCP port. It uses " + help = _("This check tests the connection to a TCP port. It uses " "<tt>check_tcp</tt> from the standard Nagios plugins."), elements = [ Integer(title = _("TCP Port"), minvalue=1, maxvalue=65535),

11 years

Check_MK Git: check_mk: FIX: windows_agent: fixed bug in cleanup of open thread handles

by Andreas Boesl

Module: check_mk Branch: master Commit: 7fa36bfe1f1841dbde86f6133e0a2c0bf80127a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fa36bfe1f1841… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 30 14:47:28 2013 +0200 FIX: windows_agent: fixed bug in cleanup of open thread handles --- ChangeLog | 1 + agents/windows/check_mk_agent-64.exe | Bin 179200 -> 179200 bytes agents/windows/check_mk_agent.cc | 5 +++++ agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/install_agent-64.exe | Bin 149246 -> 149297 bytes agents/windows/install_agent.exe | Bin 146741 -> 146756 bytes 6 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6ca185d..55dc03d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.3i3: Checks & Agents: * windows_agent: increased maximum plugin output buffer size to 2MB + * FIX: windows_agent: fixed bug in cleanup of open thread handles 1.2.3i2: diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 3ca08ee..3ae686b 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 8c785f0..bc6d7b6 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2422,6 +2422,9 @@ void run_external_programs(char *dirname, script_type type, bool dry_run = false cont->buffer_time = time(0); cont->status = SCRIPT_COLLECT; crash_log("Thread start: %s", cont->path); + + if (cont->worker_thread != INVALID_HANDLE_VALUE) + CloseHandle(cont->worker_thread); cont->worker_thread = CreateThread( NULL, // default security attributes 0, // use default stack size @@ -3745,6 +3748,8 @@ void start_external_data_collection() } } + if (g_collection_thread != INVALID_HANDLE_VALUE) + CloseHandle(g_collection_thread); crash_log("Start thread for collecting local/plugin data"); g_collection_thread = CreateThread(NULL, // default security attributes 0, // use default stack size diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 9ebfcc3..e9cd4f4 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-64.exe b/agents/windows/install_agent-64.exe index 8457418..b13071d 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index c0a5cab..956f445 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years

Check_MK Git: check_mk: Added draft for possible rule based notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: 9ae4b09f29ed73054627f4c561d8c0005370267a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ae4b09f29ed73… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 30 13:20:33 2013 +0200 Added draft for possible rule based notifications --- doc/drafts/LIESMICH.rule_based_notifications | 165 ++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/doc/drafts/LIESMICH.rule_based_notifications b/doc/drafts/LIESMICH.rule_based_notifications new file mode 100644 index 0000000..6a81979 --- /dev/null +++ b/doc/drafts/LIESMICH.rule_based_notifications @@ -0,0 +1,165 @@ +Ausgangspunkt: die "Flexible Notifications" von Check_MK sind einigermaßen +flexibel und bieten schon mehr Möglichkeiten, als das Standard-Nagios. +Allerdings gibt es etliche Situationen, in denen man noch mehr Flexibilität +braucht. Ferner ist es so, dass bei einer größeren Zahl von Benutzern es +sehr umständlich ist, für jeden Benutzer diese korrekt einzurichten. + +Das folgende Konzept soll diese Probleme lösen und für die Zukunft +ausbaubar sein. + +REGELBASIERTE NOTIFIKATIONEN +---------------------------- +Grundidee: Notifikationen werden - ganz ähnlich zur Event Console - +von einem Regelwerk abgearbeitet, dass zunächst unabhängig von einem +konkreten Benutzer ist. Der Ablauf ist dann wie folgt: + +1. In Nagios/CMC geschieht ein Host/Service-Alert. + +2. Über einen Sammelbenutzer "checkmk-notify", der von allem Kontakt ist, + wird eine Notifikation ausgelöst. + +3. Diese ruft wie gehabt "cmk --notify" auf. Dabei wird in einer Umgebungsvariable + vom Core auch die Liste der (eigentlichen) Kontakte für diesen Service + mitgeteilt. Bei diesen Kontakten selbst sind die Notifikationen ausgeschaltet, + damit sie nicht doppelt versendet werden. Dafür sorgt WATO in der Benutzerverwaltung. + +4. Jetzt durchläuft das Ereignis eine Regelkette, die man mit WATO editieren kann. + *Jede* Regel, die greift, wird ausgeführt. Dadurch wird festgelegt, welcher Benutzer + über welches Plugin notifiziert wird. + +REGELN +------ +Die Regeln sind ähnlich aufgebaut, wie bei der Event Console und werden ähnlich +über ein eigenes WATO-Modul gepflegt. Jede Regel hat eine Bedingung und eine +daraus resultierende Aktion. + +Die Bedingung kann formuliert werden über: + +Wie bei bestehenden "Flexible Notifications": +* Ob eine bestimmte Timeperiod gerade aktiv ist +* Eskalationsnummer +* Service Level +* Host/Service Event-Typ (down,up,unreach,OK,CRIT,etc.) +* Host-Bedingung wie bei den WATO-Regeln, mit Tags und expliziten Ausnahmen +* Service-Bedingungen wie bei den WATO-Regeln mit Regexen + +Neu kommt dazu: +* Eventuell: Bedingung über den Typ des Checks (z.B. nur df) +* Eventuell: enthalten in bestimmter Host oder Servicegruppe +* Eventuell: enthalten in bestimmter Kontaktgruppe +* Eventuell: bestimmter Kontakt ist zuständig +* Eventuell: Wert von bestimmter Custom-Variable + +Wenn die Bedingung zutrifft, legt die Regel eine Aktion fest: + +* Wer soll Notifiziert werden? + a) alle Kontakte des Hosts/Services + b) explizite Liste von Kontakten + c) Mitglieder einer bestimmten Kontaktgruppe + d) Email/Pager-Adressen, die nicht Kontakt sind + e) alle Kontakte + +* Mit welchem Plugin soll notifiziert werden? + +* Die Parameter dieses Plugins + +Die Aktion wird aber nicht sofort ausgeführt, sondern zunächst in +einer Aktionsliste gespeichert. Diese ist eine Liste von Tupeln +mit dem Aufbau + + Kontakt, Plugin, Parameter + + +AUSSCHLUSS-REGELN +----------------- +Um besser Ausnahmen behandeln zu können, kann man Ausschluss-Regeln +definieren. Hierzu wird die Regel wie gehabt aufgebaut, nur wird +jetzt festgelegt, wer *nicht* notifiziert werden kann. Dabei ist die +Reihenfolge der Regeln entscheidend. Beispiel: + +Regel 1 ... +Regel 2 ... +Regel 3 -> löst Notifikation an A und B mit Plugin P aus +Regel 4 ... +Regel 5 -> legt fest, dass B *nicht* über Plugin P notifiziert wird + +--> Nur A wird mit P notifiziert. + +Achtung: Da - anders als z.B. bei der Event Console - immer *alle* Regeln +ausgewertet werden, muss man hier die Ausnahmen *nach* den allgemeinen +Regeln definieren. So können spätere Regeln frühere immer wieder revidieren. + +Auch bei Sperrregeln kann man ein Plugin auswählen. Dann werden nur die +Notifikationen mit diesem Plugin gelöscht (um z.B. keine SMS zu bekommen) + + +BENUTZER-REGELN +--------------- +Damit trotz allem Benutzer individuell etwas konfigurieren können, kann +jeder Benutzer eigenen Regeln definieren. Diese sind analog aufgebaut. +Allerdings ist bei der Frage *wer* notifiziert werden soll, nur der +eigene Kontakt auswählbar. Ausschlussregeln sind aber möglich. Die Benutzer-Regeln +werden immer *nach* den globalen Regeln ausgewertet. + +Der Benutzer kann somit: + +- Notifikationen hinzufügen +- durch globale Regeln erzeugte Notifikationen abklemmen + +Merke: Der Benutzer kann so auch Notifikationen "abbonieren" für +Hosts/Services, für die er im Nagios kein Kontakt ist! + + +FALLBACK +-------- +Wenn auf eine Notifikationsereignis keine einzige Regel greift, so wird +stattdessen eine Email ein eine global einstellbare Default-Adresse +versendet. + + +UMSETZUNG IN WATO +----------------- +Im WATO sieht das ganze neue Konzept dann so aus: + +* Über eine neue globale Option werden die regelbasierten + Notifikationen eingeschaltet. Diese sind zunächst per Default aus, + später (1.4.0) dann an. + +* Wenn sie an sind, dann ändert sich der Notifikations-Abschnitt + bei den Benutzereinstellungen. Der aktuelle Block verschwindet + komplett. Anstelle dessen kommt man über einen neuen Knopf auf + eine eigene neue Seite, in der man die individuellen Regeln des + Benutzers festlegen kann. Ein-/Ausschalten kann man die Notifikationen + hier nicht. Das geht dann bei Bedarf über eine Regel. + +* Wenn bereits flexible Notifications konfiguriert waren, werden + diese nicht automatisch in regelbasiert konvertiert. Die Einstellungen + bleiben aber latent vorhanden für den Fall, dass man wieder zurückschaltet. + +* Ein neues WATO-Modul zeigt die globalen Notifikations-Regeln. Das + gleiche Modul wird auch für die Benutzer-Individuellen Regeln leicht + aberwandelt verwendet. + + In diesem Modul kann man Regeln anlegen, ändern, löschen und umsortieren - + analog zur Event Console. Eventuell könnte man ein Simulationsfeld machen, + mit dem man eine Notifikation ausprobieren kann. Das ist allerdings deutlich + aufwendiger, als bei der EC, weil eine Notifikation deutlich mehr Datenfelder + hat und die Logik dann in der GUI dupliziert werden muss. + + +UMSETZUNG IN CHECK_MK +--------------------- +Das cmk --notify muss automatisch erkennen, dass es die regelbasierte +Notifikation verwendet werden soll. Das kann z.B. am Kontaktnamen +checkmk-notify festgemacht werden. Es führt dann das Regelwerk aus. Dieses +ist zum einen in einer main.mk-Variable gespeichert, zum anderen in den +individuellen contacts-Einstellungen. Es müssen bei jeder Notifikation +alle Regeln aller Kontakte ausgeführt werden! + +im notify.log muss man bei entsprechendem Level wie bisher auch genau +erklärt bekommen, warum jetzt welche Notifikation erzeugt oder verhindert +wurde. + +Bei der Konfigerzeugung für Nagios/CMC muss man einen speziellen +Benutzer anlegen, der für alles Kontakt ist. +

11 years

Check_MK Git: check_mk: new man page for df taking into account new level syntax

by Götz Golla

Module: check_mk Branch: master Commit: 97e433d34bb7c7c1f6693715ff9926830955945c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97e433d34bb7c7… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 30 08:07:16 2013 +0200 new man page for df taking into account new level syntax --- checkman/df | 67 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/checkman/df b/checkman/df index 65ff3f9..dc6f6c5 100644 --- a/checkman/df +++ b/checkman/df @@ -8,38 +8,36 @@ description: is checked against a warning and a critical level, which can be specified in numerous ways. Beware: on Linux and UNIX systems the filesystem might reserve a certain amount for root (typical is 5%). - This checks considers that reserved space as used. This is consistant with + This checks considers that reserved space as used. This is consistent with the percentage-column in the output of {df}. So your filesystem might be at 100% in a situation where root still has 5% free space available. {Trends:} This checks supports filesystem {trends}. This means that the {df} check is able to compute the {change} of the used space over the time and can - make a forecast into the future. It can estimate the point of time where + make a forecast into the future. It can estimate the time when the filesystem will be full. In the default configuration the check will compute the trend based on the - data of the last 24 hours. Similar like the CPU load this is done with - a logarithmic average that weights the more recent time more than time - farer away. Also data beyond the 24 hours will to some small degree be + data of the last 24 hours using a logarithmic average that gives more recent + data a higher weight. Also data beyond the 24 hours will to some small degree be reflected in the computation. The advantage of this algorithm is a more precise prediction and a simpler implementation, which does not need any access to any RRDs or similar storage. - Please note, that when a filesystem is started being monitored, then - the trend of the past is unknown and will be assumed to be {zero}. That - means that it will take at least one trend range of time until the trend + Please note that when a filesystem is started to be monitored, + the trend of the past is unknown and is assumed to be {zero}. + It will take at least one trend range of time until the trend approximately reflects the reality. {Grouping:} In some situations you do not want to monitor a single - filesystem but a group of filesystems that together form a pool. - It is not relevant if some filesystems of the pool are - full but only the total usage of the pool as whole. The {df} check supports such pools + filesystem but a group of filesystems forming a pool. + Only the total usage of the pool is of interest. The {df} check supports pools by defining groups. For each group you specify a name and a list of globbing patterns (path patterns containing {*} and {?}). The name is being used as the check item. All filesystems that match one of the patterns are part of the pool. - When using inventory then you specify the groups with the ruleset + When using inventory you specify the groups with the ruleset {filesystem_groups}. When configuring manual checks, you specify the list of patterns in the check parameter {"patterns"}. @@ -50,14 +48,14 @@ item: examples: # Set default levels for all filesystems to 90/95 (simple way) - filesystem_default_levels = (90, 95) + filesystem_default_levels = (90.0, 95.0) # alternative: Set default levels via new dictionary method: filesystem_default_levels = { - "levels" : (80, 90), # levels in percent + "levels" : (80.0, 90.0), # levels in percent "magic" : 0.8, # magic factor "magic_normsize" : 20, # normsize in GB - "levels_low" : (50, 60), # magic never lowers levels below this (percent) + "levels_low" : (50.0, 60.0), # magic never lowers levels below this (percent) "trend_range" : 48, # hours "trend_mb" : (10, 20), # MB of change during trend_range "trend_perc" : (1, 2), # Percent change during trend_range @@ -75,17 +73,17 @@ examples: # levels are "filesystem_default_levels" check_parameters = [ # Hosts with tag "vms" get 85/95 - ( (85, 95), ["vms"], ALL_HOSTS, [ "fs_" ] ), + ( (85.0, 95.0), ["vms"], ALL_HOSTS, [ "fs_" ] ), # all /sapdata partitions will never be critical - ( (101, 101), ALL_HOSTS, [ "fs_/sapdata$" ] ), + ( (101.0, 101.0), ALL_HOSTS, [ "fs_/sapdata$" ] ), # Partitions below "/var" get 80/90 with magic factor 0.5 - ( (80, 90, 0.5), ALL_HOSTS, [ "fs_/var" ] ), + ( (80.0, 90.0, 0.5), ALL_HOSTS, [ "fs_/var" ] ), # /usr and /opt on hosts zlnx01 and zlnx02 - ( (98, 99), [ "zlnx01", "zlnx02" ], [ "fs_/usr$", "fs_/opt$" ] ), + ( (98.0, 99.0), [ "zlnx01", "zlnx02" ], [ "fs_/usr$", "fs_/opt$" ] ), # All filesystems on clusters get 80/95 - ( (80, 95), CLUSTERS_HOSTS, [ "fs_" ] ), + ( (80.0, 95.0), CLUSTERS_HOSTS, [ "fs_" ] ), # Complex parameters in dictionary form - ( {"levels":(80,90), "trend_range":48, "trend_mb":(20,40)}, + ( {"levels":(80.0,90.0), "trend_range":48, "trend_mb":(20,40)}, [ "windows" ], ALL_HOSTS, [ "fs_" ]), ] @@ -122,7 +120,7 @@ perfdata: trends is enabled per default. You can globally disable that in {main.mk} with {filesystem_default_levels["trend_perfdata"] = False}. - Please note, that - until you use the storage type {MULTIPLE} in PNP4Nagios - + Please note that - until you use the storage type {MULTIPLE} in PNP4Nagios - changing the parameter {"trend_perfdata"} will stop all updates to your existing filesystem RRDs. You need either to delete or convert your RRDs if you want to change. @@ -136,7 +134,7 @@ inventory: that have a size and are not of type smbfs, tmpfs, cifs or nfs. When {filesystem_groups} is defined and a found filesystem - is matching one of the patterns of a group then instead of a + is matching one of the patterns of a group, then instead of a service of the single filesystem a check for the group is being created. The check item is the name of that group in that case. @@ -146,20 +144,27 @@ parameters (dict): This check supports two types of parameters. The new version supports trends and is a dictionary with the following keys: - {"levels"}: Warning and critical level of filesystem usage in percentages - of the filesystem size. The default is {(80, 90)}. + {"levels"}: Warning and critical level of filesystem usage. You need to + supply two numbers. Depending of the type of number you can choose + different kinds of levels as follows: Positive {integers} denote the + amount of {used} space in {megabytes}. Positive {floating point numbers} + denote the amount of used space in {precent}. {Negative} numbers impose + limits on the amount of space {available}, again with the possibility + to specify integers or floats to denote values in megabytes of precent. + The default is {(80.0, 90.0)}, meaning 80% and 90%. {"magic"}: The magic number, which scales the levels according to the filesystem size. Default is a factor of 1.0, which does no adaptation. A factor less than 1.0 raises the levels for large filesystems and lowers them for small ones. Please - look at online documentation for more details about the magic factor. + have a look at the online documentation for more details about the magic factor. {"magic_normsize"}: Norm size of a filesystem for the magic computation. The default for this is {20}. It is measured in {GB}. {"levels_low"}: When applying the magic factor the warn/crit levels - will never drop below these numbers. The is preset to {(50,60)}. + will never drop below these numbers. The default is preset to + {(50.0,60.0)} meaning 50% and 60%. {"trend_range"}: The time range over that trends are computed. This is in hours and preset to {24} (i.e. one day). If you set this to @@ -196,9 +201,9 @@ parameters (dict): This check supports two types of parameters. The It is still possible to specify a pair or triple of numbers {instead} of a dictionary: -warning (int): The percentage of used space that triggers +warning (int or float): The amount of used space that triggers WARNING state -critical (int): The percentage of used space that triggers +critical (int or float): The amount of used space that triggers CRITICAL space magic_factor (float): Optional: Magic factor that adapts the levels according to the size of the filesystem. Default @@ -211,8 +216,8 @@ magic_factor (float): Optional: Magic factor that adapts the levels inventory_df_exclude_fs (list of strings): Lists of filesystem types to exclude from inventory inventory_df_exclude_mountpoints (list of strings): List of mount points to exclude from inventory filesystem_default_levels: Default levels for filesystem detected by inventory. - This variable is preset to {{ "levels" : (80, 90), "magic_normsize" : 20, - "levels_low" : (50, 60), "trend_range" : 24 }} + This variable is preset to {{ "levels" : (80.0, 90.0), "magic_normsize" : 20, + "levels_low" : (50.0, 60.0), "trend_range" : 24 }} filesystem_groups (ruleset): A ruleset for defining filesystem groups. The value of each rule is a pair of (groupname, patterns), where patterns is a list of strings (path patterns). During inventory filesystems that match one of the patterns are handled

11 years

Check_MK Git: check_mk: mssql_counters: tolerate base of 0, simply assume 1

by Mathias Kettner

Module: check_mk Branch: master Commit: f3b956cfa8312b753e6edda49050ccae90103daf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3b956cfa8312b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Sep 29 21:55:21 2013 +0200 mssql_counters: tolerate base of 0, simply assume 1 This avoid UNKNOWN results for very small databases --- checks/mssql_counters | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/mssql_counters b/checks/mssql_counters index 0af5dda..ad672d4 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -90,7 +90,7 @@ def check_mssql_counters_perc(item, params, info, perc_w_base = True): if perc_w_base: if base == 0: - return (3, 'Base is 0 (Value: %.2f)' % value) + base = 1 perc = value / base * 100.0 else: perc = value

11 years

Check_MK Git: check_mk: FIX: avoid Python exception for invalid parameters even in debug mode

by Mathias Kettner

Module: check_mk Branch: master Commit: 555ec7d74286e7730639b8a5866496aae62284e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=555ec7d74286e7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Sep 29 21:30:17 2013 +0200 FIX: avoid Python exception for invalid parameters even in debug mode --- ChangeLog | 1 + web/htdocs/wato.py | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12b71fa..6ca185d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -410,6 +410,7 @@ * FIX: Fixed first toggle of flags in global settings when default is set to True * FIX: fix exception and loss of hosts in a folder when deleting all site connections of a distributed WATO setup + * FIX: avoid Python exception for invalid parameters even in debug mode Event Console: * FIX: apply rewriting of application/hostname also when cancelling events diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 65b5d76..e7fad09 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2329,8 +2329,6 @@ def show_service_table(host, firsttime): rulespec["valuespec"].validate_value(params, "") paramtext = rulespec["valuespec"].value_to_text(params) except Exception, e: - if config.debug: - raise paramtext = _("Invalid check parameter: %s!") % e paramtext += _(" The parameter is: %r") % (params,)

11 years

Check_MK Git: check_mk: FIX: Multisite: correctly display sub-minute check/ retry intervals

by Mathias Kettner

Module: check_mk Branch: master Commit: 49e8754c03b31d54dc177dc1e70204058d0970e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49e8754c03b31d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Sep 29 21:08:14 2013 +0200 FIX: Multisite: correctly display sub-minute check/retry intervals --- ChangeLog | 1 + web/plugins/views/painters.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 367dacb..12b71fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -398,6 +398,7 @@ e.g. alert statistics source * FIX: Folder Tree Snapin: make folder filter also work for remote folders that do not exist locally + * FIX: correctly display sub-minute check/retry intervals WATO: * FIX: fix layout of Auxiliary tags table diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index bb450e0..d459b13 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -560,20 +560,20 @@ multisite_painters["svc_normal_interval"] = { "title" : _("Service normal check interval"), "short" : _("Check int."), "columns" : [ "service_check_interval" ], - "paint" : lambda row: (None, "%ds" % (row["service_check_interval"] * 60)), + "paint" : lambda row: (None, "%.0fs" % (row["service_check_interval"] * 60.0)), } multisite_painters["svc_retry_interval"] = { "title" : _("Service retry check interval"), "short" : _("Retry"), "columns" : [ "service_retry_interval" ], - "paint" : lambda row: (None, "%ds" % (row["service_retry_interval"] * 60)), + "paint" : lambda row: (None, "%.0fs" % (row["service_retry_interval"] * 60.0)), } multisite_painters["svc_check_interval"] = { "title" : _("Service normal/retry check interval"), "short" : _("Interval"), "columns" : [ "service_check_interval", "service_retry_interval" ], - "paint" : lambda row: (None, "%ds/%ds" % ( - row["service_check_interval"] * 60, row["service_retry_interval"] * 60)), + "paint" : lambda row: (None, "%.0fs/%.0fs" % ( + row["service_check_interval"] * 60.0, row["service_retry_interval"] * 60.0)), } multisite_painters["svc_check_type"] = { @@ -918,20 +918,20 @@ multisite_painters["host_normal_interval"] = { "title" : _("Normal check interval"), "short" : _("Check int."), "columns" : [ "host_check_interval" ], - "paint" : lambda row: (None, "%ds" % (row["host_check_interval"] * 60)), + "paint" : lambda row: (None, "%.0fs" % (row["host_check_interval"] * 60.0)), } multisite_painters["host_retry_interval"] = { "title" : _("Retry check interval"), "short" : _("Retry"), "columns" : [ "host_retry_interval" ], - "paint" : lambda row: (None, "%ds" % (row["host_retry_interval"] * 60)), + "paint" : lambda row: (None, "%.0fs" % (row["host_retry_interval"] * 60.0)), } multisite_painters["host_check_interval"] = { "title" : _("Normal/retry check interval"), "short" : _("Interval"), "columns" : [ "host_check_interval", "host_retry_interval" ], - "paint" : lambda row: (None, "%ds/%ds" % ( - row["host_check_interval"] * 60, row["host_retry_interval"] * 60)), + "paint" : lambda row: (None, "%.0fs/%.0fs" % ( + row["host_check_interval"] * 60.0, row["host_retry_interval"] * 60.0)), } multisite_painters["host_check_type"] = {

11 years

Check_MK Git: check_mk: ps: fixed inventory with optional subgroups

by Mathias Kettner

Module: check_mk Branch: master Commit: c7d1027fab03f5896d3287219a8b5abd936701c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7d1027fab03f5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Sep 29 19:47:58 2013 +0200 ps: fixed inventory with optional subgroups Like (mysql)?, where the group migh be None --- checks/ps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ps b/checks/ps index 17f00f2..150e935 100644 --- a/checks/ps +++ b/checks/ps @@ -261,7 +261,7 @@ def process_matches(ps, procname, l_user): compiled_regexes[pattern] = reg matchobject = reg.match(" ".join(ps)) if matchobject: - return matchobject.groups() + return [ g and g or "" for g in matchobject.groups() ] return False # New parameter format: dictionary. Example:

11 years

Check_MK Git: check_mk: various spelling fixes

by Götz Golla

Module: check_mk Branch: master Commit: e2c45e4956d0bb9d66c67f6827362e56cb292dee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2c45e4956d0bb… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Sun Sep 29 11:52:31 2013 +0200 various spelling fixes --- web/plugins/views/commands.py | 16 ++++++++-------- web/plugins/views/datasources.py | 2 +- web/plugins/wato/check_parameters.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 33f58cf..6e4feda 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -77,8 +77,8 @@ multisite_commands.append({ "permission" : "action.notifications", "title" : _("Notifications"), "render" : lambda: \ - html.button("_enable_notifications", _("Enable")) == \ - html.button("_disable_notifications", _("Disable")), + html.button("_enable_notifications", _("Enable.")) == \ + html.button("_disable_notifications", _("Disable.")), "action" : command_notifications, }) @@ -102,8 +102,8 @@ multisite_commands.append({ "permission" : "action.enablechecks", "title" : _("Active checks"), "render" : lambda: \ - html.button("_enable_checks", _("Enable")) == \ - html.button("_disable_checks", _("Disable")), + html.button("_enable_checks", _("Enable.")) == \ + html.button("_disable_checks", _("Disable.")), "action" : command_enable_active, }) @@ -122,8 +122,8 @@ multisite_commands.append({ "permission" : "action.enablechecks", "title" : _("Passive checks"), "render" : lambda: \ - html.button("_enable_passive_checks", _("Enable")) == \ - html.button("_disable_passive_checks", _("Disable")), + html.button("_enable_passive_checks", _("Enable.")) == \ + html.button("_disable_passive_checks", _("Disable.")), "action" : command_enable_passive, }) @@ -249,10 +249,10 @@ def command_acknowledgement(cmdtag, spec, row): multisite_commands.append({ "tables" : [ "host", "service" ], "permission" : "action.acknowledge", - "title" : _("Acknowledge"), + "title" : _("Acknowledging Problems"), "render" : lambda: \ html.button("_acknowledge", _("Acknowledge")) == \ - html.button("_remove_ack", _("Remove Acknowledge")) == \ + html.button("_remove_ack", _("Remove Acknowledgement")) == \ html.write("<hr>") == \ html.checkbox("_ack_sticky", True, label=_("sticky")) == \ html.checkbox("_ack_notify", True, label=_("send notification")) == \ diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 3acd649..2991264 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -158,7 +158,7 @@ multisite_datasources["comments"] = { } multisite_datasources["downtimes"] = { - "title" : _("Schedules Downtimes"), + "title" : _("Scheduled Downtimes"), "table" : "downtimes", "infos" : [ "downtime", "host", "service" ], "keys" : [ "downtime_id", "service_description" ], diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7822068..3b6995c 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -851,7 +851,7 @@ register_rule(group + '/' + subgroup_storage, '<tt>/var/log/apache/*.log</tt>. For files contained in a group ' 'the inventory will automatically create a group service instead ' 'of single services for each file. This rule also applies when ' - 'you use manual configured checks instead of inventorized ones.'), + 'you use manually configured checks instead of inventorized ones.'), valuespec = ListOf( Tuple( help = _("This defines one file grouping pattern"),

11 years

Check_MK Git: check_mk: check apc_symmetra_power can now be configured in WATO, check man pages

by Götz Golla

Module: check_mk Branch: master Commit: 6544d6a5f5474bbb79e48ad2c93fae87c92313c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6544d6a5f5474b… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Sep 27 22:49:34 2013 +0200 check apc_symmetra_power can now be configured in WATO, check man pages adopted for apc_symmetra_power and apc_symmetra_ext_temp --- checkman/apc_symmetra_ext_temp | 5 +++-- checkman/apc_symmetra_power | 8 +++++--- checks/apc_symmetra_ext_temp | 5 ----- checks/apc_symmetra_power | 5 +++-- checks/apc_symmetra_test | 2 +- checks/ups_test | 2 +- web/plugins/wato/check_parameters.py | 27 +++++++++++++++++++++++++++ 7 files changed, 40 insertions(+), 14 deletions(-) diff --git a/checkman/apc_symmetra_ext_temp b/checkman/apc_symmetra_ext_temp index 0303c59..35b7699 100644 --- a/checkman/apc_symmetra_ext_temp +++ b/checkman/apc_symmetra_ext_temp @@ -4,8 +4,9 @@ catalog: hw/environment license: GPL distribution: check_mk description: - This check polls the state of temperature sensors - attached to a APC Symmetra UPS. + This check polls the state of external temperature sensors + attached to a APC Symmetra UPS. The check is in the group "room_temperature" + and can this be configured in WATO with the "Room Temperature" rule. item: The index of the sensor, e.g. {"1"}. diff --git a/checkman/apc_symmetra_power b/checkman/apc_symmetra_power index 97896cc..01b04c1 100644 --- a/checkman/apc_symmetra_power +++ b/checkman/apc_symmetra_power @@ -4,11 +4,13 @@ catalog: hw/power license: GPL distribution: check_mk description: - This checks just monitors the output power (in Watt) of the + This check monitors the output power (in Watt) of the (usually three) phases of an APC Symmetra power supply. You can define warning and critical levels of power, below which - the phases must not drop. Each phase is realized as a separate - check. + the phases must not drop. + +item: + The index of the phase, e.g. {"1"}. examples: # Trigger warning/critical level if power drops below 100 or 20 Watt diff --git a/checks/apc_symmetra_ext_temp b/checks/apc_symmetra_ext_temp index bcc9a9d..a75aacb 100644 --- a/checks/apc_symmetra_ext_temp +++ b/checks/apc_symmetra_ext_temp @@ -45,11 +45,6 @@ def check_temp(item, params, info): return (0, infotxt, perfdata) return (3, "Sensor not found in SNMP data") - - - - - check_info["apc_symmetra_ext_temp"] = { 'check_function': check_temp, 'inventory_function': inventory_temp, diff --git a/checks/apc_symmetra_power b/checks/apc_symmetra_power index 60ff68f..fbe2370 100644 --- a/checks/apc_symmetra_power +++ b/checks/apc_symmetra_power @@ -38,9 +38,9 @@ def check_apc_power(item, params, info): infotext = "current power: %d W, warn/crit at and below %d/%d W" % \ (power, warn, crit) - if power != -1 and power <= crit: + if power != -1 and power < crit: return (2, infotext, perfdata) - elif power != -1 and power <= warn: + elif power != -1 and power < warn: return (1, infotext, perfdata) else: return (0, infotext, perfdata) @@ -53,6 +53,7 @@ check_info["apc_symmetra_power"] = { 'inventory_function': inventory_apc_power, 'service_description': 'Power phase %s', 'has_perfdata': True, + 'group': 'apc_power', 'snmp_info': ('.1.3.6.1.4.1.318.1.1.1.9.3.3.1', ['2.1.1', '7.1.1']), 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), } diff --git a/checks/apc_symmetra_test b/checks/apc_symmetra_test index c3e26fc..3b18dca 100644 --- a/checks/apc_symmetra_test +++ b/checks/apc_symmetra_test @@ -103,7 +103,7 @@ def inventory_apc_test(info): check_info['apc_symmetra_test'] = { "inventory_function" : inventory_apc_test, "check_function" : check_apc_test, - "service_description" : "APC Self Test", + "service_description" : "Self Test", "has_perfdata" : False, "group" : "ups_test", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), diff --git a/checks/ups_test b/checks/ups_test index e68a847..f08c89b 100644 --- a/checks/ups_test +++ b/checks/ups_test @@ -128,7 +128,7 @@ def check_ups_test(item, params, info): check_info['ups_test'] = { "inventory_function" : inventory_ups_test, "check_function" : check_ups_test, - "service_description" : "UPS Self Test", + "service_description" : "Self Test", "has_perfdata" : False, "group" : "ups_test", "snmp_info" : ( ".1.3.6.1.2.1.33.1.7", [3,5,6,4 ] ), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 20a7f35..7822068 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -729,6 +729,33 @@ register_check_parameters( ) register_check_parameters( + subgroup_environment, + "apc_power", + _("APC Power Consumption"), + Tuple( + title = _("Power Comsumption of APC Devices"), + elements = [ + Integer( + title = _("Warning below"), + unit = _("W"), + default_value = 20, + ), + Integer( + title = _("Critical below"), + unit = _("W"), + default_value = 1, + ), + ] + ), + TextAscii( + title = _("Phase"), + help = _("The identifier of the phase the power is related to."), + ), + None, + "first" +) + +register_check_parameters( subgroup_storage, "fileinfo", _("Size and age of single files"),

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits