diff options
| -rw-r--r-- | lib/bb/event.py | 17 | ||||
| -rw-r--r-- | lib/bb/monitordisk.py | 8 |
2 files changed, 25 insertions, 0 deletions
diff --git a/lib/bb/event.py b/lib/bb/event.py index cacbac8f5..549191475 100644 --- a/lib/bb/event.py +++ b/lib/bb/event.py @@ -451,6 +451,23 @@ class DiskFull(Event): self._free = freespace self._mountpoint = mountpoint +class DiskUsageSample: + def __init__(self, available_bytes, free_bytes, total_bytes): + # Number of bytes available to non-root processes. + self.available_bytes = available_bytes + # Number of bytes available to root processes. + self.free_bytes = free_bytes + # Total capacity of the volume. + self.total_bytes = total_bytes + +class MonitorDiskEvent(Event): + """If BB_DISKMON_DIRS is set, then this event gets triggered each time disk space is checked. + Provides information about devices that are getting monitored.""" + def __init__(self, disk_usage): + Event.__init__(self) + # hash of device root path -> DiskUsageSample + self.disk_usage = disk_usage + class NoProvider(Event): """No Provider for an Event""" diff --git a/lib/bb/monitordisk.py b/lib/bb/monitordisk.py index d3d210684..833cd3d34 100644 --- a/lib/bb/monitordisk.py +++ b/lib/bb/monitordisk.py @@ -205,6 +205,7 @@ class diskMonitor: """ Take action for the monitor """ if self.enableMonitor: + diskUsage = {} for k, attributes in self.devDict.items(): path, action = k dev, minSpace, minInode = attributes @@ -214,6 +215,11 @@ class diskMonitor: # The available free space, integer number freeSpace = st.f_bavail * st.f_frsize + # Send all relevant information in the event. + freeSpaceRoot = st.f_bfree * st.f_frsize + totalSpace = st.f_blocks * st.f_frsize + diskUsage[dev] = bb.event.DiskUsageSample(freeSpace, freeSpaceRoot, totalSpace) + if minSpace and freeSpace < minSpace: # Always show warning, the self.checked would always be False if the action is WARN if self.preFreeS[k] == 0 or self.preFreeS[k] - freeSpace > self.spaceInterval and not self.checked[k]: @@ -257,4 +263,6 @@ class diskMonitor: self.checked[k] = True rq.finish_runqueue(True) bb.event.fire(bb.event.DiskFull(dev, 'inode', freeInode, path), self.configuration) + + bb.event.fire(bb.event.MonitorDiskEvent(diskUsage), self.configuration) return |