summaryrefslogtreecommitdiffstats
path: root/packaging/dag
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-11-25 14:45:37 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-11-25 14:48:03 +0000
commite55403ed71282d7bfd8b56df219de3c28a8af064 (patch)
tree524889e5becb81643bf8741e3082955dca076f09 /packaging/dag
parentReleasing debian version 1.47.5-1. (diff)
downloadnetdata-e55403ed71282d7bfd8b56df219de3c28a8af064.tar.xz
netdata-e55403ed71282d7bfd8b56df219de3c28a8af064.zip
Merging upstream version 2.0.3+dfsg:
- does not include dygraphs anymore (Closes: #923993) - does not include pako anymore (Closes: #1042533) - does not include dashboard binaries anymore (Closes: #1045145) Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'packaging/dag')
-rw-r--r--packaging/dag/files/child_stream.conf4
-rw-r--r--packaging/dag/files/parent_stream.conf4
-rw-r--r--packaging/dag/imageutils.py1
3 files changed, 4 insertions, 5 deletions
diff --git a/packaging/dag/files/child_stream.conf b/packaging/dag/files/child_stream.conf
index ed78bd3fb..4e37d0a91 100644
--- a/packaging/dag/files/child_stream.conf
+++ b/packaging/dag/files/child_stream.conf
@@ -2,9 +2,9 @@
enabled = {{ enabled }}
destination = {{ destination }}
api key = {{ api_key }}
- timeout seconds = {{ timeout_seconds }}
+ timeout = {{ timeout_seconds }}
default port = {{ default_port }}
send charts matching = {{ send_charts_matching }}
buffer size bytes = {{ buffer_size_bytes }}
- reconnect delay seconds = {{ reconnect_delay_seconds }}
+ reconnect delay = {{ reconnect_delay_seconds }}
initial clock resync iterations = {{ initial_clock_resync_iterations }}
diff --git a/packaging/dag/files/parent_stream.conf b/packaging/dag/files/parent_stream.conf
index 15f303f97..4c190a758 100644
--- a/packaging/dag/files/parent_stream.conf
+++ b/packaging/dag/files/parent_stream.conf
@@ -1,7 +1,7 @@
[{{ api_key }}]
enabled = {{ enabled }}
allow from = {{ allow_from }}
- default history = {{ default_history }}
+ retention = {{ default_history }}
health enabled by default = {{ health_enabled_by_default }}
- default postpone alarms on connect seconds = {{ default_postpone_alarms_on_connect_seconds }}
+ postpone alerts on connect = {{ default_postpone_alarms_on_connect_seconds }}
multiple connections = {{ multiple_connections }}
diff --git a/packaging/dag/imageutils.py b/packaging/dag/imageutils.py
index fd1e8ad26..42aba077c 100644
--- a/packaging/dag/imageutils.py
+++ b/packaging/dag/imageutils.py
@@ -345,7 +345,6 @@ def static_build_netdata(
"--dont-wait",
"--dont-start-it",
"--disable-exporting-mongodb",
- "--require-cloud",
"--use-system-protobuf",
"--dont-scrub-cflags-even-though-it-may-break-things",
"--one-time-build",