Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
3dcabba4f6
!14 Update package to version 0.24.0
From: @jxy_git 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl
2024-01-02 08:59:22 +00:00
jxy_git
34741c749c Update package to version 0.24.0 2024-01-02 16:16:14 +08:00
openeuler-ci-bot
3a06cec25c
!11 [sync] PR-10: 删除linkmode选项
From: @openeuler-sync-bot 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git
2023-03-21 01:43:14 +00:00
wu-leilei
1104bac255 Delete strip and pie
(cherry picked from commit 69ac21051ed384b5341a540b13f6d4d42510d8a2)
2023-03-21 09:35:46 +08:00
openeuler-ci-bot
fa3a201917
!8 [sync] PR-7: 添加blackbox_exporter的安全编译选项strip和pie
From: @openeuler-sync-bot 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl
2023-03-07 01:21:25 +00:00
wu-leilei
21b99aa129 Add strip and pie
(cherry picked from commit a7edd9723b218d59e0742e204c0c30abdeb57c10)
2023-03-07 09:07:34 +08:00
openeuler-ci-bot
1240f5499c
!5 Update package to version 0.23.0
From: @jxy_git 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl
2023-01-31 07:39:29 +00:00
jxy_git
32c20337ed Update package to version 0.23.0 2023-01-31 10:09:22 +08:00
openeuler-ci-bot
5fdcb9d681
!3 update changelog date
From: @tanyulong2021 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl
2022-06-09 03:01:58 +00:00
tanyulong2021
4816274a1f update changelog date 2022-06-08 14:16:04 +08:00
6 changed files with 47 additions and 11 deletions

View File

@ -0,0 +1,20 @@
diff -Nur a/.promu.yml b/.promu.yml
--- a/.promu.yml 2023-02-09 14:54:47.876832158 +0800
+++ b/.promu.yml 2023-02-09 14:56:28.322288215 +0800
@@ -7,11 +7,11 @@
build:
flags: -a -tags netgo
ldflags: |
- -X github.com/prometheus/common/version.Version={{.Version}}
- -X github.com/prometheus/common/version.Revision={{.Revision}}
- -X github.com/prometheus/common/version.Branch={{.Branch}}
- -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
- -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X github.com/prometheus/common/version.Version={{.Version}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X github.com/prometheus/common/version.Revision={{.Revision}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X github.com/prometheus/common/version.Branch={{.Branch}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+ -w -s -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
tarball:
files:
- blackbox.yml

Binary file not shown.

Binary file not shown.

View File

@ -1,14 +1,18 @@
%define __debug_install_post %{_rpmconfigdir}/find-debuginfo.sh %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}" %{nil}
%define debug_package %{nil}
Name: blackbox_exporter
Version: 0.19.0
Release: 2
Version: 0.24.0
Release: 1
Summary: Prometheus blackbox prober exporter
License: Apache-2.0
Url: https://github.com/prometheus/blackbox_exporter
Source: https://github.com/prometheus/blackbox_exporter/archive/refs/tags/v%{version}.tar.gz
URL: https://github.com/prometheus/blackbox_exporter
Source0: https://github.com/prometheus/blackbox_exporter/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: %{name}.service
Source2: vendor.tar.gz
# tar -xvf Source0
# run 'go mod vendor' in it
# tar -czvf blackbox_exporter-vendor.tar.gz vendor
Source2: blackbox_exporter-vendor.tar.gz
Patch0: add-parameters-to-solve-the-strip.patch
BuildRequires: golang promu
Requires(pre): prometheus2
%description
@ -17,16 +21,16 @@ The blackbox exporter allows blackbox probing of endpoints over HTTP, HTTPS, DNS
%prep
%setup -q -n %{name}-%{version}
tar xvf %{SOURCE2} -C .
%patch0 -p1
%build
export GOFLAGS="-mod=vendor"
promu build
%install
mkdir -p %{buildroot}{%{_bindir},%{_unitdir},%{_sysconfdir}/prometheus}
install -m0755 %{name}-%{version} %{buildroot}%{_bindir}/%{name}
install -m0644 blackbox.yml %{buildroot}%{_sysconfdir}/prometheus/blackbox.yml
install -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
install -D -m 0755 %{name}-%{version} %{buildroot}%{_bindir}/%{name}
install -D -m 0644 blackbox.yml %{buildroot}%{_sysconfdir}/prometheus/blackbox.yml
install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
%post
%systemd_post %{name}.service
@ -41,7 +45,19 @@ install -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
%config(noreplace) %{_sysconfdir}/prometheus/blackbox.yml
%changelog
* Thu Aug 10 2021 huanghaitao <huanghaitao8@huawei.com> - 0.19.0-2
* Tue Jan 02 2024 jiangxinyu <jiangxinyu@kylinos.cn> - 0.24.0-1
- Update package to version 0.24.0
* Fri Mar 10 2023 wulei <wulei80@h-partners.com> - 0.23.0-3
- Delete linkmode
* Thu Mar 02 2023 wulei <wulei80@h-partners.com> - 0.23.0-2
- Add strip and pie
* Tue Jan 31 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 0.23.0-1
- Update package to version 0.23.0
* Tue Aug 10 2021 huanghaitao <huanghaitao8@huawei.com> - 0.19.0-2
- Fix systemd macro spelling errors.
* Thu Aug 5 2021 huanghaitao <huanghaitao8@huawei.com> - 0.19.0-1

Binary file not shown.

Binary file not shown.