Checkmk git commits September 2011

checkmk-commits@lists.checkmk.com

3 participants
125 discussions

Check_MK Git: check_mk: FIX: nfsmounts handles zero-sized volumes correctly

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1dc2ab087ac19d206f1d8856f19c733e9784969d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dc2ab087ac19d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 10:11:06 2011 +0200 FIX: nfsmounts handles zero-sized volumes correctly --- ChangeLog | 1 + checks/nfsmounts | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9743b49..6a981d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * Added 4 new checks dell_powerconnect_* by Chris Bowlby * ipmi_sensors: correctly handle further positive status texts (thanks to Sebastian Talmon) + * FIX: nfsmounts handles zero-sized volumes correctly Multisite: * FIX: WATO filtered status GUIs did not update the title after changing diff --git a/checks/nfsmounts b/checks/nfsmounts index faddfa3..89dcc25 100644 --- a/checks/nfsmounts +++ b/checks/nfsmounts @@ -42,6 +42,9 @@ def check_nfsmounts(item, params, info): if line[1] == 'ok': gb = 1024 * 1024 * 1024.0 size_gb = (size_blocks * blocksize) / gb + if size_gb == 0: + return (0, "OK - server is responding") + free_gb = (free_blocks * blocksize) / gb used_gb = size_gb - free_gb used_perc = 100.0 * used_gb / size_gb

13 years

