add support for zabbix as alternative to nagios #81

smoors · 2022-05-03T06:28:45Z

No description provided.

stdweird · 2022-05-03T07:15:22Z

@smoors can you add a unittest as well?

also tests fail

Try to import each namespace

----------------------------------------------------------------------

Traceback (most recent call last):

  File "/var/lib/jenkins/jobs/hpcugent_github.com/jobs/vsc-utils/branches/PR-81/workspace/.tox/py36/lib/python3.6/site-packages/vsc_install-0.17.23-py3.6.egg/vsc/install/commontest.py", line 291, in test_import_packages

    msg='check_header of %s' % fn)

AssertionError: True is not false : check_header of lib/vsc/__init__.py


======================================================================


FAIL: test_prospector (vsc.install.commontest.CommonTest)

Test prospector failures

----------------------------------------------------------------------

Traceback (most recent call last):

  File "/var/lib/jenkins/jobs/hpcugent_github.com/jobs/vsc-utils/branches/PR-81/workspace/.tox/py36/lib/python3.6/site-packages/vsc_install-0.17.23-py3.6.egg/vsc/install/commontest.py", line 314, in test_prospector

    self.assertFalse(failures, "prospector failures: %s" % pprint.pformat(failures))

AssertionError: [{'source': 'pylint', 'code': 'unused-import', 'location': {'path': '/var/lib/jenkins/jobs/hpcugent_github.com/jobs/vsc-utils/branches/PR-81/workspace/lib/vsc/utils/script_tools.py', 'module': 'vsc.utils.script_tools', 'function': None, 'line': 44, 'character': 0}, 'message': 'Unused SimpleZabbix imported from vsc.utils.nagios'}] is not false : prospector failures: [{'code': 'unused-import',

  'location': {'character': 0,

               'function': None,

               'line': 44,

               'module': 'vsc.utils.script_tools',

               'path': '/var/lib/jenkins/jobs/hpcugent_github.com/jobs/vsc-utils/branches/PR-81/workspace/lib/vsc/utils/script_tools.py'},

  'message': 'Unused SimpleZabbix imported from vsc.utils.nagios',

  'source': 'pylint'}]


ERROR: script_tools (unittest.loader._FailedTest)

----------------------------------------------------------------------

ImportError: Failed to import test module: script_tools

