Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64149 discussions

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fa07bf9f5d5998ab9235f03ca7b682eda88a59d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa07bf9f5d5998… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 21 15:06:42 2011 +0200 Updated bug entries --- .bugs/120 | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.bugs/120 b/.bugs/120 index 7edcfdc..3a8d54a 100644 --- a/.bugs/120 +++ b/.bugs/120 @@ -1,9 +1,14 @@ Title: bytes_readable function to format negative values Component: core +State: done +Class: nastiness +Date: 2011-02-01 13:47:06 Benefit: 7 -State: open Cost: 1 -Date: 2011-02-01 13:47:06 -Class: nastiness +Fun: 0 + +The bytes readable formating function was not able to format negative values over here. This +should really be possible. -The bytes readable formating function was not able to format negative values over here. This should really be possible. +2011-08-21 14:53:08: changed state open -> done +This is already implemented for a while.

13 years

Check_MK Git: check_mk: FIX: Multisite: avoid seven broken images in case of missing PNP graphs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4af399e381556c1927fe1b85429caa9639680000 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4af399e381556c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 21 15:07:09 2011 +0200 FIX: Multisite: avoid seven broken images in case of missing PNP graphs --- .bugs/315 | 12 +++++++++--- ChangeLog | 1 + web/htdocs/js/check_mk.js | 7 ++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.bugs/315 b/.bugs/315 index ca19841..47334c1 100644 --- a/.bugs/315 +++ b/.bugs/315 @@ -1,11 +1,17 @@ Title: embedded PNP-graphs broken if none are there Component: multisite +State: done +Class: nastiness +Date: 2011-07-22 10:56:11 Benefit: 1 -State: open Cost: 1 -Date: 2011-07-22 10:56:11 -Class: nastiness +Fun: 0 If you got to the service details of a service without performance data, then the embedded PNP-Graph area is not empty but shows seven broken images. + +2011-08-21 15:06:22: changed state open -> done +We show the fall back images only in case of a 404 respone +from the webserver (meaning that the JSON webserver is not +available). diff --git a/ChangeLog b/ChangeLog index e2685fb..cc7bdb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ Multisite: * FIX: reschedule now works for host names containing spaces * FIX: correctly sort log views in case of multi site setups + * FIX: avoid seven broken images in case of missing PNP graphs * New sorters for time and line number of logfile entries * Bookmarks snapin: save relative URLs whenever possible * Man-Pages of Check_MK checks shown in Multisite honor OMD's local hierarchy diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 26a5469..66ef51d 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -225,7 +225,12 @@ function unhover_tab(linkobject) // ---------------------------------------------------------------------------- function pnp_error_response_handler(data, statusCode) { - fallback_graphs(data); + // PNP versions that do not have the JSON webservice respond with + // 404. Current version with the webservice answer 500 if the service + // in question does not have any PNP graphs. So we paint the fallback + // graphs only if the respone code is 404 (not found). + if (parseInt(statusCode) == 404) + fallback_graphs(data); } function pnp_response_handler(data, code) {

13 years

