Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

6716 FIX Add SNMP trap processing log target for deep SNMP trap debugging

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ebdf3cb6f34ca4edb5b0200c2ca5b73fec8ff1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ebdf3cb6f34ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 08:57:24 2018 +0200 6716 FIX Add SNMP trap processing log target for deep SNMP trap debugging A new option "SNMP trap processing" has been added to the Event Console log setting which tells the underlying SNMP library (PySNMP) to write it's debug output to the <tt>var/log/mkeventd.log</tt> when set to <tt>Debug</tt>. Please be careful with this setting. It may result in a lot of log output when you set it to debug for instances which receive a lot of SNMP traps. CMK-905 Change-Id: I7d4589434c45edd2b92545b0eb04fdd2eaad00e7 --- .werks/6716 | 27 +++++++++++++++++++++++++++ cmk/ec/.f12 | 2 +- cmk/ec/main.py | 5 +++-- cmk/ec/snmp.py | 4 ++++ cmk/gui/wato/mkeventd.py | 3 +++ 5 files changed, 38 insertions(+), 3 deletions(-) diff --git a/.werks/6716 b/.werks/6716 new file mode 100644 index 0000000..0f0e7b1 --- /dev/null +++ b/.werks/6716 @@ -0,0 +1,27 @@ +Title: Add SNMP trap processing log target for deep SNMP trap debugging +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537879295 + +A new option "SNMP trap processing" has been added to the Event Console log setting. + +This setting is currently used in the following ways: + +<ul> +<li>It controls the log level of all SNMP related log messages. Previously some +of the SNMP messages were controlled through the "Processing of incoming +events" setting.</li> +<li>Nothing is logged in Informational log level</li> +<li>When set to Verbose it shows details about which traps are received +by the Event Console and how they are handled on protocol level (whether they +are accepted or dropped).</li> +<li>When set to Debug it tells the underlying SNMP library (PySNMP) to +write it's debug output to the <tt>var/log/mkeventd.log</tt>. Please be careful +with this level. It may result in a lot of log output when you set it to debug +for instances which receive a lot of SNMP traps.</li> +</ul> diff --git a/cmk/ec/.f12 b/cmk/ec/.f12 index 3384149..662901d 100644 --- a/cmk/ec/.f12 +++ b/cmk/ec/.f12 @@ -1,7 +1,7 @@ #!/bin/bash set -e -SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} +SITE=${SITE:-$(cat ../../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} ROOT=/omd/sites/$SITE diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 464152f..0e37388 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -698,7 +698,7 @@ class EventServer(ECServerThread): self.open_syslog() self.open_syslog_tcp() self.open_snmptrap() - self._snmp_trap_engine = cmk.ec.snmp.SNMPTrapEngine(self.settings, self._config, self._logger, self.handle_snmptrap) + self._snmp_trap_engine = cmk.ec.snmp.SNMPTrapEngine(self.settings, self._config, self._logger.getChild("snmp"), self.handle_snmptrap) self._snmp_trap_translator = cmk.ec.snmp.SNMPTrapTranslator(self.settings, self._config, self._logger) @classmethod @@ -1328,7 +1328,7 @@ class EventServer(ECServerThread): def reload_configuration(self, config): self._config = config - self._snmp_trap_engine = cmk.ec.snmp.SNMPTrapEngine(self.settings, self._config, self._logger, self.handle_snmptrap) + self._snmp_trap_engine = cmk.ec.snmp.SNMPTrapEngine(self.settings, self._config, self._logger.getChild("snmp"), self.handle_snmptrap) self._snmp_trap_translator = cmk.ec.snmp.SNMPTrapTranslator(self.settings, self._config, self._logger) self.compile_rules(self._config["rules"], self._config["rule_packs"]) self.host_config.initialize() @@ -3942,6 +3942,7 @@ def load_configuration(settings, logger, slave_status): logger.getChild("EventServer").setLevel(levels["cmk.mkeventd.EventServer"]) logger.getChild("EventStatus").setLevel(levels["cmk.mkeventd.EventStatus"]) logger.getChild("StatusServer").setLevel(levels["cmk.mkeventd.StatusServer"]) + logger.getChild("EventServer.snmp").setLevel(levels["cmk.mkeventd.EventServer.snmp"]) logger.getChild("lock").setLevel(levels["cmk.mkeventd.lock"]) # Are we a replication slave? Parts of the configuration diff --git a/cmk/ec/snmp.py b/cmk/ec/snmp.py index d1b5e3b..50d606c 100644 --- a/cmk/ec/snmp.py +++ b/cmk/ec/snmp.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. # Needed for receiving traps +import pysnmp.debug import pysnmp.entity.config import pysnmp.entity.engine import pysnmp.entity.rfc3413.ntfrcv @@ -57,6 +58,9 @@ class SNMPTrapEngine(object): self._initialize_snmp_credentials(config) self._snmp_receiver = SNMPTrapEngine.ECNotificationReceiver(self.snmp_engine, callback) + # Hand over our logger to PySNMP + pysnmp.debug.setLogger(pysnmp.debug.Debug("all", printer=self._logger.debug)) + @staticmethod def _auth_proto_for(proto_name): diff --git a/cmk/gui/wato/mkeventd.py b/cmk/gui/wato/mkeventd.py index c53de79..62018a7 100644 --- a/cmk/gui/wato/mkeventd.py +++ b/cmk/gui/wato/mkeventd.py @@ -3164,6 +3164,9 @@ if mkeventd_enabled: ("cmk.mkeventd.lock", _("Locking"), _("Log level for the locking mechanics. Setting this to debug will enable " "log entries for each lock/unlock action.")), + ("cmk.mkeventd.EventServer.snmp", _("SNMP trap processing"), + _("Log level for the SNMP trap processing mechanics. Setting this to debug will enable " + "detailed log entries for each received SNMP trap.")), ]: elements.append( (component, DropdownChoice(

