Update package to version 1.7.0

This commit is contained in:
jxy_git 2023-12-29 17:31:26 +08:00
parent 6f1337e465
commit 2bf70dc5c9
12 changed files with 93 additions and 433 deletions

View File

@ -1,65 +0,0 @@
commit 9e1fd818c15d3fd2f64cf594c3abb5df0885b1e0
Author: Tobias Klauser <tklauser@distanz.ch>
Date: Wed Jul 22 11:52:26 2020 +0200
Add CPUInfo parsing for RISCV
Currently only 64-bit RISCV is supported (GOARCH=riscv64) by the Go
compiler, but the cpuinfo format would be the same for 32-bit RISCV.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
Rebased on node-exporter 1.0.1 by laokz <zhangkai@iscas.ac.cn>
diff --git a/vendor/github.com/prometheus/procfs/cpuinfo.go b/vendor/github.com/prometheus/procfs/cpuinfo.go
index 935157e..b9fb589 100644
--- a/vendor/github.com/prometheus/procfs/cpuinfo.go
+++ b/vendor/github.com/prometheus/procfs/cpuinfo.go
@@ -407,6 +407,46 @@ func parseCPUInfoPPC(info []byte) ([]CPUInfo, error) {
return cpuinfo, nil
}
+func parseCPUInfoRISCV(info []byte) ([]CPUInfo, error) {
+ scanner := bufio.NewScanner(bytes.NewReader(info))
+
+ firstLine := firstNonEmptyLine(scanner)
+ if !strings.HasPrefix(firstLine, "processor") || !strings.Contains(firstLine, ":") {
+ return nil, errors.New("invalid cpuinfo file: " + firstLine)
+ }
+ field := strings.SplitN(firstLine, ": ", 2)
+ v, err := strconv.ParseUint(field[1], 0, 32)
+ if err != nil {
+ return nil, err
+ }
+ firstcpu := CPUInfo{Processor: uint(v)}
+ cpuinfo := []CPUInfo{firstcpu}
+ i := 0
+
+ for scanner.Scan() {
+ line := scanner.Text()
+ if !strings.Contains(line, ":") {
+ continue
+ }
+ field := strings.SplitN(line, ": ", 2)
+ switch strings.TrimSpace(field[0]) {
+ case "processor":
+ v, err := strconv.ParseUint(field[1], 0, 32)
+ if err != nil {
+ return nil, err
+ }
+ i = int(v)
+ cpuinfo = append(cpuinfo, CPUInfo{}) // start of the next processor
+ cpuinfo[i].Processor = uint(v)
+ case "hart":
+ cpuinfo[i].CoreID = field[1]
+ case "isa":
+ cpuinfo[i].ModelName = field[1]
+ }
+ }
+ return cpuinfo, nil
+}
+
// firstNonEmptyLine advances the scanner to the first non-empty line
// and returns the contents of that line
func firstNonEmptyLine(scanner *bufio.Scanner) string {

View File

@ -1,39 +0,0 @@
commit 910e68572b35da779e4f84cfa5261b0a67532d05
Author: Tobias Klauser <tklauser@distanz.ch>
Date: Mon Sep 7 12:37:51 2020 +0200
Fix build on RISCV
PR #318 forgot to wire parseCPUInfo to parseCPUInfoRISCV on
GOARCH=riscv{,64}, leading to a build/test failure:
./cpuinfo.go:71:9: undefined: parseCPUInfo
./cpuinfo_test.go:222:2: undefined: parseCPUInfo
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
diff --git a/vendor/github.com/prometheus/procfs/cpuinfo_riscvx.go b/vendor/github.com/prometheus/procfs/cpuinfo_riscvx.go
new file mode 100644
index 0000000..e83c2e2
--- /dev/null
+++ b/vendor/github.com/prometheus/procfs/cpuinfo_riscvx.go
@@ -0,0 +1,19 @@
+// Copyright 2020 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build linux
+// +build riscv riscv64
+
+package procfs
+
+var parseCPUInfo = parseCPUInfoRISCV

View File

@ -1,265 +0,0 @@
# Generate devel rpm
%global with_devel 1
# Build project from bundled dependencies
%global with_bundled 1
# Build with debug info rpm
%global with_debug 0
# Run tests in check section
%global with_check 1
# Generate unit-test rpm
%global with_unit_test 0
%if 0%{?with_debug}
%global _dwz_low_mem_die_limit 0
%else
%global debug_package %{nil}
%endif
%global provider github
%global provider_tld com
%global project prometheus
%global repo node_exporter
# https://github.com/prometheus/node_exporter
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
Name: golang-%{provider}-%{project}-%{repo}
Version: 1.0.1
Release: 3
Summary: Exporter for machine metrics
License: ASL 2.0
URL: https://%{provider_prefix}
Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz
Source1: sysconfig.node_exporter
Source2: node_exporter.service
Source3: node_exporter_textfile_wrapper.sh
Source4: textfile_collectors_README
Patch0: add_cpuinfo_parsing_for_riscv.patch
Patch1: fix_build_on_riscv.patch
Provides: node_exporter = %{version}-%{release}
BuildRequires: systemd
Requires: shadow coreutils
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm} riscv64}
%description
%{summary}
%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
BuildRequires: git
BuildRequires: golang >= 1.14
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
%{import_path} prefix.
%endif
%if 0%{?with_unit_test} && 0%{?with_devel}
%package unit-test-devel
Summary: Unit tests for %{name} package
%if 0%{?with_check}
#Here comes all BuildRequires: PACKAGE the unit tests
#in %%check section need for running
%endif
# test subpackage tests code from devel subpackage
Requires: %{name}-devel = %{version}-%{release}
%if 0%{?with_check} && ! 0%{?with_bundled}
BuildRequires: golang(github.com/prometheus/client_golang/prometheus/promhttp)
%endif
Requires: golang(github.com/prometheus/client_golang/prometheus/promhttp)
%description unit-test-devel
%{summary}
This package contains unit tests for project
providing packages with %{import_path} prefix.
%endif
%prep
%autosetup -p1 -n %{repo}-%{version}
mkdir -p _build/src/%{provider}.%{provider_tld}/%{project}
ln -s $(pwd) _build/src/%{provider_prefix}
%build
# mkdir -p _build/src/%{provider}.%{provider_tld}/%{project}
# ln -s $(pwd) _build/src/%{provider_prefix}
%if ! 0%{?with_bundled}
export GOPATH=$(pwd)/_build:%{gopath}
%else
# Since we aren't packaging up the vendor directory we need to link
# back to it somehow. Hack it up so that we can add the vendor
# directory from BUILD dir as a gopath to be searched when executing
# tests from the BUILDROOT dir.
ln -s ./ ./vendor/src # ./vendor/src -> ./vendor
export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
%endif
# set version information
export LDFLAGS="-X github.com/prometheus/common/version.Version=%{version} -X github.com/prometheus/common/version.BuildUser=copr -X github.com/prometheus/common/version.BuildDate=$(date '+%Y%m%d-%T')"
%if ! 0%{?gobuild:1}
function _gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') $LDFLAGS" -v -x "$@"; }
%global gobuild _gobuild
%endif
# non-modular build
#####
export GOPATH=$(pwd)/_build
#####
export GO111MODULE=off; rm -f go.mod
%gobuild -o _build/node_exporter %{provider_prefix}
%install
install -d -p %{buildroot}%{_sbindir} \
%{buildroot}%{_defaultdocdir}/node_exporter \
%{buildroot}%{_sysconfdir}/sysconfig \
%{buildroot}%{_sysconfdir}/prometheus/node_exporter/text_collectors
%if 0%{?rhel} != 6
install -d -p %{buildroot}%{_unitdir}
%endif
install -p -m 0644 %{_sourcedir}/textfile_collectors_README %{buildroot}%{_sysconfdir}/prometheus/node_exporter/text_collectors/README
install -p -m 0644 %{_sourcedir}/sysconfig.node_exporter %{buildroot}%{_sysconfdir}/sysconfig/node_exporter
%if 0%{?rhel} != 6
install -p -m 0644 %{_sourcedir}/node_exporter.service %{buildroot}%{_unitdir}/node_exporter.service
%endif
install -p -m 0755 %{_sourcedir}/node_exporter_textfile_wrapper.sh %{buildroot}%{_sbindir}/node_exporter_textfile_wrapper
install -p -m 0755 ./_build/node_exporter %{buildroot}%{_sbindir}/node_exporter
# source codes for building projects
%if 0%{?with_devel}
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
# find all *.go but no *_test.go files and generate devel.file-list
for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go" | grep -v "vendor") ; do
dirprefix=$(dirname $file)
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
while [ "$dirprefix" != "." ]; do
echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
dirprefix=$(dirname $dirprefix)
done
done
%endif
# testing files for this project
%if 0%{?with_unit_test} && 0%{?with_devel}
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
# find all *_test.go files and generate unit-test-devel.file-list
for file in $(find . -iname "*_test.go" | grep -v "vendor") ; do
dirprefix=$(dirname $file)
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
while [ "$dirprefix" != "." ]; do
echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
dirprefix=$(dirname $dirprefix)
done
done
%endif
%if 0%{?with_devel}
sort -u -o devel.file-list devel.file-list
%endif
%check
%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
%if ! 0%{?with_bundled}
export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%else
# Since we aren't packaging up the vendor directory we need to link
# back to it somehow. Hack it up so that we can add the vendor
# directory from BUILD dir as a gopath to be searched when executing
# tests from the BUILDROOT dir.
ln -s ./ ./vendor/src # ./vendor/src -> ./vendor
export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%endif
%if ! 0%{?gotest:1}
%global gotest go test
%endif
%gotest %{import_path}
%gotest %{import_path}/collector
%endif
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
%if 0%{?with_devel}
%files devel -f devel.file-list
%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
%endif
%if 0%{?with_unit_test} && 0%{?with_devel}
%files unit-test-devel -f unit-test-devel.file-list
%endif
%files
%if 0%{?rhel} != 6
%{_unitdir}/node_exporter.service
%endif
%config(noreplace) %{_sysconfdir}/sysconfig/node_exporter
%config %{_sysconfdir}/prometheus/node_exporter/text_collectors/README
%license LICENSE
%doc *.md text_collector_examples
%{_sbindir}/*
%pre
getent group node_exporter > /dev/null || groupadd -r node_exporter
getent passwd node_exporter > /dev/null || \
useradd -rg node_exporter -d /var/lib/node_exporter -s /sbin/nologin \
-c "Prometheus node exporter" node_exporter
mkdir -p /var/lib/node_exporter/textfile_collector
chgrp node_exporter /var/lib/node_exporter/textfile_collector
chmod 771 /var/lib/node_exporter/textfile_collector
%post
%if 0%{?rhel} != 6
%systemd_post node_exporter.service
%endif
%preun
%if 0%{?rhel} != 6
%systemd_preun node_exporter.service
%endif
%postun
%if 0%{?rhel} != 6
%systemd_postun node_exporter.service
%endif
%changelog
* Wed Feb 15 2023 laokz <zhangkai@iscas.ac.cn> - 1.0.1-3
- Add runtime requires: shadow coreutils
- Backport 1.1.0(procfs-0.3.0) patches to support riscv64
* Sat Feb 20 2021 yangzhao <yangzhao1@kylinos.cn> - 1.0.1-2
- Remove unnecessary requirements
* Wed Sep 17 2020 houjian <houjian@kylinos.cn> - 1.0.1-1
- Package Init

BIN
node_exporter-1.7.0.tar.gz Normal file

Binary file not shown.

BIN
node_exporter-vendor.tar.gz Normal file

Binary file not shown.

View File

@ -1,11 +1,17 @@
[Unit]
Description=Node Exporter
Description=Prometheus exporter for machine metrics
Documentation=https://github.com/prometheus/node_exporter
Wants=network-online.target
After=network-online.target
[Service]
User=node_exporter
EnvironmentFile=/etc/sysconfig/node_exporter
ExecStart=/usr/sbin/node_exporter $OPTIONS
Restart=always
User=node_exporter
EnvironmentFile=-/etc/sysconfig/node_exporter
ExecStart=/usr/sbin/node_exporter $ARGS
ExecReload=/bin/kill -HUP $MAINPID
TimeoutStopSec=20s
SendSIGKILL=no
[Install]
WantedBy=multi-user.target

71
node_exporter.spec Normal file
View File

@ -0,0 +1,71 @@
%define debug_package %{nil}
Name: node_exporter
Version: 1.7.0
Release: 1
Summary: Exporter for machine metrics
License: ASL 2.0
URL: https://github.com/prometheus/node_exporter
Source0: https://github.com/prometheus/node_exporter/archive/v%{version}.tar.gz#/node_exporter-%{version}.tar.gz
# tar -xvf Source0
# run 'go mod vendor' in it
# tar -czvf node_exporter-vendor.tar.gz vendor
Source1: node_exporter-vendor.tar.gz
Source2: node_exporter.service
Source3: node_exporter.sysconfig
BuildRequires: systemd
BuildRequires: promu
BuildRequires: git
BuildRequires: golang >= 1.18
Requires: shadow coreutils
Provides: golang-github-prometheus-node_exporter = %{version}-%{release}
ExclusiveArch: x86_64 aarch64 riscv64
%description
Prometheus exporter for hardware and OS metrics exposed by *NIX kernels, written in Go with pluggable metric collectors.
%prep
%autosetup -p1 -n %{name}-%{version}
tar -xzvf %{SOURCE1}
sed -i '/flags:/ s/ -tags .*/ -tags '\''netgo osusergo static_build'\'' --mod=vendor/' .promu-cgo.yml .promu.yml
%build
promu build
%install
install -D -m 0755 node_exporter %{buildroot}%{_sbindir}/node_exporter
install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/node_exporter.service
install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/node_exporter
%post
%systemd_post node_exporter.service
%preun
%systemd_preun node_exporter.service
%postun
%systemd_postun node_exporter.service
%files
%doc README.md
%license LICENSE
%{_sbindir}/node_exporter
%{_unitdir}/node_exporter.service
%config(noreplace)%{_sysconfdir}/sysconfig/node_exporter
%changelog
* Fri Dec 29 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 1.7.0-1
- Update package to version 1.7.0
* Wed Feb 15 2023 laokz <zhangkai@iscas.ac.cn> - 1.0.1-3
- Add runtime requires: shadow coreutils
- Backport 1.1.0(procfs-0.3.0) patches to support riscv64
* Sat Feb 20 2021 yangzhao <yangzhao1@kylinos.cn> - 1.0.1-2
- Remove unnecessary requirements
* Wed Sep 17 2020 houjian <houjian@kylinos.cn> - 1.0.1-1
- Package Init