Check_MK Git: check_mk: Multisite: new command for clearing modified attributes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: abe0b803fa2b3548dae75a36d32b1d5c09355ba9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abe0b803fa2b35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 21 15:24:17 2011 +0200 Multisite: new command for clearing modified attributes --- .bugs/32 | 10 +++++++--- ChangeLog | 1 + web/htdocs/views.py | 44 +++++++++++++++++++++++++++++--------------- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/.bugs/32 b/.bugs/32 index 1507919..33b1c32 100644 --- a/.bugs/32 +++ b/.bugs/32 @@ -1,13 +1,17 @@ Title: modified_attributes bei Bedarf zurücksetzen Component: multisite +State: done +Class: nastiness +Date: 2010-12-21 20:48:09 Benefit: 1 -State: open Cost: 3 -Date: 2010-12-21 20:48:09 -Class: nastiness +Fun: 0 Wenn man z.B. die active checks aus und wieder eingeschaltet hat, dann erscheint der grüne Haken. Irgendwie müsste man die modified Attributes zurücksetzen können. Evtl. hilft auch die Doku, dass man das über die state retention konfiguriert. Das Kommando zum Zurücksetzen heisst CHANGE_SVC_MODATTR;<host_name>;<service_description>;<value> + +2011-08-21 15:23:59: changed state open -> done +Umgesetzt. Es gibt jetzt ein eigenes Kommando dafür. diff --git a/ChangeLog b/ChangeLog index cc7bdb0..5f1aecd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * Bookmarks snapin: save relative URLs whenever possible * Man-Pages of Check_MK checks shown in Multisite honor OMD's local hierarchy * nicer output of substates, translate (!) and (!!) into HTML code + * new command for clearing modified attributes (red cross, green checkmark) WATO: * Show error message in case of empty inventory due to agent error diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 164e657..4f11b50 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -57,34 +57,38 @@ def load_plugins(): return loaded_with_language = current_language - config.declare_permission_section("action", "Commands on Objects") + config.declare_permission_section("action", _("Commands on Objects")) config.declare_permission("action.notifications", - "Enable/disable notifications", - "Enable and disable notifications on hosts and services", + _("Enable/disable notifications"), + _("Enable and disable notifications on hosts and services"), [ "admin" ]) config.declare_permission("action.enablechecks", - "Enable/disable checks", - "Enable and disable active or passive checks on hosts and services", + _("Enable/disable checks"), + _("Enable and disable active or passive checks on hosts and services"), + [ "admin" ]) + config.declare_permission("action.clearmodattr", + _("Clear modified attributes"), + _("Remove the information that an attribute (like check enabling) has been changed"), [ "admin" ]) config.declare_permission("action.reschedule", - "Reschedule checks", - "Reschedule host and service checks", + _("Reschedule checks"), + _("Reschedule host and service checks"), [ "user", "admin" ]) config.declare_permission("action.fakechecks", - "Fake check results", - "Manually submit check results for host and service checks", + _("Fake check results"), + _("Manually submit check results for host and service checks"), [ "admin" ]) config.declare_permission("action.acknowledge", - "Acknowledge", - "Acknowledge host and service problems and remove acknowledgements", + _("Acknowledge"), + _("Acknowledge host and service problems and remove acknowledgements"), [ "user", "admin" ]) config.declare_permission("action.addcomment", - "Add comments", - "Add comments to hosts or services, and remove comments", + _("Add comments"), + _("Add comments to hosts or services, and remove comments"), [ "user", "admin" ]) config.declare_permission("action.downtimes", - "Set/Remove Downtimes", - "Schedule and remove downtimes on hosts and services", + _("Set/Remove Downtimes"), + _("Schedule and remove downtimes on hosts and services"), [ "user", "admin" ]) load_web_plugins("views", globals()) @@ -1781,6 +1785,12 @@ def show_host_service_actions(what): "<input type=submit name=_disable_passive_checks value=\"Disable\">   " "</td></tr>\n") + if config.may("action.clearmodattr"): + html.write("<tr><td class=legend>Modified attributes</td>\n" + "<td class=content>\n" + "<input type=submit name=_clear_modattr value=\"Clear information about modified attributes\">" + "</td></tr>\n") + if config.may("action.fakechecks"): if what == "service": states = ["Ok", "Warning", "Critical", "Unknown"] @@ -1911,6 +1921,10 @@ def nagios_host_service_action_command(what, dataset): command = "DISABLE_PASSIVE_" + cmdtag + "_CHECKS;%s" % spec title = "<b>disable passive checks</b> of" + elif html.var("_clear_modattr") and config.may("action.clearmodattr"): + command = "CHANGE_" + cmdtag + "_MODATTR;%s;0" % spec + title = "<b>clear the information about modified attributes</b> of" + elif html.var("_resched_checks") and config.may("action.reschedule"): command = "SCHEDULE_FORCED_" + cmdtag + "_CHECK;%s;%d" % (spec, int(time.time())) title = "<b>reschedule an immediate check</b> of"

