Monitoring/nagios-plugins
1
0
Fork 0
mirror of https://github.com/opinkerfi/nagios-plugins.git synced 2024-11-22 10:23:46 +01:00
Code Issues Releases Wiki Activity

pycharm recomended formatting fixes

Browse Source
This commit is contained in:
Tomas Edwardsson 2013-07-16 10:27:04 +00:00
parent ec0cece507
commit 6a69093487
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
check_pkgkit/check_pkgkit
View File

@ -20,12 +20,11 @@ from pynag.Plugins import PluginHelper, unknown, ok
known_types = ['Enhancement', 'Normal', 'Bug fix', 'Security'] known_types = ['Enhancement', 'Normal', 'Bug fix', 'Security']
def main(): def main():
p = PluginHelper() p = PluginHelper()
p.parse_arguments() p.parse_arguments()
p.status(ok) p.status(ok)
opt = p.options
total_updates = 0 total_updates = 0
pkg_updates = {} pkg_updates = {}
@ -37,7 +36,7 @@ def main():
p.exit() p.exit()
p.add_summary("Total: %i, " % total_updates + 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) p.add_metric("total", total_updates)
for update_type in pkg_updates: for update_type in pkg_updates:
if len(pkg_updates[update_type]): if len(pkg_updates[update_type]):
@ -49,6 +48,7 @@ def main():
p.check_all_metrics() p.check_all_metrics()
p.exit() p.exit()
def pkcon_get_updates(): def pkcon_get_updates():
""" """
Fetches all package updates and returns a tuple containing: 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" ], :return: { "Bug fix": [ "pkg-1.0.1", "anthr-pkg-3.1.4" ], "Security": [ "pkg2-2.1.1" ],
""" """
update_types = { } update_types = {}
stdout = "" stdout = ""
stderr = "" stderr = ""
@ -68,7 +68,7 @@ def pkcon_get_updates():
rc = p.wait() >> 8 rc = p.wait() >> 8
except OSError, e: except OSError, e:
if e.errno == 2: if e.errno == 2:
raise Exception("%s - PackageKit not installed?" % (e.strerror)) raise Exception("%s - PackageKit not installed?" % e.strerror)
total_updates = 0 total_updates = 0
results_section = False results_section = False
@ -87,14 +87,15 @@ def pkcon_get_updates():
total_updates += 1 total_updates += 1
if rc > 0: 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: if results_section is False:
raise Exception("pkcon returned no 'Results:' section. Output of pkcon command:\n" + stdout) raise Exception("pkcon returned no 'Results:' section. Output of pkcon command:\n" + stdout)
for t in known_types: for t in known_types:
if t not in update_types: if t not in update_types:
update_types[t] = [] update_types[t] = []
return (total_updates, update_types) return total_updates, update_types
if __name__ == "__main__": if __name__ == "__main__":