12
node_exporter.sysconfig Normal file
View File

@ -0,0 +1,12 @@
## Path: Network/Monitors/Prometheus/node_exporter
## Description: Prometheus node exporter startup parameters
## Type: string
## Default: ''
#
# Additional arguments for the node_exporter.
# Please call: /usr/bin/node_exporter --help
# for a full list of possible options.
# Note: Please keep the list on one line, of possible.
#
ARGS=''

View File

@ -1,46 +0,0 @@
#!/bin/bash
# usage:
# node_exporter_textfile_wrapper smartmon.sh smartmon
# will atomically replace smartmon.prom in the textfile-collector dir with
# output from smartmon.sh in /etc/prometheus/node_exporter/text_collectors or
# in /usr/share/doc/golang-github-prometheus-node_exporter*/text_collector_examples.
set -eu
set -o pipefail
script="$1"
outname="${2-""}"
dirs_to_consider=( "/etc/prometheus/node_exporter/text_collectors" /usr/share/doc/golang-github-prometheus-node_exporter*/text_collector_examples)
if [[ "$outname" = "" ]]; then
outname="$(basename "$script")"
outname="${outname%.*}"
fi
if [[ "$(dirname "$script")" = "." ]]; then
for dir in "${dirs_to_consider[@]}"; do
candidate="$dir/$script"
if [[ -x "$candidate" ]]; then
script="$candidate"
break
fi
done
fi
tmpout="$(mktemp -p /var/lib/node_exporter/textfile_collector/)"
realout="/var/lib/node_exporter/textfile_collector/$outname.prom"
main() {
$script > "$tmpout"
chmod 640 "$tmpout"
chgrp node_exporter "$tmpout" || chmod a+r "$tmpout"
mv "$tmpout" "$realout"
}
cleanup() {
rm -f "$tmpout"
}
trap cleanup EXIT
main

View File

@ -1 +0,0 @@
OPTIONS="--collector.textfile.directory /var/lib/node_exporter/textfile_collector"

View File

@ -1,13 +0,0 @@
Collectors to run with cronjobs
===============================
This is a place for textfile collectors for node_exporter.
See /usr/share/doc/golang-github-prometheus-node_exporter/text_collector_examples for included examples.
You can use /usr/sbin/node_exporter_textfile_wrapper to simplify using them.
Example:
* * * * * /usr/sbin/node_exporter_textfile_wrapper smartmon.sh
will minutely execute smartmon.sh in the examples dir and write the output to the expected path.

Binary file not shown.