Check_MK Git: check_mk: FIX: fix Stats: sum/min/max/ avg for columns of type time

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4ab1cc4e8101ad1da74f6b831b09f662d0293957 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ab1cc4e8101ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 09:45:55 2011 +0200 FIX: fix Stats: sum/min/max/avg for columns of type time --- ChangeLog | 1 + livestatus/src/Query.cc | 2 +- livestatus/src/StatsColumn.cc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3e813c..9743b49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * FIX: tables comments and downtimes now honor AuthUser * Table log honors AuthUser for entries that belong to hosts (not for external commands, though. Sorry...) + * FIX: fix Stats: sum/min/max/avg for columns of type time 1.1.11i3: Core, Setup, etc.: diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 2519340..d1142d0 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -379,7 +379,7 @@ void Query::parseStatsLine(char *line) operation = STATS_OP_STD; char *column_name; - if (operation == STATS_OP_COUNT) + if (operation == STATS_OP_COUNT) column_name = col_or_op; else { // aggregation operator is followed by column name diff --git a/livestatus/src/StatsColumn.cc b/livestatus/src/StatsColumn.cc index c010577..bda53c4 100644 --- a/livestatus/src/StatsColumn.cc +++ b/livestatus/src/StatsColumn.cc @@ -42,7 +42,7 @@ Aggregator *StatsColumn::createAggregator() { if (_operation == STATS_OP_COUNT) return new CountAggregator(_filter); - else if (_column->type() == COLTYPE_INT) + else if (_column->type() == COLTYPE_INT || _column->type() == COLTYPE_TIME) return new IntAggregator((IntColumn *)_column, _operation); else if (_column->type() == COLTYPE_DOUBLE) return new DoubleAggregator((DoubleColumn *)_column, _operation);

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: 4aea56aa65b0108d0f8e4a55d71b79a8500c67da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4aea56aa65b010… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 09:32:18 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Livestatus: downtimes/comment/ logs now honor AuthUser:

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f1c7ee228270b083e81dbdf7b13108686caf9024 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1c7ee228270b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 09:16:51 2011 +0200 Livestatus: downtimes/comment/logs now honor AuthUser: Table log does honor AuthUser only for entries of type notification, alert, passive check or state. Entries for deleted hosts are hidden if AuthUser is used. --- .bugs/366 | 11 +++++++++++ ChangeLog | 3 +++ livestatus/src/Makefile.am | 2 +- livestatus/src/Query.cc | 1 + livestatus/src/Query.h | 1 - livestatus/src/TableDownComm.cc | 7 +++++++ livestatus/src/TableDownComm.h | 1 + livestatus/src/TableHosts.cc | 7 ++----- livestatus/src/TableLog.cc | 14 ++++++++++---- livestatus/src/TableServices.cc | 15 +-------------- livestatus/src/auth.cc | 25 +++++++++++++++++++++++++ livestatus/src/auth.h | 14 ++++++++++++++ 12 files changed, 76 insertions(+), 25 deletions(-) diff --git a/.bugs/366 b/.bugs/366 new file mode 100644 index 0000000..62167c8 --- /dev/null +++ b/.bugs/366 @@ -0,0 +1,11 @@ +Title: Livestatus: table log: EXTERNAL_COMMAND should get host info +Component: livestatus +Benefit: 1 +State: open +Cost: 5 +Date: 2011-09-08 09:29:57 +Class: feature + +The table log could parse the external command entries and assign +them to the correct host and service. This needs a complete list +of all known external commands :-(. diff --git a/ChangeLog b/ChangeLog index 2ea7ba4..a3e813c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,9 @@ Livestatus: * FIX: fix compile error in TableLog.cc by including stddef.h + * FIX: tables comments and downtimes now honor AuthUser + * Table log honors AuthUser for entries that belong to hosts + (not for external commands, though. Sorry...) 1.1.11i3: Core, Setup, etc.: diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 054027d..7a7f6c2 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 opids.cc + ContactgroupsColumn.cc opids.cc auth.cc livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC livestatus_so_CFLAGS = $(livestatus_so_CXXFLAGS) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index d429440..2519340 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -44,6 +44,7 @@ #include "NegatingFilter.h" #include "waittriggers.h" #include "data_encoding.h" +#include "auth.h" extern int g_debug_level; extern unsigned long g_max_response_size; diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 187d267..b7df988 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -55,7 +55,6 @@ class Aggregator; #define ANDOR_AND 1 #define ANDOR_NEGATE 2 -#define UNKNOWN_AUTH_USER ((contact *)0xdeadbeaf) class Query { diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index c16dc93..4b6d529 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -31,6 +31,7 @@ #include "OffsetStringColumn.h" #include "OffsetIntColumn.h" #include "OffsetTimeColumn.h" +#include "auth.h" #include "tables.h" // Todo: the dynamic data in this table must be @@ -158,6 +159,12 @@ void TableDownComm::answerQuery(Query *query) } } +bool TableDownComm::isAuthorized(contact *ctc, void *data) +{ + DowntimeOrComment *dtc = (DowntimeOrComment *)data; + return is_authorized_for(ctc, dtc->_host, dtc->_service); +} + DowntimeOrComment *TableDownComm::findEntry(unsigned long id) { _entries_t::iterator it = _entries.find(id); diff --git a/livestatus/src/TableDownComm.h b/livestatus/src/TableDownComm.h index 652bb35..d12cf5e 100644 --- a/livestatus/src/TableDownComm.h +++ b/livestatus/src/TableDownComm.h @@ -54,6 +54,7 @@ public: void add(DowntimeOrComment *data); void remove(unsigned id); void answerQuery(Query *); + bool isAuthorized(contact *ctc, void *data); _entries_t::iterator entriesIteratorBegin() { return _entries.begin(); } _entries_t::iterator entriesIteratorEnd() { return _entries.end(); } }; diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index a3d03eb..a629c77 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -45,6 +45,7 @@ #include "ContactgroupsColumn.h" #include "HostSpecialIntColumn.h" #include "tables.h" +#include "auth.h" extern host *host_list; extern hostgroup *hostgroup_list; @@ -57,12 +58,8 @@ struct hostbygroup { bool TableHosts::isAuthorized(contact *ctc, void *data) { - if (ctc == UNKNOWN_AUTH_USER) - return false; - host *hst = (host *)data; - return is_contact_for_host(hst, ctc) - || is_escalated_contact_for_host(hst, ctc); + return is_authorized_for(ctc, hst, 0); } diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 912c2a9..5d3031a 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -42,6 +42,7 @@ #include "TableHosts.h" #include "TableCommands.h" #include "TableContacts.h" +#include "auth.h" #define CHECK_MEM_CYCLE 1000 /* Check memory every N'th new message */ @@ -399,10 +400,15 @@ bool TableLog::isAuthorized(contact *ctc, void *data) service *svc = entry->_service; host *hst = entry->_host; - if (svc) - return g_table_services->isAuthorized(ctc, svc); - else if (hst) - return g_table_hosts->isAuthorized(ctc, hst); + if (hst || svc) + return is_authorized_for(ctc, hst, svc); + // suppress entries for messages that belong to + // hosts that do not exist anymore. + else if (entry->_logclass == LOGCLASS_ALERT + || entry->_logclass == LOGCLASS_NOTIFICATION + || entry->_logclass == LOGCLASS_PASSIVECHECK + || entry->_logclass == LOGCLASS_STATE) + return false; else return true; } diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index f53e7b3..c381211 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -160,21 +160,8 @@ void TableServices::answerQuery(Query *query) bool TableServices::isAuthorized(contact *ctc, void *data) { - if (ctc == UNKNOWN_AUTH_USER) - return false; - service *svc = (service *)data; - if (g_service_authorization == AUTH_STRICT) { - return is_contact_for_service(svc, ctc); - is_escalated_contact_for_service(svc, ctc); - } - else { // AUTH_LOOSE - host *hst = svc->host_ptr; - return is_contact_for_host(hst, ctc) - || is_escalated_contact_for_host(hst, ctc) - || is_contact_for_service(svc, ctc) - || is_escalated_contact_for_service(svc, ctc); - } + return is_authorized_for(ctc, svc->host_ptr, svc); } TableServices::TableServices(bool by_group, bool by_hostgroup) diff --git a/livestatus/src/auth.cc b/livestatus/src/auth.cc new file mode 100644 index 0000000..d63f01f --- /dev/null +++ b/livestatus/src/auth.cc @@ -0,0 +1,25 @@ +#include "auth.h" + +int is_authorized_for(contact *ctc, host *hst, service *svc) { + if (ctc == UNKNOWN_AUTH_USER) + return false; + + if (svc) { + if (g_service_authorization == AUTH_STRICT) { + return is_contact_for_service(svc, ctc) + || is_escalated_contact_for_service(svc, ctc); + } + else { // AUTH_LOOSE + return is_contact_for_host(hst, ctc) + || is_escalated_contact_for_host(hst, ctc) + || is_contact_for_service(svc, ctc) + || is_escalated_contact_for_service(svc, ctc); + } + } + // Entries for hosts + else { + return is_contact_for_host(hst, ctc) + || is_escalated_contact_for_host(hst, ctc); + } +} + diff --git a/livestatus/src/auth.h b/livestatus/src/auth.h index 754558b..0fceb3c 100644 --- a/livestatus/src/auth.h +++ b/livestatus/src/auth.h @@ -25,11 +25,25 @@ #ifndef auth_h #define auth_h +#include "nagios.h" + #define AUTH_LOOSE 0 #define AUTH_STRICT 1 +// Dummy pointer for unknown user (not no user) +#define UNKNOWN_AUTH_USER ((contact *)0xdeadbeaf) + + extern int g_service_authorization; extern int g_group_authorization; +#ifdef __cplusplus +extern "C" { +#endif + int is_authorized_for(contact *ctc, host *host, service *svc); +#ifdef __cplusplus +} +#endif + #endif // auth_h

13 years

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0100cb570c6bcd36bef6663a527b95737c68c9be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0100cb570c6bcd… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Sep 7 19:11:18 2011 +0200 Add new bug entry --- .bugs/317 | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/.bugs/317 b/.bugs/317 new file mode 100644 index 0000000..8c179d2 --- /dev/null +++ b/.bugs/317 @@ -0,0 +1,14 @@ +Title: md raid check reports wrong number of disks +Component: checks +Benefit: 2 +State: open +Cost: 2 +Date: 2011-09-07 19:09:23 +Class: bug + +the infotext seems to mix up numbers +this is from a 4-disk raid10 with one "missing" member +CRIT - disk state is [4/3] [UUU_] (expected 3 disks to be up) +... there was 2 or 3 disks during inventory actually, since i created it with +"sda missing sdb missing". but the message sounds like the numbers are just +twisted

13 years

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bdf7415b8f9851ab74debfc3170031de18daec06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdf7415b8f9851… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 17:42:24 2011 +0200 Updated bug entries --- .bugs/365 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/365 b/.bugs/365 new file mode 100644 index 0000000..fbf7f04 --- /dev/null +++ b/.bugs/365 @@ -0,0 +1,10 @@ +Title: Windows agent: make sections disableable by config +Component: checks +Benefit: 1 +State: open +Cost: 1 +Date: 2011-09-07 17:35:51 +Class: feature + +It would be nice if the configuration of the windows agent would allow +to disable certain sections, e.g. logwatch.

13 years

Check_MK Git: check_mk: scan-parents: tag found parents with ping

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d132299be100d879a21e2807bd7a1106a4f95ecd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d132299be100d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 17:43:34 2011 +0200 scan-parents: tag found parents with ping --- ChangeLog | 2 ++ modules/check_mk.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3ef015..2ea7ba4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Core, Setup, etc.: * FIX: use hostgroups instead of host_groups in Nagios configuration. This fixes a problem with Shinken + * --scan-parents: detected parent hosts are now tagged with 'ping', so + that no agent will be contacted on those hosts Checks & Agents: * Added 4 new checks dell_powerconnect_* by Chris Bowlby diff --git a/modules/check_mk.py b/modules/check_mk.py index 899458c..d69efe2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3624,7 +3624,7 @@ def do_scan_parents(hosts): gateway = "gw-%s" % (gateway_ip.replace(".", "-")) if gateway not in gateway_hosts: gateway_hosts.add(gateway) - parent_hosts.append("%s|parent" % gateway) + parent_hosts.append("%s|parent|ping" % gateway) parent_ips[gateway] = gateway_ip parent_rules.append( (monitoring_host, [gateway]) ) # make Nagios a parent of gw parent_rules.append( (gateway, [host]) )

13 years

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f49ea7a0cc57cae547b54113532b4b874dab5952 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f49ea7a0cc57ca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 17:14:19 2011 +0200 Updated bug entries --- .bugs/363 | 9 +++++++++ .bugs/364 | 11 +++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/.bugs/363 b/.bugs/363 new file mode 100644 index 0000000..505def1 --- /dev/null +++ b/.bugs/363 @@ -0,0 +1,9 @@ +Title: NagStaMon: Dokumentation how to setup +Component: doku +Benefit: 1 +State: open +Cost: 2 +Date: 2011-09-07 17:04:21 +Class: todo + +Document how to configure NagStaMon with Check_MK Multisite. diff --git a/.bugs/364 b/.bugs/364 new file mode 100644 index 0000000..24005da --- /dev/null +++ b/.bugs/364 @@ -0,0 +1,11 @@ +Title: Make links targets controllable via URL parameter +Component: multisite +Benefit: 2 +State: open +Cost: 3 +Date: 2011-09-07 17:13:09 +Class: feature + +We could add URL parameters that control the target-tag in links, +such that either internal, external or both links can be directed +to certain frames (e.g. external links to _parent).

13 years

Check_MK Git: check_mk: Fix hook missing bug

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 67a82bdfde6b782168cff48ee767b7974667704c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67a82bdfde6b78… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 17:04:16 2011 +0200 Fix hook missing bug --- web/htdocs/views.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 61fbb50..f7ca622 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2244,7 +2244,7 @@ def register_hook(hook, func): view_hooks[hook].append(func) def execute_hooks(hook): - for hook_func in view_hooks[hook]: + for hook_func in view_hooks.get(hook, []): try: hook_func() except:

13 years

Check_MK Git: check_mk: Fixed Python/JSON webservice after checkbox change

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f66dbf7ef7f58caab93b32cfc16979a43111d06c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f66dbf7ef7f58c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 17:01:42 2011 +0200 Fixed Python/JSON webservice after checkbox change --- web/plugins/views/webservice.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index 7305e1c..a0391b6 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def render_python_raw(data, view, group_painters, painters, num_columns): +def render_python_raw(data, view, group_painters, painters, num_columns, show_checkboxes): html.write(repr(data)) multisite_layouts["python-raw"] = { @@ -34,7 +34,7 @@ multisite_layouts["python-raw"] = { "hide" : True, } -def render_python(rows, view, group_painters, painters, num_columns): +def render_python(rows, view, group_painters, painters, num_columns, show_checkboxes): html.write("[\n") html.write(repr([p[0]["name"] for p in painters])) html.write(",\n") @@ -63,7 +63,7 @@ def encode_string_json(s): return '"' + json_escape.sub(lambda m: json_encoding_table[m.group(0)], s) + '"' -def render_json(rows, view, group_painters, painters, num_columns): +def render_json(rows, view, group_painters, painters, num_columns, show_checkboxes): html.write("[\n") html.write(repr([p[0]["name"] for p in painters])) for row in rows:

13 years

← Newer
1
...
4
5
6
7
8
9
10
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2011