Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

4722 FIX agent_ucs_bladecenter: Fixed broken special agent

by Lars Michelsen

Module: check_mk Branch: master Commit: 54a5e2cbc095954e6c2f94f9e0f92f9b9e5d2480 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54a5e2cbc09595… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 17 16:02:37 2017 +0200 4722 FIX agent_ucs_bladecenter: Fixed broken special agent The special agent was broken since march. It failed with the error "NameError: global name 'netloc' is not defined". Change-Id: I5c368394ac4f7f4ff0f2af0a3f3a16cb9aec537b --- .werks/4722 | 11 +++++++++++ agents/special/agent_ucs_bladecenter | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4722 b/.werks/4722 new file mode 100644 index 0000000..2e1452b --- /dev/null +++ b/.werks/4722 @@ -0,0 +1,11 @@ +Title: agent_ucs_bladecenter: Fixed broken special agent +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1495029698 +Class: fix + +The special agent was broken since march. It failed with the error +"NameError: global name 'netloc' is not defined". diff --git a/agents/special/agent_ucs_bladecenter b/agents/special/agent_ucs_bladecenter index a33e7a9..ca55b10 100755 --- a/agents/special/agent_ucs_bladecenter +++ b/agents/special/agent_ucs_bladecenter @@ -94,7 +94,7 @@ def get_pattern(pattern, line): class Server: def __init__(self, host_address): self.netloc = host_address - self.conn_handle = httplib.HTTPSConnection(netloc, context = ssl._create_unverified_context()) + self.conn_handle = httplib.HTTPSConnection(self.netloc, context = ssl._create_unverified_context()) self.cookie = None if opt_debug:

7 years, 4 months

Some more IWYU tweaks to work around the Boost versionitis.

by Sven Panne

Module: check_mk Branch: master Commit: c117fc2de6bfa1e4f121c28dab4713f8197f8a5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c117fc2de6bfa1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 17 15:45:40 2017 +0200 Some more IWYU tweaks to work around the Boost versionitis. Change-Id: I969af4f1eda49e5b5909f5048a47ba73b63a2d1a --- livestatus/src/EventConsoleConnection.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/livestatus/src/EventConsoleConnection.cc b/livestatus/src/EventConsoleConnection.cc index a2493cf..61fbb61 100644 --- a/livestatus/src/EventConsoleConnection.cc +++ b/livestatus/src/EventConsoleConnection.cc @@ -22,8 +22,9 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +// IWYU pragma: no_include <boost/asio/local/basic_endpoint.hpp> +// IWYU pragma: no_include <boost/asio/basic_socket_streambuf.hpp> #include "EventConsoleConnection.h" -#include <boost/asio/basic_socket_streambuf.hpp> #include <boost/asio/socket_base.hpp> #include <boost/system/system_error.hpp> #include <ostream>

7 years, 4 months

Log exceptions happening in quicksearch handler to web.log

by Lars Michelsen

Module: check_mk Branch: master Commit: ecabf4783fe8978f33265dddb8508b8ee3987356 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecabf4783fe897… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 17 15:06:12 2017 +0200 Log exceptions happening in quicksearch handler to web.log Change-Id: I5f80a1e23c8183b142364fb24fc5bacc81224665 --- web/htdocs/sidebar.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index d9abb4a..9b1db5b 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -727,6 +727,7 @@ def ajax_search(): except MKException, e: html.show_error(e) except Exception, e: + log_exception() if config.debug: raise import traceback

7 years, 4 months

Tweak Boost autoconf magic.

by Sven Panne

Module: check_mk Branch: master Commit: f90def66d691464b4c6e4a559b71b42e6c5f59f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f90def66d69146… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 17 14:50:23 2017 +0200 Tweak Boost autoconf magic. Change-Id: I4ee68579ffa6a5d854981c14c21d35678b3f785d --- livestatus/src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index c58ac10..2f95a53 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -163,10 +163,10 @@ liblivestatus_a_CXXFLAGS = -fPIC livestatus.o: $(liblivestatus_a_OBJECTS) # Note: libstdc++fs is only available as a static library, so we are lucky - $(CXX) $(LDFLAGS) -shared $^ -o $@ -lstdc++fs -lpthread -static-libstdc++ @BOOST_LDFLAGS@ -lboost_system + $(CXX) $(LDFLAGS) -shared $^ -o $@ -lstdc++fs -lpthread -static-libstdc++ # To make sure we can dlopen() our NEB later $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) -c NagiosMockup.cc -o NagiosMockup.o - $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) NagiosMockup.o $@ -o NagiosMockup + $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) NagiosMockup.o $@ @BOOST_LDFLAGS@ @BOOST_ASIO_LIB@ -o NagiosMockup $(RM) NagiosMockup all-local: livestatus.o

