From 75590a9ac12efb62a1e958d2d62c5c3adc562655 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 18 Aug 2019 14:50:06 +0200 Subject: [PATCH] :sparkles: Adds support for memory usage in percent --- lib/addons.sh | 15 +++++++++++++++ lib/homeassistant.sh | 18 ++++++++++++++++-- lib/supervisor.sh | 8 ++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/lib/addons.sh b/lib/addons.sh index ec90074..25e541a 100644 --- a/lib/addons.sh +++ b/lib/addons.sh @@ -1022,6 +1022,21 @@ function bashio::addon.memory_limit() { '.memory_limit' } +# ------------------------------------------------------------------------------ +# Returns memory usage in percentage for the specified add-on. +# +# Arguments: +# $1 Add-on slug (optional, default: self) +# ------------------------------------------------------------------------------ +function bashio::addon.memory_percent() { + local slug=${1:-'self'} + bashio::log.trace "${FUNCNAME[0]}" "$@" + bashio::addons.stats \ + "${slug}" \ + "addons.${slug}.stats.memory_percent" \ + '.memory_percent' +} + # ------------------------------------------------------------------------------ # Returns outgoing network usage from the specified add-on. # diff --git a/lib/homeassistant.sh b/lib/homeassistant.sh index d02674f..6a8d9fb 100644 --- a/lib/homeassistant.sh +++ b/lib/homeassistant.sh @@ -279,7 +279,9 @@ function bashio::homeassistant.cpu_percent() { # ------------------------------------------------------------------------------ function bashio::homeassistant.memory_usage() { bashio::log.trace "${FUNCNAME[0]}" - bashio::homeassistant.stats 'homeassistant.stats.memory_usage' '.memory_usage' + bashio::homeassistant.stats \ + 'homeassistant.stats.memory_usage' \ + '.memory_usage' } # ------------------------------------------------------------------------------ @@ -287,7 +289,19 @@ function bashio::homeassistant.memory_usage() { # ------------------------------------------------------------------------------ function bashio::homeassistant.memory_limit() { bashio::log.trace "${FUNCNAME[0]}" - bashio::homeassistant.stats 'homeassistant.stats.memory_limit' '.memory_limit' + bashio::homeassistant.stats \ + 'homeassistant.stats.memory_limit' \ + '.memory_limit' +} + +# ------------------------------------------------------------------------------ +# Returns memory usage in percent from Home Assistant. +# ------------------------------------------------------------------------------ +function bashio::homeassistant.memory_percent() { + bashio::log.trace "${FUNCNAME[0]}" + bashio::homeassistant.stats \ + 'homeassistant.stats.memory_percent' \ + '.memory_percent' } # ------------------------------------------------------------------------------ diff --git a/lib/supervisor.sh b/lib/supervisor.sh index 2aff93d..3b83ebc 100644 --- a/lib/supervisor.sh +++ b/lib/supervisor.sh @@ -271,6 +271,14 @@ function bashio::supervisor.memory_limit() { bashio::supervisor.stats 'supervisor.stats.memory_limit' '.memory_limit' } +# ------------------------------------------------------------------------------ +# Returns memory usage in percent from the Supervisor. +# ------------------------------------------------------------------------------ +function bashio::supervisor.memory_percent() { + bashio::log.trace "${FUNCNAME[0]}" + bashio::supervisor.stats 'supervisor.stats.memory_percent' '.memory_percent' +} + # ------------------------------------------------------------------------------ # Returns outgoing network usage from the Supervisor. # ------------------------------------------------------------------------------