report per second incremental values when update frequency is higher than a second
Costa Tsaousis (ktsaou) committed
Jun 1, 2014 at 12:52 UTC
bdf5738fcf96e6ba89ca022594d66d73eefbf91c
6 files changed
+138
-137
apps_plugin.c
+12
-12
@@ -1482,7 +1482,7 @@ void show_charts(void)
1482
for (w = target_root; w ; w = w->next) {
1483
if(w->target || (!w->processes && !w->exposed)) continue;
1484
1485
- fprintf(stdout, "DIMENSION %s '' incremental 100 %llu %s\n", w->name, Hertz, w->hidden?"hidden":"");
1485
+ fprintf(stdout, "DIMENSION %s '' incremental 100 %llu %s\n", w->name, (unsigned long long)(Hertz * update_every), w->hidden?"hidden":"");
1486
}
1487
1488
fprintf(stdout, "CHART apps.mem '' 'Apps Dedicated Memory (w/o shared)' 'MB' apps apps stacked 20003 %d\n", update_every);
@@ -1510,56 +1510,56 @@ void show_charts(void)
1510
for (w = target_root; w ; w = w->next) {
1511
if(w->target || (!w->processes && !w->exposed)) continue;
1512
1513
- fprintf(stdout, "DIMENSION %s '' incremental 100 %llu\n", w->name, Hertz * processors);
1513
+ fprintf(stdout, "DIMENSION %s '' incremental 100 %llu\n", w->name, Hertz * processors * update_every);
1514
}
1515
1516
fprintf(stdout, "CHART apps.cpu_system '' 'Apps CPU System Time (%ld%% = %ld core%s)' 'cpu time %%' apps none stacked 20021 %d\n", (processors * 100), processors, (processors>1)?"s":"", update_every);
1517
for (w = target_root; w ; w = w->next) {
1518
if(w->target || (!w->processes && !w->exposed)) continue;
1519
1520
- fprintf(stdout, "DIMENSION %s '' incremental 100 %llu\n", w->name, Hertz * processors);
1520
+ fprintf(stdout, "DIMENSION %s '' incremental 100 %llu\n", w->name, Hertz * processors * update_every);
1521
}
1522
1523
fprintf(stdout, "CHART apps.major_faults '' 'Apps Major Page Faults (swaps in)' 'page faults/s' apps apps stacked 20010 %d\n", update_every);
1524
for (w = target_root; w ; w = w->next) {
1525
if(w->target || (!w->processes && !w->exposed)) continue;
1526
1527
- fprintf(stdout, "DIMENSION %s '' incremental 1 1\n", w->name);
1527
+ fprintf(stdout, "DIMENSION %s '' incremental 1 %d\n", w->name, update_every);
1528
}
1529
1530
fprintf(stdout, "CHART apps.minor_faults '' 'Apps Minor Page Faults' 'page faults/s' apps none stacked 20011 %d\n", update_every);
1531
for (w = target_root; w ; w = w->next) {
1532
if(w->target || (!w->processes && !w->exposed)) continue;
1533
1534
- fprintf(stdout, "DIMENSION %s '' incremental 1 1\n", w->name);
1534
+ fprintf(stdout, "DIMENSION %s '' incremental 1 %d\n", w->name, update_every);
1535
}
1536
1537
fprintf(stdout, "CHART apps.lreads '' 'Apps Disk Logical Reads' 'kilobytes/s' apps none stacked 20042 %d\n", update_every);
1538
for (w = target_root; w ; w = w->next) {
1539
if(w->target || (!w->processes && !w->exposed)) continue;
1540
1541
- fprintf(stdout, "DIMENSION %s '' incremental 1 1024\n", w->name);
1541
+ fprintf(stdout, "DIMENSION %s '' incremental 1 %d\n", w->name, 1024 * update_every);
1542
}
1543
1544
fprintf(stdout, "CHART apps.lwrites '' 'Apps I/O Logical Writes' 'kilobytes/s' apps none stacked 20042 %d\n", update_every);
1545
for (w = target_root; w ; w = w->next) {
1546
if(w->target || (!w->processes && !w->exposed)) continue;
1547
1548
- fprintf(stdout, "DIMENSION %s '' incremental 1 1024\n", w->name);
1548
+ fprintf(stdout, "DIMENSION %s '' incremental 1 %d\n", w->name, 1024 * update_every);
1549
}
1550
1551
fprintf(stdout, "CHART apps.preads '' 'Apps Disk Reads' 'kilobytes/s' apps apps stacked 20002 %d\n", update_every);
1552
for (w = target_root; w ; w = w->next) {
1553
if(w->target || (!w->processes && !w->exposed)) continue;
1554
1555
- fprintf(stdout, "DIMENSION %s '' incremental 1 1024\n", w->name);
1555
+ fprintf(stdout, "DIMENSION %s '' incremental 1 %d\n", w->name, 1024 * update_every);
1556
}
1557
1558
fprintf(stdout, "CHART apps.pwrites '' 'Apps Disk Writes' 'kilobytes/s' apps apps stacked 20002 %d\n", update_every);
1559
for (w = target_root; w ; w = w->next) {
1560
if(w->target || (!w->processes && !w->exposed)) continue;
1561
1562
- fprintf(stdout, "DIMENSION %s '' incremental 1 1024\n", w->name);
1562
+ fprintf(stdout, "DIMENSION %s '' incremental 1 %d\n", w->name, 1024 * update_every);
1563
}
1564
1565
fprintf(stdout, "CHART apps.files '' 'Apps Open Files' 'open files' apps apps stacked 20050 %d\n", update_every);
@@ -1584,11 +1584,11 @@ void show_charts(void)
1584
}
1585
1586
fprintf(stdout, "CHART netdata.apps_cpu '' 'Apps Plugin CPU' 'milliseconds/s' netdata netdata stacked 10000 %d\n", update_every);
1587
- fprintf(stdout, "DIMENSION user '' incremental 1 1000\n");
1588
- fprintf(stdout, "DIMENSION system '' incremental 1 1000\n");
1587
+ fprintf(stdout, "DIMENSION user '' incremental 1 %d\n", 1000 * update_every);
1588
+ fprintf(stdout, "DIMENSION system '' incremental 1 %d\n", 1000 * update_every);
1589
1590
fprintf(stdout, "CHART netdata.apps_files '' 'Apps Plugin Files' 'files/s' netdata netdata line 10001 %d\n", update_every);
1591
- fprintf(stdout, "DIMENSION files '' incremental 1 1\n");
1591
+ fprintf(stdout, "DIMENSION files '' incremental 1 %d\n", update_every);
1592
fprintf(stdout, "DIMENSION pids '' absolute 1 1\n");
1593
fprintf(stdout, "DIMENSION fds '' absolute 1 1\n");
1594
fprintf(stdout, "DIMENSION targets '' absolute 1 1\n");
charts.d/airsearches.chart.sh
+1
-1
@@ -40,7 +40,7 @@ airsearches_create() {
40
echo "CHART airsearches.affiliates '' 'Air Searches per affiliate' 'requests / $airsearches_update_every secs' airsearches '' stacked 20000 $airsearches_update_every"
41
for x in $airsearches_cmds
42
do
43
- echo "DIMENSION $x '' incremental 1 1"
43
+ echo "DIMENSION $x '' incremental 1 $((1 * airsearches_update_every))"
44
done
45
46
return 0
charts.d/cpu_apps.chart.sh
+1
-1
@@ -30,7 +30,7 @@ cpu_apps_create() {
30
local x=
31
for x in $cpu_apps_apps
32
do
33
- echo "DIMENSION $x $x incremental 1000 $cpu_apps_clockticks"
33
+ echo "DIMENSION $x $x incremental 1000 $((cpu_apps_clockticks * cpu_apps_update_every))"
34
35
# this string is needed later in the update() function
36
# to finalize the instructions for the bc command
charts.d/crsproxy.chart.sh
+11
-11
@@ -34,31 +34,31 @@ DIMENSION web '' absolute 1 1
34
DIMENSION native '' absolute 1 1
35
DIMENSION virtual '' absolute 1 1
36
CHART crsproxy.requests '' "CRS Proxy Requests Rate" "requests / $crsproxy_update_every sec" crsproxy '' area 20001 $crsproxy_update_every
37
-DIMENSION web '' incremental 1 1
38
-DIMENSION native '' incremental -1 1
37
+DIMENSION web '' incremental 1 $((1 * crsproxy_update_every))
38
+DIMENSION native '' incremental -1 $((1 * crsproxy_update_every))
39
CHART crsproxy.clients '' "CRS Proxy Clients Rate" "clients / $crsproxy_update_every sec" crsproxy '' area 20010 $crsproxy_update_every
40
-DIMENSION web '' incremental 1 1
41
-DIMENSION native '' incremental -1 1
42
-DIMENSION virtual '' incremental 1 1
40
+DIMENSION web '' incremental 1 $((1 * crsproxy_update_every))
41
+DIMENSION native '' incremental -1 $((1 * crsproxy_update_every))
42
+DIMENSION virtual '' incremental 1 $((1 * crsproxy_update_every))
43
CHART crsproxy.replies '' "CRS Replies Rate" "replies / $crsproxy_update_every sec" crsproxy '' area 20020 $crsproxy_update_every
44
-DIMENSION ok '' incremental 1 1
45
-DIMENSION failed '' incremental -1 1
44
+DIMENSION ok '' incremental 1 $((1 * crsproxy_update_every))
45
+DIMENSION failed '' incremental -1 $((1 * crsproxy_update_every))
46
CHART crsproxy.bconnections '' "Back-End Connections Rate" "connections / $crsproxy_update_every sec" crsproxy '' area 20030 $crsproxy_update_every
47
-DIMENSION ok '' incremental 1 1
48
-DIMENSION failed '' incremental -1 1
47
+DIMENSION ok '' incremental 1 $((1 * crsproxy_update_every))
48
+DIMENSION failed '' incremental -1 $((1 * crsproxy_update_every))
49
EOF
50
51
local x=
52
echo "CHART crsproxy.commands '' 'CRS Commands Requests' 'requests / $crsproxy_update_every sec' crsproxy '' stacked 20100 $crsproxy_update_every"
53
for x in $crsproxy_cmds
54
do
55
- echo "DIMENSION $x '' incremental 1 1"
55
+ echo "DIMENSION $x '' incremental 1 $((1 * crsproxy_update_every))"
56
done
57
58
echo "CHART crsproxy.commands_failed '' 'CRS Failed Commands' 'replies / $crsproxy_update_every sec' crsproxy '' stacked 20110 $crsproxy_update_every"
59
for x in $crsproxy_cmds
60
do
61
- echo "DIMENSION $x '' incremental 1 1"
61
+ echo "DIMENSION $x '' incremental 1 $((1 * crsproxy_update_every))"
62
done
63
64
return 0
charts.d/squid.chart.sh
+10
-10
@@ -19,22 +19,22 @@ squid_create() {
19
# create the charts
20
cat <<EOF
21
CHART squid.clients_net '' "Squid Client Bandwidth" "kilobits / $squid_update_every sec" squid '' area 20001 $squid_update_every
22
-DIMENSION client_http_kbytes_in in incremental 8 1
23
-DIMENSION client_http_kbytes_out out incremental -8 1
24
-DIMENSION client_http_hit_kbytes_out hits incremental -8 1
22
+DIMENSION client_http_kbytes_in in incremental 8 $((1 * squid_update_every))
23
+DIMENSION client_http_kbytes_out out incremental -8 $((1 * squid_update_every))
24
+DIMENSION client_http_hit_kbytes_out hits incremental -8 $((1 * squid_update_every))
25
26
CHART squid.clients_requests '' "Squid Client Requests" "requests / $squid_update_every sec" squid '' line 20003 $squid_update_every
27
-DIMENSION client_http_requests requests incremental 1 1
28
-DIMENSION client_http_hits hits incremental 1 1
29
-DIMENSION client_http_errors errors incremental -1 1
27
+DIMENSION client_http_requests requests incremental 1 $((1 * squid_update_every))
28
+DIMENSION client_http_hits hits incremental 1 $((1 * squid_update_every))
29
+DIMENSION client_http_errors errors incremental -1 $((1 * squid_update_every))
30
31
CHART squid.servers_net '' "Squid Server Bandwidth" "kilobits / $squid_update_every sec" squid '' area 20002 $squid_update_every
32
-DIMENSION server_all_kbytes_in in incremental 8 1
33
-DIMENSION server_all_kbytes_out out incremental -8 1
32
+DIMENSION server_all_kbytes_in in incremental 8 $((1 * squid_update_every))
33
+DIMENSION server_all_kbytes_out out incremental -8 $((1 * squid_update_every))
34
35
CHART squid.servers_requests '' "Squid Server Requests" "requests / $squid_update_every sec" squid '' line 20004 $squid_update_every
36
-DIMENSION server_all_requests requests incremental 1 1
37
-DIMENSION server_all_errors errors incremental -1 1
36
+DIMENSION server_all_requests requests incremental 1 $((1 * squid_update_every))
37
+DIMENSION server_all_errors errors incremental -1 $((1 * squid_update_every))
38
EOF
39
40
return 0
netdata.c
+103
-102
@@ -4124,8 +4124,8 @@ int do_proc_net_dev() {
4124
if(!st) {
4125
st = rrd_stats_create(RRD_TYPE_NET, iface, NULL, iface, "Bandwidth", "kilobits/s", 1000, update_every, CHART_TYPE_AREA);
4126
4127
- rrd_stats_dimension_add(st, "received", NULL, 8, 1024, RRD_DIMENSION_INCREMENTAL);
4128
- rrd_stats_dimension_add(st, "sent", NULL, -8, 1024, RRD_DIMENSION_INCREMENTAL);
4127
+ rrd_stats_dimension_add(st, "received", NULL, 8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
4128
+ rrd_stats_dimension_add(st, "sent", NULL, -8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
4129
}
4130
else rrd_stats_next(st);
4131
@@ -4142,8 +4142,8 @@ int do_proc_net_dev() {
4142
st = rrd_stats_create("net_packets", iface, NULL, iface, "Packets", "packets/s", 1001, update_every, CHART_TYPE_LINE);
4143
st->isdetail = 1;
4144
4145
- rrd_stats_dimension_add(st, "received", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4146
- rrd_stats_dimension_add(st, "sent", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4145
+ rrd_stats_dimension_add(st, "received", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4146
+ rrd_stats_dimension_add(st, "sent", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4147
}
4148
else rrd_stats_next(st);
4149
@@ -4160,8 +4160,8 @@ int do_proc_net_dev() {
4160
st = rrd_stats_create("net_errors", iface, NULL, iface, "Interface Errors", "errors/s", 1002, update_every, CHART_TYPE_LINE);
4161
st->isdetail = 1;
4162
4163
- rrd_stats_dimension_add(st, "receive", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4164
- rrd_stats_dimension_add(st, "transmit", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4163
+ rrd_stats_dimension_add(st, "receive", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4164
+ rrd_stats_dimension_add(st, "transmit", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4165
}
4166
else rrd_stats_next(st);
4167
@@ -4196,8 +4196,8 @@ int do_proc_net_dev() {
4196
st = rrd_stats_create("net_compressed", iface, NULL, iface, "Compressed Packets", "packets/s", 1200, update_every, CHART_TYPE_LINE);
4197
st->isdetail = 1;
4198
4199
- rrd_stats_dimension_add(st, "received", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4200
- rrd_stats_dimension_add(st, "sent", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4199
+ rrd_stats_dimension_add(st, "received", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4200
+ rrd_stats_dimension_add(st, "sent", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4201
}
4202
else rrd_stats_next(st);
4203
@@ -4420,8 +4420,8 @@ int do_proc_diskstats() {
4420
4421
st = rrd_stats_create(RRD_TYPE_DISK, disk, NULL, disk, "Disk I/O", "kilobytes/s", 2000, update_every, CHART_TYPE_AREA);
4422
4423
- rrd_stats_dimension_add(st, "reads", NULL, sector_size, 1024, RRD_DIMENSION_INCREMENTAL);
4424
- rrd_stats_dimension_add(st, "writes", NULL, sector_size * -1, 1024, RRD_DIMENSION_INCREMENTAL);
4423
+ rrd_stats_dimension_add(st, "reads", NULL, sector_size, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
4424
+ rrd_stats_dimension_add(st, "writes", NULL, sector_size * -1, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
4425
}
4426
else rrd_stats_next(st);
4427
@@ -4438,8 +4438,8 @@ int do_proc_diskstats() {
4438
st = rrd_stats_create("disk_ops", disk, NULL, disk, "Disk Operations", "operations/s", 2001, update_every, CHART_TYPE_LINE);
4439
st->isdetail = 1;
4440
4441
- rrd_stats_dimension_add(st, "reads", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4442
- rrd_stats_dimension_add(st, "writes", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4441
+ rrd_stats_dimension_add(st, "reads", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4442
+ rrd_stats_dimension_add(st, "writes", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4443
}
4444
else rrd_stats_next(st);
4445
@@ -4456,8 +4456,8 @@ int do_proc_diskstats() {
4456
st = rrd_stats_create("disk_merged_ops", disk, NULL, disk, "Merged Disk Operations", "operations/s", 2010, update_every, CHART_TYPE_LINE);
4457
st->isdetail = 1;
4458
4459
- rrd_stats_dimension_add(st, "reads", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4460
- rrd_stats_dimension_add(st, "writes", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4459
+ rrd_stats_dimension_add(st, "reads", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4460
+ rrd_stats_dimension_add(st, "writes", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4461
}
4462
else rrd_stats_next(st);
4463
@@ -4474,10 +4474,10 @@ int do_proc_diskstats() {
4474
st = rrd_stats_create("disk_iotime", disk, NULL, disk, "Disk I/O Time", "milliseconds/s", 2005, update_every, CHART_TYPE_LINE);
4475
st->isdetail = 1;
4476
4477
- rrd_stats_dimension_add(st, "reads", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4478
- rrd_stats_dimension_add(st, "writes", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4479
- rrd_stats_dimension_add(st, "latency", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4480
- rrd_stats_dimension_add(st, "weighted", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4477
+ rrd_stats_dimension_add(st, "reads", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4478
+ rrd_stats_dimension_add(st, "writes", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4479
+ rrd_stats_dimension_add(st, "latency", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4480
+ rrd_stats_dimension_add(st, "weighted", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4481
}
4482
else rrd_stats_next(st);
4483
@@ -4570,9 +4570,9 @@ int do_proc_net_snmp() {
4570
if(!st) {
4571
st = rrd_stats_create(RRD_TYPE_NET_SNMP, "packets", NULL, RRD_TYPE_NET_SNMP, "IPv4 Packets", "packets/s", 3000, update_every, CHART_TYPE_LINE);
4572
4573
- rrd_stats_dimension_add(st, "received", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4574
- rrd_stats_dimension_add(st, "sent", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4575
- rrd_stats_dimension_add(st, "forwarded", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4573
+ rrd_stats_dimension_add(st, "received", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4574
+ rrd_stats_dimension_add(st, "sent", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4575
+ rrd_stats_dimension_add(st, "forwarded", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4576
}
4577
else rrd_stats_next(st);
4578
@@ -4590,9 +4590,9 @@ int do_proc_net_snmp() {
4590
st = rrd_stats_create(RRD_TYPE_NET_SNMP, "fragsout", NULL, RRD_TYPE_NET_SNMP, "IPv4 Fragments Sent", "packets/s", 3010, update_every, CHART_TYPE_LINE);
4591
st->isdetail = 1;
4592
4593
- rrd_stats_dimension_add(st, "ok", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4594
- rrd_stats_dimension_add(st, "failed", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4595
- rrd_stats_dimension_add(st, "all", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4593
+ rrd_stats_dimension_add(st, "ok", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4594
+ rrd_stats_dimension_add(st, "failed", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4595
+ rrd_stats_dimension_add(st, "all", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4596
}
4597
else rrd_stats_next(st);
4598
@@ -4610,9 +4610,9 @@ int do_proc_net_snmp() {
4610
st = rrd_stats_create(RRD_TYPE_NET_SNMP, "fragsin", NULL, RRD_TYPE_NET_SNMP, "IPv4 Fragments Reassembly", "packets/s", 3011, update_every, CHART_TYPE_LINE);
4611
st->isdetail = 1;
4612
4613
- rrd_stats_dimension_add(st, "ok", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4614
- rrd_stats_dimension_add(st, "failed", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4615
- rrd_stats_dimension_add(st, "all", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4613
+ rrd_stats_dimension_add(st, "ok", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4614
+ rrd_stats_dimension_add(st, "failed", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4615
+ rrd_stats_dimension_add(st, "all", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4616
}
4617
else rrd_stats_next(st);
4618
@@ -4630,14 +4630,14 @@ int do_proc_net_snmp() {
4630
st = rrd_stats_create(RRD_TYPE_NET_SNMP, "errors", NULL, RRD_TYPE_NET_SNMP, "IPv4 Errors", "packets/s", 3002, update_every, CHART_TYPE_LINE);
4631
st->isdetail = 1;
4632
4633
- rrd_stats_dimension_add(st, "InDiscards", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4634
- rrd_stats_dimension_add(st, "OutDiscards", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4633
+ rrd_stats_dimension_add(st, "InDiscards", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4634
+ rrd_stats_dimension_add(st, "OutDiscards", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4635
4636
- rrd_stats_dimension_add(st, "InHdrErrors", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4637
- rrd_stats_dimension_add(st, "InAddrErrors", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4638
- rrd_stats_dimension_add(st, "InUnknownProtos", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4636
+ rrd_stats_dimension_add(st, "InHdrErrors", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4637
+ rrd_stats_dimension_add(st, "InAddrErrors", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4638
+ rrd_stats_dimension_add(st, "InUnknownProtos", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4639
4640
- rrd_stats_dimension_add(st, "OutNoRoutes", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4640
+ rrd_stats_dimension_add(st, "OutNoRoutes", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4641
}
4642
else rrd_stats_next(st);
4643
@@ -4692,8 +4692,8 @@ int do_proc_net_snmp() {
4692
if(!st) {
4693
st = rrd_stats_create(RRD_TYPE_NET_SNMP, "tcppackets", NULL, "tcp", "IPv4 TCP Packets", "packets/s", 2600, update_every, CHART_TYPE_LINE);
4694
4695
- rrd_stats_dimension_add(st, "received", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4696
- rrd_stats_dimension_add(st, "sent", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4695
+ rrd_stats_dimension_add(st, "received", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4696
+ rrd_stats_dimension_add(st, "sent", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4697
}
4698
else rrd_stats_next(st);
4699
@@ -4710,8 +4710,8 @@ int do_proc_net_snmp() {
4710
st = rrd_stats_create(RRD_TYPE_NET_SNMP, "tcperrors", NULL, "tcp", "IPv4 TCP Errors", "packets/s", 2700, update_every, CHART_TYPE_LINE);
4711
st->isdetail = 1;
4712
4713
- rrd_stats_dimension_add(st, "InErrs", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4714
- rrd_stats_dimension_add(st, "RetransSegs", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4713
+ rrd_stats_dimension_add(st, "InErrs", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4714
+ rrd_stats_dimension_add(st, "RetransSegs", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4715
}
4716
else rrd_stats_next(st);
4717
@@ -4728,11 +4728,11 @@ int do_proc_net_snmp() {
4728
st = rrd_stats_create(RRD_TYPE_NET_SNMP, "tcphandshake", NULL, "tcp", "IPv4 TCP Handshake Issues", "events/s", 2900, update_every, CHART_TYPE_LINE);
4729
st->isdetail = 1;
4730
4731
- rrd_stats_dimension_add(st, "EstabResets", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4732
- rrd_stats_dimension_add(st, "OutRsts", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4733
- rrd_stats_dimension_add(st, "ActiveOpens", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4734
- rrd_stats_dimension_add(st, "PassiveOpens", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4735
- rrd_stats_dimension_add(st, "AttemptFails", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4731
+ rrd_stats_dimension_add(st, "EstabResets", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4732
+ rrd_stats_dimension_add(st, "OutRsts", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4733
+ rrd_stats_dimension_add(st, "ActiveOpens", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4734
+ rrd_stats_dimension_add(st, "PassiveOpens", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4735
+ rrd_stats_dimension_add(st, "AttemptFails", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4736
}
4737
else rrd_stats_next(st);
4738
@@ -4770,8 +4770,8 @@ int do_proc_net_snmp() {
4770
if(!st) {
4771
st = rrd_stats_create(RRD_TYPE_NET_SNMP, "udppackets", NULL, "udp", "IPv4 UDP Packets", "packets/s", 2601, update_every, CHART_TYPE_LINE);
4772
4773
- rrd_stats_dimension_add(st, "received", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4774
- rrd_stats_dimension_add(st, "sent", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4773
+ rrd_stats_dimension_add(st, "received", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4774
+ rrd_stats_dimension_add(st, "sent", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4775
}
4776
else rrd_stats_next(st);
4777
@@ -4788,10 +4788,10 @@ int do_proc_net_snmp() {
4788
st = rrd_stats_create(RRD_TYPE_NET_SNMP, "udperrors", NULL, "udp", "IPv4 UDP Errors", "events/s", 2701, update_every, CHART_TYPE_LINE);
4789
st->isdetail = 1;
4790
4791
- rrd_stats_dimension_add(st, "RcvbufErrors", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4792
- rrd_stats_dimension_add(st, "SndbufErrors", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4793
- rrd_stats_dimension_add(st, "InErrors", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4794
- rrd_stats_dimension_add(st, "NoPorts", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4791
+ rrd_stats_dimension_add(st, "RcvbufErrors", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4792
+ rrd_stats_dimension_add(st, "SndbufErrors", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4793
+ rrd_stats_dimension_add(st, "InErrors", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4794
+ rrd_stats_dimension_add(st, "NoPorts", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4795
}
4796
else rrd_stats_next(st);
4797
@@ -4867,8 +4867,8 @@ int do_proc_net_netstat() {
4867
if(!st) {
4868
st = rrd_stats_create("system", "ipv4", NULL, "ipv4", "IPv4 Bandwidth", "kilobits/s", 2000, update_every, CHART_TYPE_AREA);
4869
4870
- rrd_stats_dimension_add(st, "received", NULL, 8, 1024, RRD_DIMENSION_INCREMENTAL);
4871
- rrd_stats_dimension_add(st, "sent", NULL, -8, 1024, RRD_DIMENSION_INCREMENTAL);
4870
+ rrd_stats_dimension_add(st, "received", NULL, 8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
4871
+ rrd_stats_dimension_add(st, "sent", NULL, -8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
4872
}
4873
else rrd_stats_next(st);
4874
@@ -4885,8 +4885,8 @@ int do_proc_net_netstat() {
4885
st = rrd_stats_create("ipv4", "inerrors", NULL, "ipv4", "IPv4 Input Errors", "packets/s", 4000, update_every, CHART_TYPE_LINE);
4886
st->isdetail = 1;
4887
4888
- rrd_stats_dimension_add(st, "noroutes", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4889
- rrd_stats_dimension_add(st, "trunkated", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4888
+ rrd_stats_dimension_add(st, "noroutes", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4889
+ rrd_stats_dimension_add(st, "trunkated", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4890
}
4891
else rrd_stats_next(st);
4892
@@ -4903,8 +4903,8 @@ int do_proc_net_netstat() {
4903
st = rrd_stats_create("ipv4", "mcast", NULL, "ipv4", "IPv4 Multicast Bandwidth", "kilobits/s", 9000, update_every, CHART_TYPE_AREA);
4904
st->isdetail = 1;
4905
4906
- rrd_stats_dimension_add(st, "received", NULL, 8, 1024, RRD_DIMENSION_INCREMENTAL);
4907
- rrd_stats_dimension_add(st, "sent", NULL, -8, 1024, RRD_DIMENSION_INCREMENTAL);
4906
+ rrd_stats_dimension_add(st, "received", NULL, 8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
4907
+ rrd_stats_dimension_add(st, "sent", NULL, -8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
4908
}
4909
else rrd_stats_next(st);
4910
@@ -4921,8 +4921,8 @@ int do_proc_net_netstat() {
4921
st = rrd_stats_create("ipv4", "bcast", NULL, "ipv4", "IPv4 Broadcast Bandwidth", "kilobits/s", 8000, update_every, CHART_TYPE_AREA);
4922
st->isdetail = 1;
4923
4924
- rrd_stats_dimension_add(st, "received", NULL, 8, 1024, RRD_DIMENSION_INCREMENTAL);
4925
- rrd_stats_dimension_add(st, "sent", NULL, -8, 1024, RRD_DIMENSION_INCREMENTAL);
4924
+ rrd_stats_dimension_add(st, "received", NULL, 8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
4925
+ rrd_stats_dimension_add(st, "sent", NULL, -8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
4926
}
4927
else rrd_stats_next(st);
4928
@@ -4939,8 +4939,8 @@ int do_proc_net_netstat() {
4939
st = rrd_stats_create("ipv4", "mcastpkts", NULL, "ipv4", "IPv4 Multicast Packets", "packets/s", 9500, update_every, CHART_TYPE_LINE);
4940
st->isdetail = 1;
4941
4942
- rrd_stats_dimension_add(st, "received", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4943
- rrd_stats_dimension_add(st, "sent", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4942
+ rrd_stats_dimension_add(st, "received", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4943
+ rrd_stats_dimension_add(st, "sent", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4944
}
4945
else rrd_stats_next(st);
4946
@@ -4957,8 +4957,8 @@ int do_proc_net_netstat() {
4957
st = rrd_stats_create("ipv4", "bcastpkts", NULL, "ipv4", "IPv4 Broadcast Packets", "packets/s", 8500, update_every, CHART_TYPE_LINE);
4958
st->isdetail = 1;
4959
4960
- rrd_stats_dimension_add(st, "received", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
4961
- rrd_stats_dimension_add(st, "sent", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
4960
+ rrd_stats_dimension_add(st, "received", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4961
+ rrd_stats_dimension_add(st, "sent", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
4962
}
4963
else rrd_stats_next(st);
4964
@@ -5059,9 +5059,9 @@ int do_proc_net_stat_conntrack() {
5059
if(!st) {
5060
st = rrd_stats_create(RRD_TYPE_NET_STAT_CONNTRACK, "new", NULL, RRD_TYPE_NET_STAT_CONNTRACK, "Netfilter New Connections", "connections/s", 1001, update_every, CHART_TYPE_LINE);
5061
5062
- rrd_stats_dimension_add(st, "new", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5063
- rrd_stats_dimension_add(st, "ignore", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
5064
- rrd_stats_dimension_add(st, "invalid", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
5062
+ rrd_stats_dimension_add(st, "new", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5063
+ rrd_stats_dimension_add(st, "ignore", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5064
+ rrd_stats_dimension_add(st, "invalid", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5065
}
5066
else rrd_stats_next(st);
5067
@@ -5079,9 +5079,9 @@ int do_proc_net_stat_conntrack() {
5079
st = rrd_stats_create(RRD_TYPE_NET_STAT_CONNTRACK, "changes", NULL, RRD_TYPE_NET_STAT_CONNTRACK, "Netfilter Connection Changes", "changes/s", 1002, update_every, CHART_TYPE_LINE);
5080
st->isdetail = 1;
5081
5082
- rrd_stats_dimension_add(st, "inserted", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5083
- rrd_stats_dimension_add(st, "deleted", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
5084
- rrd_stats_dimension_add(st, "delete_list", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
5082
+ rrd_stats_dimension_add(st, "inserted", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5083
+ rrd_stats_dimension_add(st, "deleted", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5084
+ rrd_stats_dimension_add(st, "delete_list", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5085
}
5086
else rrd_stats_next(st);
5087
@@ -5099,9 +5099,9 @@ int do_proc_net_stat_conntrack() {
5099
st = rrd_stats_create(RRD_TYPE_NET_STAT_CONNTRACK, "expect", NULL, RRD_TYPE_NET_STAT_CONNTRACK, "Netfilter Connection Expectations", "expectations/s", 1003, update_every, CHART_TYPE_LINE);
5100
st->isdetail = 1;
5101
5102
- rrd_stats_dimension_add(st, "created", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5103
- rrd_stats_dimension_add(st, "deleted", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
5104
- rrd_stats_dimension_add(st, "new", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5102
+ rrd_stats_dimension_add(st, "created", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5103
+ rrd_stats_dimension_add(st, "deleted", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5104
+ rrd_stats_dimension_add(st, "new", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5105
}
5106
else rrd_stats_next(st);
5107
@@ -5119,9 +5119,9 @@ int do_proc_net_stat_conntrack() {
5119
st = rrd_stats_create(RRD_TYPE_NET_STAT_CONNTRACK, "search", NULL, RRD_TYPE_NET_STAT_CONNTRACK, "Netfilter Connection Searches", "searches/s", 1010, update_every, CHART_TYPE_LINE);
5120
st->isdetail = 1;
5121
5122
- rrd_stats_dimension_add(st, "searched", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5123
- rrd_stats_dimension_add(st, "restarted", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
5124
- rrd_stats_dimension_add(st, "found", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5122
+ rrd_stats_dimension_add(st, "searched", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5123
+ rrd_stats_dimension_add(st, "restarted", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5124
+ rrd_stats_dimension_add(st, "found", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5125
}
5126
else rrd_stats_next(st);
5127
@@ -5139,10 +5139,10 @@ int do_proc_net_stat_conntrack() {
5139
st = rrd_stats_create(RRD_TYPE_NET_STAT_CONNTRACK, "errors", NULL, RRD_TYPE_NET_STAT_CONNTRACK, "Netfilter Errors", "events/s", 1005, update_every, CHART_TYPE_LINE);
5140
st->isdetail = 1;
5141
5142
- rrd_stats_dimension_add(st, "icmp_error", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5143
- rrd_stats_dimension_add(st, "insert_failed", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
5144
- rrd_stats_dimension_add(st, "drop", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
5145
- rrd_stats_dimension_add(st, "early_drop", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
5142
+ rrd_stats_dimension_add(st, "icmp_error", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5143
+ rrd_stats_dimension_add(st, "insert_failed", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5144
+ rrd_stats_dimension_add(st, "drop", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5145
+ rrd_stats_dimension_add(st, "early_drop", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5146
}
5147
else rrd_stats_next(st);
5148
@@ -5214,7 +5214,7 @@ int do_proc_net_ip_vs_stats() {
5214
if(!st) {
5215
st = rrd_stats_create(RRD_TYPE_NET_IPVS, "sockets", NULL, RRD_TYPE_NET_IPVS, "IPVS New Connections", "connections/s", 1001, update_every, CHART_TYPE_LINE);
5216
5217
- rrd_stats_dimension_add(st, "connections", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5217
+ rrd_stats_dimension_add(st, "connections", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5218
}
5219
else rrd_stats_next(st);
5220
@@ -5229,8 +5229,8 @@ int do_proc_net_ip_vs_stats() {
5229
if(!st) {
5230
st = rrd_stats_create(RRD_TYPE_NET_IPVS, "packets", NULL, RRD_TYPE_NET_IPVS, "IPVS Packets", "packets/s", 1002, update_every, CHART_TYPE_LINE);
5231
5232
- rrd_stats_dimension_add(st, "received", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5233
- rrd_stats_dimension_add(st, "sent", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
5232
+ rrd_stats_dimension_add(st, "received", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5233
+ rrd_stats_dimension_add(st, "sent", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5234
}
5235
else rrd_stats_next(st);
5236
@@ -5246,8 +5246,8 @@ int do_proc_net_ip_vs_stats() {
5246
if(!st) {
5247
st = rrd_stats_create(RRD_TYPE_NET_IPVS, "net", NULL, RRD_TYPE_NET_IPVS, "IPVS Bandwidth", "kilobits/s", 1000, update_every, CHART_TYPE_AREA);
5248
5249
- rrd_stats_dimension_add(st, "received", NULL, 8, 1024, RRD_DIMENSION_INCREMENTAL);
5250
- rrd_stats_dimension_add(st, "sent", NULL, -8, 1024, RRD_DIMENSION_INCREMENTAL);
5249
+ rrd_stats_dimension_add(st, "received", NULL, 8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
5250
+ rrd_stats_dimension_add(st, "sent", NULL, -8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
5251
}
5252
else rrd_stats_next(st);
5253
@@ -5311,7 +5311,7 @@ int do_proc_stat() {
5311
st = rrd_stats_create(type, id, NULL, "cpu", title, "percentage", priority, update_every, CHART_TYPE_STACKED);
5312
5313
long multiplier = 1;
5314
- long divisor = 1; // sysconf(_SC_CLK_TCK);
5314
+ long divisor = 1 * update_every; // sysconf(_SC_CLK_TCK);
5315
5316
rrd_stats_dimension_add(st, "guest_nice", NULL, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL);
5317
rrd_stats_dimension_add(st, "guest", NULL, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL);
@@ -5358,7 +5358,7 @@ int do_proc_stat() {
5358
st = rrd_stats_create("system", id, NULL, "cpu", "CPU Interrupts", "interrupts/s", 900, update_every, CHART_TYPE_LINE);
5359
st->isdetail = 1;
5360
5361
- rrd_stats_dimension_add(st, "interrupts", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5361
+ rrd_stats_dimension_add(st, "interrupts", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5362
}
5363
else rrd_stats_next(st);
5364
@@ -5382,7 +5382,7 @@ int do_proc_stat() {
5382
if(!st) {
5383
st = rrd_stats_create("system", id, NULL, "cpu", "CPU Context Switches", "context switches/s", 800, update_every, CHART_TYPE_LINE);
5384
5385
- rrd_stats_dimension_add(st, "switches", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5385
+ rrd_stats_dimension_add(st, "switches", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5386
}
5387
else rrd_stats_next(st);
5388
@@ -5434,7 +5434,7 @@ int do_proc_stat() {
5434
st = rrd_stats_create("system", "forks", NULL, "cpu", "New Processes", "processes/s", 700, update_every, CHART_TYPE_LINE);
5435
st->isdetail = 1;
5436
5437
- rrd_stats_dimension_add(st, "started", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5437
+ rrd_stats_dimension_add(st, "started", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5438
}
5439
else rrd_stats_next(st);
5440
@@ -5857,8 +5857,8 @@ int do_proc_vmstat() {
5857
if(!st) {
5858
st = rrd_stats_create("system", "swapio", NULL, "mem", "Swap I/O", "kilobytes/s", 250, update_every, CHART_TYPE_AREA);
5859
5860
- rrd_stats_dimension_add(st, "in", NULL, sysconf(_SC_PAGESIZE), 1024, RRD_DIMENSION_INCREMENTAL);
5861
- rrd_stats_dimension_add(st, "out", NULL, -sysconf(_SC_PAGESIZE), 1024, RRD_DIMENSION_INCREMENTAL);
5860
+ rrd_stats_dimension_add(st, "in", NULL, sysconf(_SC_PAGESIZE), 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
5861
+ rrd_stats_dimension_add(st, "out", NULL, -sysconf(_SC_PAGESIZE), 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
5862
}
5863
else rrd_stats_next(st);
5864
@@ -5874,8 +5874,8 @@ int do_proc_vmstat() {
5874
if(!st) {
5875
st = rrd_stats_create("system", "io", NULL, "disk", "Disk I/O", "kilobytes/s", 150, update_every, CHART_TYPE_AREA);
5876
5877
- rrd_stats_dimension_add(st, "in", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5878
- rrd_stats_dimension_add(st, "out", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
5877
+ rrd_stats_dimension_add(st, "in", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5878
+ rrd_stats_dimension_add(st, "out", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5879
}
5880
else rrd_stats_next(st);
5881
@@ -5892,8 +5892,8 @@ int do_proc_vmstat() {
5892
st = rrd_stats_create("system", "pgfaults", NULL, "mem", "Memory Page Faults", "page faults/s", 500, update_every, CHART_TYPE_LINE);
5893
st->isdetail = 1;
5894
5895
- rrd_stats_dimension_add(st, "minor", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
5896
- rrd_stats_dimension_add(st, "major", NULL, -1, 1, RRD_DIMENSION_INCREMENTAL);
5895
+ rrd_stats_dimension_add(st, "minor", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5896
+ rrd_stats_dimension_add(st, "major", NULL, -1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
5897
}
5898
else rrd_stats_next(st);
5899
@@ -5979,8 +5979,8 @@ void *proc_main(void *ptr)
5979
if(!stcpu) {
5980
stcpu = rrd_stats_create("netdata", "server_cpu", NULL, "netdata", "NetData CPU usage", "milliseconds/s", 9999, update_every, CHART_TYPE_STACKED);
5981
5982
- rrd_stats_dimension_add(stcpu, "user", NULL, 1, 1000, RRD_DIMENSION_INCREMENTAL);
5983
- rrd_stats_dimension_add(stcpu, "system", NULL, 1, 1000, RRD_DIMENSION_INCREMENTAL);
5982
+ rrd_stats_dimension_add(stcpu, "user", NULL, 1, 1000 * update_every, RRD_DIMENSION_INCREMENTAL);
5983
+ rrd_stats_dimension_add(stcpu, "system", NULL, 1, 1000 * update_every, RRD_DIMENSION_INCREMENTAL);
5984
}
5985
else rrd_stats_next(stcpu);
5986
@@ -6009,7 +6009,7 @@ void *proc_main(void *ptr)
6009
if(!streqs) {
6010
streqs = rrd_stats_create("netdata", "requests", NULL, "netdata", "NetData Web Requests", "requests/s", 12000, update_every, CHART_TYPE_LINE);
6011
6012
- rrd_stats_dimension_add(streqs, "requests", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
6012
+ rrd_stats_dimension_add(streqs, "requests", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
6013
}
6014
else rrd_stats_next(streqs);
6015
@@ -6022,8 +6022,8 @@ void *proc_main(void *ptr)
6022
if(!stbytes) {
6023
stbytes = rrd_stats_create("netdata", "net", NULL, "netdata", "NetData Network Traffic", "kilobits/s", 13000, update_every, CHART_TYPE_AREA);
6024
6025
- rrd_stats_dimension_add(stbytes, "in", NULL, 8, 1024, RRD_DIMENSION_INCREMENTAL);
6026
- rrd_stats_dimension_add(stbytes, "out", NULL, -8, 1024, RRD_DIMENSION_INCREMENTAL);
6025
+ rrd_stats_dimension_add(stbytes, "in", NULL, 8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
6026
+ rrd_stats_dimension_add(stbytes, "out", NULL, -8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
6027
}
6028
else rrd_stats_next(stbytes);
6029
@@ -6118,7 +6118,7 @@ void tc_device_commit(struct tc_device *d)
6118
6119
for ( c = d->classes ; c ; c = c->next) {
6120
if(c->isleaf && c->hasparent)
6121
- rrd_stats_dimension_add(st, c->id, c->name, 8, 1024, RRD_DIMENSION_INCREMENTAL);
6121
+ rrd_stats_dimension_add(st, c->id, c->name, 8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
6122
}
6123
}
6124
else {
@@ -6132,7 +6132,7 @@ void tc_device_commit(struct tc_device *d)
6132
if(rrd_stats_dimension_set(st, c->id, c->bytes) != 0) {
6133
6134
// new class, we have to add it
6135
- rrd_stats_dimension_add(st, c->id, c->name, 8, 1024, RRD_DIMENSION_INCREMENTAL);
6135
+ rrd_stats_dimension_add(st, c->id, c->name, 8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
6136
rrd_stats_dimension_set(st, c->id, c->bytes);
6137
}
6138
@@ -6438,11 +6438,11 @@ void *checks_main(void *ptr)
6438
6439
check1 = rrd_stats_create("netdata", "check1", NULL, "netdata", "Caller gives microseconds", "a million !", 99999, update_every, CHART_TYPE_LINE);
6440
rrd_stats_dimension_add(check1, "absolute", NULL, -1, 1, RRD_DIMENSION_ABSOLUTE);
6441
- rrd_stats_dimension_add(check1, "incremental", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
6441
+ rrd_stats_dimension_add(check1, "incremental", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
6442
6443
check2 = rrd_stats_create("netdata", "check2", NULL, "netdata", "Netdata calcs microseconds", "a million !", 99999, update_every, CHART_TYPE_LINE);
6444
rrd_stats_dimension_add(check2, "absolute", NULL, -1, 1, RRD_DIMENSION_ABSOLUTE);
6445
- rrd_stats_dimension_add(check2, "incremental", NULL, 1, 1, RRD_DIMENSION_INCREMENTAL);
6445
+ rrd_stats_dimension_add(check2, "incremental", NULL, 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
6446
6447
check3 = rrd_stats_create("netdata", "checkdt", NULL, "netdata", "Clock difference", "microseconds diff", 99999, update_every, CHART_TYPE_LINE);
6448
rrd_stats_dimension_add(check3, "caller", NULL, 1, 1, RRD_DIMENSION_ABSOLUTE);
@@ -7329,6 +7329,7 @@ int unit_test(long delay, long shift)
7329
7330
debug_flags = 0xffffffff;
7331
memory_mode = NETDATA_MEMORY_MODE_RAM;
7332
+ update_every = 1;
7333
7334
int do_abs = 1;
7335
int do_inc = 1;
@@ -7344,9 +7345,9 @@ int unit_test(long delay, long shift)
7345
RRD_DIMENSION *rdabsi = NULL;
7346
7347
if(do_abs) rdabs = rrd_stats_dimension_add(st, "absolute", "absolute", 1, 1, RRD_DIMENSION_ABSOLUTE);
7347
- if(do_inc) rdinc = rrd_stats_dimension_add(st, "incremental", "incremental", 1, 1, RRD_DIMENSION_INCREMENTAL);
7348
+ if(do_inc) rdinc = rrd_stats_dimension_add(st, "incremental", "incremental", 1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
7349
if(do_abst) rdabst = rrd_stats_dimension_add(st, "percentage-of-absolute-row", "percentage-of-absolute-row", 1, 1, RRD_DIMENSION_PCENT_OVER_ROW_TOTAL);
7349
- if(do_absi) rdabsi = rrd_stats_dimension_add(st, "percentage-of-incremental-row", "percentage-of-incremental-row", 1, 1, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL);
7350
+ if(do_absi) rdabsi = rrd_stats_dimension_add(st, "percentage-of-incremental-row", "percentage-of-incremental-row", 1, 1 * update_every, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL);
7351
7352
long increment = 1000;
7353
collected_number i = 0;