remove openbsd amd64 cgo dependecies by ston1th · Pull Request #1774 · prometheus/node_exporter

ston1th · 2020-07-02T10:14:25Z

I have rewritten all CGO dependencies for OpenBSD amd64
using pure go, be able to crosscompile node_exporter.

Signed-off-by: ston1th ston1th@giftfish.de

SuperQ · 2020-07-31T12:37:17Z

Thanks for working on this.

The build is failing on this:

 >   node_exporter
# github.com/prometheus/node_exporter/collector
collector/interrupts_openbsd_amd64.go:109:26: cannot use itr (type interrupt) as type interrupt in assignment
collector/interrupts_openbsd.go:98:2: interruptLabelNames redeclared in this block
        previous declaration at collector/interrupts_openbsd_amd64.go:71:2
collector/interrupts_openbsd.go:101:31: (*interruptsCollector).Update redeclared in this block
        previous declaration at collector/interrupts_openbsd_amd64.go:74:6
collector/interrupts_openbsd.go:119:6: interrupt redeclared in this block
        previous declaration at collector/interrupts_openbsd_amd64.go:92:6
collector/interrupts_openbsd.go:125:6: getInterrupts redeclared in this block
        previous declaration at collector/interrupts_openbsd_amd64.go:98:45
collector/meminfo_openbsd.go:55:28: (*meminfoCollector).getMemInfo redeclared in this block
        previous declaration at collector/meminfo_openbsd_amd64.go:23:6
collector/netdev_openbsd.go:35:6: getNetDevStats redeclared in this block
        previous declaration at collector/netdev_openbsd_amd64.go:28:117
!! command failed: build -o /home/peon/.buildkite-agent/builds/openbsd-6-3-amd64-build-prometheus-io-1/prometheus/node-exporter-6470c58fd8ce2b1e43cf9f5ef49b48f136ad7209-2849-AlfBQuWB/src/github.com/prometheus/node_exporter/node_exporter -ldflags -X github.com/prometheus/common/version.Version=1.0.1 -X github.com/prometheus/common/version.Revision=non-git -X github.com/prometheus/common/version.Branch=non-git -X github.com/prometheus/common/version.BuildUser=peon@openbsd-6-3-amd64.build.prometheus.io -X github.com/prometheus/common/version.BuildDate=20200702-10:43:43  -extldflags '-static' -mod=vendor -a -tags 'netgostatic_build' github.com/prometheus/node_exporter: exit status 2

discordianfish

I don't have any real openbsd experience and I'm a bit worried about more code without tests..
But LGTM in general. We might want to look for additional maintainers of the *bsd bits eventually.

collector/cpu_openbsd_amd64.go

ston1th · 2020-09-02T12:11:44Z

Currently I have this version running on my servers (OpenBSD 6.7 amd64) and things look fine.
I tested the overall correctness of the metrics by using the packaged node_exporter from the OpenBSD ports tree and comparing it to this version.

All metrics looked the same except some .0x differences on cpu, network and memory metrics.

ston1th · 2020-09-02T12:16:22Z

~~@SuperQ @discordianfish do not merge yet.~~

~~I just found occasional spikes in the node_memory_wired_bytes metric which should not happen. I need to look into this.~~

Edit: nevermind - I missunderstood this metric and this happens in both versions of node_exporter (this and from the ports tree).

SuperQ · 2020-09-23T13:38:19Z

CC @mischief

I have rewritten all CGO dependencies for OpenBSD amd64 using pure go, be able to crosscompile node_exporter. Signed-off-by: ston1th <ston1th@giftfish.de>

Signed-off-by: ston1th <ston1th@giftfish.de>

new type: `netDevStats map[string]map[string]uint64` Signed-off-by: ston1th <ston1th@giftfish.de>

discordianfish · 2020-11-24T10:13:24Z

We really need a maintainer for all the BSD stuff.. @SuperQ you still willing to approve? It's been open for a while now :-/

SuperQ · 2020-12-14T00:05:28Z

Yea, sorry, I got behind on my review, cleanup.

SuperQ

LGTM, Thanks.

