Checkmk git commits April 2017

checkmk-commits@lists.checkmk.com

11 participants
159 discussions

8287 brocade_mlx_power: Added new standard OID for snChasPwrSupply2Table to receive all power supplies in stacked devices

by Sven Rueß

Module: check_mk Branch: master Commit: 46785bf8654b1500e446b0e47f9a9badb08af56c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46785bf8654b15… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Mon Apr 24 14:40:45 2017 +0200 8287 brocade_mlx_power: Added new standard OID for snChasPwrSupply2Table to receive all power supplies in stacked devices Added new OID for snChasPwrSupply2Table to receive the information about all available power supplies and fixed the item name for all power supplies. Now we take only the index as item name. This makes rule creation equal to all temperature checks. To get all power supplies automatically detected and renamed, you have to make a new service discovery. With this servicce discovery it can happen that power supplies will be renamed. Now historic data and rules exists for this check. So nothing special have to be done. Change-Id: Ie6bfc213938cac30f6ce9de5ed967b7788abc1e3 --- .werks/8287 | 17 ++++++++++++ checks/brocade_mlx_power | 72 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 65 insertions(+), 24 deletions(-) diff --git a/.werks/8287 b/.werks/8287 new file mode 100644 index 0000000..ab8664d --- /dev/null +++ b/.werks/8287 @@ -0,0 +1,17 @@ +Title: brocade_mlx_power: Added new standard OID for snChasPwrSupply2Table to receive all power supplies in stacked devices +Level: 1 +Component: checks +Compatible: incomp +Edition: cee +Version: 1.5.0i1 +Date: 1493037069 +Class: feature + +Added new OID for snChasPwrSupply2Table to receive the information about all available power supplies +and fixed the item name for all power supplies. Now we take only the index as item name. This makes +rule creation equal to all temperature checks. + +To get all power supplies automatically detected and renamed, you have to make a new service discovery. +With this servicce discovery it can happen that power supplies will be renamed. Now historic data and +rules exists for this check. So nothing special have to be done. + diff --git a/checks/brocade_mlx_power b/checks/brocade_mlx_power index 2ee1825..f9a7d7d 100644 --- a/checks/brocade_mlx_power +++ b/checks/brocade_mlx_power @@ -24,40 +24,64 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def brocade_mlx_power_combine_item(id, descr): - if descr == "" or "AC " in descr: - return id +def parse_brocade_mlx_power(info): + parsed = {} + + if len(info[1]) > 0: + # .1.3.6.1.4.1.1991.1.1.1.2.2.1 + for power_unit, power_id, power_desc, power_state in info[1]: + if power_state != "1": + parsed[power_unit] = { 'desc' : power_desc, + 'state' : power_state } else: - return "%s %s" % (id, descr) + # .1.3.6.1.4.1.1991.1.1.1.2.1.1 + for power_id, power_desc, power_state in info[0]: + if power_state != "1": + parsed[power_id] = { 'desc' : power_desc, + 'state' : power_state } + return parsed + -def inventory_brocade_mlx_power(info): +def inventory_brocade_mlx_power(parsed): inventory = [] - for power_id, power_descr, power_state in info: - if power_state != "1": - inventory.append( (brocade_mlx_power_combine_item(power_id, power_descr), None) ) + + for powersupply_id in parsed.keys(): + inventory.append((powersupply_id, None)) return inventory -def check_brocade_mlx_power(item, _no_params, info): - for power_id, power_descr, power_state in info: - if brocade_mlx_power_combine_item(power_id, power_descr) == item: - if power_state == "2": - return 0, "Power supply reports state: normal" - elif power_state == "3": - return 2, "Power supply reports state: failure" - elif power_state == "1": - return 3, "Power supply reports state: other" + +def check_brocade_mlx_power(item, _no_params, parsed): + if item not in parsed.keys(): + yield 3, "Power supply not found" + + for powersupply_id in parsed.keys(): + if powersupply_id == item: + if parsed[powersupply_id]['state'] == "2": + yield 0, "Power supply reports state: normal" + elif parsed[powersupply_id]['state'] == "3": + yield 2, "Power supply reports state: failure" + elif parsed[powersupply_id]['state'] == "1": + yield 3, "Power supply reports state: other" else: - return 3, "Power supply reports an unhandled state (%s)" % power_state - return 3, "Power supply not found" + yield 3, "Power supply reports an unhandled state (%s)" % parsed[powersupply_id]['state'] + check_info["brocade_mlx_power"] = { + "parse_function" : parse_brocade_mlx_power, "check_function" : check_brocade_mlx_power, "inventory_function" : inventory_brocade_mlx_power, "service_description" : "Power supply %s", - "snmp_info" : ('.1.3.6.1.4.1.1991.1.1.1.2.1.1', [ - 1, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupplyIndex - 2, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupplyDescription - 3, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupplyOperStatus - ]), + "snmp_info" : [ ('.1.3.6.1.4.1.1991.1.1.1.2.1.1', [ + 1, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupplyIndex + 2, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupplyDescription + 3, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupplyOperStatus + ]), + ('.1.3.6.1.4.1.1991.1.1.1.2.2.1', [ + 1, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupply2Unit + 2, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupply2Index + 3, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupply2Description + 4, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupply2OperStatus + ]) + ], "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1991.1."), }