5 years, 11 months

Add verbose log entries for not processed SNMP traps

by Lars Michelsen

Module: check_mk Branch: master Commit: e33a07ccc63aa2e00cf36835080ff36c940e384e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e33a07ccc63aa2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 09:12:07 2018 +0200 Add verbose log entries for not processed SNMP traps When an SNMP trap can not be processed this results in no log entry by default. When now setting the new "SNMP trap processing" log to verbose there are now entries added for dropped traps. They look like this: 2018-09-25 16:15:02,143 [15] [cmk.mkeventd.snmp] Trap received from 127.0.0.1:38365. Checking for acceptance now. 2018-09-25 16:15:02,149 [15] [cmk.mkeventd.snmp] Trap (v1) dropped from 127.0.0.1: Unknown community (asd) 2018-09-25 16:15:06,019 [15] [cmk.mkeventd.snmp] Trap received from 127.0.0.1:42741. Checking for acceptance now. 2018-09-25 16:15:06,021 [15] [cmk.mkeventd.snmp] Trap (v1) dropped from 127.0.0.1: Unknown community (x) 2018-09-25 16:15:08,253 [15] [cmk.mkeventd.snmp] Trap received from 127.0.0.1:37728. Checking for acceptance now. 2018-09-25 16:15:08,255 [15] [cmk.mkeventd.snmp] Trap (v3) dropped from 127.0.0.1: Unknown credentials (msgUserName: usr-sha-aes128) CMK-905 Change-Id: I624ec2d2827b8256bd3fc6261c713d8cccde4c91 --- cmk/ec/defaults.py | 1 + cmk/ec/main.py | 7 ++++++- cmk/ec/snmp.py | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/cmk/ec/defaults.py b/cmk/ec/defaults.py index 784154b..07485d8 100644 --- a/cmk/ec/defaults.py +++ b/cmk/ec/defaults.py @@ -68,6 +68,7 @@ def default_config(): "log_level": { "cmk.mkeventd": cmk.log.INFO, "cmk.mkeventd.EventServer": cmk.log.INFO, + "cmk.mkeventd.EventServer.snmp": cmk.log.INFO, "cmk.mkeventd.EventStatus": cmk.log.INFO, "cmk.mkeventd.StatusServer": cmk.log.INFO, "cmk.mkeventd.lock": cmk.log.INFO, diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 0e37388..7ecdc73 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -865,7 +865,12 @@ class EventServer(ECServerThread): self._logger.verbose("Trap received from %s:%d. Checking for acceptance now." % sender_address) engine = self._snmp_trap_engine.snmp_engine engine.setUserContext(sender_address=sender_address) - engine.msgAndPduDsp.receiveMessage(engine, (), (), message) + engine.msgAndPduDsp.receiveMessage( + snmpEngine=engine, + transportDomain=(), + transportAddress=sender_address, + wholeMsg=message + ) def handle_snmptrap(self, snmp_engine, state_reference, context_engine_id, context_name, var_binds, cb_ctx): diff --git a/cmk/ec/snmp.py b/cmk/ec/snmp.py index 50d606c..9043b75 100644 --- a/cmk/ec/snmp.py +++ b/cmk/ec/snmp.py @@ -30,6 +30,7 @@ import pysnmp.entity.config import pysnmp.entity.engine import pysnmp.entity.rfc3413.ntfrcv import pysnmp.proto.api +import pysnmp.proto.errind # Needed for trap translation import pysnmp.smi.builder @@ -61,6 +62,10 @@ class SNMPTrapEngine(object): # Hand over our logger to PySNMP pysnmp.debug.setLogger(pysnmp.debug.Debug("all", printer=self._logger.debug)) + self.snmp_engine.observer.registerObserver(self._handle_unauthenticated_snmptrap, + "rfc2576.prepareDataElements:sm-failure", "rfc3412.prepareDataElements:sm-failure") + + @staticmethod def _auth_proto_for(proto_name): @@ -129,6 +134,18 @@ class SNMPTrapEngine(object): securityEngineId=pysnmp.proto.api.v2c.OctetString(hexValue=engine_id)) + def _handle_unauthenticated_snmptrap(self, snmp_engine, execpoint, variables, cb_ctx): + if variables["securityLevel"] in [ 1, 2 ] and variables["statusInformation"]["errorIndication"] == pysnmp.proto.errind.unknownCommunityName: + msg = "Unknown community (%s)" % variables["statusInformation"].get("communityName", "") + elif variables["securityLevel"] == 3 and variables["statusInformation"]["errorIndication"] == pysnmp.proto.errind.unknownSecurityName: + msg = "Unknown credentials (msgUserName: %s)" % variables["statusInformation"].get("msgUserName", "") + else: + msg = "%s" % variables["statusInformation"] + + self._logger.verbose("Trap (v%d) dropped from %s: %s", + variables["securityLevel"], variables["transportAddress"][0], msg) + + class SNMPTrapTranslator(object): def __init__(self, settings, config, logger): super(SNMPTrapTranslator, self).__init__()

5 years, 11 months

Refactored left over SNMP protocol handling to cmk.ec.snmp

by Lars Michelsen

Module: check_mk Branch: master Commit: c651da4b5117b2a87b37206ca656a5deb411aac7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c651da4b5117b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 09:29:31 2018 +0200 Refactored left over SNMP protocol handling to cmk.ec.snmp Change-Id: I27655b9aa8096f6621a4167a7c132402b8e41a2f --- cmk/ec/main.py | 38 +++++--------------------------------- cmk/ec/snmp.py | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 7ecdc73..20ab2d7 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -699,7 +699,6 @@ class EventServer(ECServerThread): self.open_syslog_tcp() self.open_snmptrap() self._snmp_trap_engine = cmk.ec.snmp.SNMPTrapEngine(self.settings, self._config, self._logger.getChild("snmp"), self.handle_snmptrap) - self._snmp_trap_translator = cmk.ec.snmp.SNMPTrapTranslator(self.settings, self._config, self._logger) @classmethod def status_columns(cls): @@ -859,36 +858,10 @@ class EventServer(ECServerThread): # http://www.outflux.net/blog/archives/2008/03/09/using-select-on-a-fifo/ return os.open(str(self.settings.paths.event_pipe.value), os.O_RDWR | os.O_NONBLOCK) - # Receives an incoming SNMP trap from the socket and hands it over to PySNMP for parsing - # and processing. PySNMP is calling self.handle_snmptrap back. - def process_snmptrap(self, message, sender_address): - self._logger.verbose("Trap received from %s:%d. Checking for acceptance now." % sender_address) - engine = self._snmp_trap_engine.snmp_engine - engine.setUserContext(sender_address=sender_address) - engine.msgAndPduDsp.receiveMessage( - snmpEngine=engine, - transportDomain=(), - transportAddress=sender_address, - wholeMsg=message - ) - - def handle_snmptrap(self, snmp_engine, state_reference, context_engine_id, context_name, - var_binds, cb_ctx): - ipaddress = snmp_engine.getUserContext("sender_address")[0] - self.log_snmptrap_details(context_engine_id, context_name, var_binds, ipaddress) - trap = self._snmp_trap_translator.translate(ipaddress, var_binds) - event = self.create_event_from_trap(trap, ipaddress) - self.process_event(event) - - def log_snmptrap_details(self, context_engine_id, context_name, var_binds, ipaddress): - if self._logger.is_verbose(): - self._logger.verbose('Trap accepted from %s (ContextEngineId "%s", ContextName "%s")' % - (ipaddress, context_engine_id.prettyPrint(), context_name.prettyPrint())) - - for name, val in var_binds: - self._logger.verbose('%-40s = %s' % (name.prettyPrint(), val.prettyPrint())) + def handle_snmptrap(self, trap, ipaddress): + self.process_event(self._create_event_from_trap(trap, ipaddress)) - def create_event_from_trap(self, trap, ipaddress): + def _create_event_from_trap(self, trap, ipaddress): # use the trap-oid as application application = u'' for index, (oid, _unused_val) in enumerate(trap): @@ -1037,7 +1010,7 @@ class EventServer(ECServerThread): if self._snmptrap is not None and self._snmptrap.fileno() in readable: try: message, sender_address = self._snmptrap.recvfrom(65535) - self.process_raw_data(lambda: self.process_snmptrap(message, sender_address)) + self.process_raw_data(lambda: self._snmp_trap_engine.process_snmptrap(message, sender_address)) except Exception: self._logger.exception('Exception handling a SNMP trap from "%s". Skipping this one' % sender_address[0]) @@ -1334,7 +1307,6 @@ class EventServer(ECServerThread): def reload_configuration(self, config): self._config = config self._snmp_trap_engine = cmk.ec.snmp.SNMPTrapEngine(self.settings, self._config, self._logger.getChild("snmp"), self.handle_snmptrap) - self._snmp_trap_translator = cmk.ec.snmp.SNMPTrapTranslator(self.settings, self._config, self._logger) self.compile_rules(self._config["rules"], self._config["rule_packs"]) self.host_config.initialize() @@ -2665,7 +2637,7 @@ class QueryCOMMAND(Query): # - deal with convert_history_line() (if not a str column) # - make sure that the new column is filled at *every* place where # an event is being created: -# * create_event_from_trap() +# * _create_event_from_trap() # * create_event_from_line() # * _handle_absent_event() # * _create_overflow_event() diff --git a/cmk/ec/snmp.py b/cmk/ec/snmp.py index 9043b75..712d1b3 100644 --- a/cmk/ec/snmp.py +++ b/cmk/ec/snmp.py @@ -57,10 +57,12 @@ class SNMPTrapEngine(object): return self.snmp_engine = pysnmp.entity.engine.SnmpEngine() self._initialize_snmp_credentials(config) - self._snmp_receiver = SNMPTrapEngine.ECNotificationReceiver(self.snmp_engine, callback) + self._snmp_receiver = SNMPTrapEngine.ECNotificationReceiver(self.snmp_engine, self._handle_snmptrap) + self._snmp_trap_translator = SNMPTrapTranslator(settings, config, logger) + self._callback = callback # Hand over our logger to PySNMP - pysnmp.debug.setLogger(pysnmp.debug.Debug("all", printer=self._logger.debug)) + pysnmp.debug.setLogger(pysnmp.debug.Debug("all", printer=logger.debug)) self.snmp_engine.observer.registerObserver(self._handle_unauthenticated_snmptrap, "rfc2576.prepareDataElements:sm-failure", "rfc3412.prepareDataElements:sm-failure") @@ -134,6 +136,36 @@ class SNMPTrapEngine(object): securityEngineId=pysnmp.proto.api.v2c.OctetString(hexValue=engine_id)) + def process_snmptrap(self, message, sender_address): + """Receives an incoming SNMP trap from the socket and hands it over to PySNMP for parsing + and processing. PySNMP is calling the registered call back (self._handle_snmptrap) back.""" + self._logger.verbose("Trap received from %s:%d. Checking for acceptance now." % sender_address) + self.snmp_engine.setUserContext(sender_address=sender_address) + self.snmp_engine.msgAndPduDsp.receiveMessage( + snmpEngine=self.snmp_engine, + transportDomain=(), + transportAddress=sender_address, + wholeMsg=message + ) + + + def _handle_snmptrap(self, snmp_engine, state_reference, context_engine_id, context_name, + var_binds, cb_ctx): + ipaddress = self.snmp_engine.getUserContext("sender_address")[0] + self._log_snmptrap_details(context_engine_id, context_name, var_binds, ipaddress) + trap = self._snmp_trap_translator.translate(ipaddress, var_binds) + self._callback(trap, ipaddress) + + + def _log_snmptrap_details(self, context_engine_id, context_name, var_binds, ipaddress): + if self._logger.is_verbose(): + self._logger.verbose('Trap accepted from %s (ContextEngineId "%s", ContextName "%s")' % + (ipaddress, context_engine_id.prettyPrint(), context_name.prettyPrint())) + + for name, val in var_binds: + self._logger.verbose('%-40s = %s' % (name.prettyPrint(), val.prettyPrint())) + + def _handle_unauthenticated_snmptrap(self, snmp_engine, execpoint, variables, cb_ctx): if variables["securityLevel"] in [ 1, 2 ] and variables["statusInformation"]["errorIndication"] == pysnmp.proto.errind.unknownCommunityName: msg = "Unknown community (%s)" % variables["statusInformation"].get("communityName", "")

5 years, 11 months

6717 3rd party components and licenses are now listed in central file

by Lars Michelsen

Module: check_mk Branch: master Commit: b7a1711ec70521fd4ff263430f188f37429eebd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7a1711ec70521… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 25 17:37:50 2018 +0200 6717 3rd party components and licenses are now listed in central file Check_MK contains a lot of open source software. The licensing and copyright of each package can now be found in a central CSV file. This file is located in <tt>share/doc/Licenses.csv</tt> in each released version. You can find the file of your local default version e.g. at <tt>/omd/versions/default/share/doc/Licenses.csv</tt>. The latest file is always available in the git at <tt>omd/Licenses.csv</tt> which is also available via the git browser <a href="https://git.mathias-kettner.de/git/?p=check_mk.git;a=blob;f=omd/Makefile/Li…">here</a>. CMK-822 Change-Id: Ic636131c26242ba9df599d9b517bc619b2c8ab0f --- .werks/6717 | 18 ++++ omd/Licenses.README | 6 ++ omd/Licenses.csv | 274 +++++++++++++++++++++++++++++++++++++++++++++++++++ omd/Licenses.ods | Bin 0 -> 31221 bytes omd/Makefile | 1 + omd/debian/copyright | 7 +- 6 files changed, 302 insertions(+), 4 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b7a1711ec7…

5 years, 11 months

Fixed wrong URL in werk

by Lars Michelsen

Module: check_mk Branch: master Commit: 619d1dbedf5c84e8a8a2e5b69b64887c8378ef48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=619d1dbedf5c84… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 08:44:08 2018 +0200 Fixed wrong URL in werk Change-Id: I0640b8e2f938051b0ba9bab49b4e52e19da86604 --- .werks/6717 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/6717 b/.werks/6717 index 35ec888..137d9f2 100644 --- a/.werks/6717 +++ b/.werks/6717 @@ -15,4 +15,4 @@ of your local default version e.g. at <tt>/omd/versions/default/share/doc/Licens The latest file is always available in the git at <tt>omd/Licenses.csv</tt> which is also available via the git browser -<a href="https://git.mathias-kettner.de/git/?p=check_mk.git;a=blob;f=omd/Makefile/Li…">here</a>. +<a href="https://git.mathias-kettner.de/git/?p=check_mk.git;a=blob;f=omd/Licenses.csv">here</a>.

5 years, 11 months

agent_azure: more info on VMs

by Moritz Kiemer

Module: check_mk Branch: master Commit: e57250a4045e31e4f882a76670ba2cc8c271c576 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e57250a4045e31… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Sep 24 13:09:37 2018 +0200 agent_azure: more info on VMs CMK-1028 Change-Id: I2649673ae6da6e8451505396d916b6d40aed69e7 --- Pipfile | 15 ++-- agents/special/agent_azure | 79 +++++++++++++++------ omd/packages/python-modules/Makefile | 15 ++-- omd/packages/python-modules/src/adal-1.0.2.tar.gz | Bin 32634 -> 0 bytes omd/packages/python-modules/src/adal-1.1.0.tar.gz | Bin 0 -> 32978 bytes .../python-modules/src/azure-common-1.1.14.zip | Bin 15737 -> 0 bytes .../python-modules/src/azure-common-1.1.15.zip | Bin 0 -> 15887 bytes .../src/azure-mgmt-compute-4.1.0.zip | Bin 0 -> 2199016 bytes .../python-modules/src/certifi-2018.4.16.tar.gz | Bin 149967 -> 0 bytes .../python-modules/src/certifi-2018.8.24.tar.gz | Bin 0 -> 146866 bytes .../python-modules/src/msrest-0.5.4.tar.gz | Bin 41215 -> 0 bytes .../python-modules/src/msrest-0.5.5.tar.gz | Bin 0 -> 38505 bytes .../python-modules/src/msrestazure-0.4.34.tar.gz | Bin 29668 -> 0 bytes .../python-modules/src/msrestazure-0.5.0.tar.gz | Bin 0 -> 26781 bytes .../python-modules/src/pycparser-2.18.tar.gz | Bin 245897 -> 0 bytes .../python-modules/src/pycparser-2.19.tar.gz | Bin 0 -> 158295 bytes .../python-modules/src/typing-3.6.4.tar.gz | Bin 71347 -> 0 bytes .../python-modules/src/typing-3.6.6.tar.gz | Bin 0 -> 71799 bytes 18 files changed, 75 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e57250a404…

5 years, 11 months

agent_netapp: recover from parse exception & print some debug info

by Moritz Kiemer

Module: check_mk Branch: master Commit: 20fdef80330266e7d0e7f14f844014ba57f430d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20fdef80330266… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Sep 25 16:10:48 2018 +0200 agent_netapp: recover from parse exception & print some debug info Change-Id: Id9dd3b78b2a6af11f7f0da8b67d56640f28cccac --- agents/special/agent_netapp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 1075440..055dc8f 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -289,6 +289,8 @@ else: print "######## GOT RESPONSE #######" if netapp_response.results_status() != "passed": print "Error: Unable to parse content of response:\n%s" % netapp_response.results_reason() + if netapp_response.results_status() == "parse-exception": + print "Raw response text:\n%s" % netapp_response.raw_response_text else: print prettify(netapp_response.get_results().get_node()) @@ -387,7 +389,12 @@ else: return # We except an XML answer (not HTML) - self.content = NetAppNode(ET.fromstring(self.raw_response_text)) + try: + self.content = NetAppNode(ET.fromstring(self.raw_response_text)) + except ET.ParseError, exc: + self.status = "parse-exception" + self.reason = str(exc) + return self.status = self.content.child_get("results").node.attrib["status"] if self.status != "passed":

5 years, 11 months

5510 FIX Add missing metrics for Windows Memory and Pagefile check

by Andreas Umbreit

Module: check_mk Branch: master Commit: c440ea0b3f560a00a2d80db6287c33ad6c301387 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c440ea0b3f560a… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Sep 24 14:13:42 2018 +0200 5510 FIX Add missing metrics for Windows Memory and Pagefile check Memory and Pagefile average graphs are now displayed using the correct scaling and unit. Change-Id: Ibd63ef11d5bdeac215421a40ad290c755286ad14 --- .werks/5510 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5510 b/.werks/5510 new file mode 100644 index 0000000..a25679d --- /dev/null +++ b/.werks/5510 @@ -0,0 +1,11 @@ +Title: Add missing metrics for Windows Memory and Pagefile check +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537791027 + +Memory and Pagefile average graphs are now displayed using the correct scaling and unit.

5 years, 11 months

CMK-1063: Add metrics for memory and pagefile avg.

by Andreas Umbreit

Module: check_mk Branch: master Commit: c8cf8cab5a749940ceee7636bad13dadc64277e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8cf8cab5a7499… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Sep 24 13:05:57 2018 +0200 CMK-1063: Add metrics for memory and pagefile avg. Change-Id: Ia47d88c333c671fb6631e54e201f6f4ace9923d5 --- cmk/gui/plugins/metrics/check_mk.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 8d91f5b..b7c039a 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -693,6 +693,18 @@ metric_info["mem_total"] = { "unit" : "bytes", } +metric_info["memory_avg"] = { + "title" : _("Memory Average"), + "color": "#80ff40", + "unit" : "bytes", +} + +metric_info["pagefile_avg"] = { + "title" : _("Commit Charge Average"), + "color": "#408f20", + "unit" : "bytes", +} + metric_info["mem_free"] = { "title" : _("Free RAM"), "color" : "#ffffff", @@ -4675,6 +4687,8 @@ check_metrics["check_mk-aix_memory"] = { check_metrics["check_mk-mem.win"] = { "memory" : { "name" : "mem_used", "scale" : MB }, "pagefile" : { "name" : "pagefile_used", "scale" : MB }, + "memory_avg" : { "scale" : MB }, + "pagefile_avg" : { "scale" : MB }, "mem_total" : { "auto_graph" : False, "scale" : MB }, "pagefile_total" : { "auto_graph" : False, "scale" : MB}, }

5 years, 11 months

Fixed merge issue in last commit

by Lars Michelsen

Module: check_mk Branch: master Commit: b23a8a406cf5dc922dbc572227acc8b11bdfb83d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b23a8a406cf5dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 25 21:03:56 2018 +0200 Fixed merge issue in last commit Change-Id: Ib983c744e68bb73ffe9625c6844ecaac3f84090c --- cmk_base/checks.py | 927 ----------------------------------------------------- cmk_base/config.py | 6 +- 2 files changed, 3 insertions(+), 930 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b23a8a406c…

5 years, 11 months

← Newer
1
...
6
7
8
9
10
11
12
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018