diff options
| author | Bharath Vignesh J K <52282402+RazCrimson@users.noreply.github.com> | 2024-05-01 23:21:35 +0530 |
|---|---|---|
| committer | Bharath Vignesh J K <52282402+RazCrimson@users.noreply.github.com> | 2024-05-01 23:21:35 +0530 |
| commit | 5b54ef9baf14ae200a2b93f50533b486ae2ae0e0 (patch) | |
| tree | c4e9266e71604969a7cb081251494f0d9e7ffbc2 /glances/outputs | |
| parent | 6f30f135c61d164e30c4c159ea3919ed7bd33684 (diff) | |
| parent | e0f7498b7e85fd215a1d55f1b126cccd44ef5809 (diff) | |
Merge branch 'refs/heads/develop' into 2637-docker-memory-usage-is-incorrect
# Conflicts:
# glances/outputs/static/public/glances.js
Diffstat (limited to 'glances/outputs')
| -rw-r--r-- | glances/outputs/glances_curses.py | 6 | ||||
| -rw-r--r-- | glances/outputs/static/js/components/plugin-containers.vue | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py index d95e63aa..e7e032f5 100644 --- a/glances/outputs/glances_curses.py +++ b/glances/outputs/glances_curses.py @@ -1130,6 +1130,10 @@ class _GlancesCurses(object): update the terminal.""" self.term_window.erase() + def refresh(self): + """Refresh the windows""" + self.term_window.refresh() + def flush(self, stats, cs_status=None): """Erase and update the screen. @@ -1139,8 +1143,10 @@ class _GlancesCurses(object): "Connected": Client is connected to the server "Disconnected": Client is disconnected from the server """ + # See https://stackoverflow.com/a/43486979/1919431 self.erase() self.display(stats, cs_status=cs_status) + self.refresh() def update(self, stats, duration=3, cs_status=None, return_to_browser=False): """Update the screen. diff --git a/glances/outputs/static/js/components/plugin-containers.vue b/glances/outputs/static/js/components/plugin-containers.vue index db5abfd8..51366399 100644 --- a/glances/outputs/static/js/components/plugin-containers.vue +++ b/glances/outputs/static/js/components/plugin-containers.vue @@ -29,7 +29,7 @@ > MEM </div> - <div class="table-cell">/MAX</div> + <div class="table-cell text-left">/MAX</div> <div class="table-cell">IOR/s</div> <div class="table-cell">IOW/s</div> <div class="table-cell">RX/s</div> @@ -56,8 +56,8 @@ <div class="table-cell"> {{ $filters.bytes(container.memory_usage) }} </div> - <div class="table-cell"> - {{ $filters.bytes(container.limit) }} + <div class="table-cell text-left"> + /{{ $filters.bytes(container.limit) }} </div> <div class="table-cell"> {{ $filters.bytes(container.io_rx) }} |