Commit Graph

1185 Commits

Author SHA1 Message Date
Aman Gupta d021425af3 do not ignore A: and B: drives on windows
from https://www.howtogeek.com/122891/what-are-the-windows-a-and-b-drives-used-for/

>if your computer does not have floppy disk drives, you can assign A and B to volumes
2018-11-20 13:09:36 -08:00
Lomanic b0c24b4251
Merge pull request #610 from Lomanic/issue555
[disk][linux] Fix #555 Unescape escaped sequences in fstab path in disk.Partitions
2018-11-19 07:42:09 +01:00
Lomanic 8888537497 [disk][linux] Fix #555 Unescape escaped sequences in fstab path in disk.Partitions 2018-11-18 20:39:18 +01:00
shirou 48177ef5f8
Merge pull request #603 from pierresouchay/host_id_fixed_on_linux
Have a real fixed HostID on Linux
2018-11-07 20:16:21 +09:00
Pierre Souchay 890eb80501 Better comments for fallback on /etc/machine-id 2018-11-07 00:09:22 +01:00
Pierre Souchay be2b25a7c6 Have a real fixed HostID on Linux
On Linux, most golang programs do not run as root (or at least, they should not),
by default, the kernels uses strict permissions, so most userland programs cannot
read `/sys/class/dmi/id/product_uuid`. However, programs such as Consul are relying
on it to get fixed IDs, instead they have a different ID on each boot.

We propose to use `/etc/machine-id` as fallback https://www.freedesktop.org/software/systemd/man/machine-id.html

In order to fix this, this patch does the following:
 - if `/sys/class/dmi/id/product_uuid` can be read, use it for HostID
 - else if `/etc/machine-id` exists and has 32 chars, use it and add '-' to have the same format as product_uuid
 - finally, if notthing works, use the `kernel.random.boot_id`

This will greatly increase the number of programs having correct behaviour when
those rely on having a fixed HostID.

This will fix the following issues:
 - https://github.com/shirou/gopsutil/issues/350
 - https://github.com/hashicorp/consul/issues/4741
2018-11-06 18:06:40 +01:00
Lomanic 4254ce2081
Merge pull request #601 from Lomanic/issue551
Fix #551 Filter out '_Total' results from PerfInfoWithContext and unexport this function.

Also propagate context in perCPUTimes (renamed to perCPUTimesWithContext) and unexport Win32_PerfFormattedData_Counters_ProcessorInformation type.
2018-11-06 14:56:13 +01:00
Lomanic da37b31860 Create Github issue templates 2018-11-05 16:22:32 +01:00
Lomanic 79f8a73e23 Fix #551 Filter out '_Total' results from PerfInfoWithContext and unexport this function
Also propagate context in perCPUTimes (renamed to perCPUTimesWithContext)
and unexport Win32_PerfFormattedData_Counters_ProcessorInformation.
2018-11-05 12:28:39 +01:00
shirou 3ec50d2876
Merge pull request #595 from liu4480/dev
add CgroupCPUUsageDocker just like CgroupCPUDocker
2018-10-23 22:17:00 +09:00
Lomanic feffc5e3e1
Merge pull request #597 from liu4480/arg_in_lines
correct param in docker_linux.go for memory.stat
2018-10-23 12:36:06 +02:00
Bin Liu 4ef2371dda correct param in docker_linux.go for memory.stat
The version of docker on Ubuntu18.04 and Centos7 are old, and the
parameters in memory.stat on Ubuntu18.04 and Centos7 are as following:

cat /sys/fs/cgroup/memory/docker/33f962ca254969762d750ced9a97d8deef67535b96b1e8c17abd0939a3f2cbcf/memory.stat

cache 1110016
rss 413696
rss_huge 0
shmem 0
mapped_file 1015808
dirty 0
writeback 0
pgpgin 1610
pgpgout 1238
pgfault 1923
pgmajfault 12
inactive_anon 262144
active_anon 151552
inactive_file 0
active_file 1110016
unevictable 0
hierarchical_memory_limit 9223372036854771712
total_cache 1110016
total_rss 413696
total_rss_huge 0
total_shmem 0
total_mapped_file 1015808
total_dirty 0
total_writeback 0
total_pgpgin 1610
total_pgpgout 1238
total_pgfault 1923
total_pgmajfault 12
total_inactive_anon 262144
total_active_anon 151552
total_inactive_file 0
total_active_file 1110016
total_unevictable 0