13 years

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: bb0068bd5f8f3554025da93bff5bff84fee87340 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb0068bd5f8f35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 21 21:44:20 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Removed many trailing spaces from checks

by git＠mathias-kettner.de

13 years

Check_MK Git: check_mk: HTML representation of (!) and (!!)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: faed97f30dd7eaabdef8f4884281bbab7f3d518b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faed97f30dd7ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 21:21:25 2011 +0200 HTML representation of (!) and (!!) Also fix some checks that did not use these markers. Also fixed many WARNING -> WARN und CRITICAL -> CRITs --- ChangeLog | 1 + checks/3ware_disks | 2 +- checks/3ware_units | 4 ++-- checks/akcp_sensor_humidity | 6 +++--- checks/akcp_sensor_temp | 4 ++-- checks/blade_bays | 4 ++-- checks/blade_powerfan | 2 +- checks/cisco_qos | 4 ++-- checks/drbd | 8 ++++---- checks/f5_bigip_cluster | 2 +- checks/fsc_subsystems | 2 +- checks/fsc_temp | 2 +- checks/heartbeat_crm | 2 +- checks/heartbeat_rscstatus | 2 +- checks/hp_blade_blades | 2 +- checks/hp_blade_fan | 2 +- checks/hp_blade_manager | 2 +- checks/hp_blade_psu | 2 +- checks/if.include | 12 ++++++------ checks/j4p_performance | 2 +- checks/netapp_volumes | 6 +++--- checks/nfsmounts | 4 ++-- checks/oracle_asm_dg | 2 +- checks/postfix_mailq | 4 ++-- checks/printer_supply | 2 +- checks/services | 2 +- checks/smart | 8 ++++---- checks/strem1_sensors | 4 ++-- checks/tcp_conn_stats | 4 ++-- checks/tsm_stgpool | 2 +- checks/ucd_cpu_util | 4 ++-- web/htdocs/check_mk.css | 9 +++++++++ web/plugins/views/painters.py | 11 ++++++++++- 33 files changed, 74 insertions(+), 55 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=faed97f30d…

13 years

