From 89b54f4dae58c4ea4bb860c7a6790f01cd8f873b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 6 Apr 2026 15:50:29 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=85=20Sync=202026-04-06=2015:50:29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3ginfo/Makefile | 4 +- .../usr/share/3ginfo/html/3ginfo.js | 2 +- .../usr/share/3ginfo/cgi-bin/3ginfo.sh | 13 +- netdata/Makefile | 146 +++++++++++++ netdata/files/netdata.conf | 33 +++ netdata/files/netdata.config | 5 + netdata/files/netdata.htpasswd | 1 + netdata/files/netdata.init | 96 +++++++++ netdata/files/netdata.locations | 11 + netdata/files/netdata.uci-defaults | 5 + .../001-disable-plugins-by-default.patch | 20 ++ ...-of-abseil-independently-of-protobuf.patch | 192 ++++++++++++++++++ netdata/patches/003-use-cpp-17.patch | 12 ++ ...gin_python__modules_bases_loaders.py.patch | 20 ++ netdata/patches/05-dashboard.patch | 17 ++ netdata/test.sh | 3 + 16 files changed, 568 insertions(+), 12 deletions(-) create mode 100644 netdata/Makefile create mode 100644 netdata/files/netdata.conf create mode 100644 netdata/files/netdata.config create mode 100644 netdata/files/netdata.htpasswd create mode 100644 netdata/files/netdata.init create mode 100644 netdata/files/netdata.locations create mode 100644 netdata/files/netdata.uci-defaults create mode 100644 netdata/patches/001-disable-plugins-by-default.patch create mode 100644 netdata/patches/002-support-handling-of-abseil-independently-of-protobuf.patch create mode 100644 netdata/patches/003-use-cpp-17.patch create mode 100644 netdata/patches/004-patch-collectors_python.d.plugin_python__modules_bases_loaders.py.patch create mode 100644 netdata/patches/05-dashboard.patch create mode 100644 netdata/test.sh diff --git a/3ginfo/Makefile b/3ginfo/Makefile index 24c524bf..612b7c9b 100644 --- a/3ginfo/Makefile +++ b/3ginfo/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=3ginfo -PKG_VERSION:=20251114 -PKG_RELEASE:=1 +PKG_VERSION:=20260404 +PKG_RELEASE:=2 include $(INCLUDE_DIR)/package.mk diff --git a/3ginfo/files-html/usr/share/3ginfo/html/3ginfo.js b/3ginfo/files-html/usr/share/3ginfo/html/3ginfo.js index ba6751b1..55151530 100644 --- a/3ginfo/files-html/usr/share/3ginfo/html/3ginfo.js +++ b/3ginfo/files-html/usr/share/3ginfo/html/3ginfo.js @@ -365,7 +365,7 @@ function showmodemparams() { } if (data.cid_dec && data.cid_dec > 0 && data.operator_mcc == 260) { - document.getElementById('btsearch' + idx).setAttribute("href", "http://www.btsearch.pl/szukaj.php?search=" + data.cid_dec + "&siec=-1&mode=std"); + document.getElementById('btsearch' + idx).setAttribute("href", "https://btsearch.pl/stations?q=" + data.cid_dec); setDisplay('div_btsearch' + idx, true); } else { setDisplay('div_btsearch' + idx, false); diff --git a/3ginfo/files-text-old/usr/share/3ginfo/cgi-bin/3ginfo.sh b/3ginfo/files-text-old/usr/share/3ginfo/cgi-bin/3ginfo.sh index a71d57f3..8cce3305 100755 --- a/3ginfo/files-text-old/usr/share/3ginfo/cgi-bin/3ginfo.sh +++ b/3ginfo/files-text-old/usr/share/3ginfo/cgi-bin/3ginfo.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# (c) 2010-2019 Cezary Jackiewicz +# (c) 2010-2026 Cezary Jackiewicz # # Output format @@ -426,9 +426,9 @@ if [ "x$CID" != "x" ]; then [ "x$T" != "x-" -a "x$LAC_NUM" != "x-" ] && PAT="^$COPS_NUM;0x"$(printf %04X 0x$T)";0x"$(printf %04X $LAC_NUM)";" is_gz=$(dd if="$CLF" bs=1 count=2 2>/dev/null | hexdump -v -e '1/1 "%02x"') if [ "x$is_gz" = "x1f8b" ] ; then - BTSINFO=""$(zcat "$CLF" | awk -F";" '/'$PAT'/ {gsub(/\!/,"\\!");print $8}')"" + BTSINFO=""$(zcat "$CLF" | awk -F";" '/'$PAT'/ {gsub(/\!/,"\\!");print $8}')"" else - BTSINFO=""$(awk -F";" '/'$PAT'/ {gsub(/\!/,"\\!");print $8}' "$CLF")"" + BTSINFO=""$(awk -F";" '/'$PAT'/ {gsub(/\!/,"\\!");print $8}' "$CLF")"" fi if [ $FORMAT -eq 2 ]; then BTSINFO=$(echo "$BTSINFO" | sed 's!\(.*\)!\1!g') @@ -437,12 +437,7 @@ if [ "x$CID" != "x" ]; then if [ $FORMAT -eq 0 ]; then case $COPS_NUM in - 26001*) CID="$CID";; - 26002*) CID="$CID";; - 26003*) CID="$CID";; - 26006*) CID="$CID";; - 26016*) CID="$CID";; - 26017*) CID="$CID";; + 260*) CID="$CID";; esac fi else diff --git a/netdata/Makefile b/netdata/Makefile new file mode 100644 index 00000000..c1a722e5 --- /dev/null +++ b/netdata/Makefile @@ -0,0 +1,146 @@ +# +# Copyright (C) 2008-2024 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=netdata +PKG_VERSION:=2.9.0 +PKG_RELEASE:=1 + +PKG_MAINTAINER:=Josef Schlehofer , Daniel Engberg +PKG_LICENSE:=GPL-3.0-or-later +PKG_LICENSE_FILES:=COPYING +PKG_CPE_ID:=cpe:/a:netdata:netdata + +PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/netdata/netdata/releases/download/v$(PKG_VERSION) +PKG_HASH:=skip +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) + +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 +PKG_FIXUP:=autoreconf +PKG_BUILD_FLAGS:=no-mips16 gc-sections + +PKG_BUILD_DEPENDS:=protobuf/host rust/host + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk +include $(INCLUDE_DIR)/nls.mk +include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk + + +define Package/netdata + SECTION:=admin + CATEGORY:=Administration + DEPENDS:=+zlib +libuuid +libuv +libmnl +liblz4 +libjson-c +libyaml +libopenssl +libcurl +protobuf +libzstd +libpcre2 + TITLE:=Real-time performance monitoring tool + URL:=https://www.netdata.cloud/ + PROVIDES:=netdata-ssl +endef + +define Package/netdata/description + netdata is a highly optimized Linux daemon providing real-time performance + monitoring for Linux systems, applications and SNMP devices over the web. + + If you want to use Python plugins install python3, python3-yaml and + python3-urllib3 +endef + +TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS)) -O3 +TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib +TARGET_CFLAGS += $(FPIC) + +CMAKE_OPTIONS += \ + -DCMAKE_INSTALL_PREFIX="/" \ + -DCMAKE_CROSSCOMPILING=True \ + -DProtobuf_PROTOC_EXECUTABLE=$(STAGING_DIR_HOSTPKG)/bin/protoc \ + -DENABLE_ACLK=On \ + -DENABLE_CLOUD=On \ + -DENABLE_DBENGINE=On \ + -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=Off \ + -DENABLE_EXPORTER_MONGODB=Off \ + -DENABLE_H2O=Off \ + -DENABLE_BACKTRACE=Off \ + -DENABLE_LOGS_MANAGEMENT_TESTS=Off \ + -DENABLE_ML=Off \ + -DENABLE_NETDATA_JOURNAL_FILE_READER=Off \ + -DENABLE_PLUGIN_OTEL=Off \ + -DENABLE_PLUGIN_OTEL_SIGNAL_VIEWER=Off \ + -DENABLE_PLUGIN_GO=Off \ + -DENABLE_PLUGIN_APPS=Off \ + -DENABLE_PLUGIN_CGROUP_NETWORK=Off \ + -DENABLE_PLUGIN_CUPS=Off \ + -DENABLE_PLUGIN_DEBUGFS=Off \ + -DENABLE_PLUGIN_EBPF=Off \ + -DENABLE_PLUGIN_FREEIPMI=Off \ + -DENABLE_PLUGIN_LOGS_MANAGEMENT=Off \ + -DENABLE_PLUGIN_NFACCT=Off \ + -DENABLE_PLUGIN_SYSTEMD_JOURNAL=Off \ + -DENABLE_PLUGIN_SYSTEMD_UNITS=Off \ + -DENABLE_PLUGIN_XENSTAT=Off \ + -DENABLE_WEBRTC=Off + +define Package/netdata/conffiles +/etc/config/netdata +/etc/netdata/ +endef + +define Download/netdata-dashboard + URL:=https://app.netdata.cloud + URL_FILE:=agent.tar.gz + FILE:=netdata-dashboard-agent.tar.gz + HASH:=skip +endef + +define Build/Prepare + $(call Build/Prepare/Default) + $(CP) $(DL_DIR)/netdata-dashboard-agent.tar.gz $(PKG_BUILD_DIR)/dashboard.tar.gz +endef + +define Package/netdata/install + #netdata binary + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/netdata $(1)/usr/sbin + + #netdata libs + $(INSTALL_DIR) $(1)/usr/lib/netdata + $(CP) $(PKG_INSTALL_DIR)/usr/lib/netdata/conf.d $(1)/usr/lib/netdata + + #netdata plugins + $(INSTALL_DIR) $(1)/usr/libexec/netdata + $(CP) $(PKG_INSTALL_DIR)/usr/libexec/netdata/charts.d $(1)/usr/libexec/netdata + $(CP) $(PKG_INSTALL_DIR)/usr/libexec/netdata/plugins.d $(1)/usr/libexec/netdata + $(CP) $(PKG_INSTALL_DIR)/usr/libexec/netdata/python.d $(1)/usr/libexec/netdata + + #netdata configuration + $(INSTALL_DIR) $(1)/etc/netdata + $(CP) $(PKG_INSTALL_DIR)/etc/netdata $(1)/etc + $(INSTALL_DATA) ./files/netdata.conf $(1)/etc/netdata + touch $(1)/etc/netdata/.opt-out-from-anonymous-statistics + + #netdata webdir and remove uneeded files + $(INSTALL_DIR) $(1)/usr/share/netdata + $(CP) $(PKG_INSTALL_DIR)/usr/share/netdata $(1)/usr/share + rm $(1)/usr/share/netdata/build-info-cmake-cache.gz + rm $(1)/usr/share/netdata/web/v3/3D_PARTY_LICENSES.txt + rm $(1)/usr/share/netdata/web/v3/LICENSE.md + rm $(1)/usr/share/netdata/web/v3/*.LICENSE.txt + rm -r $(1)/usr/share/netdata/web/static/* + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/netdata.init $(1)/etc/init.d/netdata + $(INSTALL_DIR) $(1)/etc/config + $(INSTALL_CONF) ./files/netdata.config $(1)/etc/config/netdata + $(INSTALL_DIR) $(1)/etc/nginx/conf.d + $(INSTALL_DATA) ./files/netdata.locations $(1)/etc/nginx/conf.d/netdata.locations + $(INSTALL_DATA) ./files/netdata.htpasswd $(1)/etc/nginx/conf.d/netdata.htpasswd + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_DATA) ./files/netdata.uci-defaults $(1)/etc/uci-defaults/luci-netdata +endef + +$(eval $(call Download,netdata-dashboard)) +$(eval $(call BuildPackage,netdata)) diff --git a/netdata/files/netdata.conf b/netdata/files/netdata.conf new file mode 100644 index 00000000..2ed4dfbb --- /dev/null +++ b/netdata/files/netdata.conf @@ -0,0 +1,33 @@ +# Full configuration can be retrieved from the running +# server at http://localhost:19999/netdata.conf +# +# Example: +# curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf +# + +[global] + run as user = root + +[db] + memory deduplication (ksm) = no + +[logs] + daemon = syslog + debug = none + access = none + +[web] + default port = 19999 + allow connections from = fd* localhost 10.* 192.168.* 172.16.* 172.17.* 172.18.* 172.19.* 172.20.* 172.21.* 172.22.* 172.23.* 172.24.* 172.25.* 172.26.* 172.27.* 172.28.* 172.29.* 172.30.* 172.31.* + allow dashboard from = fd* localhost 10.* 192.168.* 172.16.* 172.17.* 172.18.* 172.19.* 172.20.* 172.21.* 172.22.* 172.23.* 172.24.* 172.25.* 172.26.* 172.27.* 172.28.* 172.29.* 172.30.* 172.31.* + ssl certificate = /etc/netdata/cert.crt + ssl key = /etc/netdata/cert.key + +[plugins] + apps = no + cgroups = no + charts.d = no + python.d = no + +[plugin:proc:ipc] + shared memory totals = no diff --git a/netdata/files/netdata.config b/netdata/files/netdata.config new file mode 100644 index 00000000..492d050b --- /dev/null +++ b/netdata/files/netdata.config @@ -0,0 +1,5 @@ + +config netdata + option enabled '0' + option port '19999' + diff --git a/netdata/files/netdata.htpasswd b/netdata/files/netdata.htpasswd new file mode 100644 index 00000000..70d477e6 --- /dev/null +++ b/netdata/files/netdata.htpasswd @@ -0,0 +1 @@ +admin:$apr1$t7qQjoqb$YBHtAb7VGSkjIdObMG.Oy0 diff --git a/netdata/files/netdata.init b/netdata/files/netdata.init new file mode 100644 index 00000000..db38969b --- /dev/null +++ b/netdata/files/netdata.init @@ -0,0 +1,96 @@ +#!/bin/sh /etc/rc.common + +START=99 +USE_PROCD=1 + +APPBINARY=/usr/sbin/netdata +CONFIGFILE=/etc/netdata/netdata.conf + +config_load 'netdata' + +get_config() { + config_get_bool enabled $1 enabled 0 + config_get port $1 port 19999 + config_get_bool ssl $1 enable_ssl 0 + config_get cert_file $1 cert_file '/etc/netdata/cert.crt' + config_get key_file $1 key_file '/etc/netdata/cert.key' + config_get_bool ennginx $1 nginx_support 0 + config_get_bool auth $1 auth 0 + config_get userpw $1 user_passwd 'admin:$apr1$t7qQjoqb$YBHtAb7VGSkjIdObMG.Oy0' + [ "$ennginx" == "1" ] && ssl=0 +} + +#read_option