apitech
/
node_exporter
mirror of https://github.com/prometheus/node_exporter
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: ignore/include metrics for FreeBSD (#3242)

Browse Source 
* chore: ignore/include metrics for FreeBSD

Ignore non-deterministic metrics and include deterministic ones.

Use go123 for NetBSD from upstream release channel rather than the
package manager as that doesn't exist.
* https://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/x86_64/10.0_2024Q4/All/

---------

Signed-off-by: Pranshu Srivastava <rexagod@gmail.com>
superq/systemd_shutdown
Pranshu Srivastava 11 months ago committed by GitHub
parent 11365f97be
commit 2f2113376f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 13 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      .github/workflows/bsd.yml
  2. 2
      collector/fixtures/e2e-output-darwin.txt
  3. 2
      collector/fixtures/e2e-output-dragonfly.txt
  4. 3
      collector/fixtures/e2e-output-freebsd.txt
  5. 2
      collector/fixtures/e2e-output-openbsd.txt
  6. 5
      end-to-end-test.sh

12
.github/workflows/bsd.yml
Unescape View File

@ -15,7 +15,7 @@ env:
GNU_TAR_VERSION: "1.35"
GO_VERSION_DRAGONFLY: "1.23.3"
GO_VERSION_FREEBSD: "123"
GO_VERSION_NETBSD: "123"
GO_VERSION_NETBSD: "1.23.3"
GO_VERSION_OPENBSD: "1.23.1"
GO_VERSION_SOLARIS: "1.23.3"
@ -131,7 +131,6 @@ jobs:
/usr/sbin/pkg_add \
git \
gmake \
go${GO_VERSION_NETBSD} \
grep \
gsed \
gtar-base-${GNU_TAR_VERSION}\
@ -141,7 +140,10 @@ jobs:
echo "::group::Setup prerequisites"
set -eu
mkdir bin
ln -s $(which go${GO_VERSION_NETBSD}) $(pwd)/bin/go
GOGZ="go${GO_VERSION_NETBSD}.netbsd-amd64.tar.gz"
wget https://go.dev/dl/${GOGZ}
gtar xzf ${GOGZ}
ln -s $(pwd)/go/bin/go $(pwd)/bin/go
ln -s $(which ggrep) $(pwd)/bin/grep
ln -s $(which gmake) $(pwd)/bin/make
ln -s $(which gsed) $(pwd)/bin/sed
@ -187,7 +189,6 @@ jobs:
echo "::group::Setup prerequisites"
set -eu
mkdir bin
export PATH=$(pwd)/bin:$PATH
GOGZ="go${GO_VERSION_DRAGONFLY}.dragonfly-amd64.tar.gz"
wget https://go.dev/dl/${GOGZ}
gtar xzf ${GOGZ}
@ -197,6 +198,7 @@ jobs:
ln -s $(which gsed) $(pwd)/bin/sed
ln -s $(which gtar) $(pwd)/bin/tar
ln -s $(which python3) $(pwd)/bin/python
export PATH=$(pwd)/bin:$PATH
echo "::endgroup::"
echo "::group::Print environment information"
@ -237,7 +239,6 @@ jobs:
echo "::group::Setup prerequisites"
set -eu
mkdir bin
export PATH=$(pwd)/bin:$PATH
GOGZ="go${GO_VERSION_SOLARIS}.solaris-amd64.tar.gz"
wget https://go.dev/dl/${GOGZ}
gtar xzf ${GOGZ}
@ -246,6 +247,7 @@ jobs:
ln -s $(which gmake) $(pwd)/bin/make
ln -s $(which gsed) $(pwd)/bin/sed
ln -s $(which gtar) $(pwd)/bin/tar
export PATH=$(pwd)/bin:$PATH
echo ">> building promu as it is not shipped for Solaris"
git clone https://github.com/prometheus/promu.git

2
collector/fixtures/e2e-output-darwin.txt
Unescape View File

@ -117,8 +117,6 @@ node_memory_total_bytes 7.516192768e+09
# HELP node_network_noproto_total Network device statistic noproto.
# TYPE node_network_noproto_total counter
node_network_noproto_total{device="lo0"} 0
# HELP node_network_receive_bytes_total Network device statistic receive_bytes.
# TYPE node_network_receive_bytes_total counter
# HELP node_network_receive_drop_total Network device statistic receive_drop.
# TYPE node_network_receive_drop_total counter
node_network_receive_drop_total{device="lo0"} 0

2
collector/fixtures/e2e-output-dragonfly.txt
Unescape View File

@ -93,8 +93,6 @@ node_buddyinfo_blocks{node="0",size="9",zone="DMA32"} 0
node_buddyinfo_blocks{node="0",size="9",zone="Normal"} 0
# HELP node_exporter_build_info A metric with a constant '1' value labeled by version, revision, branch, goversion from which node_exporter was built, and the goos and goarch for the build.
# TYPE node_exporter_build_info gauge
# HELP node_network_receive_bytes_total Network device statistic receive_bytes.
# TYPE node_network_receive_bytes_total counter
# HELP node_network_receive_drop_total Network device statistic receive_drop.
# TYPE node_network_receive_drop_total counter
node_network_receive_drop_total{device="lo0"} 0

3
collector/fixtures/e2e-output-freebsd.txt
Unescape View File

@ -126,8 +126,6 @@ node_netisr_maxthreads 1
# HELP node_netisr_numthreads netisr current thread count
# TYPE node_netisr_numthreads gauge
node_netisr_numthreads 1
# HELP node_network_receive_bytes_total Network device statistic receive_bytes.
# TYPE node_network_receive_bytes_total counter
# HELP node_network_receive_drop_total Network device statistic receive_drop.
# TYPE node_network_receive_drop_total counter
node_network_receive_drop_total{device="lo0"} 0
@ -164,6 +162,7 @@ node_scrape_collector_success{collector="loadavg"} 1
node_scrape_collector_success{collector="meminfo"} 1
node_scrape_collector_success{collector="netdev"} 1
node_scrape_collector_success{collector="netisr"} 1
node_scrape_collector_success{collector="netstat"} 1
node_scrape_collector_success{collector="os"} 1
node_scrape_collector_success{collector="textfile"} 1
node_scrape_collector_success{collector="time"} 1

2
collector/fixtures/e2e-output-openbsd.txt
Unescape View File

@ -109,8 +109,6 @@ node_memory_swapped_out_pages_bytes_total 0
# TYPE node_network_noproto_total counter
node_network_noproto_total{device="lo0"} 0
node_network_noproto_total{device="pflog0"} 0
# HELP node_network_receive_bytes_total Network device statistic receive_bytes.
# TYPE node_network_receive_bytes_total counter
# HELP node_network_receive_drop_total Network device statistic receive_drop.
# TYPE node_network_receive_drop_total counter
node_network_receive_drop_total{device="lo0"} 0

5
end-to-end-test.sh
Unescape View File

@ -320,6 +320,8 @@ sleep 1
get "127.0.0.1:${port}/metrics" | grep --text -E -v "${skip_re}" > "${generated_metrics}"
# The following ignore-list is only applicable to the VMs used to run E2E tests on platforms for which containerized environments are not available.
# However, owing to this, there are some non-deterministic metrics that end up generating samples, unlike their containerized counterparts, for e.g., node_network_receive_bytes_total.
non_deterministic_metrics=$(cat << METRICS
node_boot_time_seconds
node_cpu_frequency_hertz
@ -356,6 +358,9 @@ non_deterministic_metrics=$(cat << METRICS
node_memory_swapped_in_bytes_total
node_memory_swapped_out_bytes_total
node_memory_wired_bytes
node_netstat_tcp_receive_packets_total
node_netstat_tcp_transmit_packets_total
node_network_receive_bytes_total
node_network_receive_multicast_total
node_network_transmit_multicast_total
METRICS

Write Preview
Loading…
Cancel
Save