Merge remote-tracking branch 'origin/bullseye-swap-top' into unstable
Some checks reported errors
continuous-integration/drone/push Build was killed
Some checks reported errors
continuous-integration/drone/push Build was killed
This commit is contained in:
commit
0e34d4cd4b
|
@ -110,6 +110,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
|
||||||
* Add Elastic GPG key to kibana, filebeat, logstash, metricbeat roles
|
* Add Elastic GPG key to kibana, filebeat, logstash, metricbeat roles
|
||||||
* apache: new variable for mpm mode (+ updated default config accordingly)
|
* apache: new variable for mpm mode (+ updated default config accordingly)
|
||||||
* evolinux-base: add default motd template
|
* evolinux-base: add default motd template
|
||||||
|
* evolinux-base: configure top and htop to display the swap column
|
||||||
* kvm-host: add migrate-vm script
|
* kvm-host: add migrate-vm script
|
||||||
* mysql: variable to disable myadd script overwrite (default: True)
|
* mysql: variable to disable myadd script overwrite (default: True)
|
||||||
* nodejs: update apt cache before installing the package
|
* nodejs: update apt cache before installing the package
|
||||||
|
|
2
evolinux-base/files/htoprc
Normal file
2
evolinux-base/files/htoprc
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
# Force the SWAP column to the right of the CPU one
|
||||||
|
fields=0 48 17 18 38 39 40 119 2 46 47 49 1
|
15
evolinux-base/files/topdefaultrc
Normal file
15
evolinux-base/files/topdefaultrc
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
top's Config File (Linux processes with windows)
|
||||||
|
Id:j, Mode_altscr=0, Mode_irixps=1, Delay_time=3.0, Curwin=0
|
||||||
|
Def fieldscur=ķ&')*+,-./012568>?ABCFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz
|
||||||
|
winflags=193844, sortindx=18, maxtasks=0, graph_cpus=0, graph_mems=0, double_up=0, combine_cpus=0
|
||||||
|
summclr=1, msgsclr=1, headclr=3, taskclr=1
|
||||||
|
Job fieldscur=(Ļ@<)*+,-./012568>?ABCFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz
|
||||||
|
winflags=193844, sortindx=0, maxtasks=0, graph_cpus=0, graph_mems=0, double_up=0, combine_cpus=0
|
||||||
|
summclr=6, msgsclr=6, headclr=7, taskclr=6
|
||||||
|
Mem fieldscur=<MBND34&'()*+,-./0125689FGHIJKLOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz
|
||||||
|
winflags=193844, sortindx=21, maxtasks=0, graph_cpus=0, graph_mems=0, double_up=0, combine_cpus=0
|
||||||
|
summclr=5, msgsclr=5, headclr=4, taskclr=5
|
||||||
|
Usr fieldscur=)+,-./1234568;<=>?@ABCFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz
|
||||||
|
winflags=193844, sortindx=3, maxtasks=0, graph_cpus=0, graph_mems=0, double_up=0, combine_cpus=0
|
||||||
|
summclr=3, msgsclr=3, headclr=2, taskclr=3
|
||||||
|
Fixed_widest=0, Summ_mscale=1, Task_mscale=0, Zero_suppress=0
|
6
evolinux-base/tasks/htop.yml
Normal file
6
evolinux-base/tasks/htop.yml
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
- name: Deploy htop configuration
|
||||||
|
copy:
|
||||||
|
src: htoprc
|
||||||
|
dest: /etc/htoprc
|
||||||
|
mode: "0644"
|
|
@ -130,3 +130,7 @@
|
||||||
include_role:
|
include_role:
|
||||||
name: evolix/generate-ldif
|
name: evolix/generate-ldif
|
||||||
when: evolinux_generateldif_include | bool
|
when: evolinux_generateldif_include | bool
|
||||||
|
|
||||||
|
- include: top.yml
|
||||||
|
|
||||||
|
- include: htop.yml
|
||||||
|
|
7
evolinux-base/tasks/top.yml
Normal file
7
evolinux-base/tasks/top.yml
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
---
|
||||||
|
- name: Deploy top configuration file
|
||||||
|
copy:
|
||||||
|
# The config format is unredable; ATM it only add the SWAP column
|
||||||
|
src: htoprc
|
||||||
|
dest: /etc/topdefaultrc
|
||||||
|
mode: "0644"
|
Loading…
Reference in a new issue