7 years, 4 months

Made several row accesses more robust.

by Sven Panne

Module: check_mk Branch: master Commit: ca5aa1c9f81bad0c5d35f078f44e032e8f9ef5ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca5aa1c9f81bad… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 24 13:18:36 2017 +0200 Made several row accesses more robust. They worked only by accident, because some structs start with a field, so a pointer to the struct and a pointer to the field have the same value. This is highly fragile, so we access the first field in type-safe manner now. While we're there, use "auto" a bit more often, following Scott Meyer's advice in "Effective Modern C++", item 5: "Prefer auto to explicit type declarations." Change-Id: I2dd8358046fadabd6070947db79073d5579ebf2e --- livestatus/src/TableComments.cc | 2 +- livestatus/src/TableDowntimes.cc | 2 +- livestatus/src/TableHostsByGroup.cc | 2 +- livestatus/src/TableLog.cc | 2 +- livestatus/src/TableServices.cc | 2 +- livestatus/src/TableServicesByGroup.cc | 2 +- livestatus/src/TableServicesByHostGroup.cc | 2 +- livestatus/src/TableStateHistory.cc | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/livestatus/src/TableComments.cc b/livestatus/src/TableComments.cc index fd9959f..4db7d9d 100644 --- a/livestatus/src/TableComments.cc +++ b/livestatus/src/TableComments.cc @@ -103,6 +103,6 @@ void TableComments::answerQuery(Query *query) { } bool TableComments::isAuthorized(Row row, contact *ctc) { - DowntimeOrComment *dtc = rowData<DowntimeOrComment>(row); + auto dtc = rowData<DowntimeOrComment>(row); return is_authorized_for(ctc, dtc->_host, dtc->_service); } diff --git a/livestatus/src/TableDowntimes.cc b/livestatus/src/TableDowntimes.cc index 00adaf1..29aec62 100644 --- a/livestatus/src/TableDowntimes.cc +++ b/livestatus/src/TableDowntimes.cc @@ -104,6 +104,6 @@ void TableDowntimes::answerQuery(Query *query) { } bool TableDowntimes::isAuthorized(Row row, contact *ctc) { - DowntimeOrComment *dtc = rowData<DowntimeOrComment>(row); + auto dtc = rowData<DowntimeOrComment>(row); return is_authorized_for(ctc, dtc->_host, dtc->_service); } diff --git a/livestatus/src/TableHostsByGroup.cc b/livestatus/src/TableHostsByGroup.cc index b743d2c..527292e 100644 --- a/livestatus/src/TableHostsByGroup.cc +++ b/livestatus/src/TableHostsByGroup.cc @@ -81,7 +81,7 @@ void TableHostsByGroup::answerQuery(Query *query) { } bool TableHostsByGroup::isAuthorized(Row row, contact *ctc) { - return is_authorized_for(ctc, rowData<host>(row), nullptr); + return is_authorized_for(ctc, &rowData<hostbygroup>(row)->_host, nullptr); } Row TableHostsByGroup::findObject(const string &objectspec) { diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 86c9f45..3966407 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -183,7 +183,7 @@ void TableLog::answerQuery(Query *query) { } bool TableLog::isAuthorized(Row row, contact *ctc) { - LogEntry *entry = rowData<LogEntry>(row); + auto entry = rowData<LogEntry>(row); service *svc = entry->_service; host *hst = entry->_host; diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index a0b9698..659e585 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -524,7 +524,7 @@ void TableServices::answerQuery(Query *query) { } bool TableServices::isAuthorized(Row row, contact *ctc) { - service *svc = rowData<service>(row); + auto svc = rowData<service>(row); return is_authorized_for(ctc, svc->host_ptr, svc); } diff --git a/livestatus/src/TableServicesByGroup.cc b/livestatus/src/TableServicesByGroup.cc index be6128d..330f744 100644 --- a/livestatus/src/TableServicesByGroup.cc +++ b/livestatus/src/TableServicesByGroup.cc @@ -83,7 +83,7 @@ void TableServicesByGroup::answerQuery(Query *query) { } bool TableServicesByGroup::isAuthorized(Row row, contact *ctc) { - service *svc = rowData<service>(row); + auto svc = &rowData<servicebygroup>(row)->_service; return is_authorized_for(ctc, svc->host_ptr, svc); } diff --git a/livestatus/src/TableServicesByHostGroup.cc b/livestatus/src/TableServicesByHostGroup.cc index 6d53ceb..f3f06af 100644 --- a/livestatus/src/TableServicesByHostGroup.cc +++ b/livestatus/src/TableServicesByHostGroup.cc @@ -67,7 +67,7 @@ void TableServicesByHostGroup::answerQuery(Query *query) { } bool TableServicesByHostGroup::isAuthorized(Row row, contact *ctc) { - service *svc = rowData<service>(row); + auto svc = &rowData<servicebyhostgroup>(row)->_service; return is_authorized_for(ctc, svc->host_ptr, svc); } diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 8492e9a..dde51e5 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -958,7 +958,7 @@ void TableStateHistory::process(Query *query, HostServiceState *hs_state) { } bool TableStateHistory::isAuthorized(Row row, contact *ctc) { - HostServiceState *entry = rowData<HostServiceState>(row); + auto entry = rowData<HostServiceState>(row); service *svc = entry->_service; host *hst = entry->_host; return (hst != nullptr || svc != nullptr) &&

7 years, 4 months

Make recent cppcheck versions happy.

by Sven Panne

Module: check_mk Branch: master Commit: 8c7a2aad1ae944f2a73036b265bb345f14eb36ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c7a2aad1ae944… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 24 12:48:17 2017 +0200 Make recent cppcheck versions happy. The "unusedFunction" checks seems to be even more seriously broken than in previous versions, so let's disable it, it's not that helpful, anyway. Change-Id: I1a3e14ca498e7e81748bbb44f3a8a342b7a96d5c --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4903e0e..f1a07b3 100644 --- a/Makefile +++ b/Makefile @@ -516,12 +516,12 @@ cppcheck: compile_commands.json @scripts/compiled_sources | \ grep /livestatus/src/ |\ sed 's/^"$.*$"$$/\1/' | \ - ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc ) + ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc ) ifeq ($(ENTERPRISE),yes) @scripts/compiled_sources | \ grep /enterprise/core/ |\ sed 's/^"$.*$"$$/\1/' | \ - ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc ) + ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc ) endif # XML output into file intended for machine processing. @@ -529,12 +529,12 @@ cppcheck-xml: compile_commands.json scripts/compiled_sources | \ grep /livestatus/src/ |\ sed 's/^"$.*$"$$/\1/' | \ - ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) + ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) ifeq ($(ENTERPRISE),yes) scripts/compiled_sources | \ grep /enterprise/core/ |\ sed 's/^"$.*$"$$/\1/' | \ - ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) + ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) endif # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in

