From 85c14745192dfbc48ecadd9f3dfa9ea6bfd14a94 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Wed, 5 Jun 2013 14:24:08 +0000 Subject: [PATCH 01/40] Added check_ifoperstate --- check_ifoperstate/check_ifoperstate.py | 85 ++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 check_ifoperstate/check_ifoperstate.py diff --git a/check_ifoperstate/check_ifoperstate.py b/check_ifoperstate/check_ifoperstate.py new file mode 100644 index 0000000..37b4b2f --- /dev/null +++ b/check_ifoperstate/check_ifoperstate.py @@ -0,0 +1,85 @@ +#!/usr/bin/python +# +# Copyright 2013, Tomas Edwardsson +# +# This script is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This script is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Enumerates interfaces and their operstate (up/down/unknown). + +__author__ = 'tommi' + +from subprocess import PIPE, Popen +import os +import sys +from pynag.Plugins import PluginHelper, ok, critical, unknown + +helper = PluginHelper() + +helper.parser.add_option('-I', "--interface", help="Interface (eth0/bond/em/..) multiple supported with -I ... -I ...", + dest="interfaces", action="append") +helper.parser.add_option('-H', "--hostname", help="Check interface on remote host", dest="host_name") +helper.parser.add_option('-l', "--list-interfaces", help="List interfaces", dest="list_interfaces", action="store_true") + +helper.parse_arguments() +# /usr/lib/nagios/plugins:/usr/lib64/nagios/plugins:/usr/local/libexec:/usr/libexec:/usr/local/nagios/libexec + +local_env = os.environ +local_env["PATH"] += ":%s" % (":".join([ + "/usr/lib/nagios/plugins", + "/usr/lib64/nagios/plugins", + "/usr/local/libexec", + "/usr/libexec", + "/usr/local/nagios/libexec"])) + +if helper.options.host_name: + command = ("check_nrpe -H %s -c get_ifoperstate" % helper.options.host_name).split() +else: + command = ["get_ifoperstate.sh"] + + +# List the interfaces and exit +def get_interfaces(): + interfaces = [] + try: + cmd = Popen(command, stdout=PIPE, shell=False) + for line in cmd.stdout.readlines(): + interface, status = line.strip().split(":") + interfaces.append((interface, status)) + + except Exception, e: + helper.add_summary("Unable to get interfaces: %s" % e) + helper.status(unknown) + helper.exit() + return interfaces + +interface_state = get_interfaces() + +if helper.options.list_interfaces: + for interface in interface_state: + print "%-20s %s" % (interface[0], interface[1]) + sys.exit(0) + + +for interface in interface_state: + if not helper.options.interfaces or interface[0] in helper.options.interfaces: + if interface[1] == "unknown": + helper.add_status(unknown) + elif interface[1] == "up": + helper.add_status(ok) + else: + helper.add_status(critical) + helper.add_long_output("%s operstate is %s" % (interface[0], interface[1])) + +helper.check_all_metrics() +helper.exit() From 91e7874a5b7e63c995d8807de32265ba4a508dc5 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Wed, 5 Jun 2013 14:32:21 +0000 Subject: [PATCH 02/40] Packaged check_ifoperstate.sh --- check_ifoperstate/README.md | 5 +++ check_ifoperstate/check_ifoperstate.py | 5 +-- .../nagios-okplugin-check_ifoperstate.spec | 39 +++++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 check_ifoperstate/README.md create mode 100644 check_ifoperstate/nagios-okplugin-check_ifoperstate.spec diff --git a/check_ifoperstate/README.md b/check_ifoperstate/README.md new file mode 100644 index 0000000..424bc08 --- /dev/null +++ b/check_ifoperstate/README.md @@ -0,0 +1,5 @@ +Checks the operator status of network interfaces + +Requires: + + The get_ifoperstate.sh script diff --git a/check_ifoperstate/check_ifoperstate.py b/check_ifoperstate/check_ifoperstate.py index 37b4b2f..0435397 100644 --- a/check_ifoperstate/check_ifoperstate.py +++ b/check_ifoperstate/check_ifoperstate.py @@ -17,7 +17,7 @@ # Enumerates interfaces and their operstate (up/down/unknown). -__author__ = 'tommi' +__author__ = 'Tomas Edwardsson ' from subprocess import PIPE, Popen import os @@ -32,7 +32,6 @@ helper.parser.add_option('-H', "--hostname", help="Check interface on remote hos helper.parser.add_option('-l', "--list-interfaces", help="List interfaces", dest="list_interfaces", action="store_true") helper.parse_arguments() -# /usr/lib/nagios/plugins:/usr/lib64/nagios/plugins:/usr/local/libexec:/usr/libexec:/usr/local/nagios/libexec local_env = os.environ local_env["PATH"] += ":%s" % (":".join([ @@ -58,7 +57,7 @@ def get_interfaces(): interfaces.append((interface, status)) except Exception, e: - helper.add_summary("Unable to get interfaces: %s" % e) + helper.add_summary("Unable to get interfaces \"%s\": %s" % (" ".join(command), e)) helper.status(unknown) helper.exit() return interfaces diff --git a/check_ifoperstate/nagios-okplugin-check_ifoperstate.spec b/check_ifoperstate/nagios-okplugin-check_ifoperstate.spec new file mode 100644 index 0000000..e425922 --- /dev/null +++ b/check_ifoperstate/nagios-okplugin-check_ifoperstate.spec @@ -0,0 +1,39 @@ +%define debug_package %{nil} +%define plugin check_ifoperstate + +Summary: A Nagios plugin to check interface operator status +Name: nagios-okplugin-%{plugin} +Version: 0.0.1 +Release: 1%{?dist} +License: GPLv2+ +Group: Applications/System +URL: https://github.com/opinkerfi/misc/tree/master/nagios-plugins/check_%{plugin} +Source0: https://github.com/opinkerfi/misc/tree/master/nagios-plugins/check_%{plugin}/releases/%{name}-%{version}.tar.gz +Requires: nagios-okconfig-nrpe >= 0.0.4 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Packager: Tomas Edwardsson +BuildArch: noarch + + +%description +Checks the operator status of network interfaces + +%prep +%setup -q + +%build + + +%install +rm -rf %{buildroot} +install -D -p -m 0755 %{plugin} %{buildroot}%{_libdir}/nagios/plugins/%{plugin} + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc README.md +%{_libdir}/nagios/plugins/* + +%changelog From ad16f4f7299938afb068d1b5e5cb0f09d21455ff Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Wed, 5 Jun 2013 14:33:26 +0000 Subject: [PATCH 03/40] Automatic commit of package [nagios-okplugin-check_ifoperstate] release [0.0.2-1]. --- check_http_multi/check_http_multi | 89 +++++++++++++++++++ .../nagios-okplugin-check_ifoperstate.spec | 5 +- .../nagios-okplugin-check_ifoperstate | 1 + 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 check_http_multi/check_http_multi create mode 100644 rel-eng/packages/nagios-okplugin-check_ifoperstate diff --git a/check_http_multi/check_http_multi b/check_http_multi/check_http_multi new file mode 100644 index 0000000..9f4abfb --- /dev/null +++ b/check_http_multi/check_http_multi @@ -0,0 +1,89 @@ +#!/usr/bin/python +# Copyright 2013, Tomas Edwardsson +# +# This script is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This script is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from pynag.Plugins import PluginHelper, critical, warning, ok +import requests +import time +import signal + + +class TimeoutException(Exception): + pass + + +def signal_alarm(signo, frame): + raise TimeoutException() + + +def main(): + plugin = PluginHelper() + + plugin.parser.add_option('-u', help="http uris", dest="uri", action="append") + plugin.parse_arguments() + + if not plugin.options.uri: + plugin.parser.error("-u (uri) argument is required") + + start_time = time.time() + # Assign timeout handler + signal.signal(signal.SIGALRM, signal_alarm) + + success = 0 + failed = 0 + for uri in plugin.options.uri: + webstate, status = check_website(uri) + if webstate: + success += 1 + plugin.add_long_output("%s fetched in %s seconds" % (uri, status)) + plugin.add_metric(uri, status, uom="s") + + else: + failed += 1 + plugin.add_long_output("%s failed, %s" % (uri, status)) + + plugin.add_summary("Checked %i uris, %i failed" % ((failed + success), failed)) + plugin.status(ok) + plugin.add_metric("failed", failed) + plugin.add_metric("failed_percentage", (100 * failed / float(failed + success)), uom="%") + plugin.add_metric("runtime", time.time() - start_time, uom="s") + plugin.check_all_metrics() + + plugin.exit() + + + +def check_website(uri, timeout=10): + """Tries fetching the uri specified + returns (False, "Invalid status code ") on any failure and status code other than 2XX + returns (None, "Timeout in %f seconds") on timeout + returns (True, time (float)) it took to fetch the website on success""" + + start_time = time.time() + signal.alarm(timeout) + try: + req = requests.get(uri) + if str(req.status_code)[0] != "2": + return False, "Invalid HTTP status: " + str(req.status_code) + except TimeoutException: + return None, "Timeout in %.2f seconds" % (time.time() - start_time) + except Exception, e: + return False, "Error encountered: " + e.message + signal.alarm(0) + return True, "%.2f" % (time.time() - start_time) + + +if __name__ == "__main__": + main() diff --git a/check_ifoperstate/nagios-okplugin-check_ifoperstate.spec b/check_ifoperstate/nagios-okplugin-check_ifoperstate.spec index e425922..f3c1a69 100644 --- a/check_ifoperstate/nagios-okplugin-check_ifoperstate.spec +++ b/check_ifoperstate/nagios-okplugin-check_ifoperstate.spec @@ -3,7 +3,7 @@ Summary: A Nagios plugin to check interface operator status Name: nagios-okplugin-%{plugin} -Version: 0.0.1 +Version: 0.0.2 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -37,3 +37,6 @@ rm -rf %{buildroot} %{_libdir}/nagios/plugins/* %changelog +* Wed Jun 05 2013 Tomas Edwardsson 0.0.2-1 +- new package built with tito + diff --git a/rel-eng/packages/nagios-okplugin-check_ifoperstate b/rel-eng/packages/nagios-okplugin-check_ifoperstate new file mode 100644 index 0000000..86b6c4b --- /dev/null +++ b/rel-eng/packages/nagios-okplugin-check_ifoperstate @@ -0,0 +1 @@ +0.0.2-1 check_ifoperstate/ From c0361e67d9b29372e90f31d419c98a4a5474bc69 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Wed, 5 Jun 2013 14:33:54 +0000 Subject: [PATCH 04/40] Rename ifoperstate --- check_ifoperstate/{check_ifoperstate.py => check_ifoperstate} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename check_ifoperstate/{check_ifoperstate.py => check_ifoperstate} (100%) diff --git a/check_ifoperstate/check_ifoperstate.py b/check_ifoperstate/check_ifoperstate similarity index 100% rename from check_ifoperstate/check_ifoperstate.py rename to check_ifoperstate/check_ifoperstate From d6e0eee0fbe29f8f65520a3a4e0c7318b52d2310 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Wed, 5 Jun 2013 17:11:14 +0000 Subject: [PATCH 05/40] Automatic commit of package [nagios-okplugin-check_ifoperstate] release [0.0.3-1]. --- check_ifoperstate/nagios-okplugin-check_ifoperstate.spec | 5 ++++- rel-eng/packages/nagios-okplugin-check_ifoperstate | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/check_ifoperstate/nagios-okplugin-check_ifoperstate.spec b/check_ifoperstate/nagios-okplugin-check_ifoperstate.spec index f3c1a69..9992309 100644 --- a/check_ifoperstate/nagios-okplugin-check_ifoperstate.spec +++ b/check_ifoperstate/nagios-okplugin-check_ifoperstate.spec @@ -3,7 +3,7 @@ Summary: A Nagios plugin to check interface operator status Name: nagios-okplugin-%{plugin} -Version: 0.0.2 +Version: 0.0.3 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -37,6 +37,9 @@ rm -rf %{buildroot} %{_libdir}/nagios/plugins/* %changelog +* Wed Jun 05 2013 Tomas Edwardsson 0.0.3-1 +- Rename ifoperstate (tommi@tommi.org) + * Wed Jun 05 2013 Tomas Edwardsson 0.0.2-1 - new package built with tito diff --git a/rel-eng/packages/nagios-okplugin-check_ifoperstate b/rel-eng/packages/nagios-okplugin-check_ifoperstate index 86b6c4b..6d558f9 100644 --- a/rel-eng/packages/nagios-okplugin-check_ifoperstate +++ b/rel-eng/packages/nagios-okplugin-check_ifoperstate @@ -1 +1 @@ -0.0.2-1 check_ifoperstate/ +0.0.3-1 check_ifoperstate/ From 0828935d9096311e5986efa594b15336bfdd3a34 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Thu, 6 Jun 2013 10:11:31 +0000 Subject: [PATCH 06/40] Allow -u "" for service macros --- check_http_multi/check_http_multi | 1 + 1 file changed, 1 insertion(+) diff --git a/check_http_multi/check_http_multi b/check_http_multi/check_http_multi index 9f4abfb..6f76843 100644 --- a/check_http_multi/check_http_multi +++ b/check_http_multi/check_http_multi @@ -44,6 +44,7 @@ def main(): success = 0 failed = 0 for uri in plugin.options.uri: + if not uri: continue webstate, status = check_website(uri) if webstate: success += 1 From 4e21b502b7c07ce86702ee359e4ff445a313e5db Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Thu, 6 Jun 2013 10:22:09 +0000 Subject: [PATCH 07/40] Added packaging and rudimentary documentation --- check_http_multi/README.md | 40 +++++++++++++++++++ .../nagios-okplugin-check_http_multi.spec | 40 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 check_http_multi/README.md create mode 100644 check_http_multi/nagios-okplugin-check_http_multi.spec diff --git a/check_http_multi/README.md b/check_http_multi/README.md new file mode 100644 index 0000000..5d1bf24 --- /dev/null +++ b/check_http_multi/README.md @@ -0,0 +1,40 @@ +Introduction +============ +Check http multi was created to check multiple websites in one plugin. You can check the following: + +* Latency per website +* Overall runtime of http requests (serial) +* Number of failed websites +* Percentage of failed websites + + +How +=== + +Check Percentage Failed +----------------------- +Here we check http://www.google.com and http://adagios.org + +Failure rates of +* 0%-30% are ok +* 30%-60% are warning +* everything above is critical + +``` +$ check_http_multi -u http://www.google.com -u http://adagios.org/ \ + --th metric=failed_percentage,warning=30..60,critical=60..inf +Checked 2 uris, 0 failed | 'http://www.google.com'=0.24s;;;; 'http://adagios.org/'=0.47s;;;; 'failed'=0;;;; 'failed_percentage'=0.0%;30..60;60..inf;; 'runtime'=0.711745977402s;;;; +http://www.google.com fetched in 0.24 seconds +http://adagios.org/ fetched in 0.47 seconds +``` + + + +Author +====== +Tomas Edwardsson + + +License +======= +GPLv3 or later diff --git a/check_http_multi/nagios-okplugin-check_http_multi.spec b/check_http_multi/nagios-okplugin-check_http_multi.spec new file mode 100644 index 0000000..e17a442 --- /dev/null +++ b/check_http_multi/nagios-okplugin-check_http_multi.spec @@ -0,0 +1,40 @@ +%define debug_package %{nil} +%define plugin check_http_multi + +Summary: A Nagios plugin to check multiple websites +Name: nagios-okplugin-%{plugin} +Version: 0.1.0 +Release: 1%{?dist} +License: GPLv3+ +Group: Applications/System +URL: https://github.com/opinkerfi/misc/tree/master/nagios-plugins/check_%{plugin} +Source0: https://github.com/opinkerfi/misc/tree/master/nagios-plugins/check_%{plugin}/releases/%{name}-%{version}.tar.gz +Requires: nagios-okconfig-nrpe >= 0.0.4 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Packager: Tomas Edwardsson +BuildArch: noarch + + +%description +Checks multiple websites for latency and failures. You can specify how many +of them will fail to return warning or critical state. + +%prep +%setup -q + +%build + + +%install +rm -rf %{buildroot} +install -D -p -m 0755 %{plugin} %{buildroot}%{_libdir}/nagios/plugins/%{plugin} + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc README.md +%{_libdir}/nagios/plugins/* + +%changelog From 911720e5d4c9f5ea2e0e55800833ed7e6bd51b74 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Thu, 6 Jun 2013 10:22:35 +0000 Subject: [PATCH 08/40] Automatic commit of package [nagios-okplugin-check_http_multi] release [0.1.1-1]. --- check_http_multi/nagios-okplugin-check_http_multi.spec | 5 ++++- rel-eng/packages/nagios-okplugin-check_http_multi | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 rel-eng/packages/nagios-okplugin-check_http_multi diff --git a/check_http_multi/nagios-okplugin-check_http_multi.spec b/check_http_multi/nagios-okplugin-check_http_multi.spec index e17a442..3f24d7a 100644 --- a/check_http_multi/nagios-okplugin-check_http_multi.spec +++ b/check_http_multi/nagios-okplugin-check_http_multi.spec @@ -3,7 +3,7 @@ Summary: A Nagios plugin to check multiple websites Name: nagios-okplugin-%{plugin} -Version: 0.1.0 +Version: 0.1.1 Release: 1%{?dist} License: GPLv3+ Group: Applications/System @@ -38,3 +38,6 @@ rm -rf %{buildroot} %{_libdir}/nagios/plugins/* %changelog +* Thu Jun 06 2013 Tomas Edwardsson 0.1.1-1 +- new package built with tito + diff --git a/rel-eng/packages/nagios-okplugin-check_http_multi b/rel-eng/packages/nagios-okplugin-check_http_multi new file mode 100644 index 0000000..418faf6 --- /dev/null +++ b/rel-eng/packages/nagios-okplugin-check_http_multi @@ -0,0 +1 @@ +0.1.1-1 check_http_multi/ From be5d1ce505ad0daeb177a89696f803fa61059eea Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Sun, 14 Jul 2013 22:42:47 +0000 Subject: [PATCH 09/40] Initial commit, without pynag.Plugins --- check_pkgkit/LICENSE-GPL3 | 678 ++++++++++++++++++++++++++++++++++++++ check_pkgkit/README.md | 37 +++ check_pkgkit/check_pkgkit | 46 +++ 3 files changed, 761 insertions(+) create mode 100644 check_pkgkit/LICENSE-GPL3 create mode 100644 check_pkgkit/README.md create mode 100644 check_pkgkit/check_pkgkit diff --git a/check_pkgkit/LICENSE-GPL3 b/check_pkgkit/LICENSE-GPL3 new file mode 100644 index 0000000..de2dcce --- /dev/null +++ b/check_pkgkit/LICENSE-GPL3 @@ -0,0 +1,678 @@ +------------------------------------------------------------------------- + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + +------------------------------------------------------------------------- diff --git a/check_pkgkit/README.md b/check_pkgkit/README.md new file mode 100644 index 0000000..427d278 --- /dev/null +++ b/check_pkgkit/README.md @@ -0,0 +1,37 @@ +About +===== + +This plugin checks for available updates using PackageKit +http://packagekit.org/ on Linux systems + +Why a new plugin? +================= + +There are already plugins out there like check_yum and check_apt which do +check for updates but they are distribution specific. The main drivers are: + +* Can run unprivileged +* No sudo/selinux problems +* Non distribution specific, works on debian, ubuntu, fedora, centos, rhel... + +Caveats +======= +* PackageKit does draw in quite a few packages with it. +* Does not work on older distros, like centos/rhel 5. + +Dependencies +============ + +pynag-0.4.7+ +Known to work with PackageKit 0.7.6 or later + +Room for improvement +==================== + +The plugin executes pkcon instead of using the API directly. I actually gave +the API a whirl via "from gi.repository import PackageKitGlib as packagekit" +but the documentation was very lacking so I ended up with pkcon. + +License +======= +GPLv3 or newer, see LICENSE-GPL3 in the root of the project diff --git a/check_pkgkit/check_pkgkit b/check_pkgkit/check_pkgkit new file mode 100644 index 0000000..2be36a6 --- /dev/null +++ b/check_pkgkit/check_pkgkit @@ -0,0 +1,46 @@ +#!/usr/bin/python +# +# Copyright 2013, Tomas Edwardsson +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import sys +from subprocess import Popen, PIPE + +def pkcon_get_updates(): + update_types = {} + p = Popen(["pkcon", "get-updates"], stdout=PIPE) + results_section = False + for line in p.stdout.readlines(): + line = line.strip() + if results_section == False and line == "Results:": + results_section = True + elif results_section: + update_type = line[:13].replace(' ', '') + update_package = line [14:].strip() + + if update_type not in update_types: + update_types[update_type] = [] + update_types[update_type].append(update_package) + + return update_types + +def main(): + pkg_updates = pkcon_get_updates() + + for update_type in pkg_updates: + print "%s: %i" % (update_type, len(pkg_updates[update_type])) + +if __name__ == "__main__": + main() From c7a4b606544cdee95d68ca9834cd5bca399570e5 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Sun, 14 Jul 2013 22:46:08 +0000 Subject: [PATCH 10/40] Missing first char of package name --- check_pkgkit/check_pkgkit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_pkgkit/check_pkgkit b/check_pkgkit/check_pkgkit index 2be36a6..d258c2c 100644 --- a/check_pkgkit/check_pkgkit +++ b/check_pkgkit/check_pkgkit @@ -28,7 +28,7 @@ def pkcon_get_updates(): results_section = True elif results_section: update_type = line[:13].replace(' ', '') - update_package = line [14:].strip() + update_package = line [13:].strip() if update_type not in update_types: update_types[update_type] = [] From cfd3cfcff8ba98b5779be69d83323b4fb682498e Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Sun, 14 Jul 2013 22:46:30 +0000 Subject: [PATCH 11/40] Print package names --- check_pkgkit/check_pkgkit | 2 ++ 1 file changed, 2 insertions(+) diff --git a/check_pkgkit/check_pkgkit b/check_pkgkit/check_pkgkit index d258c2c..a74f4b9 100644 --- a/check_pkgkit/check_pkgkit +++ b/check_pkgkit/check_pkgkit @@ -41,6 +41,8 @@ def main(): for update_type in pkg_updates: print "%s: %i" % (update_type, len(pkg_updates[update_type])) + for pkg in pkg_updates[update_type]: + print " %s" % pkg if __name__ == "__main__": main() From e610610f2132c077752cd62c22564ada4763fec5 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Sun, 14 Jul 2013 22:49:08 +0000 Subject: [PATCH 12/40] Clearer description of unprivileged --- check_pkgkit/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_pkgkit/README.md b/check_pkgkit/README.md index 427d278..a9964a7 100644 --- a/check_pkgkit/README.md +++ b/check_pkgkit/README.md @@ -10,7 +10,7 @@ Why a new plugin? There are already plugins out there like check_yum and check_apt which do check for updates but they are distribution specific. The main drivers are: -* Can run unprivileged +* Can run unprivileged, for instance the nrpe user * No sudo/selinux problems * Non distribution specific, works on debian, ubuntu, fedora, centos, rhel... From 86430fbbc53ff9aa607d5bfe72888a368baea4ce Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Sun, 14 Jul 2013 22:54:07 +0000 Subject: [PATCH 13/40] Added install documentation --- check_pkgkit/README.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/check_pkgkit/README.md b/check_pkgkit/README.md index a9964a7..ba2d9fe 100644 --- a/check_pkgkit/README.md +++ b/check_pkgkit/README.md @@ -22,8 +22,18 @@ Caveats Dependencies ============ -pynag-0.4.7+ -Known to work with PackageKit 0.7.6 or later +* pynag-0.4.7+ +* Known to work with PackageKit 0.7.6 or later + +Install +======= + +* Install pynag (available through your favorite package manager) +* Install PackageKit (packagekit in Debian) + +``` +wget https://raw.github.com/opinkerfi/nagios-plugins/master/check_pkgkit/check_pkgkit +``` Room for improvement ==================== From 53ede666b7130bd89c3e30adfc109573cfae70f0 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Sun, 14 Jul 2013 23:10:13 +0000 Subject: [PATCH 14/40] Added a little draft notification.. ;-) --- check_pkgkit/README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/check_pkgkit/README.md b/check_pkgkit/README.md index ba2d9fe..72d2c9c 100644 --- a/check_pkgkit/README.md +++ b/check_pkgkit/README.md @@ -1,7 +1,12 @@ +Draft +===== + +I haven't finished the implementation yet. + About ===== -This plugin checks for available updates using PackageKit +This Nagios plugin checks for available updates using PackageKit http://packagekit.org/ on Linux systems Why a new plugin? From 5d331dd5e76f52e3aa9e99df5657f1b71510da20 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Sun, 14 Jul 2013 23:11:04 +0000 Subject: [PATCH 15/40] Moved draft to second heading --- check_pkgkit/README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/check_pkgkit/README.md b/check_pkgkit/README.md index 72d2c9c..c18a789 100644 --- a/check_pkgkit/README.md +++ b/check_pkgkit/README.md @@ -1,14 +1,13 @@ -Draft -===== - -I haven't finished the implementation yet. - About ===== This Nagios plugin checks for available updates using PackageKit http://packagekit.org/ on Linux systems +Draft +===== +The implementation isn't finished yet. + Why a new plugin? ================= From 755f10f0140a27629f9f71025f45a4ad0a591889 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 09:39:57 +0000 Subject: [PATCH 16/40] Update documentation with Usage examples --- check_pkgkit/README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/check_pkgkit/README.md b/check_pkgkit/README.md index c18a789..4b1b070 100644 --- a/check_pkgkit/README.md +++ b/check_pkgkit/README.md @@ -18,6 +18,25 @@ check for updates but they are distribution specific. The main drivers are: * No sudo/selinux problems * Non distribution specific, works on debian, ubuntu, fedora, centos, rhel... +Usage +===== + +Critical on all security type updates +------------------------------------- +``` +$ check_pkgkit --no-longoutput --th "metric=security,critical=1..inf" +Critical - Total: 67, Security: 15, Bug fix: 48, Enhancement: 0, Normal: 4. Critical on security | 'total'=67;;;; 'security'=15;;1..inf;; 'bug fix'=48;;;; 'normal'=4;;;; +``` + +Critical on all security type updates and warning on many total updates +----------------------------------------------------------------------- +``` +$ python check_pkgkit --no-longoutput --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" +Critical - Total: 67, Security: 15, Bug fix: 48, Enhancement: 0, Normal: 4. Critical on security. Warning on total | 'total'=67;40..inf;;; 'security'=15;;1..inf;; 'bug fix'=48;;;; 'normal'=4;;;; +``` + + + Caveats ======= * PackageKit does draw in quite a few packages with it. From e67cc67f908aa9a19b50cb19bdce111b0059991a Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 09:40:13 +0000 Subject: [PATCH 17/40] Added pynag and PluginHelper, usable now. --- check_pkgkit/check_pkgkit | 85 +++++++++++++++++++++++++++++++-------- 1 file changed, 69 insertions(+), 16 deletions(-) diff --git a/check_pkgkit/check_pkgkit b/check_pkgkit/check_pkgkit index a74f4b9..6cce9f1 100644 --- a/check_pkgkit/check_pkgkit +++ b/check_pkgkit/check_pkgkit @@ -15,34 +15,87 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import sys from subprocess import Popen, PIPE +from pynag.Plugins import PluginHelper, unknown, ok + +known_types = ['Enhancement', 'Normal', 'Bug fix', 'Security'] + +def main(): + p = PluginHelper() + p.parse_arguments() + p.status(ok) + opt = p.options + + + total_updates = 0 + pkg_updates = {} + try: + total_updates, pkg_updates = pkcon_get_updates() + except Exception, e: + p.add_summary("Error: " + e.message) + p.status(unknown) + p.exit() + + p.add_summary("Total: %i, " % total_updates + + ", ".join([ "%s: %i" % (x, len(pkg_updates[x]) ) for x in pkg_updates.keys() ])) + p.add_metric("total", total_updates) + for update_type in pkg_updates: + if len(pkg_updates[update_type]): + p.add_long_output(update_type) + p.add_metric(update_type.lower(), len(pkg_updates[update_type])) + for pkg in pkg_updates[update_type]: + p.add_long_output(" %s" % pkg) + + p.check_all_metrics() + p.exit() def pkcon_get_updates(): - update_types = {} - p = Popen(["pkcon", "get-updates"], stdout=PIPE) + """ + Fetches all package updates and returns a tuple containing: + total_updates, + dictionary where the type of update is the key and the value is a array of package names. + + :return: { "Bug fix": [ "pkg-1.0.1", "anthr-pkg-3.1.4" ], "Security": [ "pkg2-2.1.1" ], + """ + update_types = { } + + stdout = "" + stderr = "" + rc = 255 + try: + p = Popen(["pkcon", "get-updates"], stdout=PIPE, stderr=PIPE) + stdout, stderr = p.communicate() + rc = p.wait() >> 8 + except OSError, e: + if e.errno == 2: + raise Exception("%s - PackageKit not installed?" % (e.strerror)) + + total_updates = 0 results_section = False - for line in p.stdout.readlines(): - line = line.strip() - if results_section == False and line == "Results:": + for line in stdout.split("\n"): + if not line: + continue + if results_section is False and line == "Results:": results_section = True elif results_section: - update_type = line[:13].replace(' ', '') - update_package = line [13:].strip() + update_type = line[:13].strip() + update_package = line[13:].strip() if update_type not in update_types: update_types[update_type] = [] update_types[update_type].append(update_package) + total_updates += 1 - return update_types + if rc > 0: + raise Exception("pkcon returned non zero return code %i, output:\n%s\nstderr output:\n%s" % (rc, stdout, stderr)) + if results_section is False: + raise Exception("pkcon returned no 'Results:' section. Output of pkcon command:\n" + stdout) + + for t in known_types: + if t not in update_types: + update_types[t] = [] + return (total_updates, update_types) -def main(): - pkg_updates = pkcon_get_updates() - - for update_type in pkg_updates: - print "%s: %i" % (update_type, len(pkg_updates[update_type])) - for pkg in pkg_updates[update_type]: - print " %s" % pkg if __name__ == "__main__": main() From ec0cece507ac821ef0375d67db2e4200639de3c2 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 10:23:39 +0000 Subject: [PATCH 18/40] Added example of longoutput --- check_pkgkit/README.md | 51 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/check_pkgkit/README.md b/check_pkgkit/README.md index 4b1b070..8b13d0e 100644 --- a/check_pkgkit/README.md +++ b/check_pkgkit/README.md @@ -21,20 +21,67 @@ check for updates but they are distribution specific. The main drivers are: Usage ===== +Critical Security +----------------- + Critical on all security type updates -------------------------------------- ``` $ check_pkgkit --no-longoutput --th "metric=security,critical=1..inf" Critical - Total: 67, Security: 15, Bug fix: 48, Enhancement: 0, Normal: 4. Critical on security | 'total'=67;;;; 'security'=15;;1..inf;; 'bug fix'=48;;;; 'normal'=4;;;; ``` +Total Updates +------------- + Critical on all security type updates and warning on many total updates ------------------------------------------------------------------------ ``` $ python check_pkgkit --no-longoutput --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" Critical - Total: 67, Security: 15, Bug fix: 48, Enhancement: 0, Normal: 4. Critical on security. Warning on total | 'total'=67;40..inf;;; 'security'=15;;1..inf;; 'bug fix'=48;;;; 'normal'=4;;;; ``` +Long Output +----------- +With long output (default) you also get the list of packages + +``` +$ python check_pkgkit --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" +Critical - Total: 32, Security: 1, Bug fix: 31, Enhancement: 0, Normal: 0. Critical on security | 'total'=32;40..inf;;; 'security'=1;;1..inf;; 'bug fix'=31;;;; +Security + python-bugzilla-0.9.0-1.fc18.noarch +Bug fix + ibus-typing-booster-1.2.1-1.fc18.noarch + nodejs-abbrev-1.0.4-6.fc18.noarch + nodejs-archy-0.0.2-8.fc18.noarch + nodejs-async-0.2.9-2.fc18.noarch + nodejs-block-stream-0.0.6-7.fc18.noarch + nodejs-chmodr-0.1.0-4.fc18.noarch + nodejs-chownr-0.0.1-9.fc18.noarch + nodejs-combined-stream-0.0.4-3.fc18.noarch + nodejs-delayed-stream-0.0.5-5.fc18.noarch + nodejs-fstream-0.1.22-3.fc18.noarch + nodejs-ini-1.1.0-3.fc18.noarch + nodejs-lru-cache-2.3.0-3.fc18.noarch + nodejs-mime-1.2.9-3.fc18.noarch + nodejs-minimatch-0.2.12-2.fc18.noarch + nodejs-mkdirp-0.3.5-3.fc18.noarch + nodejs-mute-stream-0.0.3-6.fc18.noarch + nodejs-node-uuid-1.4.0-4.fc18.noarch + nodejs-nopt-2.1.1-3.fc18.noarch + nodejs-once-1.1.1-5.fc18.noarch + nodejs-opener-1.3.0-7.fc18.noarch + nodejs-osenv-0.0.3-5.fc18.noarch + nodejs-promzard-0.2.0-6.fc18.noarch + nodejs-proto-list-1.2.2-5.fc18.noarch + nodejs-read-1.0.4-8.fc18.noarch + nodejs-retry-0.6.0-5.fc18.noarch + nodejs-sigmund-1.0.0-5.fc18.noarch + nodejs-tar-0.1.17-3.fc18.noarch + nodejs-uid-number-0.0.3-7.fc18.noarch + nodejs-which-1.0.5-8.fc18.noarch + python-virtinst-0.600.4-2.fc18.noarch + vgabios-0.6c-9.fc18.noarch +``` + Caveats From 6a690934871e3c67405cde1c197fd67787502d5a Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 10:27:04 +0000 Subject: [PATCH 19/40] pycharm recomended formatting fixes --- check_pkgkit/check_pkgkit | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/check_pkgkit/check_pkgkit b/check_pkgkit/check_pkgkit index 6cce9f1..be07d02 100644 --- a/check_pkgkit/check_pkgkit +++ b/check_pkgkit/check_pkgkit @@ -20,12 +20,11 @@ from pynag.Plugins import PluginHelper, unknown, ok known_types = ['Enhancement', 'Normal', 'Bug fix', 'Security'] + def main(): p = PluginHelper() p.parse_arguments() p.status(ok) - opt = p.options - total_updates = 0 pkg_updates = {} @@ -37,7 +36,7 @@ def main(): p.exit() p.add_summary("Total: %i, " % total_updates + - ", ".join([ "%s: %i" % (x, len(pkg_updates[x]) ) for x in pkg_updates.keys() ])) + ", ".join(["%s: %i" % (x, len(pkg_updates[x])) for x in pkg_updates.keys()])) p.add_metric("total", total_updates) for update_type in pkg_updates: if len(pkg_updates[update_type]): @@ -49,6 +48,7 @@ def main(): p.check_all_metrics() p.exit() + def pkcon_get_updates(): """ Fetches all package updates and returns a tuple containing: @@ -57,7 +57,7 @@ def pkcon_get_updates(): :return: { "Bug fix": [ "pkg-1.0.1", "anthr-pkg-3.1.4" ], "Security": [ "pkg2-2.1.1" ], """ - update_types = { } + update_types = {} stdout = "" stderr = "" @@ -68,7 +68,7 @@ def pkcon_get_updates(): rc = p.wait() >> 8 except OSError, e: if e.errno == 2: - raise Exception("%s - PackageKit not installed?" % (e.strerror)) + raise Exception("%s - PackageKit not installed?" % e.strerror) total_updates = 0 results_section = False @@ -87,14 +87,15 @@ def pkcon_get_updates(): total_updates += 1 if rc > 0: - raise Exception("pkcon returned non zero return code %i, output:\n%s\nstderr output:\n%s" % (rc, stdout, stderr)) + raise Exception( + "pkcon returned non zero return code %i, output:\n%s\nstderr output:\n%s" % (rc, stdout, stderr)) if results_section is False: raise Exception("pkcon returned no 'Results:' section. Output of pkcon command:\n" + stdout) for t in known_types: if t not in update_types: update_types[t] = [] - return (total_updates, update_types) + return total_updates, update_types if __name__ == "__main__": From 92c4d406fd785bd18d9c11ac46a565489b42ba37 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 10:31:28 +0000 Subject: [PATCH 20/40] Renamed to check_updates --- {check_pkgkit => check_updates}/LICENSE-GPL3 | 0 {check_pkgkit => check_updates}/README.md | 0 check_pkgkit/check_pkgkit => check_updates/check_updates | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {check_pkgkit => check_updates}/LICENSE-GPL3 (100%) rename {check_pkgkit => check_updates}/README.md (100%) rename check_pkgkit/check_pkgkit => check_updates/check_updates (100%) diff --git a/check_pkgkit/LICENSE-GPL3 b/check_updates/LICENSE-GPL3 similarity index 100% rename from check_pkgkit/LICENSE-GPL3 rename to check_updates/LICENSE-GPL3 diff --git a/check_pkgkit/README.md b/check_updates/README.md similarity index 100% rename from check_pkgkit/README.md rename to check_updates/README.md diff --git a/check_pkgkit/check_pkgkit b/check_updates/check_updates similarity index 100% rename from check_pkgkit/check_pkgkit rename to check_updates/check_updates From 24c8127c9fba79203939f680ad863edbffa8e304 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 10:31:44 +0000 Subject: [PATCH 21/40] Renamed to check_updates --- check_updates/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/check_updates/README.md b/check_updates/README.md index 8b13d0e..7692799 100644 --- a/check_updates/README.md +++ b/check_updates/README.md @@ -26,7 +26,7 @@ Critical Security Critical on all security type updates ``` -$ check_pkgkit --no-longoutput --th "metric=security,critical=1..inf" +$ check_updates --no-longoutput --th "metric=security,critical=1..inf" Critical - Total: 67, Security: 15, Bug fix: 48, Enhancement: 0, Normal: 4. Critical on security | 'total'=67;;;; 'security'=15;;1..inf;; 'bug fix'=48;;;; 'normal'=4;;;; ``` @@ -35,7 +35,7 @@ Total Updates Critical on all security type updates and warning on many total updates ``` -$ python check_pkgkit --no-longoutput --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" +$ python check_updates --no-longoutput --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" Critical - Total: 67, Security: 15, Bug fix: 48, Enhancement: 0, Normal: 4. Critical on security. Warning on total | 'total'=67;40..inf;;; 'security'=15;;1..inf;; 'bug fix'=48;;;; 'normal'=4;;;; ``` @@ -44,7 +44,7 @@ Long Output With long output (default) you also get the list of packages ``` -$ python check_pkgkit --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" +$ python check_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" Critical - Total: 32, Security: 1, Bug fix: 31, Enhancement: 0, Normal: 0. Critical on security | 'total'=32;40..inf;;; 'security'=1;;1..inf;; 'bug fix'=31;;;; Security python-bugzilla-0.9.0-1.fc18.noarch @@ -102,7 +102,7 @@ Install * Install PackageKit (packagekit in Debian) ``` -wget https://raw.github.com/opinkerfi/nagios-plugins/master/check_pkgkit/check_pkgkit +wget https://raw.github.com/opinkerfi/nagios-plugins/master/check_updates/check_updates ``` Room for improvement From 16e167abfcf2e8a47dc926243d3e2e65b20b3c9e Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 10:41:22 +0000 Subject: [PATCH 22/40] Added spec file --- .../nagios-okplugin-check_updates.spec | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 check_updates/nagios-okplugin-check_updates.spec diff --git a/check_updates/nagios-okplugin-check_updates.spec b/check_updates/nagios-okplugin-check_updates.spec new file mode 100644 index 0000000..da845e6 --- /dev/null +++ b/check_updates/nagios-okplugin-check_updates.spec @@ -0,0 +1,46 @@ +%define debug_package %{nil} +%define plugin check_updates + +Summary: A Nagios plugin to check operating system updates +Name: nagios-okplugin-%{plugin} +Version: 0.0.1 +Release: 1%{?dist} +License: GPLv3+ +Group: Applications/System +URL: https://github.com/opinkerfi/nagios-plugins/tree/master/%{plugin} +Source0: https://github.com/opinkerfi/nagios-plugins/tree/master/%{plugin}/releases/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Packager: Tomas Edwardsson +BuildArch: noarch +Requires: nrpe +Requires: pynag +Requires: PackageKit + + +%description +Checks updates via PackageKit and can notify on various different situations + +%prep +%setup -q + +%build + + +%install +rm -rf %{buildroot} +install -D -p -m 0755 %{plugin} %{buildroot}%{_libdir}/nagios/plugins/%{plugin} +mkdir -p %{buildroot}%{_sysconfdir}/nrpe.d +sed "s^/usr/lib64^%{_libdir}^g" nrpe.d/%{plugin}.cfg > %{buildroot}%{_sysconfdir}/nrpe.d/%{plugin}.cfg + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc README.md +%{_libdir}/nagios/plugins/* +%config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg + +%changelog +* Wed Jul 16 2013 Tomas Edwardsson 0.0.1-1 +- Initial Packaging From c2e273951973c24a383245f796b251a8817467bb Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 10:43:58 +0000 Subject: [PATCH 23/40] Added nrpe.d config file --- check_updates/nrpe.d/check_updates.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 check_updates/nrpe.d/check_updates.cfg diff --git a/check_updates/nrpe.d/check_updates.cfg b/check_updates/nrpe.d/check_updates.cfg new file mode 100644 index 0000000..fbbf088 --- /dev/null +++ b/check_updates/nrpe.d/check_updates.cfg @@ -0,0 +1,2 @@ +# Critical on security updates, warning if 40 or more total updates +command[check_updates]=/usr/lib64/nagios/plugins/check_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" From 14e812622446fb4287b8f10b0acf1ac1948bbf13 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 10:44:20 +0000 Subject: [PATCH 24/40] Automatic commit of package [nagios-okplugin-check_updates] release [0.0.2-1]. --- check_updates/nagios-okplugin-check_updates.spec | 5 ++++- rel-eng/packages/nagios-okplugin-check_updates | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 rel-eng/packages/nagios-okplugin-check_updates diff --git a/check_updates/nagios-okplugin-check_updates.spec b/check_updates/nagios-okplugin-check_updates.spec index da845e6..b6242c7 100644 --- a/check_updates/nagios-okplugin-check_updates.spec +++ b/check_updates/nagios-okplugin-check_updates.spec @@ -3,7 +3,7 @@ Summary: A Nagios plugin to check operating system updates Name: nagios-okplugin-%{plugin} -Version: 0.0.1 +Version: 0.0.2 Release: 1%{?dist} License: GPLv3+ Group: Applications/System @@ -42,5 +42,8 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg %changelog +* Tue Jul 16 2013 Tomas Edwardsson 0.0.2-1 +- new package built with tito + * Wed Jul 16 2013 Tomas Edwardsson 0.0.1-1 - Initial Packaging diff --git a/rel-eng/packages/nagios-okplugin-check_updates b/rel-eng/packages/nagios-okplugin-check_updates new file mode 100644 index 0000000..32e9597 --- /dev/null +++ b/rel-eng/packages/nagios-okplugin-check_updates @@ -0,0 +1 @@ +0.0.2-1 check_updates/ From b884ff14c83c9f4972b77de4487f2109b68a8ba9 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 10:46:15 +0000 Subject: [PATCH 25/40] Obsolete nagios-okplugin-check_yum --- check_updates/nagios-okplugin-check_updates.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/check_updates/nagios-okplugin-check_updates.spec b/check_updates/nagios-okplugin-check_updates.spec index b6242c7..8f81d64 100644 --- a/check_updates/nagios-okplugin-check_updates.spec +++ b/check_updates/nagios-okplugin-check_updates.spec @@ -15,6 +15,7 @@ BuildArch: noarch Requires: nrpe Requires: pynag Requires: PackageKit +Obsoletes: nagios-okplugin-check_yum %description From 6976284504c0ad989da876b6c14ed7a85de2a5d5 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 10:47:45 +0000 Subject: [PATCH 26/40] No obsolete --- check_updates/nagios-okplugin-check_updates.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/check_updates/nagios-okplugin-check_updates.spec b/check_updates/nagios-okplugin-check_updates.spec index 8f81d64..b6242c7 100644 --- a/check_updates/nagios-okplugin-check_updates.spec +++ b/check_updates/nagios-okplugin-check_updates.spec @@ -15,7 +15,6 @@ BuildArch: noarch Requires: nrpe Requires: pynag Requires: PackageKit -Obsoletes: nagios-okplugin-check_yum %description From f536c03121527dbbbabd5577b1e3550235d0012d Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 11:34:13 +0000 Subject: [PATCH 27/40] Plugin should conflict with check_yum --- check_updates/nagios-okplugin-check_updates.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/check_updates/nagios-okplugin-check_updates.spec b/check_updates/nagios-okplugin-check_updates.spec index b6242c7..267f73b 100644 --- a/check_updates/nagios-okplugin-check_updates.spec +++ b/check_updates/nagios-okplugin-check_updates.spec @@ -15,6 +15,7 @@ BuildArch: noarch Requires: nrpe Requires: pynag Requires: PackageKit +Conflicts: nagios-okplugin-check_yum %description From 5493c0dd1577be1610e3b396dc01df02f03a3017 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 12:14:07 +0000 Subject: [PATCH 28/40] Automatic commit of package [nagios-okplugin-check_updates] release [0.0.3-1]. --- check_updates/nagios-okplugin-check_updates.spec | 7 ++++++- rel-eng/packages/nagios-okplugin-check_updates | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/check_updates/nagios-okplugin-check_updates.spec b/check_updates/nagios-okplugin-check_updates.spec index 267f73b..b2874b6 100644 --- a/check_updates/nagios-okplugin-check_updates.spec +++ b/check_updates/nagios-okplugin-check_updates.spec @@ -3,7 +3,7 @@ Summary: A Nagios plugin to check operating system updates Name: nagios-okplugin-%{plugin} -Version: 0.0.2 +Version: 0.0.3 Release: 1%{?dist} License: GPLv3+ Group: Applications/System @@ -43,6 +43,11 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg %changelog +* Tue Jul 16 2013 Tomas Edwardsson 0.0.3-1 +- Plugin should conflict with check_yum (tommi@tommi.org) +- No obsolete (tommi@tommi.org) +- Obsolete nagios-okplugin-check_yum (tommi@tommi.org) + * Tue Jul 16 2013 Tomas Edwardsson 0.0.2-1 - new package built with tito diff --git a/rel-eng/packages/nagios-okplugin-check_updates b/rel-eng/packages/nagios-okplugin-check_updates index 32e9597..acd74eb 100644 --- a/rel-eng/packages/nagios-okplugin-check_updates +++ b/rel-eng/packages/nagios-okplugin-check_updates @@ -1 +1 @@ -0.0.2-1 check_updates/ +0.0.3-1 check_updates/ From a71110fdff6cd164ef23f67cb11cd67183ef326f Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 13:33:38 +0000 Subject: [PATCH 29/40] Yepp, obsoletes again instead of conflicts --- check_updates/nagios-okplugin-check_updates.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_updates/nagios-okplugin-check_updates.spec b/check_updates/nagios-okplugin-check_updates.spec index b2874b6..7808a03 100644 --- a/check_updates/nagios-okplugin-check_updates.spec +++ b/check_updates/nagios-okplugin-check_updates.spec @@ -15,7 +15,7 @@ BuildArch: noarch Requires: nrpe Requires: pynag Requires: PackageKit -Conflicts: nagios-okplugin-check_yum +Obsoletes: nagios-okplugin-check_yum %description From 7143d69552a1a7ed9669040ca7af7e5d5e574a84 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 14:34:04 +0000 Subject: [PATCH 30/40] Re-renamed to check_package_updates --- {check_updates => check_package_updates}/LICENSE-GPL3 | 0 {check_updates => check_package_updates}/README.md | 8 ++++---- .../check_package_updates | 0 .../nagios-okplugin-check_package_updates.spec | 2 +- check_package_updates/nrpe.d/check_package_updates.cfg | 2 ++ check_updates/nrpe.d/check_updates.cfg | 2 -- 6 files changed, 7 insertions(+), 7 deletions(-) rename {check_updates => check_package_updates}/LICENSE-GPL3 (100%) rename {check_updates => check_package_updates}/README.md (90%) rename check_updates/check_updates => check_package_updates/check_package_updates (100%) rename check_updates/nagios-okplugin-check_updates.spec => check_package_updates/nagios-okplugin-check_package_updates.spec (97%) create mode 100644 check_package_updates/nrpe.d/check_package_updates.cfg delete mode 100644 check_updates/nrpe.d/check_updates.cfg diff --git a/check_updates/LICENSE-GPL3 b/check_package_updates/LICENSE-GPL3 similarity index 100% rename from check_updates/LICENSE-GPL3 rename to check_package_updates/LICENSE-GPL3 diff --git a/check_updates/README.md b/check_package_updates/README.md similarity index 90% rename from check_updates/README.md rename to check_package_updates/README.md index 7692799..5416396 100644 --- a/check_updates/README.md +++ b/check_package_updates/README.md @@ -26,7 +26,7 @@ Critical Security Critical on all security type updates ``` -$ check_updates --no-longoutput --th "metric=security,critical=1..inf" +$ check_package_updates --no-longoutput --th "metric=security,critical=1..inf" Critical - Total: 67, Security: 15, Bug fix: 48, Enhancement: 0, Normal: 4. Critical on security | 'total'=67;;;; 'security'=15;;1..inf;; 'bug fix'=48;;;; 'normal'=4;;;; ``` @@ -35,7 +35,7 @@ Total Updates Critical on all security type updates and warning on many total updates ``` -$ python check_updates --no-longoutput --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" +$ python check_package_updates --no-longoutput --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" Critical - Total: 67, Security: 15, Bug fix: 48, Enhancement: 0, Normal: 4. Critical on security. Warning on total | 'total'=67;40..inf;;; 'security'=15;;1..inf;; 'bug fix'=48;;;; 'normal'=4;;;; ``` @@ -44,7 +44,7 @@ Long Output With long output (default) you also get the list of packages ``` -$ python check_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" +$ python check_package_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" Critical - Total: 32, Security: 1, Bug fix: 31, Enhancement: 0, Normal: 0. Critical on security | 'total'=32;40..inf;;; 'security'=1;;1..inf;; 'bug fix'=31;;;; Security python-bugzilla-0.9.0-1.fc18.noarch @@ -102,7 +102,7 @@ Install * Install PackageKit (packagekit in Debian) ``` -wget https://raw.github.com/opinkerfi/nagios-plugins/master/check_updates/check_updates +wget https://raw.github.com/opinkerfi/nagios-plugins/master/check_package_updates/check_package_updates ``` Room for improvement diff --git a/check_updates/check_updates b/check_package_updates/check_package_updates similarity index 100% rename from check_updates/check_updates rename to check_package_updates/check_package_updates diff --git a/check_updates/nagios-okplugin-check_updates.spec b/check_package_updates/nagios-okplugin-check_package_updates.spec similarity index 97% rename from check_updates/nagios-okplugin-check_updates.spec rename to check_package_updates/nagios-okplugin-check_package_updates.spec index 7808a03..093250b 100644 --- a/check_updates/nagios-okplugin-check_updates.spec +++ b/check_package_updates/nagios-okplugin-check_package_updates.spec @@ -1,5 +1,5 @@ %define debug_package %{nil} -%define plugin check_updates +%define plugin check_package_updates Summary: A Nagios plugin to check operating system updates Name: nagios-okplugin-%{plugin} diff --git a/check_package_updates/nrpe.d/check_package_updates.cfg b/check_package_updates/nrpe.d/check_package_updates.cfg new file mode 100644 index 0000000..c0ad7dc --- /dev/null +++ b/check_package_updates/nrpe.d/check_package_updates.cfg @@ -0,0 +1,2 @@ +# Critical on security updates, warning if 40 or more total updates +command[check_updates]=/usr/lib64/nagios/plugins/check_package_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" diff --git a/check_updates/nrpe.d/check_updates.cfg b/check_updates/nrpe.d/check_updates.cfg deleted file mode 100644 index fbbf088..0000000 --- a/check_updates/nrpe.d/check_updates.cfg +++ /dev/null @@ -1,2 +0,0 @@ -# Critical on security updates, warning if 40 or more total updates -command[check_updates]=/usr/lib64/nagios/plugins/check_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" From 5ff46054002d92d2f7af2149552bcb53fa4db90e Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 17:43:28 +0000 Subject: [PATCH 31/40] Automatic commit of package [nagios-okplugin-check_package_updates] release [0.0.4-1]. --- .../nagios-okplugin-check_package_updates.spec | 5 ++++- rel-eng/packages/nagios-okplugin-check_package_updates | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 rel-eng/packages/nagios-okplugin-check_package_updates diff --git a/check_package_updates/nagios-okplugin-check_package_updates.spec b/check_package_updates/nagios-okplugin-check_package_updates.spec index 093250b..13f784c 100644 --- a/check_package_updates/nagios-okplugin-check_package_updates.spec +++ b/check_package_updates/nagios-okplugin-check_package_updates.spec @@ -3,7 +3,7 @@ Summary: A Nagios plugin to check operating system updates Name: nagios-okplugin-%{plugin} -Version: 0.0.3 +Version: 0.0.4 Release: 1%{?dist} License: GPLv3+ Group: Applications/System @@ -43,6 +43,9 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg %changelog +* Tue Jul 16 2013 Tomas Edwardsson 0.0.4-1 +- new package built with tito + * Tue Jul 16 2013 Tomas Edwardsson 0.0.3-1 - Plugin should conflict with check_yum (tommi@tommi.org) - No obsolete (tommi@tommi.org) diff --git a/rel-eng/packages/nagios-okplugin-check_package_updates b/rel-eng/packages/nagios-okplugin-check_package_updates new file mode 100644 index 0000000..f7ad271 --- /dev/null +++ b/rel-eng/packages/nagios-okplugin-check_package_updates @@ -0,0 +1 @@ +0.0.4-1 check_package_updates/ From 5a8cad97832be807c5a223af8f2c78f6d14baf44 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 19:43:00 +0000 Subject: [PATCH 32/40] Known types always have a metric, even if 0 --- check_package_updates/check_package_updates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_package_updates/check_package_updates b/check_package_updates/check_package_updates index be07d02..5974b22 100644 --- a/check_package_updates/check_package_updates +++ b/check_package_updates/check_package_updates @@ -39,9 +39,9 @@ def main(): ", ".join(["%s: %i" % (x, len(pkg_updates[x])) for x in pkg_updates.keys()])) p.add_metric("total", total_updates) for update_type in pkg_updates: + p.add_metric(update_type.lower(), len(pkg_updates[update_type])) if len(pkg_updates[update_type]): p.add_long_output(update_type) - p.add_metric(update_type.lower(), len(pkg_updates[update_type])) for pkg in pkg_updates[update_type]: p.add_long_output(" %s" % pkg) From 7ad46b2f682b86f490b50e9e7f0124b6569872ad Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 19:43:19 +0000 Subject: [PATCH 33/40] Automatic commit of package [nagios-okplugin-check_package_updates] release [0.0.5-1]. --- .../nagios-okplugin-check_package_updates.spec | 5 ++++- rel-eng/packages/nagios-okplugin-check_package_updates | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/check_package_updates/nagios-okplugin-check_package_updates.spec b/check_package_updates/nagios-okplugin-check_package_updates.spec index 13f784c..14a4bc6 100644 --- a/check_package_updates/nagios-okplugin-check_package_updates.spec +++ b/check_package_updates/nagios-okplugin-check_package_updates.spec @@ -3,7 +3,7 @@ Summary: A Nagios plugin to check operating system updates Name: nagios-okplugin-%{plugin} -Version: 0.0.4 +Version: 0.0.5 Release: 1%{?dist} License: GPLv3+ Group: Applications/System @@ -43,6 +43,9 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg %changelog +* Tue Jul 16 2013 Tomas Edwardsson 0.0.5-1 +- Known types always have a metric, even if 0 (tommi@tommi.org) + * Tue Jul 16 2013 Tomas Edwardsson 0.0.4-1 - new package built with tito diff --git a/rel-eng/packages/nagios-okplugin-check_package_updates b/rel-eng/packages/nagios-okplugin-check_package_updates index f7ad271..10e166f 100644 --- a/rel-eng/packages/nagios-okplugin-check_package_updates +++ b/rel-eng/packages/nagios-okplugin-check_package_updates @@ -1 +1 @@ -0.0.4-1 check_package_updates/ +0.0.5-1 check_package_updates/ From 5af347c3df8b067218a9e894f05c6864713e7c92 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 22:09:23 +0000 Subject: [PATCH 34/40] Fix failure on a fully patched system --- check_package_updates/check_package_updates | 2 ++ 1 file changed, 2 insertions(+) diff --git a/check_package_updates/check_package_updates b/check_package_updates/check_package_updates index 5974b22..a411152 100644 --- a/check_package_updates/check_package_updates +++ b/check_package_updates/check_package_updates @@ -75,6 +75,8 @@ def pkcon_get_updates(): for line in stdout.split("\n"): if not line: continue + if line.startswith("There are no updates"): + continue if results_section is False and line == "Results:": results_section = True elif results_section: From a5dbf632f23ac71667aeede22a3f369e663e33b8 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 22:09:50 +0000 Subject: [PATCH 35/40] Automatic commit of package [nagios-okplugin-check_package_updates] release [0.0.6-1]. --- .../nagios-okplugin-check_package_updates.spec | 5 ++++- rel-eng/packages/nagios-okplugin-check_package_updates | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/check_package_updates/nagios-okplugin-check_package_updates.spec b/check_package_updates/nagios-okplugin-check_package_updates.spec index 14a4bc6..0eaff07 100644 --- a/check_package_updates/nagios-okplugin-check_package_updates.spec +++ b/check_package_updates/nagios-okplugin-check_package_updates.spec @@ -3,7 +3,7 @@ Summary: A Nagios plugin to check operating system updates Name: nagios-okplugin-%{plugin} -Version: 0.0.5 +Version: 0.0.6 Release: 1%{?dist} License: GPLv3+ Group: Applications/System @@ -43,6 +43,9 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg %changelog +* Tue Jul 16 2013 Tomas Edwardsson 0.0.6-1 +- Fix failure on a fully patched system (tommi@tommi.org) + * Tue Jul 16 2013 Tomas Edwardsson 0.0.5-1 - Known types always have a metric, even if 0 (tommi@tommi.org) diff --git a/rel-eng/packages/nagios-okplugin-check_package_updates b/rel-eng/packages/nagios-okplugin-check_package_updates index 10e166f..c29356e 100644 --- a/rel-eng/packages/nagios-okplugin-check_package_updates +++ b/rel-eng/packages/nagios-okplugin-check_package_updates @@ -1 +1 @@ -0.0.5-1 check_package_updates/ +0.0.6-1 check_package_updates/ From 677ec90e3e1e591545011b3292d13cd353f4b54e Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 22:22:36 +0000 Subject: [PATCH 36/40] Added obsolete for okplugin check_updates nagios-okplugin-check_updates was the wrong name for nagios-okplugin-check_package_updates. It was renamed but some might have installed check_updates in the mean time. --- check_package_updates/nagios-okplugin-check_package_updates.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/check_package_updates/nagios-okplugin-check_package_updates.spec b/check_package_updates/nagios-okplugin-check_package_updates.spec index 0eaff07..63c2fb0 100644 --- a/check_package_updates/nagios-okplugin-check_package_updates.spec +++ b/check_package_updates/nagios-okplugin-check_package_updates.spec @@ -16,6 +16,7 @@ Requires: nrpe Requires: pynag Requires: PackageKit Obsoletes: nagios-okplugin-check_yum +Obsoletes: nagios-okplugin-check_updates %description From 1099ad9c02f4c84214c7b78bf42035420e991618 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 22:24:47 +0000 Subject: [PATCH 37/40] Added nrpe reload since moving from check_yum needs it --- .../nagios-okplugin-check_package_updates.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/check_package_updates/nagios-okplugin-check_package_updates.spec b/check_package_updates/nagios-okplugin-check_package_updates.spec index 63c2fb0..98f2af4 100644 --- a/check_package_updates/nagios-okplugin-check_package_updates.spec +++ b/check_package_updates/nagios-okplugin-check_package_updates.spec @@ -37,6 +37,9 @@ sed "s^/usr/lib64^%{_libdir}^g" nrpe.d/%{plugin}.cfg > %{buildroot}%{_sysconfdi %clean rm -rf %{buildroot} +%post +/sbin/service nrpe status &> /dev/null && /sbin/service nrpe reload || : + %files %defattr(-,root,root,-) %doc README.md From 30c4b15700cb5756cbd77848e2c0923a53395ec6 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Tue, 16 Jul 2013 22:42:44 +0000 Subject: [PATCH 38/40] Added --legacy to default since that is the default format --- check_package_updates/nrpe.d/check_package_updates.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_package_updates/nrpe.d/check_package_updates.cfg b/check_package_updates/nrpe.d/check_package_updates.cfg index c0ad7dc..75ed97f 100644 --- a/check_package_updates/nrpe.d/check_package_updates.cfg +++ b/check_package_updates/nrpe.d/check_package_updates.cfg @@ -1,2 +1,2 @@ # Critical on security updates, warning if 40 or more total updates -command[check_updates]=/usr/lib64/nagios/plugins/check_package_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" +command[check_updates]=/usr/lib64/nagios/plugins/check_package_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf" --legacy From a01af47d86d8d831950a70503535a4f226f52632 Mon Sep 17 00:00:00 2001 From: Tomas Edwardsson Date: Wed, 17 Jul 2013 07:59:40 +0000 Subject: [PATCH 39/40] Removed Draft, should be working pretty good --- check_package_updates/README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/check_package_updates/README.md b/check_package_updates/README.md index 5416396..539769d 100644 --- a/check_package_updates/README.md +++ b/check_package_updates/README.md @@ -4,10 +4,6 @@ About This Nagios plugin checks for available updates using PackageKit http://packagekit.org/ on Linux systems -Draft -===== -The implementation isn't finished yet. - Why a new plugin? ================= From b0663e0495ba9d99f51a2bb99fc02baef955b1e4 Mon Sep 17 00:00:00 2001 From: argusb Date: Mon, 12 Aug 2013 14:40:23 +0200 Subject: [PATCH 40/40] Update check_eva.py Change parsing of SSSU output header to make it work with Command View EVA >= 10. --- check_eva/check_eva.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_eva/check_eva.py b/check_eva/check_eva.py index 148fb75..45609f1 100644 --- a/check_eva/check_eva.py +++ b/check_eva/check_eva.py @@ -231,7 +231,7 @@ def run_sssu(system=None, command="ls system full"): error = 0 if output.pop(0).strip() != '': error = 1 if output.pop(0).strip() != '': error = 1 - if output.pop(0).strip() != 'SSSU for HP StorageWorks Command View EVA': error = 1 + if output.pop(0).strip().find('SSSU for HP ') != 0: error = 1 if output.pop(0).strip().find('Version:') != 0: error=1 if output.pop(0).strip().find('Build:') != 0: error=1 if output.pop(0).strip().find('NoSystemSelected> ') != 0: error=1