nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-08-17 00:10:48 +03:00
Code Issues Projects Releases Wiki Activity

version 3.4.0.4

Browse Source
This commit is contained in:
nicolargo 2024-03-23 10:16:34 +01:00
parent b97606247d
commit 370da44744
13 changed files with 647 additions and 639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS.rst
View File

@ -2,6 +2,12 @@
Glances changelog
==============================================================================
===============
Version 3.4.0.4
===============
Cuber security patch (update some deps in the WebUI and Docker image)
===============
Version 3.4.0.3
===============

4
conf/glances.conf
View File

@ -159,7 +159,7 @@ tx_careful=70
tx_warning=80
tx_critical=90
# Define the list of hidden network interfaces (comma-separated regexp)
#hide=docker.*,lo
hide=docker.*,lo
# Define the list of wireless network interfaces to be show (comma-separated)
#show=docker.*
# WLAN 0 alias
@ -465,7 +465,7 @@ path=/tmp
# It is possible to generate the graphs automatically by setting the
# generate_every to a non zero value corresponding to the seconds between
# two generation. Set it to 0 to disable graph auto generation.
generate_every=60
generate_every=0
# See following configuration keys definitions in the Pygal lib documentation
# http://pygal.org/en/stable/documentation/index.html
width=800

10
docker-files/alpine.Dockerfile
View File

@ -17,6 +17,11 @@ ARG PYTHON_VERSION=3.11
# Base layer to be used for building dependencies and the release images
FROM alpine:${IMAGE_VERSION} as base
# Upgrade the system
RUN apk update \
&& apk upgrade --no-cache
# Install the minimal set of packages
RUN apk add --no-cache \
python3 \
curl \
@ -52,6 +57,9 @@ RUN apk add --no-cache \
libffi-dev \
openssl-dev
RUN python${PYTHON_VERSION} -m venv venv-build
RUN /venv-build/bin/python${PYTHON_VERSION} -m pip install --upgrade pip
RUN python${PYTHON_VERSION} -m venv --without-pip venv
COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./
@ -120,4 +128,4 @@ FROM full as dev
# Forward access and error logs to Docker's log collector
RUN ln -sf /dev/stdout /tmp/glances-root.log \
&& ln -sf /dev/stderr /var/log/error.log \
&& ln -sf /dev/stderr /var/log/error.log

14
docker-files/ubuntu.Dockerfile
View File

@ -36,17 +36,21 @@ FROM base as build
ARG PYTHON_VERSION
ARG DEBIAN_FRONTEND=noninteractive
# Install build-time dependencies
# Upgrade the system
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
&& apt-get upgrade -y
# Install build-time dependencies
RUN apt-get install -y --no-install-recommends \
python3-dev \
python3-venv \
python3-pip \
python3-wheel \
libzmq5 \
musl-dev \
build-essential \
&& apt-get clean \
build-essential
RUN apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN python${PYTHON_VERSION} -m venv --without-pip venv
@ -115,4 +119,4 @@ FROM full as dev
# Forward access and error logs to Docker's log collector
RUN ln -sf /dev/stdout /tmp/glances-root.log \
&& ln -sf /dev/stderr /var/log/error.log
&& ln -sf /dev/stderr /var/log/error.log

4
docker-requirements.txt
View File

@ -6,5 +6,5 @@ podman; python_version >= "3.6"
packaging; python_version >= "3.7"
python-dateutil
six
urllib3<2.0 # See issue https://github.com/nicolargo/glances/issues/2392
requests # See issue - https://github.com/nicolargo/glances/issues/2233
urllib3
requests

1196
docs/api.rst
View File

File diff suppressed because it is too large Load Diff

4
docs/man/glances.1
View File

@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
.TH "GLANCES" "1" "May 20, 2023" "3.4.0.3" "Glances"
.TH "GLANCES" "1" "Mar 23, 2024" "3.4.0.4" "Glances"
.SH NAME
glances \- An eye on your system
.SH SYNOPSIS
@ -885,6 +885,6 @@ $ glances –browser
.sp
Nicolas Hennion aka Nicolargo <\fI\%contact@nicolargo.com\fP>
.SH COPYRIGHT
2023, Nicolas Hennion
2024, Nicolas Hennion
.\" Generated by docutils manpage writer.
.

2
glances/__init__.py
View File

@ -19,7 +19,7 @@ import sys
# Global name
# Version should start and end with a numerical char
# See https://packaging.python.org/specifications/core-metadata/#version
__version__ = '3.4.0.3'
__version__ = '3.4.0.4'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPLv3'

36
glances/outputs/static/package-lock.json generated
View File

@ -2330,9 +2330,9 @@
"dev": true
},
"node_modules/follow-redirects": {
"version": "1.15.2",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
"version": "1.15.6",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
"dev": true,
"funding": [
{
@ -4432,9 +4432,9 @@
"dev": true
},
"node_modules/sanitize-html": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.10.0.tgz",
"integrity": "sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ==",
"version": "2.13.0",
"resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.13.0.tgz",
"integrity": "sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA==",
"dependencies": {
"deepmerge": "^4.2.2",
"escape-string-regexp": "^4.0.0",
@ -5522,9 +5522,9 @@
}
},
"node_modules/webpack-dev-middleware": {
"version": "5.3.3",
"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
"integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
"version": "5.3.4",
"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
"integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
"dev": true,
"dependencies": {
"colorette": "^2.0.10",
@ -7607,9 +7607,9 @@
"dev": true
},
"follow-redirects": {
"version": "1.15.2",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
"version": "1.15.6",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
"dev": true
},
"forwarded": {
@ -9103,9 +9103,9 @@
"dev": true
},
"sanitize-html": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.10.0.tgz",
"integrity": "sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ==",
"version": "2.13.0",
"resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.13.0.tgz",
"integrity": "sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA==",
"requires": {
"deepmerge": "^4.2.2",
"escape-string-regexp": "^4.0.0",
@ -9902,9 +9902,9 @@
}
},
"webpack-dev-middleware": {
"version": "5.3.3",
"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
"integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
"version": "5.3.4",
"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
"integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
"dev": true,
"requires": {
"colorette": "^2.0.10",

BIN
glances/outputs/static/public/glances.js vendored
View File

Binary file not shown.

2
optional-requirements.txt
View File

@ -24,7 +24,7 @@ prometheus_client
pygal
pymdstat
pymongo; python_version >= "3.7"
py3nvml; python_version >= "3.5"
nvidia-ml-py; python_version >= "3.5"
pysnmp
pySMART.smartx
python-dateutil

4
setup.py
View File

@ -8,6 +8,10 @@ from io import open
from setuptools import setup, Command
# Predication warning
# Glances version 4 will only be compatible with Python 3.7 and above
if sys.version_info < (3, 7):
print('WARNING: Glances version 4 will only be compatible with Python 3.7 and above.')
if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 4):
print('Glances requires at least Python 2.7 or 3.4 to run.')

4
snap/snapcraft.yaml
View File

@ -7,7 +7,7 @@ description: |
Web based interface. It can adapt dynamically the displayed information
depending on the user interface size.
base: core20
base: core22
grade: stable
confinement: strict
@ -67,7 +67,7 @@ parts:
docker:
plugin: python
source: https://github.com/docker/docker-py.git
source-tag: '3.7.3'
source-tag: '7.0.0'
source-depth: 1
override-build: |
mkdir -p $SNAPCRAFT_PART_BUILD/dist