diff options
| author | nicolargo <nicolas@nicolargo.com> | 2022-10-29 11:13:13 +0200 |
|---|---|---|
| committer | nicolargo <nicolas@nicolargo.com> | 2022-10-29 11:13:13 +0200 |
| commit | 30f7dbc5663d8762a934f5c60db580ac977b569a (patch) | |
| tree | 5acf162902db92d889bd2665e450f6c54a336e7c /README.rst | |
| parent | bbc94568d6f71ec4be1ca044c5f04b73c0263464 (diff) | |
| parent | 63292a54fc6c26ae5743802e586bde9753772d5b (diff) | |
Solve conflicts
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 40 |
1 files changed, 19 insertions, 21 deletions
@@ -57,15 +57,6 @@ Glances is written in Python and uses libraries to grab information from your system. It is based on an open architecture where developers can add new plugins or exports modules. -Social networks -=============== - -.. image:: https://raw.githubusercontent.com/nicolargo/glances/develop/docs/_static/twitter-icon.png - :target: https://twitter.com/nicolargo - -.. image:: https://raw.githubusercontent.com/nicolargo/glances/develop/docs/_static/reddit.png - :target: https://www.reddit.com/r/glances/ - Requirements ============ @@ -80,6 +71,7 @@ Please uses Glances version 3 if you need Python 2 support. Optional dependencies: +- ``batinfo`` (for battery monitoring) - ``bernhard`` (for the Riemann export module) - ``bottle`` (for Web server mode) - ``cassandra-driver`` (for the Cassandra export module) @@ -142,7 +134,7 @@ To install it, use the following command: pip install --user 'glances[web]' -For a full installation (with all features: +For a full installation (with all features): .. code-block:: console @@ -190,16 +182,18 @@ Get the Glances container: .. code-block:: console - docker pull nicolargo/glances:<version> + docker pull nicolargo/glances:alpine-latest-full -Available versions on the Docker Hub repository: +The following tags are availables: -- *nicolargo/glances:latest* for a basic Debian Glances image version with minimal dependencies -- *nicolargo/glances:alpine-latest* for a basic Alpine Glances image version with minimal dependencies -- *nicolargo/glances:latest-full* for a full Debian Glances image version with all dependencies -- *nicolargo/glances:alpine-latest-full* for a full Alpine Glances image version with all dependencies +- *alpine-latest-full* for a full Alpine Glances image (latest release) with all dependencies +- *latest-full* for a full Debian Glances image (latest release) with all dependencies +- *alpine-latest* for a basic Alpine Glances (latest release) version with minimal dependencies +- *latest* for a basic Debian Glances image (latest release) with minimal dependencies +- *alpine-dev* for a basic Alpine Glances image (development branch) with all dependencies +- *dev* for a basic Debian Glances image (development branch) with all dependencies -You can also specify a version by replacing latest by 3.2.6.4 (for example). +You can also specify a version (example: *alpine-3.2.7-full*). Run last version of Glances container in *console mode*: @@ -242,7 +236,8 @@ may not be the latest version. Note: The Debian package (and all other Debian-based distributions) do not include anymore the JS statics files used by the Web interface -(see ``issue2021``). +(see ``issue2021``). If you want to add it to your Glances installation, +follow the instructions: ``issue2021comment``. FreeBSD ------- @@ -406,7 +401,7 @@ or in a CSV format thanks to the stdout-csv option: 2018-12-08 22:04:23 CEST,5.4,5949136896,4,1.04,0.99,1.04 ... -or in a JSON format thanks to the stdout-json option (attibute not supported in this mode in order to have a real JSON object in output): +or in a JSON format thanks to the stdout-json option (attribute not supported in this mode in order to have a real JSON object in output): .. code-block:: console @@ -446,7 +441,9 @@ Donation If you like this open-source project, you can become a sponsor. -See the sponsors_ page (one-time or monthly tier available). +See the Github sponsors_ page (one-time or monthly tier available). + +Or send me some bitcoins: 185KN9FCix3svJYp7JQM7hRMfSKyeaJR4X Author ====== @@ -470,4 +467,5 @@ Glances is distributed under the LGPL version 3 license. See ``COPYING`` for mor .. _wiki: https://github.com/nicolargo/glances/wiki/How-to-contribute-to-Glances-%3F .. _package: https://repology.org/metapackage/glances/packages .. _sponsors: https://github.com/sponsors/nicolargo -.. _issue2021: https://github.com/nicolargo/glances/issues/2021#issuecomment-1197831157
\ No newline at end of file +.. _issue2021: https://github.com/nicolargo/glances/issues/2021#issuecomment-1197831157 +.. _issue2021comment: https://github.com/nicolargo/glances/issues/2021#issuecomment-1197831157
\ No newline at end of file |