summaryrefslogtreecommitdiffstats
path: root/build_external
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-08-10 09:18:52 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-08-10 09:19:08 +0000
commita2d7dede737947d7c6afa20a88e1f0c64e0eb96c (patch)
treefed4aff7dbe0be00cf91de6261d98bc0eb9a2449 /build_external
parentReleasing debian version 1.41.0-1. (diff)
downloadnetdata-a2d7dede737947d7c6afa20a88e1f0c64e0eb96c.tar.xz
netdata-a2d7dede737947d7c6afa20a88e1f0c64e0eb96c.zip
Merging upstream version 1.42.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'build_external')
-rw-r--r--build_external/scenarios/aclk-testing/agent_netdata.conf45
-rw-r--r--build_external/scenarios/gaps_lo/mostly_off.conf7
2 files changed, 50 insertions, 2 deletions
diff --git a/build_external/scenarios/aclk-testing/agent_netdata.conf b/build_external/scenarios/aclk-testing/agent_netdata.conf
index b76f5fadb..6817a9453 100644
--- a/build_external/scenarios/aclk-testing/agent_netdata.conf
+++ b/build_external/scenarios/aclk-testing/agent_netdata.conf
@@ -7108,3 +7108,48 @@
# dim netdata algorithm = absolute
# dim netdata multiplier = 1
# dim netdata divisor = 1
+
+[system.power_consumption]
+ history = 5
+ # enabled = yes
+ # cache directory = /var/cache/netdata/system.power_consumption
+ # chart type = stacked
+ # type = system
+ # family = power_consumption
+ # units = Watts
+ # context = system.power_consumption
+ # priority = 950
+ # name = system.power_consumption
+ # title = Power Consumption
+ # dim HI name = HI
+ # dim HI algorithm = incremental
+ # dim HI multiplier = 1
+ # dim HI divisor = 1
+ # dim TIMER name = TIMER
+ # dim TIMER algorithm = incremental
+ # dim TIMER multiplier = 1
+ # dim TIMER divisor = 1
+ # dim NET_TX name = NET_TX
+ # dim NET_TX algorithm = incremental
+ # dim NET_TX multiplier = 1
+ # dim NET_TX divisor = 1
+ # dim NET_RX name = NET_RX
+ # dim NET_RX algorithm = incremental
+ # dim NET_RX multiplier = 1
+ # dim NET_RX divisor = 1
+ # dim TASKLET name = TASKLET
+ # dim TASKLET algorithm = incremental
+ # dim TASKLET multiplier = 1
+ # dim TASKLET divisor = 1
+ # dim SCHED name = SCHED
+ # dim SCHED algorithm = incremental
+ # dim SCHED multiplier = 1
+ # dim SCHED divisor = 1
+ # dim HRTIMER name = HRTIMER
+ # dim HRTIMER algorithm = incremental
+ # dim HRTIMER multiplier = 1
+ # dim HRTIMER divisor = 1
+ # dim RCU name = RCU
+ # dim RCU algorithm = incremental
+ # dim RCU multiplier = 1
+ # dim RCU divisor = 1
diff --git a/build_external/scenarios/gaps_lo/mostly_off.conf b/build_external/scenarios/gaps_lo/mostly_off.conf
index e66f928dd..dcfed367d 100644
--- a/build_external/scenarios/gaps_lo/mostly_off.conf
+++ b/build_external/scenarios/gaps_lo/mostly_off.conf
@@ -545,7 +545,7 @@ enabled = no
[cpu.cpu7_softirqs]
enabled = no
-[system.swapio]
+[mem.swapio]
enabled = no
[system.pgpgio]
@@ -560,7 +560,7 @@ enabled = no
[mem.available]
enabled = no
-[system.swap]
+[mem.swap]
enabled = no
[mem.committed]
@@ -961,3 +961,6 @@ enabled = no
[netfilter.netlink_expect]
enabled = no
+
+[system.power_consumption]
+enabled = no