* Update Build - Update CircleCI orb. - Update CIrcleCI Machine image. - Use golang-builder 1.15. * Update Go modules. * Fixup fixtures for XFS bug. Changes: * [CHANGE] Improve filter flag names. #1743 * [CHANGE] Add btrfs and powersupplyclass to list of exporters enabled by default #1897 * [FEATURE] Add fibre channel collector #1786 * [FEATURE] Expose cpu bugs and flags as info metrics. #1788 * [FEATURE] Add network_route collector #1811 * [FEATURE] Add zoneinfo collector #1922 * [ENHANCEMENT] Add more InfiniBand counters #1694 * [ENHANCEMENT] Add flag to aggr ipvs metrics to avoid high cardinality metrics #1709 * [ENHANCEMENT] Adding backlog/current queue length to qdisc collector #1732 * [ENHANCEMENT] Include TCP OutRsts in netstat metrics #1733 * [ENHANCEMENT] Add pool size to entropy collector #1753 * [ENHANCEMENT] Remove CGO dependencies for OpenBSD amd64 #1774 * [ENHANCEMENT] bcache: add writeback_rate_debug stats #1658 * [ENHANCEMENT] Add check state for mdadm arrays via node_md_state metric #1810 * [ENHANCEMENT] Expose XFS inode statistics #1870 * [ENHANCEMENT] Expose zfs zpool state #1878 * [ENHANCEMENT] Added an ability to pass collector.supervisord.url via SUPERVISORD_URL environment variable #1947 * [BUGFIX] filesystem_freebsd: Fix label values #1728 * [BUGFIX] Fix various procfs parsing errors #1735 * [BUGFIX] Handle no data from powersupplyclass #1747 * [BUGFIX] udp_queues_linux.go: s/upd/udp/ in two error strings #1769 * [BUGFIX] Fix node_scrape_collector_success behaviour #1816 * [BUGFIX] Fix NodeRAIDDegraded to not use a string rule expressions #1827 * [BUGFIX] fix: node_md_disks state label from fail to failed #1862 * [BUGFIX] Handle EPERM for syscall in timex collector #1938 * [BUGFIX] bcache: fix typo #1943 * [BUGFIX] Fix XFS read/write stats (prometheus/procfs#343) Signed-off-by: Ben Kochie <superq@gmail.com>