7 years, 4 months

Fixed bug introduced yesterday: Host tags of hosts in a folder were using same host tags

by Lars Michelsen

Module: check_mk Branch: master Commit: 367782d867199a78cb0dc12029d93809f5efc41f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=367782d867199a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 17 14:50:44 2017 +0200 Fixed bug introduced yesterday: Host tags of hosts in a folder were using same host tags Change-Id: Ieefb91415ad790075232336e4c96cac59c58aeda --- web/htdocs/watolib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index fac4fc9..ddc9ecf 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1448,7 +1448,7 @@ class CREFolder(BaseFolder): def effective_attributes(self): if self._effective_attributes != None: - return self._effective_attributes # cached :-) + return self._effective_attributes.copy() # cached :-) effective = {} for folder in self.parent_folder_chain(): @@ -1461,7 +1461,7 @@ class CREFolder(BaseFolder): if attrname not in effective: effective.setdefault(attrname, host_attribute.default_value()) - self._effective_attributes = effective + self._effective_attributes = effective.copy() return effective

7 years, 4 months

Fixed Boost versionitis.

by Sven Panne

Module: check_mk Branch: master Commit: 0cc0a4da09f6e98748e0935adcd0dcbb1914e714 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cc0a4da09f6e9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 17 14:27:35 2017 +0200 Fixed Boost versionitis. Change-Id: I72bb14cce2a576d82017cf341b84689a0ad6d9b9 --- configure.ac | 1 - livestatus/src/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 40487a4..b9ef93e 100644 --- a/configure.ac +++ b/configure.ac @@ -148,7 +148,6 @@ AC_DEFINE([_GLIBCXX_REGEX_STATE_LIMIT], [2500], [the maximum number of states the regex NFA can have]) AC_DEFINE([BOOST_SYSTEM_NO_DEPRECATED], [1], [we do not want any old stuff]) -AC_DEFINE([BOOST_ERROR_CODE_HEADER_ONLY], [1], [avoid linking with boost_system]) # HACKING ALERT: automake can't really handle optional subdirectories, so we # have to do this in a slightly hacky way by using M4's silent includes. diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index efdf542..c58ac10 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -163,7 +163,7 @@ liblivestatus_a_CXXFLAGS = -fPIC livestatus.o: $(liblivestatus_a_OBJECTS) # Note: libstdc++fs is only available as a static library, so we are lucky - $(CXX) $(LDFLAGS) -shared $^ -o $@ -lstdc++fs -lpthread -static-libstdc++ @BOOST_LDFLAGS@ + $(CXX) $(LDFLAGS) -shared $^ -o $@ -lstdc++fs -lpthread -static-libstdc++ @BOOST_LDFLAGS@ -lboost_system # To make sure we can dlopen() our NEB later $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) -c NagiosMockup.cc -o NagiosMockup.o $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) NagiosMockup.o $@ -o NagiosMockup

7 years, 4 months

Sanitized IWYU's no_include pragmas a bit.

by Sven Panne