this patch is for backward.
2018-10-23 10:20:21 +08:00
Bin Liu 601dd00812 add CgroupCPUUsageDocker just like CgroupCPUDocker 2018-10-19 18:44:19 +08:00
shirou a11c78ba2c
Merge pull request #581 from CMGS/master
get docker container cpu usage from cpuacct.usage
2018-09-27 21:43:08 +09:00
CMGS 80b3769ea3 not modify old API now 2018-09-21 11:22:23 +08:00
shirou 77e5abb6f0
migrate to circleci2 (#587)
* add circleci 2.0 config, which has golang 1.9 image.
2018-09-16 17:40:02 +09:00
shirou e50c47b503
Merge pull request #528 from pytimer/win_services
[windows]services: add windows service feature
2018-09-16 14:24:14 +09:00
shirou 6f5e32dd2f
Merge pull request #584 from Quasilyte/quasilyte/commentedOutCode
cpu,process: remove commented-out code
2018-09-15 11:30:41 +09:00
shirou 62f689bda3
Merge pull request #576 from Lomanic/issue574
Fix #574
2018-09-15 11:29:10 +09:00
shirou 50e1c3da5a
Merge pull request #575 from Lomanic/issue573
Fix #573
2018-09-15 11:28:52 +09:00
Lomanic 3773c0ebf0
Merge pull request #583 from Quasilyte/quasilyte/emptyFallthrough
net: use multi-value case clause instead of fallthrough
2018-09-14 01:16:50 +02:00
Iskander Sharipov f3d4342c30 cpu,process: remove commented-out code
Found using https://go-critic.github.io/overview#commentedOutCode-ref
2018-09-13 23:56:24 +03:00
Iskander Sharipov 3684fce88a net: use multi-value case clause instead of fallthrough
Found using https://go-critic.github.io/overview#emptyFallthrough-ref
2018-09-13 23:52:36 +03:00
CMGS d93c01e54d get docker container cpu usage from cpuacct.usage 2018-09-11 15:29:13 +08:00
Lomanic 18b2744df2 [host][darwin] Fix #574, use 'uname -r' in KernelVersion() 2018-09-01 17:23:39 +02:00
Lomanic e38ea9f318 [process] Don't lose context in ProcessesWithContext() on Windows and Linux 2018-09-01 16:18:32 +02:00
Lomanic 82b8111d04 [process][darwin] Fix #573 use Pids() to get processes in Processes() 2018-09-01 16:17:19 +02:00
Lomanic eb1f1ab16f
Merge pull request #549 from pytimer/win_net
[net] Implements windows net package Connections and ConnectionsPid
2018-09-01 15:42:34 +02:00
Lomanic ef54649286 [windows] Use windows.NewLazySystemDLL to (possibly) prevent DLL hijacking
Might be useless because of https://docs.microsoft.com/en-us/windows/desktop/dlls/dynamic-link-library-search-order#search-order-for-desktop-applications
but better be safe than sorry.

Ref: https://github.com/shirou/gopsutil/issues/570#issuecomment-413951653
2018-08-18 22:52:41 +02:00
shirou 68ff0e2996
Merge pull request #566 from zyun-i/add_freebsd_mem_laundry
Add mem(laundry) numbers on FreeBSD.
2018-08-11 22:50:56 +09:00
Isida Zyun'iti bd7b2f8148 Add mem(laundry) numbers on FreeBSD.
After FreeBSD 11.1, mem number of cached replaced by laundry.

https://reviews.freebsd.org/D8302
2018-08-08 19:54:18 +09:00
Isida Zyun'iti 48da6ade9e Fix FreeBSD total memory.
Like this.
FreeBSD: fix total memory giampaolo/psutil@bd9a58b bd9a58b2af
2018-08-07 10:42:15 +00:00
shirou 8048a2e9c5 [disk] add an comment. 2018-08-01 14:39:43 +09:00
shirou 8b14be0b8b
Merge pull request #563 from tomekkolo/usedPercent_calculation_fix
Fixing calculation of UsedPercent.
2018-08-01 14:38:17 +09:00
Tomasz Kolodziej 8e2d09ee63 Removed unnecessary line 2018-07-30 15:06:41 +02:00
Tomasz Kolodziej 573f3336a4 Fixing calculation of UsedPercent.
Now it is calculated based of available disk space for user,
not including reserved space for root. This is compatible
with psutil and df command.
2018-07-30 14:59:23 +02:00
shirou c06610bac7
Merge pull request #561 from szaydel/szaydel/add-stub-for-solaris
Fix undefined process.Processes when building telegraf on Solaris-based system
2018-07-28 21:30:39 +09:00
shirou c5575382be
Merge pull request #558 from ozairjr/slackware-version
Adding Slackware platform information
2018-07-28 21:26:27 +09:00
Sam Zaydel 391d5ecf7d Fix undefined process.Processes when building telegraf on Solaris-based system 2018-07-26 15:10:44 -07:00
Ozair Jr 0bab9611d2 Adding Slackware platform information 2018-07-25 10:17:08 -03:00
shirou d9d9688f3d
Merge pull request #556 from Lomanic/winmemtest
[mem][windows] Fix TestVirtual_memory test
2018-07-24 11:04:15 +09:00
shirou ffda3675ce
Merge pull request #557 from Lomanic/issue555
[disk][unix] Fix #555 Unescape escaped sequences in fstab path in disk.Usage
2018-07-24 10:59:49 +09:00
Lomanic 00bbeb757e [disk][unix] Fix #555 Unescape escaped sequences in fstab path in disk.Usage 2018-07-24 00:24:05 +02:00
pytimer 0ffcfc901f [net][windows] Remove exported types and convert ALL_CAPS to mixedCaps 2018-07-21 14:28:53 +08:00
pytimer 1c2cebbbc4 [net] Implements windows net package function Connections and ConnectionsPid 2018-07-21 14:21:22 +08:00
Lomanic 6b586d2fcd [mem][windows] Fix TestVirtual_memory test 2018-07-19 00:19:02 +02:00
Lomanic 6ddbb8c5d8 [process][windows] Reuse Ppid() in Parent(), don't use slow wmi call 2018-07-14 20:56:20 +02:00
Lomanic bb518e9c4e [host][windows] Remove exported wmi type from #550 2018-07-14 18:52:10 +02:00
Lomanic 97b2ed891d
Merge pull request #550 from pytimer/win_temperature
[host] Implement windows temperature use wmi
2018-07-14 18:38:17 +02:00
shirou 6b48f3bd01 [mem] fix test. 2018-07-13 23:34:38 +09:00