l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #625 from martindoublem/martin-development

Browse source 
Improved three modules in showing more compacted info with new parameters
This commit is contained in:
tobi-wan-kenobi 2020-05-08 16:08:54 +02:00 • committed by GitHub
commit fde51b3f79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/contrib/docker_ps.py
View file

@ -26,7 +26,7 @@ class Module(core.module.Module):
state = []
if self.__info == "OK - 0":
state.append("warning")
elif self.__info in ["n/a", "daemon off"]:
elif self.__info in ["n/a", "Off"]:
state.append("critical")
return state
@ -38,7 +38,7 @@ class Module(core.module.Module):
len(cli.containers.list(filters={"status": "running"}))
)
except ConnectionError:
self.__info = "daemon off"
self.__info = "Off"
except Exception:
self.__info = "n/a"
return self.__info

9
modules/contrib/smartstatus.py
View file

@ -7,7 +7,8 @@
Parameters:
* smartstatus.display: how to display (defaults to 'combined', other choices: 'seperate' or 'singles')
* smartstauts.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc')
* smartstatus.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc')
* smartstatus.shownames: boolean in the form of "True" or "False" to show the name of the drives in the form of sda, sbd, combined or none at all.
"""
import os
@ -29,6 +30,7 @@ class Module(core.module.Module):
self.devices = self.list_devices()
self.display = self.parameter("display", "combined")
self.drives = self.parameter("drives", "sda")
self.show_names = self.parameter("show_names", "True")
self.widgets(self.create_widgets())
def create_widgets(self):
@ -63,7 +65,10 @@ class Module(core.module.Module):
def output(self, widget):
device = widget.get("device")
assessment = widget.get("assessment")
widget.full_text("{}: {}".format(device, assessment))
if self.show_names == "False":
widget.full_text("{}".format(assessment))
else:
widget.full_text("{}: {}".format(device, assessment))
def state(self, widget):
states = []