Commit Graph

2194 Commits (83256398be7df65ed90ee5ede452d455ce11b5b6)
 

Author SHA1 Message Date
chbuescher 7dd96685cb
Merge branch 'shirou:master' into master 3 years ago
Alexander Scheel 4ad218b552 Update go.mod to clarify newer sys/unix dependency
Updated via:

$ go get -u golang.org/x/sys && go mod tidy

We now require upstream commit bc2c85a on OpenBSD due to type changes.

Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
3 years ago
Alexander Scheel aee8cecfcd Mirror updated x/sys/unix OpenBSD Statfs_t fields
Per change in x/sys/unix, these Statfs_t fields are now converted to
[]byte rather than []int8. Callers with updated x/sys/unix versions will
now see something like:

> Error: ../../../go/pkg/mod/github.com/shirou/gopsutil@v3.21.5+incompatible/disk/disk_openbsd.go:59:53: cannot use stat.F_mntfromname[:] (type []byte) as type []int8 in argument to common.IntToString
> Error: ../../../go/pkg/mod/github.com/shirou/gopsutil@v3.21.5+incompatible/disk/disk_openbsd.go:60:51: cannot use stat.F_mntonname[:] (type []byte) as type []int8 in argument to common.IntToString
> Error: ../../../go/pkg/mod/github.com/shirou/gopsutil@v3.21.5+incompatible/disk/disk_openbsd.go:61:52: cannot use stat.F_fstypename[:] (type []byte) as type []int8 in argument to common.IntToString
> Error: ../../../go/pkg/mod/github.com/shirou/gopsutil@v3.21.5+incompatible/disk/disk_openbsd.go:149:45: cannot use stat.F_fstypename[:] (type []byte) as type []int8 in argument to common.IntToString

It is probably prudent to update to the newer struct definitions as a
result.

See also: https://groups.google.com/g/golang-codereviews/c/bPBR9-4hV6E
See also: https://go-review.googlesource.com/c/sys/+/407195/2
See also: bc2c85ada1

Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
3 years ago
xca1075 d4f012c565 fix aix nocgo compile 3 years ago
xca1075 d177019851 fix go build flags for aix/cpu 3 years ago
xca1075 e24e72062b aix: split code, that uses perfstat, to _cgo and _nocgo files 3 years ago
shirou a91ea95c78 feat(actions): go-version will be latest two version automatically on CI 3 years ago
shirou c4a0f4689f
Merge pull request #1305 from shirou/feature/fix_lint_net_linux_test
[net][linux]: fix lint
3 years ago
shirou 0074fab5f5 [net][linux]: fix lint 3 years ago
shirou a7539106da
Merge pull request #1301 from Lomanic/issue1298
[process][windows] Use WaitForSingleObject with a 0 delay in PidExistsWithContext
3 years ago
shirou 09fa2a95e6
Merge pull request #1290 from shirou/dependabot/go_modules/github.com/google/go-cmp-0.5.8
Bump github.com/google/go-cmp from 0.5.7 to 0.5.8
3 years ago
xca1075 ce49e45ed3 get IOCounters for aix with perfstat 3 years ago
Lomanic 7501387fc1 [process][windows] Use WaitForSingleObject with a 0 delay in PidExistsWithContext
Reference https://stackoverflow.com/a/6493793

