diff options
| author | Daniil Baturin <daniil@baturin.org> | 2013-12-02 02:06:12 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2013-12-02 02:06:12 +0100 |
| commit | ef37daf34a77dffd5cbea7947d1691e7b2d72f1a (patch) | |
| tree | 6799552ad291967dc8d2a1e374492d61e20ab0c4 | |
| parent | 1185b1e766c37e3b3ad360e615d9ad4c8a71d756 (diff) | |
| download | vyatta-op-ef37daf34a77dffd5cbea7947d1691e7b2d72f1a.tar.gz vyatta-op-ef37daf34a77dffd5cbea7947d1691e7b2d72f1a.zip | |
Bug #3: Display RAM usage overview in simple total/free/used format.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | scripts/vyos-show-ram.sh | 34 | ||||
| -rw-r--r-- | templates/show/system/memory/node.def | 2 |
3 files changed, 36 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 9c39def..c26c7db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,6 +48,7 @@ bin_SCRIPTS += scripts/vyatta-monitor-list bin_SCRIPTS += scripts/vyatta-monitor-cleanup bin_SCRIPTS += scripts/vyatta-monitor-background bin_SCRIPTS += scripts/vyatta-monitor-background-stop +bin_SCRIPTS += scripts/vyos-show-ram.sh sbin_SCRIPTS = scripts/dhcpv6-client-show-leases.pl sbin_SCRIPTS += scripts/vyatta-image-tools.pl diff --git a/scripts/vyos-show-ram.sh b/scripts/vyos-show-ram.sh new file mode 100644 index 0000000..11ead79 --- /dev/null +++ b/scripts/vyos-show-ram.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# +# Module: vyos-show-ram.sh +# Displays memory usage information in minimalistic format +# +# Copyright (C) 2013 SO3Group +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# 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 <http://www.gnu.org/licenses/>. + +MB_DIVISOR=1024 + +TOTAL=$(cat /proc/meminfo | grep -E "^MemTotal:" | awk -F ' ' '{print $2}') +FREE=$(cat /proc/meminfo | grep -E "^MemFree:" | awk -F ' ' '{print $2}') +BUFFERS=$(cat /proc/meminfo | grep -E "^Buffers:" | awk -F ' ' '{print $2}') +CACHED=$(cat /proc/meminfo | grep -E "^Cached:" | awk -F ' ' '{print $2}') + +DISPLAY_FREE=$(( ($FREE + $BUFFERS + $CACHED) / $MB_DIVISOR )) +DISPLAY_TOTAL=$(( $TOTAL / $MB_DIVISOR )) +DISPLAY_USED=$(( $DISPLAY_TOTAL - $DISPLAY_FREE )) + +echo "Total: $DISPLAY_TOTAL" +echo "Free: $DISPLAY_FREE" +echo "Used: $DISPLAY_USED" + diff --git a/templates/show/system/memory/node.def b/templates/show/system/memory/node.def index cee2320..4725a47 100644 --- a/templates/show/system/memory/node.def +++ b/templates/show/system/memory/node.def @@ -1,2 +1,2 @@ help: Display system memory usage -run: free -ot +run: ${vyatta_bindir}/vyos-show-ram.sh |