Module: check_mk Branch: master Commit: ca0808fbb492a7856a84663feee02fdf9aa8bc1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca0808fbb492a7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 17 12:30:52 2017 +0200 Sanitized IWYU's no_include pragmas a bit. Change-Id: I5dd5fdd5a41e69e47e0599afc8ab586490f76a38 --- bin/mkevent.cc | 1 - bin/mkeventd_open514.cc | 1 - livestatus/src/Logfile.cc | 1 + livestatus/src/LogwatchListColumn.cc | 2 -- livestatus/src/Query.h | 1 - livestatus/src/ServiceListFilter.cc | 1 - livestatus/src/StringUtils.cc | 1 + livestatus/src/Table.h | 1 - livestatus/src/TableColumns.cc | 1 - livestatus/src/TableEventConsole.cc | 1 - livestatus/src/TableEventConsoleEvents.cc | 2 -- livestatus/src/TableEventConsoleHistory.cc | 2 -- livestatus/src/TableLog.h | 1 - livestatus/src/TableStateHistory.h | 1 - livestatus/src/module.cc | 1 + livestatus/src/pnp4nagios.cc | 2 -- tests/check_mk.imp | 8 +++++++- 17 files changed, 10 insertions(+), 18 deletions(-) diff --git a/bin/mkevent.cc b/bin/mkevent.cc index 1d09a62..2b55429 100644 --- a/bin/mkevent.cc +++ b/bin/mkevent.cc @@ -22,7 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// IWYU pragma: no_include <bits/socket_type.h> #include <arpa/inet.h> #include <fcntl.h> #include <netinet/in.h> diff --git a/bin/mkeventd_open514.cc b/bin/mkeventd_open514.cc index 8d00bf0..c2b4f1d 100644 --- a/bin/mkeventd_open514.cc +++ b/bin/mkeventd_open514.cc @@ -30,7 +30,6 @@ That can then simply use filedescriptor 3 and receive syslog messages */ -// IWYU pragma: no_include <bits/socket_type.h> #include <netinet/in.h> #include <sys/socket.h> #include <unistd.h> diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index eb7d908..42ada94 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -22,6 +22,7 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +// https://github.com/include-what-you-use/include-what-you-use/issues/166 // IWYU pragma: no_include <ext/alloc_traits.h> #include "Logfile.h" #include <fcntl.h> diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index 362b330..9631039 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -22,8 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// IWYU pragma: no_include <experimental/bits/fs_ops.h> -// IWYU pragma: no_include <experimental/fs_ops.h> #include "LogwatchListColumn.h" #include <ostream> #include "FileSystem.h" diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 7bba21d..45719dd 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -25,7 +25,6 @@ #ifndef Query_h #define Query_h -// IWYU pragma: no_include <bits/shared_ptr.h> #include "config.h" // IWYU pragma: keep #include <cstdint> #include <ctime> diff --git a/livestatus/src/ServiceListFilter.cc b/livestatus/src/ServiceListFilter.cc index 37a7750..03ebcbd 100644 --- a/livestatus/src/ServiceListFilter.cc +++ b/livestatus/src/ServiceListFilter.cc @@ -22,7 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// IWYU pragma: no_include <ext/alloc_traits.h> #include "ServiceListFilter.h" #include <ostream> #include "Logger.h" diff --git a/livestatus/src/StringUtils.cc b/livestatus/src/StringUtils.cc index 89e1319..bd4d86a 100644 --- a/livestatus/src/StringUtils.cc +++ b/livestatus/src/StringUtils.cc @@ -22,6 +22,7 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +// https://github.com/include-what-you-use/include-what-you-use/issues/434 // IWYU pragma: no_include <type_traits> #include "StringUtils.h" #include <algorithm> diff --git a/livestatus/src/Table.h b/livestatus/src/Table.h index 5356dc1..56529fa 100644 --- a/livestatus/src/Table.h +++ b/livestatus/src/Table.h @@ -25,7 +25,6 @@ #ifndef Table_h #define Table_h -// IWYU pragma: no_include <bits/shared_ptr.h> #include "config.h" // IWYU pragma: keep #include <map> #include <memory> diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc index aaae7ac..49fc726 100644 --- a/livestatus/src/TableColumns.cc +++ b/livestatus/src/TableColumns.cc @@ -22,7 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// IWYU pragma: no_include <bits/shared_ptr.h> #include "TableColumns.h" #include <memory> #include "Column.h" diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index 6fd0747..6b495a8 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -22,7 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// IWYU pragma: no_include <bits/shared_ptr.h> #include "TableEventConsole.h" #include <iosfwd> #include <iostream> diff --git a/livestatus/src/TableEventConsoleEvents.cc b/livestatus/src/TableEventConsoleEvents.cc index 19aebf4..f9911a8 100644 --- a/livestatus/src/TableEventConsoleEvents.cc +++ b/livestatus/src/TableEventConsoleEvents.cc @@ -22,8 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// IWYU pragma: no_include <bits/shared_ptr.h> -// IWYU pragma: no_include <algorithm> #include "TableEventConsoleEvents.h" #include <memory> #include "Column.h" diff --git a/livestatus/src/TableEventConsoleHistory.cc b/livestatus/src/TableEventConsoleHistory.cc index 14aa950..33b7f82 100644 --- a/livestatus/src/TableEventConsoleHistory.cc +++ b/livestatus/src/TableEventConsoleHistory.cc @@ -22,8 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// IWYU pragma: no_include <bits/shared_ptr.h> -// IWYU pragma: no_include <algorithm> #include "TableEventConsoleHistory.h" #include <memory> #include "Column.h" diff --git a/livestatus/src/TableLog.h b/livestatus/src/TableLog.h index 659c343..bee41ba 100644 --- a/livestatus/src/TableLog.h +++ b/livestatus/src/TableLog.h @@ -25,7 +25,6 @@ #ifndef TableLog_h #define TableLog_h -// IWYU pragma: no_include <bits/shared_ptr.h> #include "config.h" // IWYU pragma: keep #include <ctime> #include <memory> // IWYU pragma: keep diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index 61548e8..77ab097 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -25,7 +25,6 @@ #ifndef TableStateHistory_h #define TableStateHistory_h -// IWYU pragma: no_include <bits/shared_ptr.h> #include "config.h" // IWYU pragma: keep #include <map> #include <memory> // IWYU pragma: keep diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 90d1fcb..2e1f030 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -25,6 +25,7 @@ // Needed for strdup and S_ISSOCK #define _XOPEN_SOURCE 500 +// https://github.com/include-what-you-use/include-what-you-use/issues/166 // IWYU pragma: no_include <ext/alloc_traits.h> #include "config.h" #include <fcntl.h> diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index e7a08b4..af39f7d 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -22,8 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// IWYU pragma: no_include <experimental/bits/fs_ops.h> -// IWYU pragma: no_include <experimental/fs_ops.h> #include "pnp4nagios.h" #include <cstddef> #include <system_error> diff --git a/tests/check_mk.imp b/tests/check_mk.imp index 7b574ba..15db6ca 100644 --- a/tests/check_mk.imp +++ b/tests/check_mk.imp @@ -1,5 +1,11 @@ # Default include mappings for Check_MK [ { ref: boost-all.imp }, - { ref: boost-all-private.imp } + { ref: boost-all-private.imp }, + { include: ["<bits/shared_ptr.h>", private, "<memory>", public ] }, + { include: ["<bits/socket_type.h>", private, "<sys/socket.h>", public ] }, + { include: ["<experimental/bits/fs_ops.h>", private, "<experimental/filesystem>", public ] }, + { include: ["<experimental/fs_ops.h>", private, "<experimental/filesystem>", public ] }, + { include: ["<pcap/bpf.h>", private, "<pcap.h>", public ] }, + { include: ["<pcap/pcap.h>", private, "<pcap.h>", public ] } ]

