expanded the web buffer, added raspberry MMC support, fixed space parsing of env variables
Costa Tsaousis (ktsaou) committed
Apr 4, 2014 at 02:29 UTC
33b3cb0f2e86045cfa81b959a6634932e25fd77e
2 files changed
+24
-15
netdata.c
+23
-14
@@ -31,9 +31,9 @@
31
32
#include <pthread.h>
33
34
-#define RRD_DIMENSION_ABSOLUTE 0
35
-#define RRD_DIMENSION_INCREMENTAL 1
36
-#define RRD_DIMENSION_PCENT_OVER_TOTAL 2
34
+#define RRD_DIMENSION_ABSOLUTE 0
35
+#define RRD_DIMENSION_INCREMENTAL 1
36
+#define RRD_DIMENSION_PCENT_OVER_TOTAL 2
37
38
#define RRD_TYPE_NET "net"
39
#define RRD_TYPE_NET_LEN strlen(RRD_TYPE_NET)
@@ -56,9 +56,9 @@
56
#define RRD_TYPE_STAT "cpu"
57
#define RRD_TYPE_STAT_LEN strlen(RRD_TYPE_STAT)
58
59
-#define WEB_PATH_FILE "file"
60
-#define WEB_PATH_DATA "data"
61
-#define WEB_PATH_GRAPH "graph"
59
+#define WEB_PATH_FILE "file"
60
+#define WEB_PATH_DATA "data"
61
+#define WEB_PATH_GRAPH "graph"
62
63
// internal defaults
64
#define UPDATE_EVERY 1
@@ -101,13 +101,10 @@
101
#define EXIT_FAILURE 1
102
#define LISTEN_BACKLOG 100
103
104
-#define MAX_SOCKET_INPUT_DATA 65536
105
-#define MAX_SOCKET_OUTPUT_DATA 65536
104
+#define MAX_SOCKET_DATA_LENGTH (256 * 1024)
105
+#define SOCKET_DATA_LENGTH_INCREASE_STEP 65536
106
107
-#define MIN_SOCKET_INPUT_DATA 16384
108
-#define DEFAULT_DATA_BUFFER 65536
109
-
110
-#define MAX_HTTP_HEADER_SIZE 8192
107
+#define MAX_HTTP_HEADER_SIZE 16384
108
109
#define MAX_PROC_NET_DEV_LINE 4096
110
#define MAX_PROC_NET_DEV_IFACE_NAME 1024
@@ -1017,7 +1014,7 @@ struct web_client *web_client_create(int listener)
1014
if(setsockopt(w->ifd, SOL_SOCKET, SO_KEEPALIVE, (char *) &flag, sizeof(int)) != 0) error("%llu: Cannot set SO_KEEPALIVE on socket.", w->id);
1015
}
1016
1020
- w->data = web_buffer_create(DEFAULT_DATA_BUFFER);
1017
+ w->data = web_buffer_create(MAX_SOCKET_DATA_LENGTH);
1018
if(!w->data) {
1019
close(w->ifd);
1020
free(w);
@@ -1567,7 +1564,7 @@ ssize_t web_client_send(struct web_client *w)
1564
ssize_t web_client_receive(struct web_client *w)
1565
{
1566
// do we have any space for more data?
1570
- web_buffer_increase(w->data, MIN_SOCKET_INPUT_DATA);
1567
+ web_buffer_increase(w->data, SOCKET_DATA_LENGTH_INCREASE_STEP);
1568
1569
ssize_t left = w->data->size - w->data->bytes;
1570
ssize_t bytes;
@@ -1882,6 +1879,11 @@ int do_proc_diskstats() {
1879
if(minor % 64) continue; // partitions
1880
break;
1881
1882
+ case 160: // raid
1883
+ case 161: // raid
1884
+ if(minor % 32) continue; // partitions
1885
+ break;
1886
+
1887
case 8: // scsi disks
1888
case 65: // scsi disks
1889
case 66: // scsi disks
@@ -1927,6 +1929,9 @@ int do_proc_diskstats() {
1929
case 134: // scsi
1930
case 135: // scsi
1931
case 153: // raid
1932
+ case 202: // xen
1933
+ case 256: // flash
1934
+ case 257: // flash
1935
if(minor % 16) continue; // partitions
1936
break;
1937
@@ -1935,6 +1940,8 @@ int do_proc_diskstats() {
1940
case 144: // nfs
1941
case 145: // nfs
1942
case 146: // nfs
1943
+ case 199: // veritas
1944
+ case 201: // veritas
1945
break;
1946
1947
case 48: // RAID
@@ -1954,6 +1961,8 @@ int do_proc_diskstats() {
1961
case 141: // RAID
1962
case 142: // RAID
1963
case 143: // RAID
1964
+ case 179: // MMC
1965
+ case 180: // USB
1966
if(minor % 8) continue; // partitions
1967
break;
1968
netdata.start
+1
-1
@@ -70,7 +70,7 @@ then
70
fi
71
72
# merge the server variables into the config
73
-eval "`wget -O - http://localhost:$NETDATA_CONFIG_PORT/envlist 2>/dev/null`"
73
+eval "`wget -O - http://localhost:$NETDATA_CONFIG_PORT/envlist 2>/dev/null | tr " " "_" `"
74
75
# save config back
76
set|grep ^NETDATA_CONFIG_ >netdata.conf