From 483926a283e118590da3f9ecfa75a8a4d62143ce Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 1 Dec 2021 07:15:11 +0100 Subject: Merging upstream version 1.32.0. Signed-off-by: Daniel Baumann --- .../scenarios/aclk-testing/agent-compose.yml | 7 ++- .../aclk-testing/agent-valgrind-compose.yml | 7 ++- .../scenarios/aclk-testing/agent_netdata.conf | 56 +++++++++++----------- .../scenarios/aclk-testing/paho-compose.yml | 2 +- .../scenarios/aclk-testing/vernemq-compose.yml | 1 - build_external/scenarios/gaps_hi/child-compose.yml | 3 +- .../scenarios/gaps_hi/middle-compose.yml | 2 +- build_external/scenarios/gaps_lo/child-compose.yml | 1 - .../scenarios/only-agent/docker-compose.yml | 4 +- 9 files changed, 39 insertions(+), 44 deletions(-) (limited to 'build_external') diff --git a/build_external/scenarios/aclk-testing/agent-compose.yml b/build_external/scenarios/aclk-testing/agent-compose.yml index c05c97cdf..5f0f19af5 100644 --- a/build_external/scenarios/aclk-testing/agent-compose.yml +++ b/build_external/scenarios/aclk-testing/agent-compose.yml @@ -5,8 +5,8 @@ services: context: ../../.. dockerfile: build_external/make-install.Dockerfile args: - - DISTRO=arch - - VERSION=current + - DISTRO=arch + - VERSION=current image: arch_current_dev:latest command: > sh -c "echo -n 00000000-0000-0000-0000-000000000000 >/var/lib/netdata/cloud.d/claimed_id && @@ -15,5 +15,4 @@ services: echo ' agent cloud link port = 9002' >>/etc/netdata/netdata.conf && /usr/sbin/netdata -D" ports: - - 20000:19999 - + - 20000:19999 diff --git a/build_external/scenarios/aclk-testing/agent-valgrind-compose.yml b/build_external/scenarios/aclk-testing/agent-valgrind-compose.yml index d404ed41b..3173e81e4 100644 --- a/build_external/scenarios/aclk-testing/agent-valgrind-compose.yml +++ b/build_external/scenarios/aclk-testing/agent-valgrind-compose.yml @@ -5,8 +5,8 @@ services: context: ../../.. dockerfile: build_external/make-install.Dockerfile args: - - DISTRO=arch - - VERSION=extras + - DISTRO=arch + - VERSION=extras image: arch_extras_dev:latest command: > sh -c "echo -n 00000000-0000-0000-0000-000000000000 >/var/lib/netdata/cloud.d/claimed_id && @@ -15,5 +15,4 @@ services: echo ' agent cloud link port = 9002' >>/etc/netdata/netdata.conf && /usr/sbin/valgrind --leak-check=full /usr/sbin/netdata -D -W debug_flags=0x200000000" ports: - - 20000:19999 - + - 20000:19999 diff --git a/build_external/scenarios/aclk-testing/agent_netdata.conf b/build_external/scenarios/aclk-testing/agent_netdata.conf index d13e51453..774005f76 100644 --- a/build_external/scenarios/aclk-testing/agent_netdata.conf +++ b/build_external/scenarios/aclk-testing/agent_netdata.conf @@ -1124,7 +1124,7 @@ # context = netdata.statsd_cpu # priority = 132001 # name = netdata.plugin_statsd_charting_cpu - # title = NetData statsd charting thread CPU usage + # title = Netdata statsd charting thread CPU usage # dim user name = user # dim user algorithm = incremental # dim user multiplier = 1 @@ -1145,7 +1145,7 @@ # context = netdata.statsd_cpu # priority = 132002 # name = netdata.plugin_statsd_collector1_cpu - # title = NetData statsd collector thread No 1 CPU usage + # title = Netdata statsd collector thread No 1 CPU usage # dim user name = user # dim user algorithm = incremental # dim user multiplier = 1 @@ -1955,7 +1955,7 @@ # context = netdata.plugin_cgroups_cpu # priority = 132000 # name = netdata.plugin_cgroups_cpu - # title = NetData CGroups Plugin CPU usage + # title = Netdata CGroups Plugin CPU usage # dim user name = user # dim user algorithm = incremental # dim user multiplier = 1 @@ -1976,7 +1976,7 @@ # context = netdata.plugin_diskspace # priority = 132020 # name = netdata.plugin_diskspace - # title = NetData Disk Space Plugin CPU usage + # title = Netdata Disk Space Plugin CPU usage # dim user name = user # dim user algorithm = incremental # dim user multiplier = 1 @@ -1997,7 +1997,7 @@ # context = netdata.plugin_diskspace_dt # priority = 132021 # name = netdata.plugin_diskspace_dt - # title = NetData Disk Space Plugin Duration + # title = Netdata Disk Space Plugin Duration # dim duration name = duration # dim duration algorithm = absolute # dim duration multiplier = 1 @@ -4844,7 +4844,7 @@ # context = netdata.plugin_proc_modules # priority = 132001 # name = netdata.plugin_proc_modules - # title = NetData Proc Plugin Modules Durations + # title = Netdata Proc Plugin Modules Durations # dim stat name = stat # dim stat algorithm = absolute # dim stat multiplier = 1 @@ -4949,7 +4949,7 @@ # context = netdata.plugin_proc_cpu # priority = 132000 # name = netdata.plugin_proc_cpu - # title = NetData Proc Plugin CPU usage + # title = Netdata Proc Plugin CPU usage # dim user name = user # dim user algorithm = incremental # dim user multiplier = 1 @@ -4970,7 +4970,7 @@ # context = netdata.server_cpu # priority = 130000 # name = netdata.server_cpu - # title = NetData CPU usage + # title = Netdata CPU usage # dim user name = user # dim user algorithm = incremental # dim user multiplier = 1 @@ -4991,7 +4991,7 @@ # context = netdata.clients # priority = 130200 # name = netdata.clients - # title = NetData Web Clients + # title = Netdata Web Clients # dim clients name = clients # dim clients algorithm = absolute # dim clients multiplier = 1 @@ -5008,7 +5008,7 @@ # context = netdata.requests # priority = 130300 # name = netdata.requests - # title = NetData Web Requests + # title = Netdata Web Requests # dim requests name = requests # dim requests algorithm = incremental # dim requests multiplier = 1 @@ -5025,7 +5025,7 @@ # context = netdata.net # priority = 130000 # name = netdata.net - # title = NetData Network Traffic + # title = Netdata Network Traffic # dim in name = in # dim in algorithm = incremental # dim in multiplier = 8 @@ -5046,7 +5046,7 @@ # context = netdata.response_time # priority = 130400 # name = netdata.response_time - # title = NetData API Response Time + # title = Netdata API Response Time # dim average name = average # dim average algorithm = absolute # dim average multiplier = 1 @@ -5067,7 +5067,7 @@ # context = netdata.compression_ratio # priority = 130500 # name = netdata.compression_ratio - # title = NetData API Responses Compression Savings Ratio + # title = Netdata API Responses Compression Savings Ratio # dim savings name = savings # dim savings algorithm = absolute # dim savings multiplier = 1 @@ -5084,7 +5084,7 @@ # context = netdata.dbengine_compression_ratio # priority = 130502 # name = netdata.dbengine_compression_ratio - # title = NetData DB engine data extents' compression savings ratio + # title = Netdata DB engine data extents' compression savings ratio # dim savings name = savings # dim savings algorithm = absolute # dim savings multiplier = 1 @@ -5101,7 +5101,7 @@ # context = netdata.page_cache_hit_ratio # priority = 130503 # name = netdata.page_cache_hit_ratio - # title = NetData DB engine page cache hit ratio + # title = Netdata DB engine page cache hit ratio # dim ratio name = ratio # dim ratio algorithm = absolute # dim ratio multiplier = 1 @@ -5118,7 +5118,7 @@ # context = netdata.page_cache_stats # priority = 130504 # name = netdata.page_cache_stats - # title = NetData dbengine page cache statistics + # title = Netdata dbengine page cache statistics # dim descriptors name = descriptors # dim descriptors algorithm = absolute # dim descriptors multiplier = 1 @@ -5155,7 +5155,7 @@ # context = netdata.dbengine_long_term_page_stats # priority = 130505 # name = netdata.dbengine_long_term_page_stats - # title = NetData dbengine long-term page statistics + # title = Netdata dbengine long-term page statistics # dim total name = total # dim total algorithm = absolute # dim total multiplier = 1 @@ -5184,7 +5184,7 @@ # context = netdata.dbengine_io_throughput # priority = 130506 # name = netdata.dbengine_io_throughput - # title = NetData DB engine I/O throughput + # title = Netdata DB engine I/O throughput # dim reads name = reads # dim reads algorithm = incremental # dim reads multiplier = 1 @@ -5205,7 +5205,7 @@ # context = netdata.dbengine_io_operations # priority = 130507 # name = netdata.dbengine_io_operations - # title = NetData DB engine I/O operations + # title = Netdata DB engine I/O operations # dim reads name = reads # dim reads algorithm = incremental # dim reads multiplier = 1 @@ -5226,7 +5226,7 @@ # context = netdata.dbengine_global_errors # priority = 130508 # name = netdata.dbengine_global_errors - # title = NetData DB engine errors + # title = Netdata DB engine errors # dim io_errors name = io_errors # dim io_errors algorithm = incremental # dim io_errors multiplier = 1 @@ -5251,7 +5251,7 @@ # context = netdata.dbengine_global_file_descriptors # priority = 130509 # name = netdata.dbengine_global_file_descriptors - # title = NetData DB engine File Descriptors + # title = Netdata DB engine File Descriptors # dim current name = current # dim current algorithm = absolute # dim current multiplier = 1 @@ -5272,7 +5272,7 @@ # context = netdata.dbengine_ram # priority = 130510 # name = netdata.dbengine_ram - # title = NetData DB engine RAM usage + # title = Netdata DB engine RAM usage # dim cache name = cache # dim cache algorithm = absolute # dim cache multiplier = 1 @@ -5297,7 +5297,7 @@ # context = netdata.web_cpu # priority = 132003 # name = netdata.web_thread4_cpu - # title = NetData web server thread No 4 CPU usage + # title = Netdata web server thread No 4 CPU usage # dim user name = user # dim user algorithm = incremental # dim user multiplier = 1 @@ -5318,7 +5318,7 @@ # context = netdata.web_cpu # priority = 132000 # name = netdata.web_thread1_cpu - # title = NetData web server thread No 1 CPU usage + # title = Netdata web server thread No 1 CPU usage # dim user name = user # dim user algorithm = incremental # dim user multiplier = 1 @@ -5339,7 +5339,7 @@ # context = netdata.web_cpu # priority = 132005 # name = netdata.web_thread6_cpu - # title = NetData web server thread No 6 CPU usage + # title = Netdata web server thread No 6 CPU usage # dim user name = user # dim user algorithm = incremental # dim user multiplier = 1 @@ -5360,7 +5360,7 @@ # context = netdata.web_cpu # priority = 132002 # name = netdata.web_thread3_cpu - # title = NetData web server thread No 3 CPU usage + # title = Netdata web server thread No 3 CPU usage # dim user name = user # dim user algorithm = incremental # dim user multiplier = 1 @@ -5381,7 +5381,7 @@ # context = netdata.web_cpu # priority = 132001 # name = netdata.web_thread2_cpu - # title = NetData web server thread No 2 CPU usage + # title = Netdata web server thread No 2 CPU usage # dim user name = user # dim user algorithm = incremental # dim user multiplier = 1 @@ -5520,7 +5520,7 @@ # context = netdata.web_cpu # priority = 132004 # name = netdata.web_thread5_cpu - # title = NetData web server thread No 5 CPU usage + # title = Netdata web server thread No 5 CPU usage # dim user name = user # dim user algorithm = incremental # dim user multiplier = 1 diff --git a/build_external/scenarios/aclk-testing/paho-compose.yml b/build_external/scenarios/aclk-testing/paho-compose.yml index 4fc6ce2c4..8c39e20fc 100644 --- a/build_external/scenarios/aclk-testing/paho-compose.yml +++ b/build_external/scenarios/aclk-testing/paho-compose.yml @@ -3,4 +3,4 @@ services: paho_inspect: build: context: . - dockerfile: paho.Dockerfile \ No newline at end of file + dockerfile: paho.Dockerfile diff --git a/build_external/scenarios/aclk-testing/vernemq-compose.yml b/build_external/scenarios/aclk-testing/vernemq-compose.yml index a9f07a546..3ec805a74 100644 --- a/build_external/scenarios/aclk-testing/vernemq-compose.yml +++ b/build_external/scenarios/aclk-testing/vernemq-compose.yml @@ -4,4 +4,3 @@ services: build: dockerfile: configureVerneMQ.Dockerfile context: . - diff --git a/build_external/scenarios/gaps_hi/child-compose.yml b/build_external/scenarios/gaps_hi/child-compose.yml index e50736093..2ca306f37 100644 --- a/build_external/scenarios/gaps_hi/child-compose.yml +++ b/build_external/scenarios/gaps_hi/child-compose.yml @@ -10,5 +10,4 @@ services: #- ./child_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro - ./min.conf:/etc/netdata/netdata.conf:ro cap_add: - - SYS_PTRACE - + - SYS_PTRACE diff --git a/build_external/scenarios/gaps_hi/middle-compose.yml b/build_external/scenarios/gaps_hi/middle-compose.yml index cb4a04555..c316164dd 100644 --- a/build_external/scenarios/gaps_hi/middle-compose.yml +++ b/build_external/scenarios/gaps_hi/middle-compose.yml @@ -10,4 +10,4 @@ services: - ./middle_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro - ./min.conf:/etc/netdata/netdata.conf:ro cap_add: - - SYS_PTRACE + - SYS_PTRACE diff --git a/build_external/scenarios/gaps_lo/child-compose.yml b/build_external/scenarios/gaps_lo/child-compose.yml index dca900c2e..dee06f2ee 100644 --- a/build_external/scenarios/gaps_lo/child-compose.yml +++ b/build_external/scenarios/gaps_lo/child-compose.yml @@ -12,4 +12,3 @@ services: - ./mostly_off.conf:/etc/netdata/netdata.conf:ro cap_add: - SYS_PTRACE - diff --git a/build_external/scenarios/only-agent/docker-compose.yml b/build_external/scenarios/only-agent/docker-compose.yml index 74bdef8e3..eb1386fd5 100644 --- a/build_external/scenarios/only-agent/docker-compose.yml +++ b/build_external/scenarios/only-agent/docker-compose.yml @@ -4,5 +4,5 @@ services: image: ${Distro}_${Version}_dev command: /usr/sbin/netdata -D ports: - - 80 - - 443 + - 80 + - 443 -- cgit v1.2.3