Traceback (most recent call last):

  File "/usr/lib64/python3.6/unittest/loader.py", line 153, in loadTestsFromName

    module = __import__(module_name)

  File "/var/lib/jenkins/jobs/hpcugent_github.com/jobs/vsc-utils/branches/PR-81/workspace/test/script_tools.py", line 40, in <module>

    from vsc.utils.script_tools import ExtendedSimpleOption, DEFAULT_OPTIONS, NrpeCLI, CLI

  File "lib/vsc/utils/script_tools.py", line 44, in <module>

    from vsc.utils.nagios import (

ImportError: cannot import name 'SimpleZabbix'



======================================================================

FAIL: test_import_modules (vsc.install.commontest.CommonTest)

Try to import each module

----------------------------------------------------------------------

Traceback (most recent call last):

  File "/var/lib/jenkins/jobs/hpcugent_github.com/jobs/vsc-utils/branches/PR-81/workspace/.tox/py36/lib/python3.6/site-packages/vsc_install-0.17.23-py3.6.egg/vsc/install/commontest.py", line 274, in _import

    __import__(pkg)

  File "lib/vsc/utils/script_tools.py", line 44, in <module>

    from vsc.utils.nagios import (

ImportError: cannot import name 'SimpleZabbix'


During handling of the above exception, another exception occurred:

lib/vsc/utils/script_tools.py

smoors · 2022-05-11T07:32:47Z

@smoors can you add a unittest as well?

done in 86afb52

smoors · 2022-05-11T07:33:37Z

@stdweird I think this is ready, can you have another look?

stdweird · 2022-05-13T07:04:16Z

lib/vsc/utils/nagios.py

@@ -434,6 +438,11 @@ class SimpleNagios(NagiosResult):

    def __init__(self, **kwargs):
        """Initialise message and perfdata"""
+        self._init(**kwargs)


don't do this please

ok, removed

stdweird · 2022-05-13T07:04:41Z

lib/vsc/utils/nagios.py

@@ -434,6 +438,11 @@ class SimpleNagios(NagiosResult):

    def __init__(self, **kwargs):
        """Initialise message and perfdata"""
+        self._init(**kwargs)
+
+    def _init(self, reporterclass=NagiosReporter, **kwargs):


why not use a class constant instead of passing the extra arg?

that's indeed a simpler solution
fixed in 507804c

stdweird · 2022-05-13T07:05:50Z

lib/vsc/utils/script_tools.py

@@ -129,6 +131,7 @@ def __init__(self, options, run_prologue=True, excepthook=None, **kwargs):

        self.nagios_reporter = None
        self.lockfile = None
+        self.monitorclass = monitorclass


same as with the reporter, why not use a class constant?

fixed in 507804c

stdweird · 2022-05-13T07:25:19Z

lib/vsc/utils/nagios.py


+
+    def print_report_and_exit(self, timestamp, nagios_exit_code, nagios_exit_string, nagios_message):
+        """Print the nagios report (if the data is not too old) and exit"""


why do you not need/use the if/else logic? i would have expected that you only want to override the if block?

for zabbix the if/else logic is skipped: we always report, even if the data is too old, and let zabbix handle that.

stdweird · 2022-05-13T08:54:59Z

lib/vsc/utils/zabbix.py

+        return json.dumps(processed_dict)
+
+
+class ExtendedSimpleOptionZabbix(ExtendedSimpleOption):


how do you use this in code? i see no easy way to pass this via commandline or config file

we use this class directly like this:

opts = ExtendedSimpleOptionZabbix(options)

this similar to how it's used here: https://github.com/vub-hpc/Lmod-UGent/blob/master/run_lmod_cache.py

or did I miss something?

smoors · 2022-06-20T14:43:21Z

@stdweird to clarify, we have a script called run_slurm_cache.py that uses ExtendedSimpleOptionZabbix, and that we can run with like this:

run_slurm_cache.py --nagios-user=zabbix
run_slurm_cache.py --nagios-report

this is already working for us.
I just added a commit that sets 'zabbix' as cache user by default, so --nagios-user=zabbix is no longer needed.

can this be merged, or is there anything else that needs to be done?

wpoely86 · 2022-06-20T14:46:39Z

lib/vsc/utils/zabbix.py

+
+    def print_report_and_exit(self, timestamp, nagios_exit_code, nagios_exit_string, nagios_message):
+        """Print the zabbix report and exit"""
+        print('[%f, "%s", %s]' % (timestamp, nagios_exit_string, nagios_message))


Let the json module do this? So we don't have to care about any special case?

that's more complicated, because nagios_message is already a json string, so then you have to first load it and then dump it again.

wpoely86 · 2022-06-20T14:49:52Z

lib/vsc/utils/zabbix.py

+
+# -*- encoding: utf-8 -*-
+#
+# Copyright 2012-2022 Ghent University


Suggested change

# Copyright 2012-2022 Ghent University

# Copyright 2022-2022 Vrije Universiteit Brussel

And run find ./{lib,test} -type f -name '*.py' | REPO_BASE_DIR=$PWD xargs -I '{}' python -m vsc.install.headers '{}' in the repo.

this command reverts the change back to Ghent University

wpoely86 · 2022-06-20T15:21:56Z

lib/vsc/utils/zabbix.py

+        """Print the zabbix report and exit"""
+        print('[%f, "%s", %s]' % (timestamp, nagios_exit_string, nagios_message))
+        self.log.info("Zabbix check cache file %s contents delivered: %s", self.filename, nagios_message)
+        sys.exit(nagios_exit_code)


for zabbix, we want a normal exit I think? Will the agent not fail if it's non-zero?

from Ward:

Checking the exit code is removed from external checks, user parameters and system.run items. These checks will not to become unsupported if the exit code is different than zero. Exit code checks are now only performed in custom alert scripts, remote commands and user scripts executed on Zabbix server and proxy.

in de release notes van 3.4.3

dus this ok

add support for zabbix as alternative to nagios

72e92ff

stdweird reviewed May 3, 2022

View reviewed changes

lib/vsc/utils/script_tools.py Outdated Show resolved Hide resolved

smoors added 2 commits May 3, 2022 09:37

remove wrong import

3f0e291

update copyright date

7b639b9

smoors changed the title ~~add support for zabbix as alternative to nagios~~ add support for zabbix as alternative to nagios (WIP) May 3, 2022

stdweird reviewed May 3, 2022

View reviewed changes

lib/vsc/utils/script_tools.py Outdated Show resolved Hide resolved

add monitorclass arg to __init__ instead of prologue

70d2fa9

smoors force-pushed the zabbix branch from bc3c247 to 70d2fa9 Compare May 3, 2022 17:23

smoors added 3 commits May 3, 2022 19:26

use lowercase monitorclass everywhere

c7595ad

dont print nagios exit string for zabbix

75732bf

include timestamp into json output for zabbix; add test for zabbix

86afb52

smoors changed the title ~~add support for zabbix as alternative to nagios (WIP)~~ add support for zabbix as alternative to nagios May 11, 2022

simplify report printing for zabbix

df0cee3

stdweird reviewed May 13, 2022

View reviewed changes

use class constants for monitorclass and reporterclass

507804c

stdweird reviewed May 13, 2022

View reviewed changes

smoors added 2 commits May 13, 2022 10:55

fix line too long

2fa7a98

use 'zabbix' as default cache user for zabbix

dacb163

wpoely86 reviewed Jun 20, 2022

View reviewed changes

version bump

4869a7c

wpoely86 reviewed Jun 20, 2022

View reviewed changes

use dictionary rather than list for json

a316993

smoors mentioned this pull request Sep 28, 2022

Zabbix vub-hpc/vsc-utils#1

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add support for zabbix as alternative to nagios #81

add support for zabbix as alternative to nagios #81

smoors commented May 3, 2022

stdweird commented May 3, 2022

smoors commented May 11, 2022

smoors commented May 11, 2022

stdweird May 13, 2022

smoors May 13, 2022

stdweird May 13, 2022

smoors May 13, 2022

stdweird May 13, 2022

smoors May 13, 2022

stdweird May 13, 2022

smoors May 13, 2022

stdweird May 13, 2022

smoors May 13, 2022 •

edited

Loading

smoors commented Jun 20, 2022

wpoely86 Jun 20, 2022

smoors Jun 20, 2022

wpoely86 Jun 20, 2022 •

edited

Loading

wpoely86 Jun 20, 2022

smoors Jun 20, 2022

wpoely86 Jun 20, 2022

smoors Jun 20, 2022



		def print_report_and_exit(self, timestamp, nagios_exit_code, nagios_exit_string, nagios_message):
		"""Print the nagios report (if the data is not too old) and exit"""

		return json.dumps(processed_dict)


		class ExtendedSimpleOptionZabbix(ExtendedSimpleOption):

	# Copyright 2012-2022 Ghent University
	# Copyright 2022-2022 Vrije Universiteit Brussel

add support for zabbix as alternative to nagios #81

Are you sure you want to change the base?

add support for zabbix as alternative to nagios #81

Conversation

smoors commented May 3, 2022

stdweird commented May 3, 2022

smoors commented May 11, 2022

smoors commented May 11, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smoors May 13, 2022 • edited Loading

Choose a reason for hiding this comment

smoors commented Jun 20, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wpoely86 Jun 20, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smoors May 13, 2022 •

edited

Loading

wpoely86 Jun 20, 2022 •

edited

Loading