mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-02-16 23:57:11 +00:00
extra/netdata to 1.44.1-4
This commit is contained in:
Kevin Mihelich
parent
776d5420c4
commit
244f871cdb
3 changed files with 43 additions and 53 deletions
|
|
@ -1,11 +1,12 @@
|
|||
pkgbase = netdata
|
||||
pkgdesc = Real-time performance monitoring, in the greatest possible detail, over the web
|
||||
pkgver = 1.44.1
|
||||
pkgrel = 2
|
||||
pkgrel = 4
|
||||
url = https://github.com/netdata/netdata
|
||||
arch = x86_64
|
||||
license = GPL
|
||||
makedepends = cups
|
||||
makedepends = go
|
||||
depends = libmnl
|
||||
depends = libnetfilter_acct
|
||||
depends = zlib
|
||||
|
|
@ -35,9 +36,13 @@ pkgbase = netdata
|
|||
optdepends = iw: for monitoring Linux as access point
|
||||
backup = etc/netdata/netdata.conf
|
||||
source = netdata-1.44.1.tar.gz::https://github.com/netdata/netdata/releases/download/v1.44.1/netdata-v1.44.1.tar.gz
|
||||
source = go.d.plugin-0.57.2.tar.gz::https://github.com/netdata/go.d.plugin/archive/refs/tags/v0.57.2.tar.gz
|
||||
source = https://github.com/netdata/go.d.plugin/releases/download/v0.57.2/go.d.plugin-config-v0.57.2.tar.gz
|
||||
source = netdata.sysusers
|
||||
source = protobuf-23.patch
|
||||
sha512sums = 2c3f4ff03704eb19a203a2ee7494c6f16e2b1a45ec3464ca3685dc6baa4b82e5d216c6076610a07a610db7e0eae93b3be52eb69382fc07fcde83fdc4727c8ba2
|
||||
sha512sums = b8bc855d18245bfa69407a1449be4179375ecd6b6d9014f8726b0ac0c9b52a7ff193e50df82cf09c7a598f96a4edc8f9178b4f77c78af07a1e15e49a2d06b9e8
|
||||
sha512sums = a64683be6d3327ce9500606b22d8d908cf36206934b5437d1c91d893c72cd8e44057f895c7e3986aa22335884903f2835d4b64196a65060d4dee41a6bca321b1
|
||||
sha512sums = a910809a823ba58ca7bdaa72e8d68427b48f452c1fbb2343fa182ecb0a091a7640e73af24b8ba2fdd90e00aed8ef53b7fccd25cb8f04ca9b9fa6c8e52223ca66
|
||||
sha512sums = 5a759d6fe29f6ded679ebe61189a81639adf4397219cb0f1128a1490702ca4b1e250a70ed3bb548ca37c53992659f9c910e1ddc8b167bc6cf1f518630b960e05
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@
|
|||
|
||||
pkgname=netdata
|
||||
pkgver=1.44.1
|
||||
pkgrel=2
|
||||
pkgrel=4
|
||||
_go_ver="0.57.2"
|
||||
pkgdesc="Real-time performance monitoring, in the greatest possible detail, over the web"
|
||||
url="https://github.com/netdata/netdata"
|
||||
arch=('x86_64')
|
||||
|
|
@ -14,7 +15,7 @@ license=('GPL')
|
|||
backup=('etc/netdata/netdata.conf')
|
||||
depends=('libmnl' 'libnetfilter_acct' 'zlib' 'judy' 'libuv' 'json-c' 'libcap' 'lz4' 'openssl' 'which' 'snappy' 'protobuf'
|
||||
'libwebsockets' 'mongo-c-driver' 'libyaml')
|
||||
makedepends=('cups')
|
||||
makedepends=('cups' 'go')
|
||||
optdepends=('nodejs: for monitoring named and SNMP devices'
|
||||
'lm_sensors: for monitoring hardware sensors'
|
||||
'iproute2: for monitoring Linux QoS'
|
||||
|
|
@ -28,15 +29,16 @@ optdepends=('nodejs: for monitoring named and SNMP devices'
|
|||
'cups: for CUPS plugin'
|
||||
'iw: for monitoring Linux as access point')
|
||||
source=("$pkgname-$pkgver.tar.gz::https://github.com/netdata/netdata/releases/download/v$pkgver/netdata-v$pkgver.tar.gz"
|
||||
"$pkgname.sysusers"
|
||||
protobuf-23.patch)
|
||||
"go.d.plugin-${_go_ver}.tar.gz::https://github.com/netdata/go.d.plugin/archive/refs/tags/v${_go_ver}.tar.gz"
|
||||
"https://github.com/netdata/go.d.plugin/releases/download/v${_go_ver}/go.d.plugin-config-v${_go_ver}.tar.gz"
|
||||
"netdata.sysusers")
|
||||
sha512sums=('2c3f4ff03704eb19a203a2ee7494c6f16e2b1a45ec3464ca3685dc6baa4b82e5d216c6076610a07a610db7e0eae93b3be52eb69382fc07fcde83fdc4727c8ba2'
|
||||
'a910809a823ba58ca7bdaa72e8d68427b48f452c1fbb2343fa182ecb0a091a7640e73af24b8ba2fdd90e00aed8ef53b7fccd25cb8f04ca9b9fa6c8e52223ca66'
|
||||
'5a759d6fe29f6ded679ebe61189a81639adf4397219cb0f1128a1490702ca4b1e250a70ed3bb548ca37c53992659f9c910e1ddc8b167bc6cf1f518630b960e05')
|
||||
'b8bc855d18245bfa69407a1449be4179375ecd6b6d9014f8726b0ac0c9b52a7ff193e50df82cf09c7a598f96a4edc8f9178b4f77c78af07a1e15e49a2d06b9e8'
|
||||
'a64683be6d3327ce9500606b22d8d908cf36206934b5437d1c91d893c72cd8e44057f895c7e3986aa22335884903f2835d4b64196a65060d4dee41a6bca321b1'
|
||||
'a910809a823ba58ca7bdaa72e8d68427b48f452c1fbb2343fa182ecb0a091a7640e73af24b8ba2fdd90e00aed8ef53b7fccd25cb8f04ca9b9fa6c8e52223ca66')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-v$pkgver
|
||||
patch -p1 -i ../protobuf-23.patch # Fix build with protobuf 23
|
||||
# protobuf 23 requires c++17
|
||||
sed -e 's|\# AX_CXX_COMPILE_STDCXX(17, noext, optional)|AX_CXX_COMPILE_STDCXX(17, noext, optional)|' -i configure.ac
|
||||
}
|
||||
|
|
@ -51,8 +53,21 @@ build() {
|
|||
--sysconfdir="/etc" \
|
||||
--libexecdir="/usr/lib" \
|
||||
--localstatedir="/var" \
|
||||
--with-zlib --with-math --with-user=netdata --disable-lto
|
||||
--disable-lto \
|
||||
--with-zlib \
|
||||
--with-math \
|
||||
--with-user=netdata
|
||||
make
|
||||
|
||||
cd ../go.d.plugin-${_go_ver}
|
||||
go build \
|
||||
-trimpath \
|
||||
-buildmode=pie \
|
||||
-mod=readonly \
|
||||
-modcacherw \
|
||||
-ldflags "-X main.version=${_go_ver} -linkmode external -extldflags \"${LDFLAGS}\"" \
|
||||
-o go.d.plugin \
|
||||
./cmd/godplugin
|
||||
}
|
||||
|
||||
package() {
|
||||
|
|
@ -60,16 +75,23 @@ package() {
|
|||
|
||||
make DESTDIR="$pkgdir" install
|
||||
|
||||
# go.d.plugin
|
||||
install -Dm755 ${srcdir}/go.d.plugin-${_go_ver}/go.d.plugin "${pkgdir}/usr/lib/netdata/plugins.d/go.d.plugin"
|
||||
cp -r "${srcdir}/go.d.conf" "${srcdir}/go.d" "${pkgdir}/usr/lib/${pkgname}/conf.d"
|
||||
|
||||
install -Dm644 system/netdata.conf "$pkgdir"/etc/netdata/netdata.conf
|
||||
chown -R 0:134 "$pkgdir"/usr/share/netdata/web
|
||||
|
||||
install -Dm0644 "system/systemd/netdata.service.v235" "$pkgdir/usr/lib/systemd/system/netdata.service"
|
||||
install -Dm0644 "system/logrotate/netdata" "$pkgdir/etc/logrotate.d/netdata"
|
||||
install -Dm0644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
|
||||
install -Dm0644 "system/systemd/netdata.service.v235" "${pkgdir}/usr/lib/systemd/system/netdata.service"
|
||||
install -Dm0644 "system/logrotate/netdata" "${pkgdir}/etc/logrotate.d/netdata"
|
||||
install -Dm0644 "${srcdir}/netdata.sysusers" "${pkgdir}/usr/lib/sysusers.d/netdata.conf"
|
||||
|
||||
# https://github.com/netdata/netdata/tree/master/collectors/apps.plugin#permissions
|
||||
setcap cap_dac_read_search,cap_sys_ptrace+ep "${pkgdir}"/usr/lib/netdata/plugins.d/apps.plugin
|
||||
setcap cap_dac_read_search,cap_sys_ptrace+ep "${pkgdir}"/usr/lib/netdata/plugins.d/debugfs.plugin
|
||||
setcap cap_dac_read_search,cap_sys_ptrace+ep "${pkgdir}"/usr/lib/netdata/plugins.d/perf.plugin
|
||||
setcap cap_dac_read_search,cap_sys_ptrace+ep "${pkgdir}"/usr/lib/netdata/plugins.d/systemd-journal.plugin
|
||||
# Also check curl -Ss https://raw.githubusercontent.com/netdata/netdata/master/netdata.spec.in | grep "%caps"
|
||||
setcap cap_net_admin,cap_net_raw+eip "${pkgdir}/usr/lib/netdata/plugins.d/go.d.plugin"
|
||||
setcap cap_dac_read_search,cap_sys_ptrace+ep "${pkgdir}/usr/lib/netdata/plugins.d/apps.plugin"
|
||||
setcap cap_dac_read_search+ep "${pkgdir}/usr/lib/netdata/plugins.d/slabinfo.plugin"
|
||||
setcap cap_perfmon,cap_sys_admin+ep "${pkgdir}/usr/lib/netdata/plugins.d/perf.plugin"
|
||||
setcap cap_dac_read_search+ep "${pkgdir}/usr/lib/netdata/plugins.d/debugfs.plugin"
|
||||
setcap cap_dac_read_search+ep "${pkgdir}/usr/lib/netdata/plugins.d/systemd-journal.plugin"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
diff --git a/aclk/schema-wrappers/alarm_stream.cc b/aclk/schema-wrappers/alarm_stream.cc
|
||||
index 11b9284f5..9e34b78a2 100644
|
||||
--- a/aclk/schema-wrappers/alarm_stream.cc
|
||||
+++ b/aclk/schema-wrappers/alarm_stream.cc
|
||||
@@ -1,11 +1,11 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
-#include "alarm_stream.h"
|
||||
-
|
||||
#include "proto/alarm/v1/stream.pb.h"
|
||||
|
||||
#include "libnetdata/libnetdata.h"
|
||||
|
||||
+#include "alarm_stream.h"
|
||||
+
|
||||
#include "schema_wrapper_utils.h"
|
||||
|
||||
using namespace alarms::v1;
|
||||
diff --git a/aclk/schema-wrappers/schema_wrapper_utils.h b/aclk/schema-wrappers/schema_wrapper_utils.h
|
||||
index 2815d0f20..751caa324 100644
|
||||
--- a/aclk/schema-wrappers/schema_wrapper_utils.h
|
||||
+++ b/aclk/schema-wrappers/schema_wrapper_utils.h
|
||||
@@ -3,11 +3,12 @@
|
||||
#ifndef SCHEMA_WRAPPER_UTILS_H
|
||||
#define SCHEMA_WRAPPER_UTILS_H
|
||||
|
||||
+#include <google/protobuf/timestamp.pb.h>
|
||||
+#include <google/protobuf/map.h>
|
||||
+
|
||||
#include "database/rrd.h"
|
||||
|
||||
#include <sys/time.h>
|
||||
-#include <google/protobuf/timestamp.pb.h>
|
||||
-#include <google/protobuf/map.h>
|
||||
|
||||
#if GOOGLE_PROTOBUF_VERSION < 3001000
|
||||
#define PROTO_COMPAT_MSG_SIZE(msg) (size_t)msg.ByteSize();
|
||||
Loading…
Reference in a new issue