mirror of
https://github.com/nicolargo/glances.git
synced 2024-09-11 12:47:14 +03:00
Compare commits
11 Commits
327726dab6
...
3f3d1e2dd4
| Author | SHA1 | Date | |
|---|---|---|---|
|
3f3d1e2dd4 | ||
|
036eb976e9 | ||
|
2c5a1150bd | ||
|
|
f6066e5d46 | ||
|
|
cff2e9fc4a | ||
|
|
e5d5351d31 | ||
|
|
be89ee0025 | ||
|
|
f4cd350221 | ||
|
|
3928007169 | ||
|
|
eebd769c46 | ||
|
1e2e36af23 |
@ -221,8 +221,6 @@ Run last version of Glances container in *console mode*:
|
|||||||
|
|
||||||
By default, the /etc/glances/glances.conf file is used (based on docker-compose/glances.conf).
|
By default, the /etc/glances/glances.conf file is used (based on docker-compose/glances.conf).
|
||||||
|
|
||||||
By default, the /etc/glances/glances.conf file is used (based on docker-compose/glances.conf).
|
|
||||||
|
|
||||||
Additionally, if you want to use your own glances.conf file, you can
|
Additionally, if you want to use your own glances.conf file, you can
|
||||||
create your own Dockerfile:
|
create your own Dockerfile:
|
||||||
|
|
||||||
|
|||||||
@ -2,13 +2,10 @@
|
|||||||
|
|
||||||
## Supported Versions
|
## Supported Versions
|
||||||
|
|
||||||
Use this section to tell people about which versions of your project are
|
|
||||||
currently being supported with security updates.
|
|
||||||
|
|
||||||
| Version | Support security updates |
|
| Version | Support security updates |
|
||||||
| ------- | ------------------------ |
|
| ------- | ------------------------ |
|
||||||
| 3.x | :white_check_mark: |
|
| 4.x | :white_check_mark: |
|
||||||
| < 3.0 | :x: |
|
| < 4.0 | :x: |
|
||||||
|
|
||||||
## Reporting a Vulnerability
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
@ -31,4 +28,3 @@ If there are any vulnerabilities in {{cookiecutter.project_name}}, don't hesitat
|
|||||||
4. Please do not disclose the vulnerability publicly until a fix is released!
|
4. Please do not disclose the vulnerability publicly until a fix is released!
|
||||||
|
|
||||||
Once we have either a) published a fix, or b) declined to address the vulnerability for whatever reason, you are free to publicly disclose it.
|
Once we have either a) published a fix, or b) declined to address the vulnerability for whatever reason, you are free to publicly disclose it.
|
||||||
|
|
||||||
|
|||||||
@ -17,36 +17,30 @@ from glances.timer import Timer
|
|||||||
class CpuPercent:
|
class CpuPercent:
|
||||||
"""Get and store the CPU percent."""
|
"""Get and store the CPU percent."""
|
||||||
|
|
||||||
def __init__(self, cached_timer_cpu=3):
|
def __init__(self, cached_timer_cpu=2):
|
||||||
self.cpu_info = {'cpu_name': None, 'cpu_hz_current': None, 'cpu_hz': None}
|
|
||||||
self.cpu_percent = 0
|
|
||||||
self.percpu_percent = []
|
|
||||||
|
|
||||||
# Get CPU name
|
|
||||||
self.cpu_info['cpu_name'] = self.__get_cpu_name()
|
|
||||||
|
|
||||||
# cached_timer_cpu is the minimum time interval between stats updates
|
# cached_timer_cpu is the minimum time interval between stats updates
|
||||||
# since last update is passed (will retrieve old cached info instead)
|
# since last update is passed (will retrieve old cached info instead)
|
||||||
self.cached_timer_cpu = cached_timer_cpu
|
self.cached_timer_cpu = cached_timer_cpu
|
||||||
self.timer_cpu = Timer(0)
|
|
||||||
self.timer_percpu = Timer(0)
|
|
||||||
|
|
||||||
# psutil.cpu_freq() consumes lots of CPU
|
# psutil.cpu_freq() consumes lots of CPU
|
||||||
# So refresh the stats every refresh*2 (6 seconds)
|
# So refresh CPU frequency stats every refresh * 2
|
||||||
self.cached_timer_cpu_info = cached_timer_cpu * 2
|
self.cached_timer_cpu_info = cached_timer_cpu * 2
|
||||||
|
|
||||||
|
# Get CPU name
|
||||||
self.timer_cpu_info = Timer(0)
|
self.timer_cpu_info = Timer(0)
|
||||||
|
self.cpu_info = {'cpu_name': self.__get_cpu_name(), 'cpu_hz_current': None, 'cpu_hz': None}
|
||||||
|
|
||||||
|
# Warning from PsUtil documentation
|
||||||
|
# The first time this function is called with interval = 0.0 or None
|
||||||
|
# it will return a meaningless 0.0 value which you are supposed to ignore.
|
||||||
|
self.timer_cpu = Timer(0)
|
||||||
|
self.cpu_percent = self.get_cpu()
|
||||||
|
self.timer_percpu = Timer(0)
|
||||||
|
self.percpu_percent = self.get_percpu()
|
||||||
|
|
||||||
def get_key(self):
|
def get_key(self):
|
||||||
"""Return the key of the per CPU list."""
|
"""Return the key of the per CPU list."""
|
||||||
return 'cpu_number'
|
return 'cpu_number'
|
||||||
|
|
||||||
def get(self, percpu=False):
|
|
||||||
"""Update and/or return the CPU using the psutil library.
|
|
||||||
If percpu, return the percpu stats"""
|
|
||||||
if percpu:
|
|
||||||
return self.__get_percpu()
|
|
||||||
return self.__get_cpu()
|
|
||||||
|
|
||||||
def get_info(self):
|
def get_info(self):
|
||||||
"""Get additional information about the CPU"""
|
"""Get additional information about the CPU"""
|
||||||
# Never update more than 1 time per cached_timer_cpu_info
|
# Never update more than 1 time per cached_timer_cpu_info
|
||||||
@ -71,7 +65,7 @@ class CpuPercent:
|
|||||||
|
|
||||||
def __get_cpu_name(self):
|
def __get_cpu_name(self):
|
||||||
# Get the CPU name once from the /proc/cpuinfo file
|
# Get the CPU name once from the /proc/cpuinfo file
|
||||||
# Read the first line with the "model name"
|
# Read the first line with the "model name" ("Model" for Raspberry Pi)
|
||||||
ret = None
|
ret = None
|
||||||
try:
|
try:
|
||||||
cpuinfo_file = open('/proc/cpuinfo').readlines()
|
cpuinfo_file = open('/proc/cpuinfo').readlines()
|
||||||
@ -79,26 +73,31 @@ class CpuPercent:
|
|||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
for line in cpuinfo_file:
|
for line in cpuinfo_file:
|
||||||
if line.startswith('model name'):
|
if line.startswith('model name') or line.startswith('Model') or line.startswith('cpu model'):
|
||||||
ret = line.split(':')[1].strip()
|
ret = line.split(':')[1].strip()
|
||||||
break
|
break
|
||||||
return ret if ret else 'CPU'
|
return ret if ret else 'CPU'
|
||||||
|
|
||||||
def __get_cpu(self):
|
def get_cpu(self):
|
||||||
"""Update and/or return the CPU using the psutil library."""
|
"""Update and/or return the CPU using the psutil library."""
|
||||||
# Never update more than 1 time per cached_timer_cpu
|
# Never update more than 1 time per cached_timer_cpu
|
||||||
if self.timer_cpu.finished():
|
if self.timer_cpu.finished():
|
||||||
self.cpu_percent = psutil.cpu_percent(interval=0.0)
|
|
||||||
# Reset timer for cache
|
# Reset timer for cache
|
||||||
self.timer_cpu.reset(duration=self.cached_timer_cpu)
|
self.timer_cpu.reset(duration=self.cached_timer_cpu)
|
||||||
|
# Update the stats
|
||||||
|
self.cpu_percent = psutil.cpu_percent(interval=0.0)
|
||||||
return self.cpu_percent
|
return self.cpu_percent
|
||||||
|
|
||||||
def __get_percpu(self):
|
def get_percpu(self):
|
||||||
"""Update and/or return the per CPU list using the psutil library."""
|
"""Update and/or return the per CPU list using the psutil library."""
|
||||||
# Never update more than 1 time per cached_timer_cpu
|
# Never update more than 1 time per cached_timer_cpu
|
||||||
if self.timer_percpu.finished():
|
if self.timer_percpu.finished():
|
||||||
self.percpu_percent = []
|
# Reset timer for cache
|
||||||
for cpu_number, cputimes in enumerate(psutil.cpu_times_percent(interval=0.0, percpu=True)):
|
self.timer_percpu.reset(duration=self.cached_timer_cpu)
|
||||||
|
# Get stats
|
||||||
|
percpu_percent = []
|
||||||
|
psutil_percpu = enumerate(psutil.cpu_times_percent(interval=0.0, percpu=True))
|
||||||
|
for cpu_number, cputimes in psutil_percpu:
|
||||||
cpu = {
|
cpu = {
|
||||||
'key': self.get_key(),
|
'key': self.get_key(),
|
||||||
'cpu_number': cpu_number,
|
'cpu_number': cpu_number,
|
||||||
@ -123,9 +122,9 @@ class CpuPercent:
|
|||||||
if hasattr(cputimes, 'guest_nice'):
|
if hasattr(cputimes, 'guest_nice'):
|
||||||
cpu['guest_nice'] = cputimes.guest_nice
|
cpu['guest_nice'] = cputimes.guest_nice
|
||||||
# Append new CPU to the list
|
# Append new CPU to the list
|
||||||
self.percpu_percent.append(cpu)
|
percpu_percent.append(cpu)
|
||||||
# Reset timer for cache
|
# Update stats
|
||||||
self.timer_percpu.reset(duration=self.cached_timer_cpu)
|
self.percpu_percent = percpu_percent
|
||||||
return self.percpu_percent
|
return self.percpu_percent
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -370,7 +370,7 @@ class _GlancesCurses:
|
|||||||
logger.info(f"Stop Glances (keypressed: {self.pressedkey})")
|
logger.info(f"Stop Glances (keypressed: {self.pressedkey})")
|
||||||
|
|
||||||
def _handle_refresh(self):
|
def _handle_refresh(self):
|
||||||
pass
|
glances_processes.reset_internal_cache()
|
||||||
|
|
||||||
def loop_position(self):
|
def loop_position(self):
|
||||||
"""Return the current sort in the loop"""
|
"""Return the current sort in the loop"""
|
||||||
|
|||||||
506
glances/outputs/static/package-lock.json
generated
506
glances/outputs/static/package-lock.json
generated
@ -4,7 +4,6 @@
|
|||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "static",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bootstrap": "^3.4.1",
|
"bootstrap": "^3.4.1",
|
||||||
"favico.js": "^0.3.10",
|
"favico.js": "^0.3.10",
|
||||||
@ -43,9 +42,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/parser": {
|
"node_modules/@babel/parser": {
|
||||||
"version": "7.21.8",
|
"version": "7.24.7",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz",
|
||||||
"integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==",
|
"integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==",
|
||||||
"bin": {
|
"bin": {
|
||||||
"parser": "bin/babel-parser.js"
|
"parser": "bin/babel-parser.js"
|
||||||
},
|
},
|
||||||
@ -441,107 +440,160 @@
|
|||||||
"@types/node": "*"
|
"@types/node": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@vue/compiler-core": {
|
"node_modules/@vue/compiler-dom": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.31.tgz",
|
||||||
"integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
|
"integrity": "sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/parser": "^7.21.3",
|
"@vue/compiler-core": "3.4.31",
|
||||||
"@vue/shared": "3.3.4",
|
"@vue/shared": "3.4.31"
|
||||||
"estree-walker": "^2.0.2",
|
|
||||||
"source-map-js": "^1.0.2"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@vue/compiler-dom": {
|
"node_modules/@vue/compiler-dom/node_modules/@vue/compiler-core": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.31.tgz",
|
||||||
"integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
|
"integrity": "sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/compiler-core": "3.3.4",
|
"@babel/parser": "^7.24.7",
|
||||||
"@vue/shared": "3.3.4"
|
"@vue/shared": "3.4.31",
|
||||||
|
"entities": "^4.5.0",
|
||||||
|
"estree-walker": "^2.0.2",
|
||||||
|
"source-map-js": "^1.2.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@vue/compiler-dom/node_modules/@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
},
|
||||||
|
"node_modules/@vue/compiler-dom/node_modules/entities": {
|
||||||
|
"version": "4.5.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
|
||||||
|
"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=0.12"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/fb55/entities?sponsor=1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@vue/compiler-sfc": {
|
"node_modules/@vue/compiler-sfc": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.31.tgz",
|
||||||
"integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
|
"integrity": "sha512-einJxqEw8IIJxzmnxmJBuK2usI+lJonl53foq+9etB2HAzlPjAS/wa7r0uUpXw5ByX3/0uswVSrjNb17vJm1kQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/parser": "^7.20.15",
|
"@babel/parser": "^7.24.7",
|
||||||
"@vue/compiler-core": "3.3.4",
|
"@vue/compiler-core": "3.4.31",
|
||||||
"@vue/compiler-dom": "3.3.4",
|
"@vue/compiler-dom": "3.4.31",
|
||||||
"@vue/compiler-ssr": "3.3.4",
|
"@vue/compiler-ssr": "3.4.31",
|
||||||
"@vue/reactivity-transform": "3.3.4",
|
"@vue/shared": "3.4.31",
|
||||||
"@vue/shared": "3.3.4",
|
|
||||||
"estree-walker": "^2.0.2",
|
"estree-walker": "^2.0.2",
|
||||||
"magic-string": "^0.30.0",
|
"magic-string": "^0.30.10",
|
||||||
"postcss": "^8.1.10",
|
"postcss": "^8.4.38",
|
||||||
"source-map-js": "^1.0.2"
|
"source-map-js": "^1.2.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@vue/compiler-sfc/node_modules/@vue/compiler-core": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==",
|
||||||
|
"dependencies": {
|
||||||
|
"@babel/parser": "^7.24.7",
|
||||||
|
"@vue/shared": "3.4.31",
|
||||||
|
"entities": "^4.5.0",
|
||||||
|
"estree-walker": "^2.0.2",
|
||||||
|
"source-map-js": "^1.2.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@vue/compiler-sfc/node_modules/@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
},
|
||||||
|
"node_modules/@vue/compiler-sfc/node_modules/entities": {
|
||||||
|
"version": "4.5.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
|
||||||
|
"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=0.12"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/fb55/entities?sponsor=1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@vue/compiler-ssr": {
|
"node_modules/@vue/compiler-ssr": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.31.tgz",
|
||||||
"integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
|
"integrity": "sha512-RtefmITAje3fJ8FSg1gwgDhdKhZVntIVbwupdyZDSifZTRMiWxWehAOTCc8/KZDnBOcYQ4/9VWxsTbd3wT0hAA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/compiler-dom": "3.3.4",
|
"@vue/compiler-dom": "3.4.31",
|
||||||
"@vue/shared": "3.3.4"
|
"@vue/shared": "3.4.31"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@vue/compiler-ssr/node_modules/@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
},
|
||||||
"node_modules/@vue/reactivity": {
|
"node_modules/@vue/reactivity": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.31.tgz",
|
||||||
"integrity": "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==",
|
"integrity": "sha512-VGkTani8SOoVkZNds1PfJ/T1SlAIOf8E58PGAhIOUDYPC4GAmFA2u/E14TDAFcf3vVDKunc4QqCe/SHr8xC65Q==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/shared": "3.3.4"
|
"@vue/shared": "3.4.31"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@vue/reactivity-transform": {
|
"node_modules/@vue/reactivity/node_modules/@vue/shared": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
"integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
"dependencies": {
|
|
||||||
"@babel/parser": "^7.20.15",
|
|
||||||
"@vue/compiler-core": "3.3.4",
|
|
||||||
"@vue/shared": "3.3.4",
|
|
||||||
"estree-walker": "^2.0.2",
|
|
||||||
"magic-string": "^0.30.0"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"node_modules/@vue/runtime-core": {
|
"node_modules/@vue/runtime-core": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.31.tgz",
|
||||||
"integrity": "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==",
|
"integrity": "sha512-LDkztxeUPazxG/p8c5JDDKPfkCDBkkiNLVNf7XZIUnJ+66GVGkP+TIh34+8LtPisZ+HMWl2zqhIw0xN5MwU1cw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/reactivity": "3.3.4",
|
"@vue/reactivity": "3.4.31",
|
||||||
"@vue/shared": "3.3.4"
|
"@vue/shared": "3.4.31"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@vue/runtime-core/node_modules/@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
},
|
||||||
"node_modules/@vue/runtime-dom": {
|
"node_modules/@vue/runtime-dom": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.31.tgz",
|
||||||
"integrity": "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==",
|
"integrity": "sha512-2Auws3mB7+lHhTFCg8E9ZWopA6Q6L455EcU7bzcQ4x6Dn4cCPuqj6S2oBZgN2a8vJRS/LSYYxwFFq2Hlx3Fsaw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/runtime-core": "3.3.4",
|
"@vue/reactivity": "3.4.31",
|
||||||
"@vue/shared": "3.3.4",
|
"@vue/runtime-core": "3.4.31",
|
||||||
"csstype": "^3.1.1"
|
"@vue/shared": "3.4.31",
|
||||||
|
"csstype": "^3.1.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
},
|
||||||
"node_modules/@vue/server-renderer": {
|
"node_modules/@vue/server-renderer": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.31.tgz",
|
||||||
"integrity": "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==",
|
"integrity": "sha512-D5BLbdvrlR9PE3by9GaUp1gQXlCNadIZytMIb8H2h3FMWJd4oUfkUTEH2wAr3qxoRz25uxbTcbqd3WKlm9EHQA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/compiler-ssr": "3.3.4",
|
"@vue/compiler-ssr": "3.4.31",
|
||||||
"@vue/shared": "3.3.4"
|
"@vue/shared": "3.4.31"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"vue": "3.3.4"
|
"vue": "3.4.31"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@vue/shared": {
|
"node_modules/@vue/server-renderer/node_modules/@vue/shared": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
"integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
},
|
},
|
||||||
"node_modules/@webassemblyjs/ast": {
|
"node_modules/@webassemblyjs/ast": {
|
||||||
"version": "1.11.6",
|
"version": "1.11.6",
|
||||||
@ -1555,9 +1607,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/csstype": {
|
"node_modules/csstype": {
|
||||||
"version": "3.1.2",
|
"version": "3.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
|
||||||
"integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
|
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
|
||||||
},
|
},
|
||||||
"node_modules/debug": {
|
"node_modules/debug": {
|
||||||
"version": "4.3.4",
|
"version": "4.3.4",
|
||||||
@ -3384,14 +3436,11 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/magic-string": {
|
"node_modules/magic-string": {
|
||||||
"version": "0.30.0",
|
"version": "0.30.10",
|
||||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
|
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
|
||||||
"integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
|
"integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@jridgewell/sourcemap-codec": "^1.4.13"
|
"@jridgewell/sourcemap-codec": "^1.4.15"
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/make-dir": {
|
"node_modules/make-dir": {
|
||||||
@ -4041,9 +4090,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/postcss": {
|
"node_modules/postcss": {
|
||||||
"version": "8.4.31",
|
"version": "8.4.38",
|
||||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
|
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
|
||||||
"integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
|
"integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
"type": "opencollective",
|
"type": "opencollective",
|
||||||
@ -4061,7 +4110,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"nanoid": "^3.3.7",
|
"nanoid": "^3.3.7",
|
||||||
"picocolors": "^1.0.0",
|
"picocolors": "^1.0.0",
|
||||||
"source-map-js": "^1.0.2"
|
"source-map-js": "^1.2.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^10 || ^12 || >=14"
|
"node": "^10 || ^12 || >=14"
|
||||||
@ -5000,9 +5049,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/source-map-js": {
|
"node_modules/source-map-js": {
|
||||||
"version": "1.0.2",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
|
||||||
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
|
"integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=0.10.0"
|
"node": ">=0.10.0"
|
||||||
}
|
}
|
||||||
@ -5432,15 +5481,23 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vue": {
|
"node_modules/vue": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/vue/-/vue-3.4.31.tgz",
|
||||||
"integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
|
"integrity": "sha512-njqRrOy7W3YLAlVqSKpBebtZpDVg21FPoaq1I7f/+qqBThK9ChAIjkRWgeP6Eat+8C+iia4P3OYqpATP21BCoQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/compiler-dom": "3.3.4",
|
"@vue/compiler-dom": "3.4.31",
|
||||||
"@vue/compiler-sfc": "3.3.4",
|
"@vue/compiler-sfc": "3.4.31",
|
||||||
"@vue/runtime-dom": "3.3.4",
|
"@vue/runtime-dom": "3.4.31",
|
||||||
"@vue/server-renderer": "3.3.4",
|
"@vue/server-renderer": "3.4.31",
|
||||||
"@vue/shared": "3.3.4"
|
"@vue/shared": "3.4.31"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"typescript": "*"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"typescript": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vue-eslint-parser": {
|
"node_modules/vue-eslint-parser": {
|
||||||
@ -5489,6 +5546,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/vue/node_modules/@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
},
|
||||||
"node_modules/watchpack": {
|
"node_modules/watchpack": {
|
||||||
"version": "2.4.0",
|
"version": "2.4.0",
|
||||||
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
|
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
|
||||||
@ -5863,9 +5925,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"@babel/parser": {
|
"@babel/parser": {
|
||||||
"version": "7.21.8",
|
"version": "7.24.7",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz",
|
||||||
"integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA=="
|
"integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw=="
|
||||||
},
|
},
|
||||||
"@discoveryjs/json-ext": {
|
"@discoveryjs/json-ext": {
|
||||||
"version": "0.5.7",
|
"version": "0.5.7",
|
||||||
@ -6208,105 +6270,160 @@
|
|||||||
"@types/node": "*"
|
"@types/node": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/compiler-core": {
|
|
||||||
"version": "3.3.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
|
|
||||||
"integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
|
|
||||||
"requires": {
|
|
||||||
"@babel/parser": "^7.21.3",
|
|
||||||
"@vue/shared": "3.3.4",
|
|
||||||
"estree-walker": "^2.0.2",
|
|
||||||
"source-map-js": "^1.0.2"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"@vue/compiler-dom": {
|
"@vue/compiler-dom": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.31.tgz",
|
||||||
"integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
|
"integrity": "sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/compiler-core": "3.3.4",
|
"@vue/compiler-core": "3.4.31",
|
||||||
"@vue/shared": "3.3.4"
|
"@vue/shared": "3.4.31"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@vue/compiler-core": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==",
|
||||||
|
"requires": {
|
||||||
|
"@babel/parser": "^7.24.7",
|
||||||
|
"@vue/shared": "3.4.31",
|
||||||
|
"entities": "^4.5.0",
|
||||||
|
"estree-walker": "^2.0.2",
|
||||||
|
"source-map-js": "^1.2.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
},
|
||||||
|
"entities": {
|
||||||
|
"version": "4.5.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
|
||||||
|
"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/compiler-sfc": {
|
"@vue/compiler-sfc": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.31.tgz",
|
||||||
"integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
|
"integrity": "sha512-einJxqEw8IIJxzmnxmJBuK2usI+lJonl53foq+9etB2HAzlPjAS/wa7r0uUpXw5ByX3/0uswVSrjNb17vJm1kQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@babel/parser": "^7.20.15",
|
"@babel/parser": "^7.24.7",
|
||||||
"@vue/compiler-core": "3.3.4",
|
"@vue/compiler-core": "3.4.31",
|
||||||
"@vue/compiler-dom": "3.3.4",
|
"@vue/compiler-dom": "3.4.31",
|
||||||
"@vue/compiler-ssr": "3.3.4",
|
"@vue/compiler-ssr": "3.4.31",
|
||||||
"@vue/reactivity-transform": "3.3.4",
|
"@vue/shared": "3.4.31",
|
||||||
"@vue/shared": "3.3.4",
|
|
||||||
"estree-walker": "^2.0.2",
|
"estree-walker": "^2.0.2",
|
||||||
"magic-string": "^0.30.0",
|
"magic-string": "^0.30.10",
|
||||||
"postcss": "^8.1.10",
|
"postcss": "^8.4.38",
|
||||||
"source-map-js": "^1.0.2"
|
"source-map-js": "^1.2.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@vue/compiler-core": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==",
|
||||||
|
"requires": {
|
||||||
|
"@babel/parser": "^7.24.7",
|
||||||
|
"@vue/shared": "3.4.31",
|
||||||
|
"entities": "^4.5.0",
|
||||||
|
"estree-walker": "^2.0.2",
|
||||||
|
"source-map-js": "^1.2.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
},
|
||||||
|
"entities": {
|
||||||
|
"version": "4.5.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
|
||||||
|
"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/compiler-ssr": {
|
"@vue/compiler-ssr": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.31.tgz",
|
||||||
"integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
|
"integrity": "sha512-RtefmITAje3fJ8FSg1gwgDhdKhZVntIVbwupdyZDSifZTRMiWxWehAOTCc8/KZDnBOcYQ4/9VWxsTbd3wT0hAA==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/compiler-dom": "3.3.4",
|
"@vue/compiler-dom": "3.4.31",
|
||||||
"@vue/shared": "3.3.4"
|
"@vue/shared": "3.4.31"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/reactivity": {
|
"@vue/reactivity": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.31.tgz",
|
||||||
"integrity": "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==",
|
"integrity": "sha512-VGkTani8SOoVkZNds1PfJ/T1SlAIOf8E58PGAhIOUDYPC4GAmFA2u/E14TDAFcf3vVDKunc4QqCe/SHr8xC65Q==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/shared": "3.3.4"
|
"@vue/shared": "3.4.31"
|
||||||
}
|
},
|
||||||
},
|
"dependencies": {
|
||||||
"@vue/reactivity-transform": {
|
"@vue/shared": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
"integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
"requires": {
|
}
|
||||||
"@babel/parser": "^7.20.15",
|
|
||||||
"@vue/compiler-core": "3.3.4",
|
|
||||||
"@vue/shared": "3.3.4",
|
|
||||||
"estree-walker": "^2.0.2",
|
|
||||||
"magic-string": "^0.30.0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/runtime-core": {
|
"@vue/runtime-core": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.31.tgz",
|
||||||
"integrity": "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==",
|
"integrity": "sha512-LDkztxeUPazxG/p8c5JDDKPfkCDBkkiNLVNf7XZIUnJ+66GVGkP+TIh34+8LtPisZ+HMWl2zqhIw0xN5MwU1cw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/reactivity": "3.3.4",
|
"@vue/reactivity": "3.4.31",
|
||||||
"@vue/shared": "3.3.4"
|
"@vue/shared": "3.4.31"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/runtime-dom": {
|
"@vue/runtime-dom": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.31.tgz",
|
||||||
"integrity": "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==",
|
"integrity": "sha512-2Auws3mB7+lHhTFCg8E9ZWopA6Q6L455EcU7bzcQ4x6Dn4cCPuqj6S2oBZgN2a8vJRS/LSYYxwFFq2Hlx3Fsaw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/runtime-core": "3.3.4",
|
"@vue/reactivity": "3.4.31",
|
||||||
"@vue/shared": "3.3.4",
|
"@vue/runtime-core": "3.4.31",
|
||||||
"csstype": "^3.1.1"
|
"@vue/shared": "3.4.31",
|
||||||
|
"csstype": "^3.1.3"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/server-renderer": {
|
"@vue/server-renderer": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.31.tgz",
|
||||||
"integrity": "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==",
|
"integrity": "sha512-D5BLbdvrlR9PE3by9GaUp1gQXlCNadIZytMIb8H2h3FMWJd4oUfkUTEH2wAr3qxoRz25uxbTcbqd3WKlm9EHQA==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/compiler-ssr": "3.3.4",
|
"@vue/compiler-ssr": "3.4.31",
|
||||||
"@vue/shared": "3.3.4"
|
"@vue/shared": "3.4.31"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/shared": {
|
|
||||||
"version": "3.3.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
|
|
||||||
"integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
|
|
||||||
},
|
|
||||||
"@webassemblyjs/ast": {
|
"@webassemblyjs/ast": {
|
||||||
"version": "1.11.6",
|
"version": "1.11.6",
|
||||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
|
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
|
||||||
@ -7080,9 +7197,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"csstype": {
|
"csstype": {
|
||||||
"version": "3.1.2",
|
"version": "3.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
|
||||||
"integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
|
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
|
||||||
},
|
},
|
||||||
"debug": {
|
"debug": {
|
||||||
"version": "4.3.4",
|
"version": "4.3.4",
|
||||||
@ -8432,11 +8549,11 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"magic-string": {
|
"magic-string": {
|
||||||
"version": "0.30.0",
|
"version": "0.30.10",
|
||||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
|
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
|
||||||
"integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
|
"integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@jridgewell/sourcemap-codec": "^1.4.13"
|
"@jridgewell/sourcemap-codec": "^1.4.15"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"make-dir": {
|
"make-dir": {
|
||||||
@ -8921,13 +9038,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"postcss": {
|
"postcss": {
|
||||||
"version": "8.4.31",
|
"version": "8.4.38",
|
||||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
|
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
|
||||||
"integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
|
"integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"nanoid": "^3.3.7",
|
"nanoid": "^3.3.7",
|
||||||
"picocolors": "^1.0.0",
|
"picocolors": "^1.0.0",
|
||||||
"source-map-js": "^1.0.2"
|
"source-map-js": "^1.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"postcss-modules-extract-imports": {
|
"postcss-modules-extract-imports": {
|
||||||
@ -9608,9 +9725,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"source-map-js": {
|
"source-map-js": {
|
||||||
"version": "1.0.2",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
|
||||||
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
|
"integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg=="
|
||||||
},
|
},
|
||||||
"source-map-support": {
|
"source-map-support": {
|
||||||
"version": "0.5.21",
|
"version": "0.5.21",
|
||||||
@ -9897,15 +10014,22 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"vue": {
|
"vue": {
|
||||||
"version": "3.3.4",
|
"version": "3.4.31",
|
||||||
"resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/vue/-/vue-3.4.31.tgz",
|
||||||
"integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
|
"integrity": "sha512-njqRrOy7W3YLAlVqSKpBebtZpDVg21FPoaq1I7f/+qqBThK9ChAIjkRWgeP6Eat+8C+iia4P3OYqpATP21BCoQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/compiler-dom": "3.3.4",
|
"@vue/compiler-dom": "3.4.31",
|
||||||
"@vue/compiler-sfc": "3.3.4",
|
"@vue/compiler-sfc": "3.4.31",
|
||||||
"@vue/runtime-dom": "3.3.4",
|
"@vue/runtime-dom": "3.4.31",
|
||||||
"@vue/server-renderer": "3.3.4",
|
"@vue/server-renderer": "3.4.31",
|
||||||
"@vue/shared": "3.3.4"
|
"@vue/shared": "3.4.31"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@vue/shared": {
|
||||||
|
"version": "3.4.31",
|
||||||
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz",
|
||||||
|
"integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA=="
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"vue-eslint-parser": {
|
"vue-eslint-parser": {
|
||||||
|
|||||||
@ -165,8 +165,6 @@ class PluginModel(GlancesPluginModel):
|
|||||||
stats = self.update_local()
|
stats = self.update_local()
|
||||||
elif self.input_method == 'snmp':
|
elif self.input_method == 'snmp':
|
||||||
stats = self.update_snmp()
|
stats = self.update_snmp()
|
||||||
else:
|
|
||||||
stats = self.get_init_value()
|
|
||||||
|
|
||||||
# Update the stats
|
# Update the stats
|
||||||
self.stats = stats
|
self.stats = stats
|
||||||
@ -185,7 +183,7 @@ class PluginModel(GlancesPluginModel):
|
|||||||
# Init new stats
|
# Init new stats
|
||||||
stats = self.get_init_value()
|
stats = self.get_init_value()
|
||||||
|
|
||||||
stats['total'] = cpu_percent.get()
|
stats['total'] = cpu_percent.get_cpu()
|
||||||
|
|
||||||
# Standards stats
|
# Standards stats
|
||||||
# - user: time spent by normal processes executing in user mode; on Linux this also includes guest time
|
# - user: time spent by normal processes executing in user mode; on Linux this also includes guest time
|
||||||
|
|||||||
@ -120,16 +120,12 @@ class PluginModel(GlancesPluginModel):
|
|||||||
@GlancesPluginModel._log_result_decorator
|
@GlancesPluginModel._log_result_decorator
|
||||||
def update(self):
|
def update(self):
|
||||||
"""Update per-CPU stats using the input method."""
|
"""Update per-CPU stats using the input method."""
|
||||||
# Init new stats
|
# Grab per-CPU stats using psutil's
|
||||||
stats = self.get_init_value()
|
|
||||||
|
|
||||||
# Grab per-CPU stats using psutil's cpu_percent(percpu=True) and
|
|
||||||
# cpu_times_percent(percpu=True) methods
|
|
||||||
if self.input_method == 'local':
|
if self.input_method == 'local':
|
||||||
stats = cpu_percent.get(percpu=True)
|
stats = cpu_percent.get_percpu()
|
||||||
else:
|
else:
|
||||||
# Update stats using SNMP
|
# Update stats using SNMP
|
||||||
pass
|
stats = self.get_init_value()
|
||||||
|
|
||||||
# Update the stats
|
# Update the stats
|
||||||
self.stats = stats
|
self.stats = stats
|
||||||
|
|||||||
@ -118,8 +118,8 @@ class PluginModel(GlancesPluginModel):
|
|||||||
|
|
||||||
# Get the CPU percent value (global and per core)
|
# Get the CPU percent value (global and per core)
|
||||||
# Stats is shared across all plugins
|
# Stats is shared across all plugins
|
||||||
stats['cpu'] = cpu_percent.get()
|
stats['cpu'] = cpu_percent.get_cpu()
|
||||||
stats['percpu'] = cpu_percent.get(percpu=True)
|
stats['percpu'] = cpu_percent.get_percpu()
|
||||||
|
|
||||||
# Get the virtual and swap memory
|
# Get the virtual and swap memory
|
||||||
stats['mem'] = psutil.virtual_memory().percent
|
stats['mem'] = psutil.virtual_memory().percent
|
||||||
|
|||||||
@ -119,6 +119,14 @@ class GlancesProcesses:
|
|||||||
"""Set args."""
|
"""Set args."""
|
||||||
self.args = args
|
self.args = args
|
||||||
|
|
||||||
|
def reset_internal_cache(self):
|
||||||
|
"""Reset the internal cache."""
|
||||||
|
self.cache_timer = Timer(0)
|
||||||
|
self.processlist_cache = {}
|
||||||
|
if hasattr(psutil.process_iter, 'cache_clear'):
|
||||||
|
# Cache clear only available in PsUtil 6 or higher
|
||||||
|
psutil.process_iter.cache_clear()
|
||||||
|
|
||||||
def reset_processcount(self):
|
def reset_processcount(self):
|
||||||
"""Reset the global process count"""
|
"""Reset the global process count"""
|
||||||
self.processcount = {'total': 0, 'running': 0, 'sleeping': 0, 'thread': 0, 'pid_max': None}
|
self.processcount = {'total': 0, 'running': 0, 'sleeping': 0, 'thread': 0, 'pid_max': None}
|
||||||
@ -445,7 +453,9 @@ class GlancesProcesses:
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
# Only get the info key
|
# Only get the info key
|
||||||
processlist = [p.info for p in processlist]
|
# PsUtil 6+ no longer check PID reused #2755 so use is_running in the loop
|
||||||
|
# Note: not sure it is realy needed but CPU consumption look teh same with or without it
|
||||||
|
processlist = [p.info for p in processlist if p.is_running()]
|
||||||
# Sort the processes list by the current sort_key
|
# Sort the processes list by the current sort_key
|
||||||
processlist = sort_stats(processlist, sorted_by=self.sort_key, reverse=True)
|
processlist = sort_stats(processlist, sorted_by=self.sort_key, reverse=True)
|
||||||
|
|
||||||
|
|||||||
@ -260,19 +260,13 @@ class GlancesStats:
|
|||||||
self._plugins[p].update_views()
|
self._plugins[p].update_views()
|
||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
"""Wrapper method to update the stats.
|
"""Wrapper method to update all stats.
|
||||||
|
|
||||||
Only called by standalone and server modes
|
Only called by standalone and server modes
|
||||||
"""
|
"""
|
||||||
threads = []
|
|
||||||
# Start update of all enable plugins
|
# Start update of all enable plugins
|
||||||
for p in self.getPluginsList():
|
for p in self.getPluginsList(enable=True):
|
||||||
thread = threading.Thread(target=self.__update_plugin, args=(p,))
|
self.__update_plugin(p)
|
||||||
thread.start()
|
|
||||||
threads.append(thread)
|
|
||||||
# Wait the end of the update
|
|
||||||
for t in threads:
|
|
||||||
t.join()
|
|
||||||
|
|
||||||
def export(self, input_stats=None):
|
def export(self, input_stats=None):
|
||||||
"""Export all the stats.
|
"""Export all the stats.
|
||||||
|
|||||||
25
test-data/issues/issue2849.py
Normal file
25
test-data/issues/issue2849.py
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import sys
|
||||||
|
import time
|
||||||
|
|
||||||
|
sys.path.insert(0, '../glances')
|
||||||
|
|
||||||
|
###########
|
||||||
|
|
||||||
|
# from glances.cpu_percent import cpu_percent
|
||||||
|
|
||||||
|
# for _ in range(0, 5):
|
||||||
|
# print([i['total'] for i in cpu_percent.get_percpu()])
|
||||||
|
# time.sleep(2)
|
||||||
|
|
||||||
|
###########
|
||||||
|
|
||||||
|
from glances.main import GlancesMain
|
||||||
|
from glances.stats import GlancesStats
|
||||||
|
|
||||||
|
core = GlancesMain()
|
||||||
|
stats = GlancesStats(config=core.get_config(), args=core.get_args())
|
||||||
|
|
||||||
|
for _ in range(0, 5):
|
||||||
|
stats.update()
|
||||||
|
print([i['total'] for i in stats.get_plugin('percpu').get_raw()])
|
||||||
|
time.sleep(2)
|
||||||
Loading…
Reference in New Issue
Block a user