added memory monitor
Costa Tsaousis (ktsaou) committed
Apr 12, 2014 at 18:07 UTC
2ad2fcb780493418920194f2080ecf09629e76c3
3 files changed
+147
-21
netdata.c
+133
-19
@@ -32,9 +32,10 @@
32
#include <pthread.h>
33
#include <zlib.h>
34
35
-#define RRD_DIMENSION_ABSOLUTE 0
36
-#define RRD_DIMENSION_INCREMENTAL 1
37
-#define RRD_DIMENSION_PCENT_OVER_TOTAL 2
35
+#define RRD_DIMENSION_ABSOLUTE 0
36
+#define RRD_DIMENSION_INCREMENTAL 1
37
+#define RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL 2
38
+#define RRD_DIMENSION_PCENT_OVER_ROW_TOTAL 3
39
40
#define RRD_TYPE_NET "net"
41
#define RRD_TYPE_NET_LEN strlen(RRD_TYPE_NET)
@@ -407,7 +408,7 @@ RRD_STATS *rrd_stats_create(const char *type, const char *id, const char *name,
408
return NULL;
409
}
410
410
- debug(D_RRD_STATS, "Creating RRD_STATS for '%s'.", name);
411
+ debug(D_RRD_STATS, "Creating RRD_STATS for '%s.%s'.", type, id);
412
413
st = calloc(1, sizeof(RRD_STATS));
414
if(!st) {
@@ -495,11 +496,11 @@ RRD_DIMENSION *rrd_stats_dimension_add(RRD_STATS *st, const char *id, const char
496
{
497
RRD_DIMENSION *rd = NULL;
498
498
- debug(D_RRD_STATS, "Adding dimension '%s' (%s) to RRD_STATS '%s' (%s).", name, id, st->name, st->id);
499
+ debug(D_RRD_STATS, "Adding dimension '%s/%s'.", st->id, id);
500
501
rd = calloc(1, sizeof(RRD_DIMENSION));
502
if(!rd) {
502
- fatal("Cannot allocate RRD_DIMENSION %s/%s.", st->name, id);
503
+ fatal("Cannot allocate RRD_DIMENSION %s/%s.", st->id, id);
504
return NULL;
505
}
506
@@ -931,7 +932,7 @@ void rrd_stats_one_json(RRD_STATS *st, char *options, struct web_buffer *wb)
932
wb->bytes += sprintf(&wb->buffer[wb->bytes], "\t\t\t\"id\" : \"%s\",\n", st->id);
933
wb->bytes += sprintf(&wb->buffer[wb->bytes], "\t\t\t\"name\" : \"%s\",\n", st->name);
934
wb->bytes += sprintf(&wb->buffer[wb->bytes], "\t\t\t\"type\" : \"%s\",\n", st->type);
934
- wb->bytes += sprintf(&wb->buffer[wb->bytes], "\t\t\t\"group\" : \"%s\",\n", st->group);
935
+ wb->bytes += sprintf(&wb->buffer[wb->bytes], "\t\t\t\"group_name\" : \"%s\",\n", st->group);
936
wb->bytes += sprintf(&wb->buffer[wb->bytes], "\t\t\t\"title\" : \"%s %s\",\n", st->title, st->name);
937
wb->bytes += sprintf(&wb->buffer[wb->bytes], "\t\t\t\"usertitle\" : \"%s %s (%s)\",\n", st->title, st->usertitle, st->id);
938
wb->bytes += sprintf(&wb->buffer[wb->bytes], "\t\t\t\"userpriority\" : \"%s\",\n", st->userpriority);
@@ -1101,7 +1102,7 @@ void rrd_stats_json(RRD_STATS *st, struct web_buffer *wb, size_t entries_to_show
1102
// find how many dimensions we have
1103
for( rd = st->dimensions ; rd ; rd = rd->next) {
1104
dimensions++;
1104
- if(rd->type == RRD_DIMENSION_PCENT_OVER_TOTAL) we_need_totals++;
1105
+ if(rd->type == RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL || rd->type == RRD_DIMENSION_PCENT_OVER_ROW_TOTAL) we_need_totals++;
1106
}
1107
1108
if(!dimensions) {
@@ -1199,10 +1200,14 @@ void rrd_stats_json(RRD_STATS *st, struct web_buffer *wb, size_t entries_to_show
1200
oldvalue = rrd_stats_dimension_get(rd, lt);
1201
1202
switch(rd->type) {
1202
- case RRD_DIMENSION_PCENT_OVER_TOTAL:
1203
+ case RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL:
1204
value = (long double)100 * (value - oldvalue) / (total - oldtotal);
1205
break;
1206
1207
+ case RRD_DIMENSION_PCENT_OVER_ROW_TOTAL:
1208
+ value = (long double)100 * value / total;
1209
+ break;
1210
+
1211
case RRD_DIMENSION_INCREMENTAL:
1212
if(oldvalue > value) {
1213
// reset
@@ -2880,18 +2885,18 @@ int do_proc_stat() {
2885
long multiplier = 1;
2886
long divisor = 1; // sysconf(_SC_CLK_TCK);
2887
2883
- rrd_stats_dimension_add(st, "iowait", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_TOTAL, NULL);
2884
- rrd_stats_dimension_add(st, "nice", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_TOTAL, NULL);
2885
- rrd_stats_dimension_add(st, "system", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_TOTAL, NULL);
2886
- rrd_stats_dimension_add(st, "user", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_TOTAL, NULL);
2887
- rrd_stats_dimension_add(st, "idle", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_TOTAL, NULL);
2888
+ rrd_stats_dimension_add(st, "iowait", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL, NULL);
2889
+ rrd_stats_dimension_add(st, "nice", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL, NULL);
2890
+ rrd_stats_dimension_add(st, "system", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL, NULL);
2891
+ rrd_stats_dimension_add(st, "user", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL, NULL);
2892
+ rrd_stats_dimension_add(st, "idle", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL, NULL);
2893
rrd_stats_dimension_hide(st, "idle");
2894
2890
- rrd_stats_dimension_add(st, "irq", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_TOTAL, NULL);
2891
- rrd_stats_dimension_add(st, "softirq", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_TOTAL, NULL);
2892
- rrd_stats_dimension_add(st, "steal", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_TOTAL, NULL);
2893
- rrd_stats_dimension_add(st, "guest", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_TOTAL, NULL);
2894
- rrd_stats_dimension_add(st, "guest_nice", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_TOTAL, NULL);
2895
+ rrd_stats_dimension_add(st, "irq", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL, NULL);
2896
+ rrd_stats_dimension_add(st, "softirq", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL, NULL);
2897
+ rrd_stats_dimension_add(st, "steal", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL, NULL);
2898
+ rrd_stats_dimension_add(st, "guest", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL, NULL);
2899
+ rrd_stats_dimension_add(st, "guest_nice", NULL, sizeof(unsigned long long), 0, multiplier, divisor, RRD_DIMENSION_PCENT_OVER_DIFF_TOTAL, NULL);
2900
}
2901
else rrd_stats_next(st);
2902
@@ -2993,6 +2998,113 @@ int do_proc_stat() {
2998
return 0;
2999
}
3000
3001
+// ----------------------------------------------------------------------------
3002
+// /proc/meminfo processor
3003
+
3004
+#define MAX_PROC_MEMINFO_LINE 4096
3005
+#define MAX_PROC_MEMINFO_NAME 1024
3006
+
3007
+int do_proc_meminfo() {
3008
+ char buffer[MAX_PROC_MEMINFO_LINE+1] = "";
3009
+
3010
+ FILE *fp = fopen("/proc/meminfo", "r");
3011
+ if(!fp) {
3012
+ error("Cannot read /proc/meminfo.");
3013
+ return 1;
3014
+ }
3015
+
3016
+ unsigned long long MemTotal = 0, MemFree = 0, Buffers = 0, Cached = 0, SwapCached = 0,
3017
+ Active = 0, Inactive = 0, ActiveAnon = 0, InactiveAnon = 0, ActiveFile = 0, InactiveFile = 0,
3018
+ Unevictable = 0, Mlocked = 0, SwapTotal = 0, SwapFree = 0, Dirty = 0, Writeback = 0, AnonPages = 0,
3019
+ Mapped = 0, Shmem = 0, Slab = 0, SReclaimable = 0, SUnreclaim = 0, KernelStack = 0, PageTables = 0,
3020
+ NFS_Unstable = 0, Bounce = 0, WritebackTmp = 0, CommitLimit = 0, Committed_AS = 0,
3021
+ VmallocTotal = 0, VmallocUsed = 0, VmallocChunk = 0,
3022
+ AnonHugePages = 0, HugePages_Total = 0, HugePages_Free = 0, HugePages_Rsvd = 0, HugePages_Surp = 0, Hugepagesize = 0,
3023
+ DirectMap4k = 0, DirectMap2M = 0,
3024
+ MemUsed = 0;
3025
+
3026
+ for(;1;) {
3027
+ char *p = fgets(buffer, MAX_PROC_MEMINFO_LINE, fp);
3028
+ if(!p) break;
3029
+
3030
+ // remove ':'
3031
+ while((p = strchr(buffer, ':'))) *p = ' ';
3032
+
3033
+ char name[MAX_PROC_MEMINFO_NAME + 1] = "";
3034
+ unsigned long long value = 0;
3035
+
3036
+ int r = sscanf(buffer, "%s %llu kB\n", name, &value);
3037
+
3038
+ if(r == EOF) break;
3039
+ if(r != 2) error("Cannot read /proc/meminfo line. Expected 2 params, read %d.", r);
3040
+
3041
+ if(!MemTotal && strcmp(name, "MemTotal") == 0) MemTotal = value;
3042
+ else if(!MemFree && strcmp(name, "MemFree") == 0) MemFree = value;
3043
+ else if(!Buffers && strcmp(name, "Buffers") == 0) Buffers = value;
3044
+ else if(!Cached && strcmp(name, "Cached") == 0) Cached = value;
3045
+ else if(!SwapCached && strcmp(name, "SwapCached") == 0) SwapCached = value;
3046
+ else if(!Active && strcmp(name, "Active") == 0) Active = value;
3047
+ else if(!Inactive && strcmp(name, "Inactive") == 0) Inactive = value;
3048
+ else if(!ActiveAnon && strcmp(name, "ActiveAnon") == 0) ActiveAnon = value;
3049
+ else if(!InactiveAnon && strcmp(name, "InactiveAnon") == 0) InactiveAnon = value;
3050
+ else if(!ActiveFile && strcmp(name, "ActiveFile") == 0) ActiveFile = value;
3051
+ else if(!InactiveFile && strcmp(name, "InactiveFile") == 0) InactiveFile = value;
3052
+ else if(!Unevictable && strcmp(name, "Unevictable") == 0) Unevictable = value;
3053
+ else if(!Mlocked && strcmp(name, "Mlocked") == 0) Mlocked = value;
3054
+ else if(!SwapTotal && strcmp(name, "SwapTotal") == 0) SwapTotal = value;
3055
+ else if(!SwapFree && strcmp(name, "SwapFree") == 0) SwapFree = value;
3056
+ else if(!Dirty && strcmp(name, "Dirty") == 0) Dirty = value;
3057
+ else if(!Writeback && strcmp(name, "Writeback") == 0) Writeback = value;
3058
+ else if(!AnonPages && strcmp(name, "AnonPages") == 0) AnonPages = value;
3059
+ else if(!Mapped && strcmp(name, "Mapped") == 0) Mapped = value;
3060
+ else if(!Shmem && strcmp(name, "Shmem") == 0) Shmem = value;
3061
+ else if(!Slab && strcmp(name, "Slab") == 0) Slab = value;
3062
+ else if(!SReclaimable && strcmp(name, "SReclaimable") == 0) SReclaimable = value;
3063
+ else if(!SUnreclaim && strcmp(name, "SUnreclaim") == 0) SUnreclaim = value;
3064
+ else if(!KernelStack && strcmp(name, "KernelStack") == 0) KernelStack = value;
3065
+ else if(!PageTables && strcmp(name, "PageTables") == 0) PageTables = value;
3066
+ else if(!NFS_Unstable && strcmp(name, "NFS_Unstable") == 0) NFS_Unstable = value;
3067
+ else if(!Bounce && strcmp(name, "Bounce") == 0) Bounce = value;
3068
+ else if(!WritebackTmp && strcmp(name, "WritebackTmp") == 0) WritebackTmp = value;
3069
+ else if(!CommitLimit && strcmp(name, "CommitLimit") == 0) CommitLimit = value;
3070
+ else if(!Committed_AS && strcmp(name, "Committed_AS") == 0) Committed_AS = value;
3071
+ else if(!VmallocTotal && strcmp(name, "VmallocTotal") == 0) VmallocTotal = value;
3072
+ else if(!VmallocUsed && strcmp(name, "VmallocUsed") == 0) VmallocUsed = value;
3073
+ else if(!VmallocChunk && strcmp(name, "VmallocChunk") == 0) VmallocChunk = value;
3074
+ else if(!AnonHugePages && strcmp(name, "AnonHugePages") == 0) AnonHugePages = value;
3075
+ else if(!HugePages_Total && strcmp(name, "HugePages_Total") == 0) HugePages_Total = value;
3076
+ else if(!HugePages_Free && strcmp(name, "HugePages_Free") == 0) HugePages_Free = value;
3077
+ else if(!HugePages_Rsvd && strcmp(name, "HugePages_Rsvd") == 0) HugePages_Rsvd = value;
3078
+ else if(!HugePages_Surp && strcmp(name, "HugePages_Surp") == 0) HugePages_Surp = value;
3079
+ else if(!Hugepagesize && strcmp(name, "Hugepagesize") == 0) Hugepagesize = value;
3080
+ else if(!DirectMap4k && strcmp(name, "DirectMap4k") == 0) DirectMap4k = value;
3081
+ else if(!DirectMap2M && strcmp(name, "DirectMap2M") == 0) DirectMap2M = value;
3082
+ }
3083
+ fclose(fp);
3084
+
3085
+ // http://stackoverflow.com/questions/3019748/how-to-reliably-measure-available-memory-in-linux
3086
+ MemUsed = MemTotal - MemFree - Cached - Buffers;
3087
+
3088
+ RRD_STATS *st = rrd_stats_find("mem.ram");
3089
+ if(!st) {
3090
+ st = rrd_stats_create("mem", "ram", NULL, "mem", "System RAM", "percentage", save_history);
3091
+
3092
+ rrd_stats_dimension_add(st, "free", NULL, sizeof(unsigned long long), 0, 1, 1, RRD_DIMENSION_PCENT_OVER_ROW_TOTAL, NULL);
3093
+ rrd_stats_dimension_add(st, "cached", NULL, sizeof(unsigned long long), 0, 1, 1, RRD_DIMENSION_PCENT_OVER_ROW_TOTAL, NULL);
3094
+ rrd_stats_dimension_add(st, "used", NULL, sizeof(unsigned long long), 0, 1, 1, RRD_DIMENSION_PCENT_OVER_ROW_TOTAL, NULL);
3095
+ rrd_stats_dimension_add(st, "buffers", NULL, sizeof(unsigned long long), 0, 1, 1, RRD_DIMENSION_PCENT_OVER_ROW_TOTAL, NULL);
3096
+ }
3097
+ else rrd_stats_next(st);
3098
+
3099
+ rrd_stats_dimension_set(st, "used", &MemUsed, NULL);
3100
+ rrd_stats_dimension_set(st, "free", &MemFree, NULL);
3101
+ rrd_stats_dimension_set(st, "cached", &Cached, NULL);
3102
+ rrd_stats_dimension_set(st, "buffers", &Buffers, NULL);
3103
+ rrd_stats_done(st);
3104
+
3105
+ return 0;
3106
+}
3107
+
3108
3109
// ----------------------------------------------------------------------------
3110
// /proc processor
@@ -3012,6 +3124,7 @@ void *proc_main(void *ptr)
3124
int vdo_proc_net_stat_conntrack = 0;
3125
int vdo_proc_net_ip_vs_stats = 0;
3126
int vdo_proc_stat = 0;
3127
+ int vdo_proc_meminfo = 0;
3128
3129
for(;1;) {
3130
unsigned long long usec, susec;
@@ -3029,6 +3142,7 @@ void *proc_main(void *ptr)
3142
if(!vdo_proc_net_stat_conntrack) vdo_proc_net_stat_conntrack = do_proc_net_stat_conntrack(usec);
3143
if(!vdo_proc_net_ip_vs_stats) vdo_proc_net_ip_vs_stats = do_proc_net_ip_vs_stats(usec);
3144
if(!vdo_proc_stat) vdo_proc_stat = do_proc_stat(usec);
3145
+ if(!vdo_proc_meminfo) vdo_proc_meminfo = do_proc_meminfo(usec);
3146
// END -- the job is done
3147
3148
// find the time to sleep in order to wait exactly update_every seconds
web/index.html
+2
-1
@@ -304,7 +304,8 @@
304
else if(a.name == "ipvs") a.priority = 4;
305
else if(a.name == "ipv4") a.priority = 5;
306
else if(a.name == "cpu") a.priority = 6;
307
- else if(a.name == "disk") a.priority = 7;
307
+ else if(a.name == "mem") a.priority = 7;
308
+ else if(a.name == "disk") a.priority = 8;
309
else a.priority = 99;
310
311
a.html = "<tr><td id=\"" + a.name + "\"><ol class=\"breadcrumb graphs\"><li class=\"active\"><span class=\"glyphicon " + a.glyphicon + "\"></span> <a id=\"" + a.name + "\" href=\"#" + a.name + "\"><b>" + a.title + "</b> " + a.description + " </a></li></ol></td></tr><tr><td><div class=\"thumbgraphs\">" + a.html + "</td></tr>";
web/netdata.js
+12
-1
@@ -252,7 +252,7 @@ function loadCharts(base_url, doNext) {
252
json.charts[i].chartOptions.lineWidth = 2;
253
json.charts[i].chartOptions.curveType = 'function';
254
}
255
- else if(json.charts[i].type == "tc" || json.charts[i].type == "cpu") {
255
+ else if(json.charts[i].type == "tc" || json.charts[i].type == "cpu" || json.charts[i].name == 'mem.ram') {
256
257
// default for all stacked AreaChart
258
json.charts[i].chartType = "AreaChart";
@@ -283,6 +283,17 @@ function loadCharts(base_url, doNext) {
283
}
284
break;
285
286
+ case "mem":
287
+ json.charts[i].category = "Memory";
288
+ json.charts[i].glyphicon = "glyphicon-dashboard";
289
+ json.charts[i].group = 5;
290
+
291
+ if(json.charts[i].name == "mem.ram") {
292
+ json.charts[i].chartOptions.vAxis.minValue = 0;
293
+ json.charts[i].chartOptions.vAxis.maxValue = 100;
294
+ }
295
+ break;
296
+
297
case "tc":
298
json.charts[i].category = "Quality of Service";
299
json.charts[i].glyphicon = "glyphicon-random";