diff options
author | nicolargo <nicolas@nicolargo.com> | 2021-02-28 10:21:16 +0100 |
---|---|---|
committer | nicolargo <nicolas@nicolargo.com> | 2021-02-28 10:21:16 +0100 |
commit | e427b840e9e50383a03e0ae222515ab89f4b9381 (patch) | |
tree | 652a24688f8e2605d6a01bed40aef3ce76ebd144 | |
parent | 20ea485a1fafb0cf1a0b7598ba90943f6466c329 (diff) | |
parent | 829174bbf0f3f86a32c5d11f7d35900a773941c9 (diff) |
Merge branch 'issues1817' into develop
-rw-r--r-- | README.rst | 2 | ||||
-rw-r--r-- | appveyor.yml | 2 | ||||
-rw-r--r-- | conf/glances.conf | 2 | ||||
-rw-r--r-- | docs/aoa/actions.rst | 4 | ||||
-rwxr-xr-x | setup.py | 2 |
5 files changed, 6 insertions, 6 deletions
@@ -65,6 +65,7 @@ Optional dependencies: - ``bernhard`` (for the Riemann export module) - ``bottle`` (for Web server mode) - ``cassandra-driver`` (for the Cassandra export module) +- ``chevron`` (for the action script feature) - ``couchdb`` (for the CouchDB export module) - ``docker`` (for the Docker monitoring support) [Linux/macOS-only] - ``elasticsearch`` (for the Elastic Search export module) @@ -82,7 +83,6 @@ Optional dependencies: - ``pymdstat`` (for RAID support) [Linux-only] - ``pySMART.smartx`` (for HDD Smart support) [Linux-only] - ``pysnmp`` (for SNMP support) -- ``pystache`` (for the action script feature) - ``pyzmq`` (for the ZeroMQ export module) - ``requests`` (for the Ports, Cloud plugins and RESTful export module) - ``scandir`` (for the Folders plugin) [Only for Python < 3.5] diff --git a/appveyor.yml b/appveyor.yml index 0a33184e..5b8be86a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -87,7 +87,7 @@ install: - "powershell .ci\\appveyor\\install.ps1" # - ps: (new-object net.webclient).DownloadFile('https://raw.github.com/pypa/pip/master/contrib/get-pip.py', 'C:/get-pip.py') - "%WITH_COMPILER% %PYTHON%/python.exe -m pip --version" - - "%WITH_COMPILER% %PYTHON%/python.exe -m pip install --upgrade --user psutil bottle requests netifaces pystache py-cpuinfo scandir" + - "%WITH_COMPILER% %PYTHON%/python.exe -m pip install --upgrade --user psutil bottle requests netifaces chevron py-cpuinfo scandir" - "%WITH_COMPILER% %PYTHON%/python.exe -m pip freeze" - "%WITH_COMPILER% %PYTHON%/python.exe setup.py install" diff --git a/conf/glances.conf b/conf/glances.conf index f21c4fd8..47481e3c 100644 --- a/conf/glances.conf +++ b/conf/glances.conf @@ -155,7 +155,7 @@ nf_conntrack_percent_warning=80 nf_conntrack_percent_critical=90 [wifi] -disable=False +disable=True # Define the list of hidden wireless network interfaces (comma-separated regexp) hide=lo,docker.* # Define SIGNAL thresholds in db (lower is better...) diff --git a/docs/aoa/actions.rst b/docs/aoa/actions.rst index 448d4fea..a594d34d 100644 --- a/docs/aoa/actions.rst +++ b/docs/aoa/actions.rst @@ -16,7 +16,7 @@ then add the ``_action`` line to the Glances configuration file: critical_action=python /path/to/foo.py All the stats are available in the command line through the use of the -`{{mustache}}`_ syntax. `Pystache`_ is required to render the mustache's template syntax. +`{{mustache}}`_ syntax. `Chevron`_ is required to render the mustache's template syntax. Another example would be to create a log file containing used vs total disk space if a space trigger warning is @@ -74,4 +74,4 @@ use with caution: critical_action_repeat=/home/myhome/bin/bipper.sh .. _{{mustache}}: https://mustache.github.io/ -.. _Pystache: https://github.com/defunkt/pystache +.. _Chevron: https://github.com/noahmorrison/chevron @@ -51,7 +51,7 @@ def get_install_requires(): def get_install_extras_require(): extras_require = { - 'action': ['pystache'], + 'action': ['chevron'], # Zeroconf 0.19.1 is the latest one compatible with Python 2 (issue #1293) 'browser': ['zeroconf==0.19.1' if PY2 else 'zeroconf>=0.19.1'], 'cloud': ['requests'], |