summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaito Bezarius <masterancpp@gmail.com>2023-12-08 23:05:53 +0100
committerRaito Bezarius <masterancpp@gmail.com>2023-12-08 23:05:57 +0100
commit7ca0e7f3ac40d120fd5ea767df88a62cba709fca (patch)
tree66d6c6eb215d1f1687856925a4544ef40354f488
parentnixos/netdata: ensure analytics reporting is truly opted-out (diff)
downloadnixpkgs-origin/netdata-improvements.tar.gz
netdata: 1.43.2 -> 1.44.0origin/netdata-improvements
https://github.com/netdata/netdata/releases/tag/v1.44.0 The patch was updated for the new subsystem called "logmanagement".
-rw-r--r--pkgs/tools/system/netdata/default.nix6
-rw-r--r--pkgs/tools/system/netdata/no-files-in-etc-and-var.patch75
2 files changed, 47 insertions, 34 deletions
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index e6f65a8c0f5e..4248b00003ec 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
# Don't forget to update go.d.plugin.nix as well
- version = "1.43.2";
+ version = "1.44.0";
pname = "netdata";
src = fetchFromGitHub {
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
repo = "netdata";
rev = "v${version}";
hash = if withCloudUi
- then "sha256-ZhSuU2VTJPFJ3ja5eHx5uTuR19LleoID8Efr9FTyg74="
- else "sha256-t2awo118mYbuoNiKiAxM5xpRmQSha+/NR5G+shsotek=";
+ then "sha256-8kkOpMfcYPcHI3GuevZ2NYjJjlZvrvBgIs883Zsztgw="
+ else "sha256-Kui3sV8OzBri4h47qD10snQgdvdi6yi/2z4cXWREcxE=";
fetchSubmodules = true;
# Remove v2 dashboard distributed under NCUL1. Make sure an empty
diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
index 6e24d707d0ae..039376fe4e3a 100644
--- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
+++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
@@ -1,8 +1,8 @@
-diff --git a/collectors/Makefile.am b/collectors/Makefile.am
-index 2aec3dd3e..27385ec28 100644
---- a/collectors/Makefile.am
-+++ b/collectors/Makefile.am
-@@ -31,7 +31,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d
+diff --git c/collectors/Makefile.am i/collectors/Makefile.am
+index 1bbb2e0ef..96c400d33 100644
+--- c/collectors/Makefile.am
++++ i/collectors/Makefile.am
+@@ -33,7 +33,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d
usergoconfigdir=$(configdir)/go.d
# Explicitly install directories to avoid permission issues due to umask
@@ -11,10 +11,10 @@ index 2aec3dd3e..27385ec28 100644
$(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir)
$(INSTALL) -d $(DESTDIR)$(usergoconfigdir)
-diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am
-index 03c7f0a94..01985db01 100644
---- a/collectors/charts.d.plugin/Makefile.am
-+++ b/collectors/charts.d.plugin/Makefile.am
+diff --git c/collectors/charts.d.plugin/Makefile.am i/collectors/charts.d.plugin/Makefile.am
+index f82992fd4..4cac1ae4f 100644
+--- c/collectors/charts.d.plugin/Makefile.am
++++ i/collectors/charts.d.plugin/Makefile.am
@@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \
$(NULL)
@@ -24,10 +24,10 @@ index 03c7f0a94..01985db01 100644
$(INSTALL) -d $(DESTDIR)$(userchartsconfigdir)
chartsconfigdir=$(libconfigdir)/charts.d
-diff --git a/collectors/ebpf.plugin/Makefile.am b/collectors/ebpf.plugin/Makefile.am
+diff --git c/collectors/ebpf.plugin/Makefile.am i/collectors/ebpf.plugin/Makefile.am
index 2d5f92a6b..8b11c7502 100644
---- a/collectors/ebpf.plugin/Makefile.am
-+++ b/collectors/ebpf.plugin/Makefile.am
+--- c/collectors/ebpf.plugin/Makefile.am
++++ i/collectors/ebpf.plugin/Makefile.am
@@ -9,7 +9,7 @@ SUFFIXES = .in
userebpfconfigdir=$(configdir)/ebpf.d
@@ -37,10 +37,10 @@ index 2d5f92a6b..8b11c7502 100644
$(INSTALL) -d $(DESTDIR)$(userebpfconfigdir)
dist_noinst_DATA = \
-diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
+diff --git c/collectors/python.d.plugin/Makefile.am i/collectors/python.d.plugin/Makefile.am
index ca49c1c02..1b9bcc446 100644
---- a/collectors/python.d.plugin/Makefile.am
-+++ b/collectors/python.d.plugin/Makefile.am
+--- c/collectors/python.d.plugin/Makefile.am
++++ i/collectors/python.d.plugin/Makefile.am
@@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \
$(NULL)
@@ -50,10 +50,10 @@ index ca49c1c02..1b9bcc446 100644
$(INSTALL) -d $(DESTDIR)$(userpythonconfigdir)
pythonconfigdir=$(libconfigdir)/python.d
-diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am
+diff --git c/collectors/statsd.plugin/Makefile.am i/collectors/statsd.plugin/Makefile.am
index c8144c137..f8aaa89b6 100644
---- a/collectors/statsd.plugin/Makefile.am
-+++ b/collectors/statsd.plugin/Makefile.am
+--- c/collectors/statsd.plugin/Makefile.am
++++ i/collectors/statsd.plugin/Makefile.am
@@ -19,5 +19,5 @@ dist_userstatsdconfig_DATA = \
$(NULL)
@@ -61,10 +61,10 @@ index c8144c137..f8aaa89b6 100644
-install-exec-local:
+no-install-exec-local:
$(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir)
-diff --git a/health/Makefile.am b/health/Makefile.am
-index 20e000860..add0137b3 100644
---- a/health/Makefile.am
-+++ b/health/Makefile.am
+diff --git c/health/Makefile.am i/health/Makefile.am
+index 7d7bca4cc..3086876dd 100644
+--- c/health/Makefile.am
++++ i/health/Makefile.am
@@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \
$(NULL)
@@ -74,11 +74,24 @@ index 20e000860..add0137b3 100644
$(INSTALL) -d $(DESTDIR)$(userhealthconfigdir)
healthconfigdir=$(libconfigdir)/health.d
-diff --git a/system/Makefile.am b/system/Makefile.am
-index 54e9278c8..e7cc7acea 100644
---- a/system/Makefile.am
-+++ b/system/Makefile.am
-@@ -21,12 +21,9 @@ include $(top_srcdir)/build/subst.inc
+diff --git c/logsmanagement/Makefile.am i/logsmanagement/Makefile.am
+index 33f08d556..1f08cbae9 100644
+--- c/logsmanagement/Makefile.am
++++ i/logsmanagement/Makefile.am
+@@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+ userlogsmanagconfigdir=$(configdir)/logsmanagement.d
+
+ # Explicitly install directories to avoid permission issues due to umask
+-install-exec-local:
++no-install-exec-local:
+ $(INSTALL) -d $(DESTDIR)$(userlogsmanagconfigdir)
+
+ dist_libconfig_DATA = \
+diff --git c/system/Makefile.am i/system/Makefile.am
+index 1e96f6f4f..98122ecdc 100644
+--- c/system/Makefile.am
++++ i/system/Makefile.am
+@@ -22,12 +22,9 @@ include $(top_srcdir)/build/subst.inc
SUFFIXES = .in
dist_config_SCRIPTS = \
@@ -91,7 +104,7 @@ index 54e9278c8..e7cc7acea 100644
$(NULL)
libconfigvnodesdir=$(libconfigdir)/vnodes
-@@ -46,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit
+@@ -47,7 +44,7 @@ libsysrunitdir=$(libsysdir)/runit
libsyssystemddir=$(libsysdir)/systemd
# Explicitly install directories to avoid permission issues due to umask
@@ -100,10 +113,10 @@ index 54e9278c8..e7cc7acea 100644
$(INSTALL) -d $(DESTDIR)$(configdir)
$(INSTALL) -d $(DESTDIR)$(libsysdir)
$(INSTALL) -d $(DESTDIR)$(libsyscrondir)
-diff --git a/web/Makefile.am b/web/Makefile.am
+diff --git c/web/Makefile.am i/web/Makefile.am
index be2c545c3..55f373114 100644
---- a/web/Makefile.am
-+++ b/web/Makefile.am
+--- c/web/Makefile.am
++++ i/web/Makefile.am
@@ -13,7 +13,7 @@ SUBDIRS = \
usersslconfigdir=$(configdir)/ssl