7 years, 4 months

Added IWYU include mappings for Boost.

by Sven Panne

Module: check_mk Branch: master Commit: dba94713d69e78b340f8ba0b4c78f5493ad311b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dba94713d69e78… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 17 11:49:53 2017 +0200 Added IWYU include mappings for Boost. Change-Id: I18d97ee8102ae577a47b88db4868887177bdf224 --- Makefile | 2 +- tests/boost-all-private.imp | 4116 +++++++++++++++++++++++++++++++ tests/boost-all.imp | 5629 +++++++++++++++++++++++++++++++++++++++++++ tests/check_mk.imp | 5 + 4 files changed, 9751 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dba94713d6…

7 years, 4 months

Use Boost.Asio in EventConsoleConnection, vastly simplifying things.

by Sven Panne

Module: check_mk Branch: master Commit: 004d0e77ab0822bbbe3fd1be48407e557cbcb08f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=004d0e77ab0822… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 16 17:14:09 2017 +0200 Use Boost.Asio in EventConsoleConnection, vastly simplifying things. Apart from being simpler, this fixes a performance issue with reading a reply from mkeventd: Previously we did single-byte reads, now we just re-use the common efficient C++ buffering framework for its I/O streams. Change-Id: I2327156877fc0be915015f9aa97beca083c09bdf --- configure.ac | 3 + .../src/DynamicEventConsoleReplicationColumn.cc | 7 +- livestatus/src/EventConsoleConnection.cc | 112 ++++++--------------- livestatus/src/EventConsoleConnection.h | 19 ++-- livestatus/src/OutputBuffer.cc | 1 - livestatus/src/Store.cc | 5 +- livestatus/src/TableEventConsole.cc | 16 ++- 7 files changed, 55 insertions(+), 108 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=004d0e77ab…

7 years, 4 months

4649 fortigate_ipsecvpn: tunnels which are down can now be ignored during levels calculation