7 years, 4 months

Introduce UnshiftedRow for ListColumn.

by Sven Panne

Module: check_mk Branch: master Commit: d106007bf383e2b1a4dd267a1f29da2a479264cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d106007bf383e2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 21 11:01:11 2017 +0200 Introduce UnshiftedRow for ListColumn. Change-Id: Ide937d5474c3de1ff7f901604d6c833965c8706c --- livestatus/src/Aggregator.h | 4 +- livestatus/src/AndingFilter.cc | 3 +- livestatus/src/AndingFilter.h | 3 +- livestatus/src/AttributeListAsIntColumn.cc | 5 +- livestatus/src/AttributeListAsIntColumn.h | 3 +- livestatus/src/AttributeListColumn.cc | 10 ++-- livestatus/src/AttributeListColumn.h | 7 +-- livestatus/src/BlobColumn.cc | 3 +- livestatus/src/BlobColumn.h | 5 +- livestatus/src/Column.cc | 7 +-- livestatus/src/Column.h | 11 +++-- livestatus/src/ColumnsColumn.cc | 9 ++-- livestatus/src/ColumnsColumn.h | 3 +- livestatus/src/CommentColumn.cc | 12 ++--- livestatus/src/CommentColumn.h | 7 +-- livestatus/src/ContactGroupsColumn.cc | 11 +++-- livestatus/src/ContactGroupsColumn.h | 7 +-- livestatus/src/ContactGroupsMemberColumn.cc | 5 +- livestatus/src/ContactGroupsMemberColumn.h | 3 +- livestatus/src/ContactsColumn.cc | 7 +-- livestatus/src/ContactsColumn.h | 7 +-- livestatus/src/CountAggregator.cc | 3 +- livestatus/src/CountAggregator.h | 3 +- livestatus/src/CustomTimeperiodColumn.cc | 7 +-- livestatus/src/CustomTimeperiodColumn.h | 5 +- livestatus/src/CustomVarsColumn.cc | 9 ++-- livestatus/src/CustomVarsColumn.h | 7 +-- livestatus/src/CustomVarsDictColumn.cc | 5 +- livestatus/src/CustomVarsDictColumn.h | 5 +- livestatus/src/CustomVarsDictFilter.cc | 3 +- livestatus/src/CustomVarsDictFilter.h | 3 +- livestatus/src/CustomVarsExplicitColumn.cc | 9 ++-- livestatus/src/CustomVarsExplicitColumn.h | 5 +- livestatus/src/CustomVarsListFilter.cc | 3 +- livestatus/src/CustomVarsListFilter.h | 3 +- livestatus/src/CustomVarsNamesColumn.cc | 5 +- livestatus/src/CustomVarsNamesColumn.h | 5 +- livestatus/src/CustomVarsValuesColumn.cc | 5 +- livestatus/src/CustomVarsValuesColumn.h | 5 +- livestatus/src/DoubleAggregator.cc | 3 +- livestatus/src/DoubleAggregator.h | 3 +- livestatus/src/DoubleColumn.cc | 6 +-- livestatus/src/DoubleColumn.h | 7 +-- livestatus/src/DoubleFilter.cc | 3 +- livestatus/src/DoubleFilter.h | 3 +- livestatus/src/DoublePointerColumn.h | 2 +- livestatus/src/DowntimeColumn.cc | 13 +++-- livestatus/src/DowntimeColumn.h | 7 +-- .../src/DynamicEventConsoleReplicationColumn.cc | 3 +- livestatus/src/Filter.h | 4 +- livestatus/src/FixedIntColumn.h | 2 +- livestatus/src/HostContactsColumn.cc | 5 +- livestatus/src/HostContactsColumn.h | 3 +- livestatus/src/HostFileColumn.cc | 7 +-- livestatus/src/HostFileColumn.h | 3 +- livestatus/src/HostGroupsColumn.cc | 11 +++-- livestatus/src/HostGroupsColumn.h | 7 +-- livestatus/src/HostListColumn.cc | 7 +-- livestatus/src/HostListColumn.h | 7 +-- livestatus/src/HostListFilter.cc | 3 +- livestatus/src/HostListFilter.h | 3 +- livestatus/src/HostListStateColumn.cc | 7 +-- livestatus/src/HostListStateColumn.h | 7 +-- livestatus/src/HostSpecialDoubleColumn.cc | 5 +- livestatus/src/HostSpecialDoubleColumn.h | 3 +- livestatus/src/HostSpecialIntColumn.cc | 5 +- livestatus/src/HostSpecialIntColumn.h | 3 +- livestatus/src/IntAggregator.cc | 3 +- livestatus/src/IntAggregator.h | 3 +- livestatus/src/IntColumn.cc | 5 +- livestatus/src/IntColumn.h | 7 +-- livestatus/src/IntFilter.cc | 3 +- livestatus/src/IntFilter.h | 3 +- livestatus/src/IntPointerColumn.h | 2 +- livestatus/src/ListColumn.h | 5 +- livestatus/src/ListFilter.cc | 3 +- livestatus/src/ListFilter.h | 3 +- livestatus/src/Logfile.cc | 5 +- livestatus/src/LogwatchListColumn.cc | 7 +-- livestatus/src/LogwatchListColumn.h | 3 +- livestatus/src/MetricsColumn.cc | 3 +- livestatus/src/MetricsColumn.h | 3 +- livestatus/src/NegatingFilter.cc | 4 +- livestatus/src/NegatingFilter.h | 3 +- livestatus/src/NullColumn.cc | 3 +- livestatus/src/NullColumn.h | 3 +- livestatus/src/OffsetBoolColumn.cc | 5 +- livestatus/src/OffsetBoolColumn.h | 3 +- livestatus/src/OffsetDoubleColumn.cc | 5 +- livestatus/src/OffsetDoubleColumn.h | 3 +- livestatus/src/OffsetIntColumn.cc | 5 +- livestatus/src/OffsetIntColumn.h | 3 +- livestatus/src/OffsetSStringColumn.cc | 5 +- livestatus/src/OffsetSStringColumn.h | 3 +- livestatus/src/OffsetStringColumn.cc | 5 +- livestatus/src/OffsetStringColumn.h | 3 +- livestatus/src/OffsetStringHostMacroColumn.cc | 7 +-- livestatus/src/OffsetStringHostMacroColumn.h | 5 +- livestatus/src/OffsetStringMacroColumn.cc | 5 +- livestatus/src/OffsetStringMacroColumn.h | 9 ++-- livestatus/src/OffsetStringServiceMacroColumn.cc | 9 ++-- livestatus/src/OffsetStringServiceMacroColumn.h | 5 +- livestatus/src/OffsetTimeColumn.cc | 5 +- livestatus/src/OffsetTimeColumn.h | 3 +- livestatus/src/OringFilter.cc | 3 +- livestatus/src/OringFilter.h | 3 +- livestatus/src/PerfdataAggregator.cc | 3 +- livestatus/src/PerfdataAggregator.h | 3 +- livestatus/src/Query.cc | 14 +++--- livestatus/src/Query.h | 7 ++- livestatus/src/Row.h | 47 ++++++++++++++++++ livestatus/src/ServiceContactsColumn.cc | 5 +- livestatus/src/ServiceContactsColumn.h | 3 +- livestatus/src/ServiceGroupsColumn.cc | 11 +++-- livestatus/src/ServiceGroupsColumn.h | 7 +-- livestatus/src/ServiceListColumn.cc | 7 +-- livestatus/src/ServiceListColumn.h | 7 +-- livestatus/src/ServiceListFilter.cc | 3 +- livestatus/src/ServiceListFilter.h | 3 +- livestatus/src/ServiceListStateColumn.cc | 7 +-- livestatus/src/ServiceListStateColumn.h | 5 +- livestatus/src/ServiceSpecialDoubleColumn.cc | 5 +- livestatus/src/ServiceSpecialDoubleColumn.h | 3 +- livestatus/src/ServiceSpecialIntColumn.cc | 6 +-- livestatus/src/ServiceSpecialIntColumn.h | 3 +- livestatus/src/StatusSpecialIntColumn.cc | 3 +- livestatus/src/StatusSpecialIntColumn.h | 3 +- livestatus/src/StringColumn.cc | 5 +- livestatus/src/StringColumn.h | 7 +-- livestatus/src/StringFilter.cc | 3 +- livestatus/src/StringFilter.h | 3 +- livestatus/src/StringPointerColumn.h | 2 +- livestatus/src/Table.cc | 6 +-- livestatus/src/Table.h | 10 +++- livestatus/src/TableColumns.cc | 3 +- livestatus/src/TableCommands.cc | 3 +- livestatus/src/TableComments.cc | 7 +-- livestatus/src/TableComments.h | 3 +- livestatus/src/TableContactGroups.cc | 6 +-- livestatus/src/TableContactGroups.h | 3 +- livestatus/src/TableContacts.cc | 6 +-- livestatus/src/TableContacts.h | 3 +- livestatus/src/TableDowntimes.cc | 7 +-- livestatus/src/TableDowntimes.h | 3 +- livestatus/src/TableEventConsole.cc | 16 +++---- livestatus/src/TableEventConsole.h | 56 +++++++++++----------- livestatus/src/TableEventConsoleEvents.cc | 7 +-- livestatus/src/TableEventConsoleEvents.h | 3 +- livestatus/src/TableEventConsoleHistory.cc | 5 +- livestatus/src/TableEventConsoleHistory.h | 3 +- livestatus/src/TableEventConsoleReplication.cc | 3 +- livestatus/src/TableHostGroups.cc | 10 ++-- livestatus/src/TableHostGroups.h | 5 +- livestatus/src/TableHosts.cc | 12 ++--- livestatus/src/TableHosts.h | 5 +- livestatus/src/TableHostsByGroup.cc | 10 ++-- livestatus/src/TableHostsByGroup.h | 5 +- livestatus/src/TableLog.cc | 5 +- livestatus/src/TableLog.h | 3 +- livestatus/src/TableServiceGroups.cc | 10 ++-- livestatus/src/TableServiceGroups.h | 5 +- livestatus/src/TableServices.cc | 16 +++---- livestatus/src/TableServices.h | 5 +- livestatus/src/TableServicesByGroup.cc | 10 ++-- livestatus/src/TableServicesByGroup.h | 5 +- livestatus/src/TableServicesByHostGroup.cc | 10 ++-- livestatus/src/TableServicesByHostGroup.h | 5 +- livestatus/src/TableStateHistory.cc | 9 ++-- livestatus/src/TableStateHistory.h | 3 +- livestatus/src/TableStatus.cc | 5 +- livestatus/src/TableTimeperiods.cc | 3 +- livestatus/src/TimeColumn.cc | 3 +- livestatus/src/TimeColumn.h | 3 +- livestatus/src/TimePointerColumn.h | 2 +- livestatus/src/TimeperiodColumn.cc | 5 +- livestatus/src/TimeperiodColumn.h | 3 +- 176 files changed, 607 insertions(+), 407 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d106007bf3…

