diff options
73 files changed, 914 insertions, 448 deletions
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..b9a8919d --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +github: [ nicolargo ] @@ -7,7 +7,8 @@ dist build -# Eclipse +# Eclipse and other IDE +.idea *.pydevproject .project .metadata diff --git a/.travis.yml b/.travis.yml index 7eddab6d..0666dab8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: python -sudo: false cache: pip python: - '2.7' @@ -11,7 +10,7 @@ install: - pip install -r requirements.txt - pip install coveralls script: -- python setup.py install +- pip install . - coverage run --source=glances unitest.py after_success: - coveralls @@ -10,10 +10,13 @@ nicolashennion@gmail.com PGP Fingerprint: A0D9 628F 5A83 A879 48EA B1FE BA43 C11F 2C8B 4347 PGP Public key: gpg --keyserver pgp.mit.edu --recv-keys 0xba43c11f2c8b4347 -Alessio Sergi (aka) Al3hex (for all it work on the project) +Alessio Sergi (aka) Al3hex (thanks you for the great job on this project) https://twitter.com/al3hex https://github.com/asergi +Floran Brutel (aka) notFloran (maintainer of the Web User Interface) +https://github.com/notFloran + Brandon Philips (aka) Philips http://ifup.org/ https://github.com/philips @@ -30,9 +33,6 @@ https://github.com/nclsHart Sylvain Mouquet (aka) SylvainMouquet (for the Web user interface) http://github.com/sylvainmouquet -Floran Brutel (aka) notFloran (for the Web user interface) -https://github.com/notFloran - Erik Eriksson (aka) Molobrakos (for the MQTT plugin and various PR) https://www.linkedin.com/in/error-errorsson/ @@ -2,6 +2,11 @@ Glances Version 3 ============================================================================== +Version 3.1.4 +============= + + ... Under development ... + Version 3.1.3 ============= diff --git a/conf/glances-grafana.json b/conf/glances-grafana.json index 0156140f..4d6cda5b 100644 --- a/conf/glances-grafana.json +++ b/conf/glances-grafana.json @@ -1243,7 +1243,7 @@ "measurement": "localhost.diskio", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"$disk.read_bytes\") FROM \"localhost.diskio\" WHERE $timeFilter GROUP BY time($__interval) fill(none)", + "query": "SELECT mean(\"$disk.read_bytes\")/mean(\"$disk.time_since_update\") FROM \"localhost.diskio\" WHERE $timeFilter GROUP BY time($__interval) fill(none)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -1286,7 +1286,7 @@ "measurement": "localhost.diskio", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"$disk.write_bytes\") FROM \"localhost.diskio\" WHERE $timeFilter GROUP BY time($__interval) fill(none)", + "query": "SELECT mean(\"$disk.write_bytes\")/mean(\"$disk.time_since_update\") FROM \"localhost.diskio\" WHERE $timeFilter GROUP BY time($__interval) fill(none)", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -1335,7 +1335,7 @@ "show": true }, { - "format": "short", + "format": "bytes", "logBase": 1, "max": null, "min": null, @@ -3183,4 +3183,4 @@ "title": "Glances", "uid": "000000002", "version": 10 -}
\ No newline at end of file +} diff --git a/conf/glances.conf b/conf/glances.conf index c967e9c6..d5cf291e 100644 --- a/conf/glances.conf +++ b/conf/glances.conf @@ -170,7 +170,7 @@ disable=False #hide=sda2,sda5,loop.* hide=loop.*,/dev/loop* # Alias for sda1 -#sda1_alias=IntDisk +#sda1_alias=InternalDisk [fs] disable=False @@ -186,7 +186,13 @@ critical=90 # Allow additional file system types (comma-separated FS type) #allow=zfs +[irq] +# Documentation: https://glances.readthedocs.io/en/stable/aoa/irq.html +# This plugin is disabled by default +disable=True + [folders] +# Documentation: https://glances.readthedocs.io/en/stable/aoa/folders.html disable=False # Define a folder list to monitor # The list is composed of items (list_#nb <= 10) @@ -207,10 +213,15 @@ disable=False #folder_3_path=/nonexisting #folder_4_path=/root -[irq] +[raid] +# Documentation: https://glances.readthedocs.io/en/stable/aoa/raid.html # This plugin is disabled by default -# Documentation: https://glances.readthedocs.io/en/stable/aoa/irq.html -disable=False +disable=True + +[smart] +# Documentation: https://glances.readthedocs.io/en/stable/aoa/smart.html +# This plugin is disabled by default +disable=True [hddtemp] disable=False @@ -244,6 +255,10 @@ battery_critical=95 [processlist] disable=False +# Sort key: if not defined, the sort is automatically done by Glances (recommended) +# Should be one of the following: +# cpu_percent, memory_percent, io_counters, name, cpu_times, username +#sort_key=memory_percent # Define CPU/MEM (per process) thresholds in % # Default values if not defined: 50/70/90 cpu_careful=50 @@ -473,6 +488,10 @@ host=localhost port=9092 topic=glances #compression=gzip +# Tags will be added for all events +#tags=foo:bar,spam:eggs +# You can also use dynamic values +#tags=hostname:`hostname -f` [zeromq] # Configuration for the --export zeromq option @@ -510,7 +529,7 @@ port=9091 labels=src:glances [restful] -# Configuration for the --export RESTful option +# Configuration for the --export restful option # Example, export to http://localhost:6789/ host=localhost port=6789 diff --git a/docker-files/devel/Dockerfile b/docker-files/devel/Dockerfile index 444f8ab9..30d16dcc 100644 --- a/docker-files/devel/Dockerfile +++ b/docker-files/devel/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu # Install Glances (develop branch) -RUN apt-get update && apt-get -y install curl && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get -y install curl iputils-ping && rm -rf /var/lib/apt/lists/* RUN curl -L https://raw.githubusercontent.com/nicolargo/glancesautoinstall/master/install-develop.sh | /bin/bash && rm -rf /var/lib/apt/lists/* diff --git a/docker-files/master/Dockerfile b/docker-files/master/Dockerfile index 045f264c..db42dec4 100644 --- a/docker-files/master/Dockerfile +++ b/docker-files/master/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu # Install Glances (develop branch) -RUN apt-get update && apt-get -y install curl && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get -y install curl iputils-ping && rm -rf /var/lib/apt/lists/* RUN curl -L https://raw.githubusercontent.com/nicolargo/glancesautoinstall/master/install.sh | /bin/bash && rm -rf /var/lib/apt/lists/* diff --git a/docs/_static/loadpercent.png b/docs/_static/loadpercent.png Binary files differnew file mode 100644 index 00000000..7d3e4875 --- /dev/null +++ b/docs/_static/loadpercent.png diff --git a/docs/aoa/amps.rst b/docs/aoa/amps.rst index 85518f86..e32d6192 100644 --- a/docs/aoa/amps.rst +++ b/docs/aoa/amps.rst @@ -6,7 +6,7 @@ Applications Monitoring Process Thanks to Glances and its AMP module, you can add specific monitoring to running processes. AMPs are defined in the Glances [configuration file](http://glances.readthedocs.io/en/stable/config.html). -You can disable AMP using the ``--disable-amps`` option or pressing the +You can disable AMP using the ``--disable-plugin amps`` option or pressing the ``A`` key. Simple AMP diff --git a/docs/aoa/disk.rst b/docs/aoa/diskio.rst index f6d03ffe..f6d03ffe 100644 --- a/docs/aoa/disk.rst +++ b/docs/aoa/diskio.rst diff --git a/docs/aoa/fs.rst b/docs/aoa/fs.rst index 923c97f3..38c56097 100644 --- a/docs/aoa/fs.rst +++ b/docs/aoa/fs.rst @@ -37,10 +37,17 @@ system: Also, you can hide mount points as well (in the following ``/boot``): + +.. code-block:: ini + +[fs] +hide=/boot.* +Filtering can also be done on device name (Glances 3.1.4 or higher): + .. code-block:: ini [fs] - hide=/boot.* + hide=/dev/sdb2 RAID ---- diff --git a/docs/aoa/gpu.rst b/docs/aoa/gpu.rst index 22d6886d..85d1cdba 100644 --- a/docs/aoa/gpu.rst +++ b/docs/aoa/gpu.rst @@ -4,11 +4,15 @@ GPU === .. note:: - You need to install the `nvidia-ml-py3`_ library on your system. + You need to install the `py3nvml`_ library on your system. + Or `nvidia-ml-py3`_ for Glances 3.1.3 or lower. The GPU stats are shown as a percentage of value and for the configured -refresh time. The total GPU usage is displayed on the first line, the -memory consumption on the second one. +refresh time. It displays: + +- total GPU usage +- memory consumption +- temperature (Glances 3.1.4 or higher) .. image:: ../_static/gpu.png @@ -45,4 +49,5 @@ GPU (PROC/MEM) Status ``>90%`` ``CRITICAL`` ============== ============ -.. _nvidia-ml-py3: https://pypi.python.org/pypi/nvidia-ml-py3 +.. _py3nvml: https://pypi.org/project/py3nvml/ +.. _nvidia-ml-py3: https://pypi.org/project/nvidia-ml-py3/ diff --git a/docs/aoa/index.rst b/docs/aoa/index.rst index 93d7db44..571e9410 100644 --- a/docs/aoa/index.rst +++ b/docs/aoa/index.rst @@ -24,16 +24,18 @@ Legend: quicklook cpu gpu - load memory + load network connections wifi ports - disk + diskio fs - folders irq + folders + raid + smart sensors ps monitor diff --git a/docs/aoa/irq.rst b/docs/aoa/irq.rst index 9a9a55a7..6fbc868f 100644 --- a/docs/aoa/irq.rst +++ b/docs/aoa/irq.rst @@ -5,7 +5,7 @@ IRQ *Availability: Linux* -This plugin is disable by default, please use the --enable-irq option +This plugin is disable by default, please use the --enable irq option to enable it. .. image:: ../_static/irq.png diff --git a/docs/aoa/load.rst b/docs/aoa/load.rst index 30eb2e38..08374abb 100644 --- a/docs/aoa/load.rst +++ b/docs/aoa/load.rst @@ -18,9 +18,18 @@ Be aware that Load on Linux, BSD and Windows are different things, high `load on BSD`_ does not means high CPU load. The Windows load is emulated by the PsUtil lib (see `load on Windows`_) -Glances gets the number of CPU core to adapt the alerts. -Alerts on load average are only set on 15 minutes time period. -The first line also displays the number of CPU core. +Glances gets the number of CPU core (displayed on the first line) to adapt +the alerts. Alerts on load average are only set on 15 minutes time period. + +Thresholds are computed by dividing the 5 and 15 minutes average load per +CPU(s) number. For example, if you have 4 CPUs and the 5 minutes load is +1.0, then the warning threshold will be set to 2.8 (0.7 * 4 * 1.0). + +From Glances 3.1.4, if Irix/Solaris mode is off ('0' key), the value is +divided by logical core number and multiple by 100 to have load as a +percentage. + +.. image:: ../_static/loadpercent.png Legend: diff --git a/docs/aoa/memory.rst b/docs/aoa/memory.rst index 05b3df87..1df04d06 100644 --- a/docs/aoa/memory.rst +++ b/docs/aoa/memory.rst @@ -12,6 +12,33 @@ the ``RAM``: .. image:: ../_static/mem-wide.png +Stats description: + +- **percent**: the percentage usage calculated as (total-available)/total*100. +- **total**: total physical memory available. +- **used**: memory used, calculated differently depending on the platform and + designed for informational purposes only. +- **free**: memory not being used at all (zeroed) that is readily available; + note that this doesn’t reflect the actual memory available (use ‘available’ + instead). +- **active**: (UNIX): memory currently in use or very recently used, and so it + is in RAM. +- **inactive**: (UNIX): memory that is marked as not used. +- **buffers**: (Linux, BSD): cache for things like file system metadata. +- **cached**: (Linux, BSD): cache for various things. + +Additional stats available in through the API: + +- **available**: the actual amount of available memory that can be given + instantly to processes that request more memory in bytes; this is calculated + by summing different memory values depending on the platform (e.g. free + + buffers + cached on Linux) and it is supposed to be used to monitor actual + memory usage in a cross platform fashion. +- **wired**: (BSD, macOS): memory that is marked to always stay in RAM. It is + never moved to disk. +- **shared**: (BSD): memory that may be simultaneously access |