by Simon Betz

Module: check_mk Branch: master Commit: ade63010177a37a013ca06f3d6e46364dabe4150 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ade63010177a37… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 10 10:21:33 2017 +0200 4649 fortigate_ipsecvpn: tunnels which are down can now be ignored during levels calculation Change-Id: Ife3ea6dadff9827534c282228da5ede3248d7be2 --- .werks/4649 | 10 +++++++ checks/fortigate_ipsecvpn | 58 ++++++++++++++++++++++-------------- web/plugins/wato/check_parameters.py | 1 + 3 files changed, 47 insertions(+), 22 deletions(-) diff --git a/.werks/4649 b/.werks/4649 new file mode 100644 index 0000000..b78cfeb --- /dev/null +++ b/.werks/4649 @@ -0,0 +1,10 @@ +Title: fortigate_ipsecvpn: tunnels which are down can now be ignored during levels calculation +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1494404461 +Class: feature + + diff --git a/checks/fortigate_ipsecvpn b/checks/fortigate_ipsecvpn index 7019ffa..664204c 100644 --- a/checks/fortigate_ipsecvpn +++ b/checks/fortigate_ipsecvpn @@ -25,7 +25,9 @@ # Boston, MA 02110-1301 USA. -fortigate_ipsecvpn_default_levels = (1, 2) +factory_settings['fortigate_ipsecvpn_default_levels'] = { + "levels" : (1, 2), +} def inventory_fortigate_ipsecvpn(info): @@ -34,47 +36,59 @@ def inventory_fortigate_ipsecvpn(info): def check_fortigate_ipsecvpn(item, params, info): - if type(params) == tuple: params = { "levels" : params } - ent_status_map = { - "1": "down", - "2": "up" - } - warn, crit = params["levels"] - - tunnels_down = [p2name for p2name, ent_status in info - if ent_status_map[ent_status] == "down"] - - num_down = len(tunnels_down) - num_total = len(info) - num_up = num_total - num_down - - if num_down >= crit: + tunnels_ignore_levels = params.get("tunnels_ignore_levels", []) + + tunnels_down = [] + tunnels_ignored = [] + for p2name, ent_status in info: + if ent_status == "1": + tunnels_down.append(p2name) + if p2name in tunnels_ignore_levels: + tunnels_ignored.append(p2name) + + num_total = len(info) + num_down = len(tunnels_down) + num_ignored = len(tunnels_ignored) + num_down_ignored = num_down - num_ignored + num_up = num_total - num_down + + if num_down_ignored >= crit: status = 2 - elif num_down >= warn: + elif num_down_ignored >= warn: status = 1 else: status = 0 - infotext = "Active/Configured: %d/%d" % (num_total - num_down, num_total) + infotext = "Total: %d, Up: %d, Down: %d" % \ + (num_total, num_up, num_down) + + if num_ignored: + infotext += " (ignored: %d)" % num_ignored + + if status > 0: + infotext += " (warn/crit at %d/%d)" % (warn, crit) + if tunnels_down: - infotext += ", down: " + ", ".join(tunnels_down) + infotext += ", Tunnels: %s" % (", ".join(tunnels_down)) return status, infotext, [('active_vpn_tunnels', num_up, '', '', 0, num_total)] check_info["fortigate_ipsecvpn"] = { - "default_levels_variable" : "fortigate_ipsecvpn", "inventory_function" : inventory_fortigate_ipsecvpn, "check_function" : check_fortigate_ipsecvpn, "service_description" : "VPN IPSec Tunnels", "has_perfdata" : True, "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0"), - "snmp_info" : (".1.3.6.1.4.1.12356.101.12.2.2.1", [3, # fgVpnTunEntPhase2Name - 20]), # fgVpnTunEntStatus + "snmp_info" : (".1.3.6.1.4.1.12356.101.12.2.2.1", [ + 3, # fgVpnTunEntPhase2Name + 20, # fgVpnTunEntStatus + ]), + "default_levels_variable" : "fortigate_ipsecvpn_default_levels", "group" : "ipsecvpn", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ac14f9f..5a74dea 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -636,6 +636,7 @@ register_check_parameters( Integer(title=_("Warning at"), default_value=1), Integer(title=_("Critical at"), default_value=2), ])), + ("tunnels_ignore_levels", ListOfStrings(title = _("Tunnels which ignore levels"))) ], optional_keys = [] ),

7 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017