* Update Build - Update CircleCI orb. - Update CIrcleCI Machine image. - Use golang-builder 1.15. * Update Go modules. * Fixup fixtures for XFS bug. NOTE: We have improved some of the flag naming conventions (PR #1743). The old names are deprecated and will be removed in 2.0. They will continue to work for backwards compatibility. * [CHANGE] Improve filter flag names #1743 * [CHANGE] Add btrfs and powersupplyclass to list of exporters enabled by default #1897 * [FEATURE] Add fibre channel collector #1786 * [FEATURE] Expose cpu bugs and flags as info metrics. #1788 * [FEATURE] Add network_route collector #1811 * [FEATURE] Add zoneinfo collector #1922 * [ENHANCEMENT] Add more InfiniBand counters #1694 * [ENHANCEMENT] Add flag to aggr ipvs metrics to avoid high cardinality metrics #1709 * [ENHANCEMENT] Adding backlog/current queue length to qdisc collector #1732 * [ENHANCEMENT] Include TCP OutRsts in netstat metrics #1733 * [ENHANCEMENT] Add pool size to entropy collector #1753 * [ENHANCEMENT] Remove CGO dependencies for OpenBSD amd64 #1774 * [ENHANCEMENT] bcache: add writeback_rate_debug stats #1658 * [ENHANCEMENT] Add check state for mdadm arrays via node_md_state metric #1810 * [ENHANCEMENT] Expose XFS inode statistics #1870 * [ENHANCEMENT] Expose zfs zpool state #1878 * [ENHANCEMENT] Added an ability to pass collector.supervisord.url via SUPERVISORD_URL environment variable #1947 * [BUGFIX] filesystem_freebsd: Fix label values #1728 * [BUGFIX] Fix various procfs parsing errors #1735 * [BUGFIX] Handle no data from powersupplyclass #1747 * [BUGFIX] udp_queues_linux.go: change upd to udp in two error strings #1769 * [BUGFIX] Fix node_scrape_collector_success behaviour #1816 * [BUGFIX] Fix NodeRAIDDegraded to not use a string rule expressions #1827 * [BUGFIX] Fix node_md_disks state label from fail to failed #1862 * [BUGFIX] Handle EPERM for syscall in timex collector #1938 * [BUGFIX] bcache: fix typo in a metric name #1943 * [BUGFIX] Fix XFS read/write stats (prometheus/procfs#343) Signed-off-by: Ben Kochie <superq@gmail.com>

* Update Build - Update CircleCI orb. - Update CIrcleCI Machine image. - Use golang-builder 1.15. * Update Go modules. * Fixup fixtures for XFS bug. NOTE: We have improved some of the flag naming conventions (PR prometheus#1743). The old names are deprecated and will be removed in 2.0. They will continue to work for backwards compatibility. * [CHANGE] Improve filter flag names prometheus#1743 * [CHANGE] Add btrfs and powersupplyclass to list of exporters enabled by default prometheus#1897 * [FEATURE] Add fibre channel collector prometheus#1786 * [FEATURE] Expose cpu bugs and flags as info metrics. prometheus#1788 * [FEATURE] Add network_route collector prometheus#1811 * [FEATURE] Add zoneinfo collector prometheus#1922 * [ENHANCEMENT] Add more InfiniBand counters prometheus#1694 * [ENHANCEMENT] Add flag to aggr ipvs metrics to avoid high cardinality metrics prometheus#1709 * [ENHANCEMENT] Adding backlog/current queue length to qdisc collector prometheus#1732 * [ENHANCEMENT] Include TCP OutRsts in netstat metrics prometheus#1733 * [ENHANCEMENT] Add pool size to entropy collector prometheus#1753 * [ENHANCEMENT] Remove CGO dependencies for OpenBSD amd64 prometheus#1774 * [ENHANCEMENT] bcache: add writeback_rate_debug stats prometheus#1658 * [ENHANCEMENT] Add check state for mdadm arrays via node_md_state metric prometheus#1810 * [ENHANCEMENT] Expose XFS inode statistics prometheus#1870 * [ENHANCEMENT] Expose zfs zpool state prometheus#1878 * [ENHANCEMENT] Added an ability to pass collector.supervisord.url via SUPERVISORD_URL environment variable prometheus#1947 * [BUGFIX] filesystem_freebsd: Fix label values prometheus#1728 * [BUGFIX] Fix various procfs parsing errors prometheus#1735 * [BUGFIX] Handle no data from powersupplyclass prometheus#1747 * [BUGFIX] udp_queues_linux.go: change upd to udp in two error strings prometheus#1769 * [BUGFIX] Fix node_scrape_collector_success behaviour prometheus#1816 * [BUGFIX] Fix NodeRAIDDegraded to not use a string rule expressions prometheus#1827 * [BUGFIX] Fix node_md_disks state label from fail to failed prometheus#1862 * [BUGFIX] Handle EPERM for syscall in timex collector prometheus#1938 * [BUGFIX] bcache: fix typo in a metric name prometheus#1943 * [BUGFIX] Fix XFS read/write stats (prometheus/procfs#343) Signed-off-by: Ben Kochie <superq@gmail.com>

ston1th force-pushed the openbsd_amd64 branch 2 times, most recently from ed2c6a8 to 6470c58 Compare July 2, 2020 10:43

SuperQ requested a review from discordianfish September 1, 2020 13:03

discordianfish approved these changes Sep 2, 2020

View reviewed changes

collector/cpu_openbsd_amd64.go Outdated Show resolved Hide resolved

ston1th added 5 commits November 12, 2020 23:37

remove openbsd amd64 cgo dependecies

f8609ae

I have rewritten all CGO dependencies for OpenBSD amd64 using pure go, be able to crosscompile node_exporter. Signed-off-by: ston1th <ston1th@giftfish.de>

fixed build

386992e

Signed-off-by: ston1th <ston1th@giftfish.de>

more build fixes

26bd6bf

Signed-off-by: ston1th <ston1th@giftfish.de>

skip null bytes at the end of strings

bdba65d

Signed-off-by: ston1th <ston1th@giftfish.de>

move const values to iota plus code cleanup

1450a92

Signed-off-by: ston1th <ston1th@giftfish.de>

ston1th force-pushed the openbsd_amd64 branch from a38db9c to 1450a92 Compare November 12, 2020 22:38

fixed build

91bec7c

new type: `netDevStats map[string]map[string]uint64` Signed-off-by: ston1th <ston1th@giftfish.de>

SuperQ approved these changes Dec 14, 2020

View reviewed changes

SuperQ merged commit 3b8a7f6 into prometheus:master Dec 14, 2020

SuperQ mentioned this pull request Feb 5, 2021

Release 1.1.0 #1952

Merged

ston1th deleted the openbsd_amd64 branch February 27, 2021 22:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

remove openbsd amd64 cgo dependecies#1774

remove openbsd amd64 cgo dependecies#1774
SuperQ merged 6 commits intoprometheus:masterfrom
ston1th:openbsd_amd64

ston1th commented Jul 2, 2020

Uh oh!

SuperQ commented Jul 31, 2020

Uh oh!

discordianfish left a comment

Uh oh!

Uh oh!

ston1th commented Sep 2, 2020

Uh oh!

ston1th commented Sep 2, 2020 •

edited

Loading

Uh oh!

SuperQ commented Sep 23, 2020

Uh oh!

discordianfish commented Nov 24, 2020

Uh oh!

SuperQ commented Dec 14, 2020

Uh oh!

SuperQ left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

Conversation

ston1th commented Jul 2, 2020

Uh oh!

SuperQ commented Jul 31, 2020

Uh oh!

discordianfish left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ston1th commented Sep 2, 2020

Uh oh!

ston1th commented Sep 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SuperQ commented Sep 23, 2020

Uh oh!

discordianfish commented Nov 24, 2020

Uh oh!

SuperQ commented Dec 14, 2020

Uh oh!

SuperQ left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ston1th commented Sep 2, 2020 •

edited

Loading