netdata: 1.29.3 -> 1.30.1

Izorkin b9809f76 9aad9155

+26 -36
+2 -2
pkgs/tools/system/netdata/default.nix
··· 15 let 16 go-d-plugin = callPackage ./go.d.plugin.nix {}; 17 in stdenv.mkDerivation rec { 18 - version = "1.29.3"; 19 pname = "netdata"; 20 21 src = fetchFromGitHub { 22 owner = "netdata"; 23 repo = "netdata"; 24 rev = "v${version}"; 25 - sha256 = "sha256-GWIQZEC5agJ+Zw7l58IIAJhXP6dxirCmWVBJulzBO5Q="; 26 }; 27 28 nativeBuildInputs = [ autoreconfHook pkg-config ];
··· 15 let 16 go-d-plugin = callPackage ./go.d.plugin.nix {}; 17 in stdenv.mkDerivation rec { 18 + version = "1.30.1"; 19 pname = "netdata"; 20 21 src = fetchFromGitHub { 22 owner = "netdata"; 23 repo = "netdata"; 24 rev = "v${version}"; 25 + sha256 = "0cp6gbn38f1cr0jkr64vvwz005cvnwj3hgfxs147wap9w228k46r"; 26 }; 27 28 nativeBuildInputs = [ autoreconfHook pkg-config ];
+24 -34
pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
··· 1 - From 4ecc1475be94a384c122594b5f7d455beb64a2f0 Mon Sep 17 00:00:00 2001 2 - From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> 3 - Date: Sat, 22 Feb 2020 06:42:14 +0000 4 - Subject: [PATCH] no files in etc and var 5 - MIME-Version: 1.0 6 - Content-Type: text/plain; charset=UTF-8 7 - Content-Transfer-Encoding: 8bit 8 - 9 - Signed-off-by: Jörg Thalheim <joerg@thalheim.io> 10 - --- 11 - collectors/Makefile.am | 2 +- 12 - collectors/charts.d.plugin/Makefile.am | 2 +- 13 - collectors/node.d.plugin/Makefile.am | 2 +- 14 - collectors/python.d.plugin/Makefile.am | 2 +- 15 - collectors/statsd.plugin/Makefile.am | 2 +- 16 - health/Makefile.am | 2 +- 17 - system/Makefile.am | 3 +-- 18 - web/Makefile.am | 2 +- 19 - 8 files changed, 8 insertions(+), 9 deletions(-) 20 - 21 diff --git a/collectors/Makefile.am b/collectors/Makefile.am 22 - index 9bb52958..c9799165 100644 23 --- a/collectors/Makefile.am 24 +++ b/collectors/Makefile.am 25 - @@ -32,7 +32,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d 26 usergoconfigdir=$(configdir)/go.d 27 28 # Explicitly install directories to avoid permission issues due to umask ··· 32 $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) 33 34 diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am 35 - index 03c7f0a9..01985db0 100644 36 --- a/collectors/charts.d.plugin/Makefile.am 37 +++ b/collectors/charts.d.plugin/Makefile.am 38 @@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \ ··· 44 $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) 45 46 chartsconfigdir=$(libconfigdir)/charts.d 47 diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am 48 - index c3142d43..95e32445 100644 49 --- a/collectors/node.d.plugin/Makefile.am 50 +++ b/collectors/node.d.plugin/Makefile.am 51 @@ -26,7 +26,7 @@ dist_usernodeconfig_DATA = \ ··· 58 59 nodeconfigdir=$(libconfigdir)/node.d 60 diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am 61 - index e678f86a..29a319da 100644 62 --- a/collectors/python.d.plugin/Makefile.am 63 +++ b/collectors/python.d.plugin/Makefile.am 64 @@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \ ··· 71 72 pythonconfigdir=$(libconfigdir)/python.d 73 diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am 74 - index b01302d1..f5b77da4 100644 75 --- a/collectors/statsd.plugin/Makefile.am 76 +++ b/collectors/statsd.plugin/Makefile.am 77 - @@ -17,5 +17,5 @@ dist_userstatsdconfig_DATA = \ 78 $(NULL) 79 80 # Explicitly install directories to avoid permission issues due to umask ··· 82 +no-install-exec-local: 83 $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) 84 diff --git a/health/Makefile.am b/health/Makefile.am 85 - index 853ed0d7..210330a6 100644 86 --- a/health/Makefile.am 87 +++ b/health/Makefile.am 88 @@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ ··· 95 96 healthconfigdir=$(libconfigdir)/health.d 97 diff --git a/system/Makefile.am b/system/Makefile.am 98 - index ad68c655..74f032f9 100644 99 --- a/system/Makefile.am 100 +++ b/system/Makefile.am 101 - @@ -17,11 +17,10 @@ include $(top_srcdir)/build/subst.inc 102 SUFFIXES = .in 103 104 dist_config_SCRIPTS = \ ··· 112 113 nodist_noinst_DATA = \ 114 diff --git a/web/Makefile.am b/web/Makefile.am 115 - index ccaccd76..16a2977e 100644 116 --- a/web/Makefile.am 117 +++ b/web/Makefile.am 118 @@ -12,7 +12,7 @@ SUBDIRS = \ ··· 124 $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) 125 126 dist_noinst_DATA = \ 127 - -- 128 - 2.25.0 129 -
··· 1 diff --git a/collectors/Makefile.am b/collectors/Makefile.am 2 + index 021e2ff23..115b88277 100644 3 --- a/collectors/Makefile.am 4 +++ b/collectors/Makefile.am 5 + @@ -33,7 +33,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d 6 usergoconfigdir=$(configdir)/go.d 7 8 # Explicitly install directories to avoid permission issues due to umask ··· 12 $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) 13 14 diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am 15 + index 03c7f0a94..01985db01 100644 16 --- a/collectors/charts.d.plugin/Makefile.am 17 +++ b/collectors/charts.d.plugin/Makefile.am 18 @@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \ ··· 24 $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) 25 26 chartsconfigdir=$(libconfigdir)/charts.d 27 + diff --git a/collectors/ebpf.plugin/Makefile.am b/collectors/ebpf.plugin/Makefile.am 28 + index 18b1fc6c8..b4b0c7852 100644 29 + --- a/collectors/ebpf.plugin/Makefile.am 30 + +++ b/collectors/ebpf.plugin/Makefile.am 31 + @@ -13,7 +13,7 @@ SUFFIXES = .in 32 + userebpfconfigdir=$(configdir)/ebpf.d 33 + 34 + # Explicitly install directories to avoid permission issues due to umask 35 + -install-exec-local: 36 + +no-install-exec-local: 37 + $(INSTALL) -d $(DESTDIR)$(userebpfconfigdir) 38 + 39 + dist_plugins_SCRIPTS = \ 40 diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am 41 + index c3142d433..95e324455 100644 42 --- a/collectors/node.d.plugin/Makefile.am 43 +++ b/collectors/node.d.plugin/Makefile.am 44 @@ -26,7 +26,7 @@ dist_usernodeconfig_DATA = \ ··· 51 52 nodeconfigdir=$(libconfigdir)/node.d 53 diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am 54 + index 38eb90f79..ce7079441 100644 55 --- a/collectors/python.d.plugin/Makefile.am 56 +++ b/collectors/python.d.plugin/Makefile.am 57 @@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \ ··· 64 65 pythonconfigdir=$(libconfigdir)/python.d 66 diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am 67 + index 71f2d468d..2c9ced2bf 100644 68 --- a/collectors/statsd.plugin/Makefile.am 69 +++ b/collectors/statsd.plugin/Makefile.am 70 + @@ -18,5 +18,5 @@ dist_userstatsdconfig_DATA = \ 71 $(NULL) 72 73 # Explicitly install directories to avoid permission issues due to umask ··· 75 +no-install-exec-local: 76 $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) 77 diff --git a/health/Makefile.am b/health/Makefile.am 78 + index b963ea0cd..6979e69bf 100644 79 --- a/health/Makefile.am 80 +++ b/health/Makefile.am 81 @@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ ··· 88 89 healthconfigdir=$(libconfigdir)/health.d 90 diff --git a/system/Makefile.am b/system/Makefile.am 91 + index 5323738c9..06e1b6a73 100644 92 --- a/system/Makefile.am 93 +++ b/system/Makefile.am 94 + @@ -20,11 +20,10 @@ include $(top_srcdir)/build/subst.inc 95 SUFFIXES = .in 96 97 dist_config_SCRIPTS = \ ··· 105 106 nodist_noinst_DATA = \ 107 diff --git a/web/Makefile.am b/web/Makefile.am 108 + index ccaccd764..16a2977e5 100644 109 --- a/web/Makefile.am 110 +++ b/web/Makefile.am 111 @@ -12,7 +12,7 @@ SUBDIRS = \ ··· 117 $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) 118 119 dist_noinst_DATA = \