7 years, 4 months

Fix the fix for races conditions.

by Sven Panne

Module: check_mk Branch: master Commit: 3af53ac21122eb7a004be5e7a3543edf293a8134 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3af53ac21122eb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 24 12:51:34 2017 +0200 Fix the fix for races conditions. Change-Id: If37cf1fd9d1114bbaf5d3a9a11b41eb465054b2e --- modules/check_mk_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 30f13a2..00b5861 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -55,6 +55,7 @@ import subprocess from cmk.exceptions import MKGeneralException, MKTerminate from cmk.regex import regex +import cmk.store as store import cmk.tty as tty import cmk.render as render import cmk.crash_reporting as crash_reporting @@ -483,8 +484,7 @@ def store_persisted_info(hostname, persisted): os.makedirs(dirname) file_path = "%s/%s" % (dirname, hostname) - file("%s.#new" % file_path, "w").write("%r\n" % persisted) - os.rename("%s.#new" % file_path, file_path) + store.save_data_to_file(file_path, persisted, pretty=False) console.verbose("Persisted sections %s.\n" % ", ".join(persisted.keys()))

7 years, 4 months

Updated some werks

by Mathias Kettner

Module: check_mk Branch: master Commit: eaf63f57c60d76d84198e07ac4a1c5eeed8e1e40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaf63f57c60d76… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 24 11:17:20 2017 +0200 Updated some werks Change-Id: I7dcd9574767e05c761606ff0673e74418b1605f9 --- .werks/2929 | 2 +- .werks/4484 | 2 +- .werks/8643 | 30 ++++++++++++++++-------------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.werks/2929 b/.werks/2929 index f1bbdc3..f7df3ee 100644 --- a/.werks/2929 +++ b/.werks/2929 @@ -1,5 +1,5 @@ Title: Show all metrics of a service in a nicely formatted table in the service details -Level: 1 +Level: 2 Component: metrics Compatible: compat Version: 1.2.7i4 diff --git a/.werks/4484 b/.werks/4484 index a41ddbf..e54c2e4 100644 --- a/.werks/4484 +++ b/.werks/4484 @@ -1,4 +1,4 @@ -Title: Graph iime range previews can be disabled, default can be set +Title: Graph time range previews can be disabled, default can be set Level: 1 Component: metrics Class: feature diff --git a/.werks/8643 b/.werks/8643 index cae4f5d..fbcde05 100644 --- a/.werks/8643 +++ b/.werks/8643 @@ -1,5 +1,5 @@ Title: Web API: New API for fetching graph data -Level: 1 +Level: 2 Edition: cee Component: metrics Compatible: compat @@ -12,32 +12,34 @@ action is named <tt>get_graph</tt>. The request object is structured like this: -C+: +F+: { "specification": [..., ...], "data_range": { "time_range" : [..., ...], } } -C-: +F-: -The specification is using the Check_MK internal graph specification format. The -first element is the specification type (<tt>template</tt>, <tt>custom</tt> or <tt>explicit</tt>. -The structure of the second element depends on the type. Please take a look at the -examples below to get an idea of it. +The specification is using the Check_MK internal graph specification +format. The first element is the specification type (<tt>template</tt>, +<tt>custom</tt> or <tt>explicit</tt>. The structure of the second element +depends on the type. Please take a look at the examples below to get an idea +of it. -The time range is given in two unix timestamps, the start time and the end time. +The time range is given in two unix timestamps, the start time and the +end time. -For example this command can be used to fetch the first graph of the Check_MK service of -the host myhost123: +For example this command can be used to fetch the first graph of the Check_MK +service of the host myhost123: C+: -# curl "http://mycmkserver/mysite/check_mk/webapi.py?action=get_graph&_username=aut…" -d 'request={"specification": ["template", {"service_description": "Check_MK", "site": "mysite", "graph_index": 0, "host_name": "myhost123" }], "data_range": {"time_range": [1480653120, 1480667520]}}' +UP:curl "http://mycmkserver/mysite/check_mk/webapi.py?action=get_graph&_username=aut…" -d 'request={"specification": ["template", {"service_description": "Check_MK", "site": "mysite", "graph_index": 0, "host_name": "myhost123" }], "data_range": {"time_range": [1480653120, 1480667520]}}' C-: The answer may look like this: -C+: +F+: { "result": { "step": 60, @@ -54,10 +56,10 @@ C+: }, "result_code": 0 } -C-: +F-: This command is used to fetch the data of a custom graph named <tt>custom_graph_1</tt>: C+: -# curl "http://mycmkserver/mysite/check_mk/webapi.py?action=get_graph&_username=aut…" -d 'request={"specification": ["custom", "custom_graph_1"], "data_range": {"time_range": [1480653120, 1480667520]}}' +UP:curl "http://mycmkserver/mysite/check_mk/webapi.py?action=get_graph&_username=aut…" -d 'request={"specification": ["custom", "custom_graph_1"], "data_range": {"time_range": [1480653120, 1480667520]}}' C-:

7 years, 4 months

4589 FIX Fixed error handling for graphs if graph is not found or unavailable

by Simon Betz

Module: check_mk Branch: master Commit: 0d5669c958bc4515be70679f94c8f79b99eeaa43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d5669c958bc45… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 19 15:00:56 2017 +0200 4589 FIX Fixed error handling for graphs if graph is not found or unavailable Change-Id: I82463c3e9b91686199662af8538e5aabec01b26e --- .werks/4589 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/4589 b/.werks/4589 new file mode 100644 index 0000000..d32756e --- /dev/null +++ b/.werks/4589 @@ -0,0 +1,11 @@ +Title: Fixed error handling for graphs if graph is not found or unavailable +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1492606841 + +

7 years, 4 months

4487 check_mk_agent.aix, check_mk_agent.linux, check_mk_agent.solaris: Agents use either default MK_[LIB/CONF/VAR] DIR variables or environmental variables if configured

by Simon Betz

Module: check_mk Branch: master Commit: 59fece037bc7f8dfdafc4a11df2f1d8e24e36ab1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59fece037bc7f8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 23 13:31:26 2017 +0100 4487 check_mk_agent.aix, check_mk_agent.linux, check_mk_agent.solaris: Agents use either default MK_[LIB/CONF/VAR]DIR variables or environmental variables if configured Change-Id: I12ece11a3f2fc532a9439031addfbf2171c3971a --- .werks/4487 | 25 +++++++++++++++++++++++++ agents/check_mk_agent.aix | 6 +++--- agents/check_mk_agent.linux | 6 +++--- agents/check_mk_agent.solaris | 6 +++--- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/.werks/4487 b/.werks/4487 new file mode 100644 index 0000000..d8dd4d0 --- /dev/null +++ b/.werks/4487 @@ -0,0 +1,25 @@ +Title: check_mk_agent.aix, check_mk_agent.linux, check_mk_agent.solaris: Agents use either default MK_[LIB/CONF/VAR]DIR variables or environmental variables if configured +Level: 1 +Component: checks +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488966063 + + +On AIX the default variables are +MK_LIBDIR /usr/check_mk/lib +MK_CONFDIR /usr/check_mk/conf +MK_VARDIR /tmp/check_mk + +On Linux the default variables are +MK_LIBDIR /usr/lib/check_mk_agent +MK_CONFDIR /etc/check_mk +MK_VARDIR /var/lib/check_mk_agent + +On Solaris the default variables are +MK_LIBDIR /usr/lib/check_mk_agent" +MK_CONFDIR /etc/check_mk" +MK_VARDIR /var/lib/check_mk_agent" diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index f258768..7df2f73 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -34,9 +34,9 @@ fi export LC_ALL=C unset LANG -export MK_LIBDIR="/usr/check_mk/lib" -export MK_CONFDIR="/usr/check_mk/conf" -export MK_VARDIR="/tmp/check_mk" +export MK_LIBDIR=${MK_LIBDIR-/usr/check_mk/lib} +export MK_CONFDIR=${MK_CONFDIR-/usr/check_mk/conf} +export MK_VARDIR=${MK_VARDIR-/tmp/check_mk} # All executables in PLUGINSDIR will simply be executed and their # ouput appended to the output of the agent. Plugins define their own diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 5abe471..5b2a580 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -28,9 +28,9 @@ export LC_ALL=C unset LANG -export MK_LIBDIR="/usr/lib/check_mk_agent" -export MK_CONFDIR="/etc/check_mk" -export MK_VARDIR="/var/lib/check_mk_agent" +export MK_LIBDIR=${MK_LIBDIR:-/usr/lib/check_mk_agent} +export MK_CONFDIR=${MK_CONFDIR:-/etc/check_mk} +export MK_VARDIR=${MK_VARDIR:-/var/lib/check_mk_agent} # Provide information about the remote host. That helps when data # is being sent only once to each remote host. diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 20e46a1..dc4ec58 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -28,9 +28,9 @@ export LC_ALL=C unset LANG -export MK_LIBDIR="/usr/lib/check_mk_agent" -export MK_CONFDIR="/etc/check_mk" -export MK_VARDIR="/var/lib/check_mk_agent" +export MK_LIBDIR=${MK_LIBDIR:-/usr/lib/check_mk_agent} +export MK_CONFDIR=${MK_CONFDIR:-/etc/check_mk} +export MK_VARDIR=${MK_VARDIR:-/var/lib/check_mk_agent} # All executables in PLUGINSDIR will simply be executed and their # ouput appended to the output of the agent. Plugins define their own

7 years, 4 months

4599 FIX Fixed rendering of netwrok scan results in folder properties

by Lars Michelsen

Module: check_mk Branch: master Commit: beb5187b997b381565fca728efe7278c9379b321 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=beb5187b997b38… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 21 12:20:57 2017 +0200 4599 FIX Fixed rendering of netwrok scan results in folder properties Change-Id: Ib90b40e2a4b6a943d1420da5618c66e63f2d96f4 --- .werks/4599 | 10 ++++++++++ web/htdocs/wato.py | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/4599 b/.werks/4599 new file mode 100644 index 0000000..bee4b97 --- /dev/null +++ b/.werks/4599 @@ -0,0 +1,10 @@ +Title: Fixed rendering of netwrok scan results in folder properties +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1492770038 +Class: fix + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7bef7f9..5045f41 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17007,7 +17007,11 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr tdclass, content = attr.paint(value, "") if not content: content = _("empty") - html.b(_u(content)) + + if isinstance(attr, ValueSpecAttribute): + html.write(content) + else: + html.b(_u(content)) html.write_text(explanation) html.close_div()

7 years, 4 months

4598 Folder tables in ruleset edit dialog can now be folded

by Lars Michelsen

Module: check_mk Branch: master Commit: e176c81c00a9192497ea13fd006269d939e00dcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e176c81c00a919… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 21 11:20:43 2017 +0200 4598 Folder tables in ruleset edit dialog can now be folded For a more comfortable editing of a large number of rules in a single ruleset it is now possible to fold the rules based on the folders. We also added the number of rules per folder to the folder title. Change-Id: I8676f7b4bc10b90a2c1474a3d1386363d0e4c501 --- .werks/4598 | 13 +++++++++++++ web/htdocs/check_mk.css | 9 ++++++++- web/htdocs/htmllib.py | 3 +++ web/htdocs/table.py | 19 ++++++++++++++++--- web/htdocs/wato.py | 6 ++++-- 5 files changed, 44 insertions(+), 6 deletions(-) diff --git a/.werks/4598 b/.werks/4598 new file mode 100644 index 0000000..c631411 --- /dev/null +++ b/.werks/4598 @@ -0,0 +1,13 @@ +Title: Folder tables in ruleset edit dialog can now be folded +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1492766075 +Class: feature + +For a more comfortable editing of a large number of rules in a single ruleset +it is now possible to fold the rules based on the folders. + +We also added the number of rules per folder to the folder title. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 1a4c300..2cb1f85 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -347,6 +347,7 @@ img.treeangle { -webkit-transition: -webkit-transform .2s ease-in-out; -moz-transition: -moz-transform .2s ease-in-out; transition: transform .2s ease-in-out; + vertical-align: middle; } img.treeangle.open { @@ -358,19 +359,25 @@ img.treeangle.open { img.treeangle.nform { margin-left: -5px; } + img.treeangle.title { width: 16px; height: 16px; vertical-align: middle; margin-right: 5px; } + b.treeangle.title { font-weight: bold; color: #ffffff; cursor: pointer; } + +img.treeangle+.treeangle.title { + display: inline-block; +} + ul.treeangle { - /* border: 1px solid #4060ff; */ padding-left: 20px; margin: 8px 0px; position: relative; /* In order for placement of invtablelink */ diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index bacd115..1071697 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -2481,6 +2481,8 @@ class html(HTMLGenerator, Encoder, RequestHandler): self.close_td() self.close_tr() else: + self.open_div(class_="foldable") + if not icon: self.img(id_="treeimg.%s.%s" % (treename, id), class_=["treeangle", "open" if isopen else "closed"], @@ -2516,6 +2518,7 @@ class html(HTMLGenerator, Encoder, RequestHandler): def end_foldable_container(self): if self.folding_indent != "nform": self.close_ul() + self.close_div() def foldable_container_is_open(self, treename, id, isopen): diff --git a/web/htdocs/table.py b/web/htdocs/table.py index a51ce5b..ebdfd42 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -123,6 +123,7 @@ class Table(object): "omit_headers" : kwargs.get("omit_headers", False), "searchable" : kwargs.get("searchable", True), "sortable" : kwargs.get("sortable", True), + "foldable" : kwargs.get("foldable", False), "output_format" : kwargs.get("output_format", "html"), # possible: html, csv, fetch } @@ -206,9 +207,18 @@ class Table(object): return if self.title: - html.open_h3() - html.write(self.title) - html.close_h3() + if self.options["foldable"]: + html.begin_foldable_container( + treename="table", + id=self.id, + isopen=True, + indent=False, + title=html.render_h3(self.title, class_=["treeangle", "title"]) + ) + else: + html.open_h3() + html.write(self.title) + html.close_h3() if self.help: html.help(self.help) @@ -232,6 +242,9 @@ class Table(object): # Render header self._write_table(rows, actions_enabled, actions_visible, search_term) + if self.title and self.options["foldable"]: + html.end_foldable_container() + if limit is not None and num_rows_unlimited > limit: html.message(_('This table is limited to show only %d of %d rows. ' 'Click <a href="%s">here</a> to disable the limitation.') % diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c83b7c2..7bef7f9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12871,8 +12871,10 @@ class ModeEditRuleset(WatoMode): last_folder = folder alias_path = folder.alias_path(show_main = False) - table.begin("rules", title="%s %s" % (_("Rules in folder"), alias_path), - css="ruleset", searchable=False, sortable=False, limit=None) + table_id = "rules_%s_%s" % (self._name, folder.ident()) + table.begin(table_id, title="%s %s (%d)" % (_("Rules in folder"), alias_path, + ruleset.num_rules_in_folder(folder)), + css="ruleset", searchable=False, sortable=False, limit=None, foldable=True) else: if skip_this_folder: continue

7 years, 4 months

← Newer
1
2
3
4
5
6
7
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2017