Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

active checks: Fixed handling of hosts with non resolvable IP addresses during runtime

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e7143369733fcbecc5d1d7c8cf9341c2ae2fb8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e7143369733fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 11:58:05 2016 +0100 active checks: Fixed handling of hosts with non resolvable IP addresses during runtime --- modules/nagios.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/nagios.py b/modules/nagios.py index 1effcc0..f6d891f 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -498,7 +498,14 @@ define service { template = has_perfdata and "check_mk_perf," or "" extraconf = extra_service_conf_of(hostname, description) - command = "check_mk_active-%s!%s" % (acttype, args) + + if host_attrs["address"] in [ "0.0.0.0", "::" ]: + command_name = "check-mk-custom" + command = command_name + "!echo \"Failed to lookup IP address and no explicit IP address configured\" && exit 3" + custom_commands_to_define.add(command_name) + else: + command = "check_mk_active-%s!%s" % (acttype, args) + outfile.write(""" define service { use\t\t\t\t%scheck_mk_default

7 years, 10 months

Link C++ libs statically. Use C++14.

by Sven Panne

Module: check_mk Branch: master Commit: c213a0c3ce3ce6bd6d3d33bd746b2f75b74bde31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c213a0c3ce3ce6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 29 11:56:39 2016 +0100 Link C++ libs statically. Use C++14. --- bin/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/Makefile b/bin/Makefile index c683185..9debf8f 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -24,7 +24,8 @@ # TODO(sp) We should really use autotools here... CXX := g++-5 -CXXFLAGS := -std=c++11 -g -O3 -Wall -Wextra +CXXFLAGS := -std=c++14 -g -O3 -Wall -Wextra +LDFLAGS := -static-libstdc++ EXECUTABLES := mkevent mkeventd_open514 .PHONY: all clean

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: ec76c0dae59d6f78fe93a2cc19309252887db05e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec76c0dae59d6f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 29 11:51:40 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/TableColumns.cc | 1 + livestatus/src/TableCommands.cc | 2 ++ livestatus/src/TableComments.cc | 1 + livestatus/src/TableContactGroups.cc | 2 ++ livestatus/src/TableContacts.cc | 2 ++ livestatus/src/TableDowntimes.cc | 1 + livestatus/src/TableEventConsoleEvents.cc | 2 ++ livestatus/src/TableEventConsoleHistory.cc | 2 ++ livestatus/src/TableEventConsoleStatus.cc | 2 ++ livestatus/src/TableHostGroups.cc | 2 ++ livestatus/src/TableHosts.cc | 3 +++ livestatus/src/TableLog.cc | 2 ++ livestatus/src/TableServiceGroups.cc | 2 ++ livestatus/src/TableServices.cc | 2 ++ livestatus/src/TableStateHistory.cc | 1 + livestatus/src/TableStatus.cc | 2 ++ livestatus/src/TableTimeperiods.cc | 2 ++ 17 files changed, 31 insertions(+) diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc index 58ac82f..e8defc8 100644 --- a/livestatus/src/TableColumns.cc +++ b/livestatus/src/TableColumns.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "TableColumns.h" +#include <memory> #include "Column.h" #include "ColumnsColumn.h" #include "Query.h" diff --git a/livestatus/src/TableCommands.cc b/livestatus/src/TableCommands.cc index bc1204d..3ac6f47 100644 --- a/livestatus/src/TableCommands.cc +++ b/livestatus/src/TableCommands.cc @@ -24,6 +24,8 @@ #include "TableCommands.h" #include <cstddef> +#include <memory> +#include "Column.h" #include "CommandsHolder.h" #include "OffsetSStringColumn.h" #include "Query.h" diff --git a/livestatus/src/TableComments.cc b/livestatus/src/TableComments.cc index f44b741..d7d314e 100644 --- a/livestatus/src/TableComments.cc +++ b/livestatus/src/TableComments.cc @@ -25,6 +25,7 @@ #include "TableComments.h" #include <memory> #include <utility> +#include "Column.h" #include "DowntimeOrComment.h" #include "DowntimesOrComments.h" // IWYU pragma: keep #include "MonitoringCore.h" diff --git a/livestatus/src/TableContactGroups.cc b/livestatus/src/TableContactGroups.cc index 7e62778..c90b0de 100644 --- a/livestatus/src/TableContactGroups.cc +++ b/livestatus/src/TableContactGroups.cc @@ -23,6 +23,8 @@ // Boston, MA 02110-1301 USA. #include "TableContactGroups.h" +#include <memory> +#include "Column.h" #include "ContactGroupsMemberColumn.h" #include "MonitoringCore.h" #include "OffsetStringColumn.h" diff --git a/livestatus/src/TableContacts.cc b/livestatus/src/TableContacts.cc index b471369..15e5f64 100644 --- a/livestatus/src/TableContacts.cc +++ b/livestatus/src/TableContacts.cc @@ -24,8 +24,10 @@ #include "TableContacts.h" #include <cstdio> +#include <memory> #include "AttributeListAsIntColumn.h" #include "AttributeListColumn.h" +#include "Column.h" #include "CustomVarsDictColumn.h" #include "CustomVarsNamesColumn.h" #include "CustomVarsValuesColumn.h" diff --git a/livestatus/src/TableDowntimes.cc b/livestatus/src/TableDowntimes.cc index 484c53f..8e65a0b 100644 --- a/livestatus/src/TableDowntimes.cc +++ b/livestatus/src/TableDowntimes.cc @@ -25,6 +25,7 @@ #include "TableDowntimes.h" #include <memory> #include <utility> +#include "Column.h" #include "DowntimeOrComment.h" #include "DowntimesOrComments.h" // IWYU pragma: keep #include "MonitoringCore.h" diff --git a/livestatus/src/TableEventConsoleEvents.cc b/livestatus/src/TableEventConsoleEvents.cc index 6248b29..63f9b73 100644 --- a/livestatus/src/TableEventConsoleEvents.cc +++ b/livestatus/src/TableEventConsoleEvents.cc @@ -23,6 +23,8 @@ // Boston, MA 02110-1301 USA. #include "TableEventConsoleEvents.h" +#include <memory> +#include "Column.h" #include "MonitoringCore.h" #include "Table.h" #include "TableHosts.h" diff --git a/livestatus/src/TableEventConsoleHistory.cc b/livestatus/src/TableEventConsoleHistory.cc index 6721094..e5bb180 100644 --- a/livestatus/src/TableEventConsoleHistory.cc +++ b/livestatus/src/TableEventConsoleHistory.cc @@ -23,6 +23,8 @@ // Boston, MA 02110-1301 USA. #include "TableEventConsoleHistory.h" +#include <memory> +#include "Column.h" #include "MonitoringCore.h" #include "TableEventConsoleEvents.h" diff --git a/livestatus/src/TableEventConsoleStatus.cc b/livestatus/src/TableEventConsoleStatus.cc index 2ad30e9..3685e82 100644 --- a/livestatus/src/TableEventConsoleStatus.cc +++ b/livestatus/src/TableEventConsoleStatus.cc @@ -23,6 +23,8 @@ // Boston, MA 02110-1301 USA. #include "TableEventConsoleStatus.h" +#include <memory> +#include "Column.h" using std::make_unique; using std::string; diff --git a/livestatus/src/TableHostGroups.cc b/livestatus/src/TableHostGroups.cc index fd4b096..20a027b 100644 --- a/livestatus/src/TableHostGroups.cc +++ b/livestatus/src/TableHostGroups.cc @@ -23,6 +23,8 @@ // Boston, MA 02110-1301 USA. #include "TableHostGroups.h" +#include <memory> +#include "Column.h" #include "HostListColumn.h" #include "HostListStateColumn.h" #include "OffsetStringColumn.h" diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 3d27a12..849d9fb 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -23,8 +23,10 @@ // Boston, MA 02110-1301 USA. #include "TableHosts.h" +#include <memory> #include "AttributeListAsIntColumn.h" #include "AttributeListColumn.h" +#include "Column.h" #include "ContactGroupsColumn.h" #include "CustomTimeperiodColumn.h" #include "CustomVarsDictColumn.h" @@ -32,6 +34,7 @@ #include "CustomVarsNamesColumn.h" #include "CustomVarsValuesColumn.h" #include "DownCommColumn.h" +#include "DynamicColumn.h" #include "DynamicLogwatchFileColumn.h" #include "HostContactsColumn.h" #include "HostFileColumn.h" diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index dc7d76f..9b50596 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -25,7 +25,9 @@ #include "TableLog.h" #include <cstdint> #include <map> +#include <memory> #include <utility> +#include "Column.h" #include "LogCache.h" #include "LogEntry.h" #include "Logfile.h" diff --git a/livestatus/src/TableServiceGroups.cc b/livestatus/src/TableServiceGroups.cc index 26bfcae..af2edc3 100644 --- a/livestatus/src/TableServiceGroups.cc +++ b/livestatus/src/TableServiceGroups.cc @@ -23,6 +23,8 @@ // Boston, MA 02110-1301 USA. #include "TableServiceGroups.h" +#include <memory> +#include "Column.h" #include "OffsetStringColumn.h" #include "Query.h" #include "ServiceListColumn.h" diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index cb7a7f9..379a888 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -23,8 +23,10 @@ // Boston, MA 02110-1301 USA. #include "TableServices.h" +#include <memory> #include "AttributeListAsIntColumn.h" #include "AttributeListColumn.h" +#include "Column.h" #include "ContactGroupsColumn.h" #include "CustomTimeperiodColumn.h" #include "CustomVarsDictColumn.h" diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index b7c1d6c..2fa2332 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -27,6 +27,7 @@ #include <cstring> #include <ctime> #include <deque> +#include <memory> #include <ostream> #include <set> #include <utility> diff --git a/livestatus/src/TableStatus.cc b/livestatus/src/TableStatus.cc index a522930..44982e5 100644 --- a/livestatus/src/TableStatus.cc +++ b/livestatus/src/TableStatus.cc @@ -24,6 +24,8 @@ #include "TableStatus.h" #include <ctime> +#include <memory> +#include "Column.h" #include "DoublePointerColumn.h" #include "IntPointerColumn.h" #include "Query.h" diff --git a/livestatus/src/TableTimeperiods.cc b/livestatus/src/TableTimeperiods.cc index c61aa43..68253a5 100644 --- a/livestatus/src/TableTimeperiods.cc +++ b/livestatus/src/TableTimeperiods.cc @@ -23,6 +23,8 @@ // Boston, MA 02110-1301 USA. #include "TableTimeperiods.h" +#include <memory> +#include "Column.h" #include "OffsetStringColumn.h" #include "OffsetTimeperiodColumn.h" #include "Query.h"

7 years, 10 months

4078 FIX Fixed handling of hosts with non resolvable IP addresses during runtime

by Lars Michelsen

Module: check_mk Branch: master Commit: bb0c68a8ff28c331579d4c1a16db8150d28e67ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb0c68a8ff28c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 11:01:58 2016 +0100 4078 FIX Fixed handling of hosts with non resolvable IP addresses during runtime Hosts which only have a hostname configured that IP address is resolved during configuration creation. When a host could not be resolved it is added to the monitoring with the 0.0.0.0 or :: address. That lead to some checks monitoring the local host accidentally. --- .werks/4078 | 13 +++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 3 +++ 3 files changed, 17 insertions(+) diff --git a/.werks/4078 b/.werks/4078 new file mode 100644 index 0000000..0eca23c --- /dev/null +++ b/.werks/4078 @@ -0,0 +1,13 @@ +Title: Fixed handling of hosts with non resolvable IP addresses during runtime +Level: 1 +Component: core +Compatible: compat +Version: 1.4.0i3 +Date: 1480413611 +Class: fix + +Hosts which only have a hostname configured that IP address is resolved during +configuration creation. When a host could not be resolved it is added to the +monitoring with the 0.0.0.0 or :: address. + +That lead to some checks monitoring the local host accidentally. diff --git a/ChangeLog b/ChangeLog index 15b16c6..a38cc2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.4.0i3: Core & Setup: * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')... + * 4078 FIX: Fixed handling of hosts with non resolvable IP addresses during runtime... Checks & Agents: * 3988 Windows agent: new global option disabled_sections... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 3f58475..5845646 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -679,6 +679,9 @@ def write_cache_file(relpath, output): # In that case it will be looked up if needed. Also caching will # be handled here def get_agent_info(hostname, ipaddress, max_cache_age): + if ipaddress in [ "0.0.0.0", "::" ]: + raise MKAgentError("Failed to lookup IP address and no explicit IP address configured") + output = read_cache_file(hostname, max_cache_age) if not output: # Try to contact every host only once

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: df09dbcec991dad5d3445dc39a462279f4350821 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df09dbcec991da… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 29 10:50:41 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/Table.cc | 20 +- livestatus/src/Table.h | 8 +- livestatus/src/TableColumns.cc | 13 +- livestatus/src/TableCommands.cc | 5 +- livestatus/src/TableComments.cc | 44 ++-- livestatus/src/TableContactGroups.cc | 15 +- livestatus/src/TableContacts.cc | 35 +-- livestatus/src/TableDowntimes.cc | 35 +-- livestatus/src/TableEventConsoleEvents.cc | 67 +++--- livestatus/src/TableEventConsoleHistory.cc | 16 +- livestatus/src/TableEventConsoleStatus.cc | 109 ++++----- livestatus/src/TableHostGroups.cc | 51 ++-- livestatus/src/TableHosts.cc | 368 +++++++++++++++-------------- livestatus/src/TableLog.cc | 42 ++-- livestatus/src/TableServiceGroups.cc | 37 +-- livestatus/src/TableServices.cc | 190 +++++++-------- livestatus/src/TableStateHistory.cc | 99 ++++---- livestatus/src/TableStatus.cc | 137 ++++++----- livestatus/src/TableTimeperiods.cc | 14 +- 19 files changed, 666 insertions(+), 639 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=df09dbcec9…

7 years, 10 months

Improved error message when a host can not be resolved during config creation

by Lars Michelsen

Module: check_mk Branch: master Commit: b07b00110dc352c807541e219948947057bebe50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b07b00110dc352… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 10:45:42 2016 +0100 Improved error message when a host can not be resolved during config creation --- modules/check_mk.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2f689cf..b07890a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2969,11 +2969,10 @@ def ip_address_of(hostname, family=None): return "" else: g_failed_ip_lookups.append(hostname) - addr = fallback_ip_for(hostname, family) if not ignore_ip_lookup_failures: - configuration_warning("Cannot lookup IP address of '%s' (%s). Using " - "address %s instead." % (hostname, e, addr)) - return addr + configuration_warning("Cannot lookup IP address of '%s' (%s). " + "The host will note be monitored correctly." % (hostname, e)) + return fallback_ip_for(hostname, family) def fallback_ip_for(hostname, family=None):

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 3b84d485290bb70344a5d316350f9a3f19e16fb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b84d485290bb7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 29 10:16:27 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/Table.cc | 21 +++++++-------------- livestatus/src/Table.h | 5 +++-- livestatus/src/TableEventConsoleReplication.cc | 5 ++++- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/livestatus/src/Table.cc b/livestatus/src/Table.cc index 801f99a..7621f39 100644 --- a/livestatus/src/Table.cc +++ b/livestatus/src/Table.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "Table.h" +#include <cassert> #include <ostream> #include "Column.h" #include "DynamicColumn.h" @@ -30,7 +31,9 @@ #include "StringUtils.h" using mk::starts_with; +using std::move; using std::string; +using std::unique_ptr; Table::Table(Logger *logger) : _logger(logger) {} @@ -38,25 +41,15 @@ Table::~Table() { for (auto &column : _columns) { delete column.second; } - - for (auto &dynamic_column : _dynamic_columns) { - delete dynamic_column.second; - } } void Table::addColumn(Column *col) { - // Do not insert column if one with that name already exists. Delete that - // column in that case. (Needed e.g. for TableLog->TableHosts, which both - // define host_name.) - if (column(col->name()) != nullptr) { - delete col; - } else { - _columns.emplace(col->name(), col); - } + assert(column(col->name()) == nullptr); + _columns.emplace(col->name(), col); } -void Table::addDynamicColumn(DynamicColumn *dyncol) { - _dynamic_columns.emplace(dyncol->name(), dyncol); +void Table::addDynamicColumn(unique_ptr<DynamicColumn> dyncol) { + _dynamic_columns.emplace(dyncol->name(), move(dyncol)); } Column *Table::column(string colname) { diff --git a/livestatus/src/Table.h b/livestatus/src/Table.h index a4af3d1..fc3767f 100644 --- a/livestatus/src/Table.h +++ b/livestatus/src/Table.h @@ -27,6 +27,7 @@ #include "config.h" // IWYU pragma: keep #include <map> +#include <memory> #include <string> #include <utility> #include "nagios.h" // IWYU pragma: keep @@ -42,7 +43,7 @@ public: virtual ~Table(); void addColumn(Column *); - void addDynamicColumn(DynamicColumn *); + void addDynamicColumn(std::unique_ptr<DynamicColumn> col); template <typename Predicate> bool any_column(Predicate pred) { @@ -91,7 +92,7 @@ private: Column *dynamicColumn(const std::string &name, const std::string &rest); std::map<std::string, Column *> _columns; - std::map<std::string, DynamicColumn *> _dynamic_columns; + std::map<std::string, std::unique_ptr<DynamicColumn>> _dynamic_columns; }; #endif // Table_h diff --git a/livestatus/src/TableEventConsoleReplication.cc b/livestatus/src/TableEventConsoleReplication.cc index 78ccfbd..3d2e394 100644 --- a/livestatus/src/TableEventConsoleReplication.cc +++ b/livestatus/src/TableEventConsoleReplication.cc @@ -23,15 +23,18 @@ // Boston, MA 02110-1301 USA. #include "TableEventConsoleReplication.h" +#include <memory> +#include "DynamicColumn.h" #include "DynamicEventConsoleReplicationColumn.h" #include "MonitoringCore.h" #include "Query.h" +using std::make_unique; using std::string; TableEventConsoleReplication::TableEventConsoleReplication(MonitoringCore *core) : Table(core->loggerLivestatus()) { - addDynamicColumn(new DynamicEventConsoleReplicationColumn( + addDynamicColumn(make_unique<DynamicEventConsoleReplicationColumn>( "value", "The replication value", -1, -1, core)); }

7 years, 10 months

Add last_state_change column only once.

by Sven Panne

Module: check_mk Branch: master Commit: c268e5235c91a79925c968fe3e082b9637d71886 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c268e5235c91a7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 29 10:08:38 2016 +0100 Add last_state_change column only once. --- livestatus/src/TableServices.cc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index f838608..0112ac8 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -219,11 +219,6 @@ void TableServices::addColumns(Table *table, const string &prefix, reinterpret_cast<char *>(&svc.no_more_notifications) - ref, indirect_offset)); table->addColumn(new OffsetTimeColumn( - prefix + "last_state_change", - "The time of the last state change (Unix timestamp)", - reinterpret_cast<char *>(&svc.last_state_change) - ref, indirect_offset, - -1)); - table->addColumn(new OffsetTimeColumn( prefix + "last_time_ok", "The last time the service was OK (Unix timestamp)", reinterpret_cast<char *>(&svc.last_time_ok) - ref, indirect_offset,

7 years, 10 months

4116 mk_oracle.ps1: added Oracle wallet support to Windows plugin

by Marcel Schulte

Module: check_mk Branch: master Commit: ebaf92efd9fe11ddb0caa4b00281f608d2d3893d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebaf92efd9fe11… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Tue Nov 29 09:15:55 2016 +0100 4116 mk_oracle.ps1: added Oracle wallet support to Windows plugin The plugin for windows could be used with the Oracle wallet. The support is limitted to all Instances except ASM. This function is only for administrators who really knows how to use the wallet. You have to add an entry with the name of the instance. Please check the connection with SQLPlus before trying to use the plugin. The plugin use the following connection: sqlplus /@<ORACLE_SID> You have to add a credential to the wallet with the ORACLE_SID as name for the entry: Example: mkstore -wrl <Wallet Directory> createCredential „<ORACLE_SID>" <Username> <Password> The wallet is only used, when username is set to '/'. Password, hostname and listener-port is ignored, because the tnsnames.ora is used. Please read the doumentation from Oracle for using the wallet. The sqlnet.ora must be configured for your environment and the wallet must be created before adding some entries. You could use TNS_ADMIN in mk_oracle_cfg.ps1 for pointing to the sqlnet configuration for the plugin. --- .werks/4116 | 29 +++++++++++++++++++++++++++++ ChangeLog | 1 + agents/windows/plugins/mk_oracle.ps1 | 23 +++++++++++++++++------ 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/.werks/4116 b/.werks/4116 new file mode 100644 index 0000000..915a0cf --- /dev/null +++ b/.werks/4116 @@ -0,0 +1,29 @@ +Title: mk_oracle.ps1: added Oracle wallet support to Windows plugin +Level: 2 +Component: checks +Compatible: compat +Version: 1.4.0i3 +Date: 1480406962 +Class: feature + +The plugin for windows could be used with the Oracle wallet. The support is +limitted to all Instances except ASM. This function is only for +administrators who really knows how to use the wallet. + +You have to add an entry with the name of the instance. Please check the +connection with SQLPlus before trying to use the plugin. +The plugin use the following connection: +sqlplus /@<ORACLE_SID> + +You have to add a credential to the wallet with the ORACLE_SID as name for +the entry: +Example: +mkstore -wrl <Wallet Directory> createCredential „<ORACLE_SID>" <Username> <Password> + +The wallet is only used, when username is set to '/'. Password, +hostname and listener-port is ignored, because the tnsnames.ora is used. + +Please read the doumentation from Oracle for using the wallet. The +sqlnet.ora must be configured for your environment and the wallet must be +created before adding some entries. You could use TNS_ADMIN in +mk_oracle_cfg.ps1 for pointing to the sqlnet configuration for the plugin. diff --git a/ChangeLog b/ChangeLog index e6878e9..15b16c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * 4094 apc_rackpdu_power: now detects all phases or banks connected to this pdu NOTE: Please refer to the migration notes! * 3993 Some minor performance improvements during config generation... + * 4116 mk_oracle.ps1: added Oracle wallet support to Windows plugin... * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs... diff --git a/agents/windows/plugins/mk_oracle.ps1 b/agents/windows/plugins/mk_oracle.ps1 index bd212b9..0188ab1 100644 --- a/agents/windows/plugins/mk_oracle.ps1 +++ b/agents/windows/plugins/mk_oracle.ps1 @@ -123,7 +123,8 @@ Param( ) # if debug=1 then output if ($DEBUG -gt 0) { - echo "DEBUG:${error_message}" + $MYTIME=Get-Date -Format o + echo "${MYTIME} DEBUG:${error_message}" } } @@ -384,11 +385,17 @@ Param( else { $assysdbaconnect="" } - #$TNSALIAS="$the_host`:$the_port/$sqlsid" $UPPER_SID=$sqlsid.toupper() - $TNSALIAS="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$the_host)(PORT=$the_port))(CONNECT_DATA=(SID=$UPPER_SID)))" - # we presume we can use an EZconnect - $SQL_CONNECT="$the_user/$the_password@$TNSALIAS$assysdbaconnect" + + # use oracle wallet if requested in cfg file + if ($the_user -like "/" ) { + $SQL_CONNECT="/@$UPPER_SID$assysdbaconnect" + } + else { + $TNSALIAS="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$the_host)(PORT=$the_port))(CONNECT_DATA=(SID=$UPPER_SID)))" + # we presume we can use an EZconnect + $SQL_CONNECT="$the_user/$the_password@$TNSALIAS$assysdbaconnect" + } debug_echo "value of sql_connect in dbuser = $SQL_CONNECT" } else { debug_echo "DBUSER is not defined" @@ -1269,7 +1276,7 @@ $list_inst=(get-service -Name "Oracle*Service*" -include "OracleService*", "Orac # the following line ensures that the output of the files generated by calling # Oracle SQLplus through Powershell are not limited to 80 character width. The # 80 character width limit is the default -$Host.UI.RawUI.BufferSize = New-Object Management.Automation.Host.Size (512, 50) +$Host.UI.RawUI.BufferSize = New-Object Management.Automation.Host.Size (512, 150) # We have to set some value for the ORACLE_SID, although here a nonsense value # This value is used when we want to simply list all the banners @@ -1420,6 +1427,10 @@ if ($the_count -gt 0) { } } } + # We need an line break after last output from sections + # otherwise the agent adds <<<local>>> as parameter to the last line of plugin + echo "" + } debug_echo "got to the end"

7 years, 10 months

update werk 4106

by Simon Betz

Module: check_mk Branch: master Commit: d6585391297d6cb58715b779688cea9bcd3b4c2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6585391297d6c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 29 09:10:45 2016 +0100 update werk 4106 --- web/plugins/visuals/filters.py | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 3c535a9..be1771e 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1221,22 +1221,51 @@ class FilterCustomVarChoice(Filter): Filter.__init__(self, name, title, info, [ name ], []) self.custom_var = custom_var self.choices = choices + self.lower_bound_varname = "%s_lower" % self.name + self.upper_bound_varname = "%s_upper" % self.name + + + def _prepare_choices(self): + return map( lambda x: ( x[0], "%s - %s" % (x[0], x[1]) ), self.choices ) def display(self): - selection = [ ("", "") ] + self.choices - html.sorted_select(self.name, selection) + selection = [ ("", "") ] + self._prepare_choices() + html.write("From") + html.sorted_select(self.lower_bound_varname, selection) + html.write("To") + html.sorted_select(self.upper_bound_varname, selection) def filter(self, infoname): - this_custom_value = html.var(self.name) - if this_custom_value: - return "Filter: %s_custom_variables = %s %s\n" % \ - ( self.info, self.custom_var, lqencode(this_custom_value) ) + lower_bound = html.var(self.lower_bound_varname) + upper_bound = html.var(self.upper_bound_varname) + + if lower_bound and upper_bound: + filterline = "Filter: %s_custom_variable_names = %s\n" % \ + ( self.info, self.custom_var ) + + filterline_values = [] + for value, readable in self.choices: + if value >= int(lower_bound) and value <= int(upper_bound): + filterline_values.append( "Filter: custom_variable_values >= %s" % \ + lqencode(str(value)) ) + filterline += "%s\n" % "\n".join( filterline_values ) + + len_filterline_values = len(filterline_values) + if len_filterline_values > 1: + filterline += "Or: %d\n" % len_filterline_values + + return filterline + else: return "" + def double_height(self): + return True + + declare_filter(310, FilterCustomVarChoice( "svc_service_level", _("Service service level"),

7 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016