Check_MK Git: check_mk: Fix layout bugs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4d3febcbc341d31d75ed65742668380f7e7817a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d3febcbc341d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 21:33:03 2011 +0200 Fix layout bugs --- checks/tcp_conn_stats | 4 ++-- web/plugins/views/painters.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index b14000d..21de0ce 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -63,10 +63,10 @@ def check_tcp_conn_stats(item, params, info): perf.append(crit) if num >= crit: worst_state = 2 - infotext += "(critical at %d)(!!)" % crit + infotext += "(!!) (critical at %d)" % crit elif num >= warn: worst_state = max(1, worst_state) - infotext += "(warning at %d)(!)" % warn + infotext += "(!) (warning at %d)" % warn perfdata.append(perf) if infotext: info.append(infotext) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index c3abf0d..c556be6 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1594,7 +1594,7 @@ multisite_painters["log_plugin_output"] = { "title" : _("Log: output of check plugin"), "short" : _("Check output"), "columns" : ["log_plugin_output"], - "paint" : lambda row: ("", row["log_plugin_output"]) + "paint" : lambda row: ("", format_plugin_output(row["log_plugin_output"])) } multisite_painters["log_attempt"] = { "title" : _("Log: number of check attempt"),

13 years

Check_MK Git: check_mk: FIX: correctly sort log views in case of multi site setups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c628721bc1c00e6bcf78d3fa500b5270918ae020 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c628721bc1c00e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 21:45:09 2011 +0200 FIX: correctly sort log views in case of multi site setups --- ChangeLog | 2 ++ web/plugins/views/builtin.py | 20 ++++++++++---------- web/plugins/views/datasources.py | 3 +-- web/plugins/views/painters.py | 6 ++++++ web/plugins/views/sorters.py | 4 ++++ 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index feae8e4..ab0b783 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,8 @@ Multisite: * FIX: reschedule now works for host names containing spaces + * FIX: correctly sort log views in case of multi site setups + * New sorters for time and line number of logfile entries * Bookmarks snapin: save relative URLs whenever possible * Man-Pages of Check_MK checks shown in Multisite honor OMD's local hierarchy * nicer output of substates, translate (!) and (!!) into HTML code diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 65a17f5..fe8981d 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1579,7 +1579,7 @@ multisite_builtin_views.update({ 'serviceregex', 'logtime', 'log_plugin_output'], - 'sorters': [], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Host- and Service events'), 'topic': _('Other')}, @@ -1614,7 +1614,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['logtime'], - 'sorters': [], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Events of host')}, 'svcevents': {'browser_reload': 0, 'column_headers': 'pergroup', @@ -1645,7 +1645,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['logtime'], - 'sorters': [], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Events of service')}, 'hostsvcevents': {'browser_reload': 0, 'column_headers': 'pergroup', @@ -1678,7 +1678,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['logtime'], - 'sorters': [], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Events of host & services')}, 'logfile': {'browser_reload': 0, 'column_headers': 'off', @@ -1730,7 +1730,7 @@ multisite_builtin_views.update({ 'serviceregex', 'opthostgroup', 'logtime'], - 'sorters': [], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Search Global Logfile'), 'topic': _('Other')}, @@ -2443,7 +2443,7 @@ multisite_builtin_views.update({ 'show_filters': ['serviceregex', 'log_plugin_output', 'logtime'], - 'sorters': [], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Notifications of host'), 'topic': _('Other')}, 'hostsvcnotifications': {'browser_reload': 0, @@ -2490,7 +2490,7 @@ multisite_builtin_views.update({ 'show_filters': ['serviceregex', 'log_plugin_output', 'logtime'], - 'sorters': [], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Notifications of host & services'), 'topic': _('Other')}, 'notifications': {'browser_reload': 0, @@ -2539,7 +2539,7 @@ multisite_builtin_views.update({ 'serviceregex', 'log_plugin_output', 'logtime'], - 'sorters': [], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Host- and Service notifications'), 'topic': _('Other')}, 'svcnotifications': {'browser_reload': 0, @@ -2579,7 +2579,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['log_plugin_output', 'logtime'], - 'sorters': [], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Service Notifications'), 'topic': _('Other')}, 'contactnotifications': {'browser_reload': 0, @@ -2627,7 +2627,7 @@ multisite_builtin_views.update({ 'serviceregex', 'log_plugin_output', 'logtime'], - 'sorters': [], + 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Notifications of contact'), 'topic': _('Other')}, }) diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 2e9b360..313f7b6 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -20,8 +20,7 @@ # out even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. See the GNU General Public License for more de- # ails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# License along with GNU Make; see the file COPYING. If not, write # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index c556be6..26cbe6b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1668,6 +1668,12 @@ multisite_painters["log_time"] = { "options" : [ "ts_format", "ts_date" ], "paint" : lambda row: paint_age(row["log_time"], True, 3600 * 24) } +multisite_painters["log_lineno"] = { + "title" : _("Log: line number in log file"), + "short" : _("Line"), + "columns" : ["log_lineno"], + "paint" : lambda row: ("number", str(row["log_lineno"])) +} multisite_painters["log_date"] = { "title" : _("Log: day of entry"), diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 1edffd6..ed2fc0e 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -117,6 +117,10 @@ declare_simple_sorter("stateage", _("Service state age"), "service_last_ declare_simple_sorter("servicegroup", _("Servicegroup"), "servicegroup_alias", cmp_simple_string) declare_simple_sorter("hostgroup", _("Hostgroup"), "hostgroup_alias", cmp_simple_string) +# Log +declare_simple_sorter("log_time", _("Time of log entry"), "log_time", cmp_simple_number) +declare_simple_sorter("log_lineno", _("Number of line in logfile"), "log_lineno", cmp_simple_number) + # Comments declare_simple_sorter("comment_author", _("Comment author"), "comment_author", cmp_simple_string) declare_simple_sorter("comment_type", _("Comment type"), "comment_type", cmp_simple_number)

13 years

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 78c47d6b5ca34d15369d0f9d3834f3a6b57ce6d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78c47d6b5ca34d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 22:03:08 2011 +0200 Updated bug entries --- .bugs/17 | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.bugs/17 b/.bugs/17 index 6be03cb..24f3ba5 100644 --- a/.bugs/17 +++ b/.bugs/17 @@ -1,10 +1,11 @@ Title: Tabelle log bei multisite setup: Chronologie ist falsch Component: multisite +State: done +Class: bug +Date: 2010-12-21 12:17:45 Benefit: 2 -State: open Cost: 3 -Date: 2010-12-21 12:17:45 -Class: bug +Fun: 0 Die Logereignisse von den verschiedenen Sites werden nicht korrekt zusammengemischt. Auch das mit dem Limit wird dann @@ -13,3 +14,12 @@ Limit, dass Multisite selbst anwendet (auch für die Alert statistics). Es muss so laufen: Bei einem Limit von 100 bekommt jede Site einzeln das Limit von 100. Dann sortiert man. Und dann wendet man nochmal das Limit von 100 an. + +Andererseits ist das mit dem Limit ja in allen Views so. Wenn +man ein Limit anwendet, bekommt man unvollständige Daten und +man muss die Query eigentlich nochmal aufrufen mit einem besseren +Filter. + + +2011-08-20 21:47:02: changed state open -> done +Die Views sind jetzt repariert. Es wird nachträglich sortiert.

13 years

Check_MK Git: check_mk: Livestatus: Better error messages in case of unimplemented operators

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 62ba2afcc4c782a50ce0590f6abbc5496356ee54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62ba2afcc4c782… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 22:04:16 2011 +0200 Livestatus: Better error messages in case of unimplemented operators --- .bugs/12 | 10 ++++++-- ChangeLog | 1 + livestatus/src/AttributelistFilter.cc | 2 +- livestatus/src/CustomVarsFilter.cc | 2 +- livestatus/src/DoubleColumnFilter.cc | 6 ++-- livestatus/src/HostlistColumnFilter.cc | 2 +- livestatus/src/IntColumnFilter.cc | 2 +- livestatus/src/ListColumnFilter.cc | 8 +++--- livestatus/src/Makefile.am | 2 +- livestatus/src/ServicelistColumnFilter.cc | 2 +- livestatus/src/StringColumnFilter.cc | 2 +- livestatus/src/opids.cc | 31 +++++++++++++++++++++++++++++ livestatus/src/opids.h | 2 + 13 files changed, 55 insertions(+), 17 deletions(-) diff --git a/.bugs/12 b/.bugs/12 index 160ac9f..d137b1c 100644 --- a/.bugs/12 +++ b/.bugs/12 @@ -1,10 +1,11 @@ Title: Sorry, Operator 4 for lists not implemented. Component: livestatus +State: done +Class: nastiness +Date: 2010-12-21 12:11:12 Benefit: 1 -State: open Cost: 3 -Date: 2010-12-21 12:11:12 -Class: nastiness +Fun: 0 Wenn ich im Thruk im Suchfenster einfach Enter drücke, kommt folgende Query bei raus: GET services @@ -22,3 +23,6 @@ Or: 2 Or: 8 livestatus: Sorry, Operator 4 for lists not implemented. Was ist eigentlich Operator 4? + +2011-08-20 22:04:00: changed state open -> done +Operator wird jetzt ausgegeben. diff --git a/ChangeLog b/ChangeLog index ab0b783..77d883e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ MK Livestatus: * WaitObject: allow to separate host name and service with a semicolon. That makes host names containing spaces possible. + * Better error messages in case of unimplemented operators Multisite: * FIX: reschedule now works for host names containing spaces diff --git a/livestatus/src/AttributelistFilter.cc b/livestatus/src/AttributelistFilter.cc index 0aebd96..196e68d 100644 --- a/livestatus/src/AttributelistFilter.cc +++ b/livestatus/src/AttributelistFilter.cc @@ -65,7 +65,7 @@ bool AttributelistFilter::accepts(void *data) case OP_REGEX_ICASE: pass = (act_value & _ref) != 0; break; default: - logger(LG_INFO, "Sorry. Operator %d not implemented for attribute lists", _opid); + logger(LG_INFO, "Sorry. Operator %s not implemented for attribute lists", op_names_plus_8[_opid]); } return pass != _negate; } diff --git a/livestatus/src/CustomVarsFilter.cc b/livestatus/src/CustomVarsFilter.cc index 9a140ab..4c64869 100644 --- a/livestatus/src/CustomVarsFilter.cc +++ b/livestatus/src/CustomVarsFilter.cc @@ -115,7 +115,7 @@ bool CustomVarsFilter::accepts(void *data) case OP_LESS: return (!is_member) == (!_negate); default: - logger(LG_INFO, "Sorry, Operator %d for custom variable lists not implemented.", _opid); + logger(LG_INFO, "Sorry, Operator %s for custom variable lists not implemented.", op_names_plus_8[_opid]); return true; } } diff --git a/livestatus/src/DoubleColumnFilter.cc b/livestatus/src/DoubleColumnFilter.cc index d13c689..2cb6ec7 100644 --- a/livestatus/src/DoubleColumnFilter.cc +++ b/livestatus/src/DoubleColumnFilter.cc @@ -28,11 +28,11 @@ #include "logger.h" #include "opids.h" - DoubleColumnFilter::DoubleColumnFilter(DoubleColumn *column, int opid, char *value) +DoubleColumnFilter::DoubleColumnFilter(DoubleColumn *column, int opid, char *value) : _column(column) , _ref_value(atof(value)) , _opid(abs(opid)) - , _negate(opid < 0) + , _negate(opid < 0) { } @@ -48,7 +48,7 @@ bool DoubleColumnFilter::accepts(void *data) case OP_LESS: pass = act_value < _ref_value; break; default: - logger(LG_INFO, "Sorry. Operator %d for float columns not implemented.", _opid); + logger(LG_INFO, "Sorry. Operator %s for float columns not implemented.", op_names_plus_8[_opid]); break; } return pass != _negate; diff --git a/livestatus/src/HostlistColumnFilter.cc b/livestatus/src/HostlistColumnFilter.cc index 080124d..5ee2102 100644 --- a/livestatus/src/HostlistColumnFilter.cc +++ b/livestatus/src/HostlistColumnFilter.cc @@ -56,7 +56,7 @@ bool HostlistColumnFilter::accepts(void *data) case OP_LESS: return !is_member; default: - logger(LG_INFO, "Sorry, Operator %d for host lists lists not implemented.", _opid); + logger(LG_INFO, "Sorry, Operator %s for host lists lists not implemented.", op_names_plus_8[_opid]); return true; } } diff --git a/livestatus/src/IntColumnFilter.cc b/livestatus/src/IntColumnFilter.cc index 2bf66cd..605814d 100644 --- a/livestatus/src/IntColumnFilter.cc +++ b/livestatus/src/IntColumnFilter.cc @@ -57,7 +57,7 @@ bool IntColumnFilter::accepts(void *data) case OP_LESS: pass = act_value < ref_value; break; default: - logger(LG_INFO, "Sorry. Operator %d for integers not implemented.", _opid); + logger(LG_INFO, "Sorry. Operator %s for integers not implemented.", op_names_plus_8[_opid]); break; } return pass != _negate; diff --git a/livestatus/src/ListColumnFilter.cc b/livestatus/src/ListColumnFilter.cc index 2bcb828..eebd4dc 100644 --- a/livestatus/src/ListColumnFilter.cc +++ b/livestatus/src/ListColumnFilter.cc @@ -29,10 +29,10 @@ #include "ListColumnFilter.h" #include "ListColumn.h" - ListColumnFilter::ListColumnFilter(ListColumn *column, int opid, char *value) +ListColumnFilter::ListColumnFilter(ListColumn *column, int opid, char *value) : _column(column) , _opid(opid) - , _empty_ref(!value[0]) + , _empty_ref(!value[0]) { _ref_member = _column->getNagiosObject(value); } @@ -52,11 +52,11 @@ bool ListColumnFilter::accepts(void *data) case -OP_EQUAL: if (_empty_ref) return _column->isEmpty(data) == (_opid == OP_EQUAL); - logger(LG_INFO, "Sorry, Equality for lists implemented only for emptyness"); + logger(LG_INFO, "Sorry, equality for lists implemented only for emptyness"); return false; default: - logger(LG_INFO, "Sorry, Operator %d for lists not implemented.", _opid); + logger(LG_INFO, "Sorry, Operator %s for lists not implemented.", op_names_plus_8[_opid]); return true; } } diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index c0117dc..054027d 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -47,7 +47,7 @@ livestatus_so_SOURCES = \ OffsetStringHostMacroColumn.cc StatsColumn.cc IntAggregator.cc CountAggregator.cc \ DoubleAggregator.cc AttributelistColumn.cc AttributelistFilter.cc \ global_counters.c module.c logger.c waittriggers.c TimeperiodsCache.cc pnp4nagios.cc \ - ContactgroupsColumn.cc + ContactgroupsColumn.cc opids.cc livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC livestatus_so_CFLAGS = $(livestatus_so_CXXFLAGS) diff --git a/livestatus/src/ServicelistColumnFilter.cc b/livestatus/src/ServicelistColumnFilter.cc index 06ad6a8..2fb2d1a 100644 --- a/livestatus/src/ServicelistColumnFilter.cc +++ b/livestatus/src/ServicelistColumnFilter.cc @@ -75,7 +75,7 @@ bool ServicelistColumnFilter::accepts(void *data) case OP_LESS: return !is_member; default: - logger(LG_INFO, "Sorry, Operator %d for service lists lists not implemented.", _opid); + logger(LG_INFO, "Sorry, Operator %s for service lists lists not implemented.", op_names_plus_8[_opid]); return true; } } diff --git a/livestatus/src/StringColumnFilter.cc b/livestatus/src/StringColumnFilter.cc index 613333d..031bfba 100644 --- a/livestatus/src/StringColumnFilter.cc +++ b/livestatus/src/StringColumnFilter.cc @@ -83,7 +83,7 @@ bool StringColumnFilter::accepts(void *data) pass = 0 < strcmp(_ref_string.c_str(), act_string); break; default: // this should never be reached, all operators are handled - logger(LG_INFO, "Sorry. Operator %d for strings not implemented.", _opid); + logger(LG_INFO, "Sorry. Operator %s for strings not implemented.", op_names_plus_8[_opid]); break; } return pass != _negate; diff --git a/livestatus/src/opids.cc b/livestatus/src/opids.cc new file mode 100644 index 0000000..50e6b39 --- /dev/null +++ b/livestatus/src/opids.cc @@ -0,0 +1,31 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// ails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +#include "opids.h" + +const char *op_names_plus_8[] { + "", "", ">=", "<=", "!~~", "!=~", "!~", "!=", + "(invalid)", "=", "~", "=~", "~~", ">", "<" +}; + diff --git a/livestatus/src/opids.h b/livestatus/src/opids.h index c5260e4..34ef770 100644 --- a/livestatus/src/opids.h +++ b/livestatus/src/opids.h @@ -35,6 +35,8 @@ #define OP_GREATER 5 // > #define OP_LESS 6 // < +extern const char *op_names_plus_8[]; + // Note: The operators !=, <= and >= are parsed into ! =, ! > and ! <. // The negation is represented by negating the value of the operator. // Example >= is represented as -6 (- OP_LESS)

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits