diff --git a/conf/glances.conf b/conf/glances.conf index 7ed466ae..b41a5a1a 100644 --- a/conf/glances.conf +++ b/conf/glances.conf @@ -461,6 +461,7 @@ port=5672 user=guest password=guest queue=glances_queue +#protocol=amqps [mqtt] # Configuration for the --export mqtt option diff --git a/docs/aoa/ps.rst b/docs/aoa/ps.rst index 14906147..c9daacb2 100644 --- a/docs/aoa/ps.rst +++ b/docs/aoa/ps.rst @@ -128,6 +128,9 @@ The extended stats feature can be enabled using the ``--enable-process-extended`` option (command line) or the ``e`` key (curses interface). +In curses/standalone mode, you can select a process using ``UP`` and ``DOWN`` and press: +- ``k`` to kill the selected process + .. note:: Limit for CPU and MEM percent values can be overwritten in the configuration file under the ``[processlist]`` section. It is also diff --git a/docs/gw/rabbitmq.rst b/docs/gw/rabbitmq.rst index 173b9b3c..30ff7911 100644 --- a/docs/gw/rabbitmq.rst +++ b/docs/gw/rabbitmq.rst @@ -15,6 +15,7 @@ following: user=glances password=glances queue=glances_queue + #protocol=amqps and run Glances with: diff --git a/docs/man/glances.1 b/docs/man/glances.1 index cbc27a3a..abe6895c 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GLANCES" "1" "May 12, 2020" "3.1.5_DEVELOP" "Glances" +.TH "GLANCES" "1" "Jul 20, 2020" "3.1.5_DEVELOP" "Glances" .SH NAME glances \- An eye on your system . @@ -395,6 +395,9 @@ Sort processes by I/O rate Show/hide IP module .TP .B \fBk\fP +Kill selected process (only in curses/standalone mode) +.TP +.B \fBK\fP Show/hide TCP connections .TP .B \fBl\fP @@ -479,6 +482,12 @@ Enable/disable mean GPU mode .TP .B \fB/\fP Switch between process command line or command name +.TP +.B \fBUP\fP +Up in the processes list +.TP +.B \fBDOWN\fP +Down in the processes list .UNINDENT .sp In the Glances client browser (accessible through the \fB\-\-browser\fP diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py index e9bcc871..2a1afce3 100644 --- a/glances/outputs/glances_curses.py +++ b/glances/outputs/glances_curses.py @@ -76,8 +76,8 @@ class _GlancesCurses(object): 'h': {'switch': 'help_tag'}, 'i': {'sort_key': 'io_counters'}, 'I': {'switch': 'disable_ip'}, - 'k': {'switch': 'disable_connections'}, - # 'K' > Kill selected process + # 'k' > Kill selected process + 'K': {'switch': 'disable_connections'}, 'l': {'switch': 'disable_alert'}, 'm': {'sort_key': 'memory_percent'}, 'M': {'switch': 'reset_minmax_tag'}, @@ -388,8 +388,8 @@ class _GlancesCurses(object): # 'f' > Show/hide fs / folder stats self.args.disable_fs = not self.args.disable_fs self.args.disable_folders = not self.args.disable_folders - elif self.pressedkey == ord('K'): - # 'K' > Kill selected process (after confirmation) + elif self.pressedkey == ord('k'): + # 'k' > Kill selected process (after confirmation) self.kill_process = not self.kill_process elif self.pressedkey == ord('w'): # 'w' > Delete finished warning logs