Fixes #1298
3 years ago
shirou 19771aaf91
Merge pull request #1296 from Lomanic/issue1094
[disk][windows] Set EnableCounterForIoctl reg key to 1 in init() to automatically enable diskperf on Server editions
3 years ago
Lomanic 2318b5e69f [disk][windows] Set EnableCounterForIoctl reg key to 1 in init() to automatically enable diskperf on Server editions
Fixes #1094
3 years ago
shirou def6865402
Merge pull request #1293 from turrisxyz/setup-permissions
chore: Set permissions for GitHub actions
3 years ago
shirou 009ec50f74
Merge pull request #1291 from arstercz/master
[disk][linux] fix readlink error which system boot by nfs mount
3 years ago
nathannaveen 3a2c8dd4f8 chore: Set permissions for GitHub actions
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: nathannaveen <42319948+nathannaveen@users.noreply.github.com>
3 years ago
arstercz f6dc96c30e follow the psutil principles, do nothing if can not find root device 3 years ago
shirou 24a1ae54b4
Merge pull request #1292 from shirou/feature/add_release_action
add a GitHub action to auto release
3 years ago
shirou ea6bed829b add a GitHub action to auto release 3 years ago
arstercz d52b97cd25 fix disk readlink error which system boot by nfs mount 3 years ago
dependabot[bot] 3876a3cd53
Bump github.com/google/go-cmp from 0.5.7 to 0.5.8
Bumps [github.com/google/go-cmp](https://github.com/google/go-cmp) from 0.5.7 to 0.5.8.
- [Release notes](https://github.com/google/go-cmp/releases)
- [Commits](https://github.com/google/go-cmp/compare/v0.5.7...v0.5.8)

---
updated-dependencies:
- dependency-name: github.com/google/go-cmp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
shirou c9a292ae52
Merge pull request #1286 from geowiwi/master
host: add support for OpenBSD/armv7
3 years ago
Martin Reindl 1d89235f34 host: add support for OpenBSD/armv7 3 years ago
shirou f43b0f7601
Merge pull request #1285 from shirou/dependabot/github_actions/actions/setup-go-3
Bump actions/setup-go from 2 to 3
3 years ago
dependabot[bot] b5592414b5
Bump actions/setup-go from 2 to 3
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 2 to 3.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](https://github.com/actions/setup-go/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
shirou cf6309316c
Merge pull request #1272 from jdstrand/jdstrand/add-env-force-workaround
[disk][linux] add HOST_PROC_MOUNTINFO
3 years ago
Jamie Strandboge 9e6e627ec8 [disk][linux] add HOST_PROC_MOUNTINFO, closes #1271
The changes to gopsutil for reading /proc/1/mountinfo affected
applications running under restricted environments that disallows access
to /proc/1/mountinfo. #1159 was filed for android but other restricted
environments are also affected (eg, snaps)). The fix for #1159 addressed
the application behavior to work under confinement for non-android as
well. However, depending on the system, the attempt to read
/proc/1/mountinfo could cause a sandbox denial in the logs which can be
quite noisy if using gopsutil as part of a monitoring solution that
polls often.

This introduces HOST_PROC_MOUNTINFO to force reading from the parent dir
of the specified path instead of first trying /proc/1. When unset,
retain the current behavior with fallback. This allows people, for
example, to set HOST_PROC_MOUNTINFO=/proc/self/mountinfo when gopsutil
is running under these restricted environments.

This change updates the private readMountFile() to use a root path
instead of a root subpath, and adjusts PartitionsWithContext() to set
the root path to /proc/1 initially and falling back to /proc/self. When
HOST_PROC_MOUNTINFO is not empty, set the root path to the parent
directory of HOST_PROC_MOUNTINFO.
3 years ago
shirou 78577a7bcd
Merge pull request #1280 from geowiwi/master
Fix telegraf 1.22.0 build on OpenBSD/arm64
3 years ago
martin 414ada919c Fix telegraf 1.22.0 build on OpenBSD/arm64:
../../../go/pkg/mod/github.com/shirou/gopsutil/v3@v3.22.2/cpu/cpu_openbsd.go:63:14: undefined: cpuTimes
3 years ago
shirou a270a18f77
Merge pull request #1279 from shirou/dependabot/github_actions/actions/cache-3
Bump actions/cache from 2 to 3
3 years ago
dependabot[bot] b68e0acc74
Bump actions/cache from 2 to 3
Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
shirou 3f83e0997a
Merge pull request #1274 from shirou/dependabot/go_modules/github.com/stretchr/testify-1.7.1
Bump github.com/stretchr/testify from 1.7.0 to 1.7.1
3 years ago
shirou 05994600f1
Merge pull request #1278 from shirou/feature/remove_windows_2016_from_tests
remove Windows 2016 from tests.
3 years ago
shirou 8717edb669 remove Windows 2016 from tests.
see https://github.com/actions/virtual-environments/issues/5238
3 years ago
shirou 9b14e64cb8
Merge pull request #1276 from scop/feat/more-linux-fss
[disk][linux] recognize more file systems
3 years ago
shirou 8530231e52
Merge pull request #1277 from scop/chore/gofumpt
[net] gofumpt with 0.3.0 / golangci-lint 1.45.0
3 years ago
Ville Skyttä 7befb75528 [net] gofumpt with 0.3.0 / golangci-lint 1.45.0 3 years ago
Ville Skyttä 5095c3f51e [disk][linux] recognize more file systems 3 years ago
quanweiZhou ddaf2d7623 [mem][linux] added additional meminfo fields
support HugePages_Rsvd, HugePages_Surp

Signed-off-by: quanweiZhou <quanweiZhou@linux.alibaba.com>
3 years ago
dependabot[bot] a1f5f64e63
Bump github.com/stretchr/testify from 1.7.0 to 1.7.1
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.7.0...v1.7.1)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
shirou 4b988f3ccd
Merge pull request #1270 from shirou/feature/disk_add_fallback_to_self_mountinfo
[disk][linux] add fallback to /proc/self
3 years ago
shirou 49037dd0d8 [disk][linux] add fallback to /proc/self 3 years ago
shirou 7de7d48ef6
Merge pull request #1267 from easyops-cn/master
fix(process): fix OpenFilesWithContext panic problem
3 years ago
shirou f3b7c002d7
Merge pull request #1268 from scop/refactor/remove-unnecessary-lookpaths
refactor: remove unnecessary exec.LookPath calls
3 years ago
Ville Skyttä f7e1f36418 refactor: remove unnecessary exec.LookPath calls
Executing the command does the lookup if needed and returns the same
error when not found, no need to do it separately.
3 years ago
paul 3cd259698f fix(process): fix OpenFilesWithContext panic problem 3 years ago
shirou 03f9f55571
Merge pull request #1262 from shirou/dependabot/go_modules/github.com/tklauser/go-sysconf-0.3.10
Bump github.com/tklauser/go-sysconf from 0.3.9 to 0.3.10
3 years ago
Lomanic c0f6ce3804
Merge pull request #1264 from shirou/dependabot/github_actions/actions/labeler-4
Bump actions/labeler from 3.0.2 to 4
3 years ago