expanded the web buffer, added raspberry MMC support, fixed space parsing of env...

diff --git a/netdata.c b/netdata.c
index bbeecf164b368177b2737b2bb8d01ce8428c343c..4ef43d3ab7baa03f3fdd6acda1935f12157531d5 100755 (executable)
--- a/netdata.c
+++ b/netdata.c
@@ -31,9 +31,9 @@
 \r
 #include <pthread.h>\r
 \r
-#define RRD_DIMENSION_ABSOLUTE         0\r
-#define RRD_DIMENSION_INCREMENTAL      1\r
-#define RRD_DIMENSION_PCENT_OVER_TOTAL 2\r
+#define RRD_DIMENSION_ABSOLUTE                 0\r
+#define RRD_DIMENSION_INCREMENTAL              1\r
+#define RRD_DIMENSION_PCENT_OVER_TOTAL         2\r
 \r
 #define RRD_TYPE_NET                           "net"\r
 #define RRD_TYPE_NET_LEN                       strlen(RRD_TYPE_NET)\r
@@ -56,9 +56,9 @@
 #define RRD_TYPE_STAT                          "cpu"\r
 #define RRD_TYPE_STAT_LEN                      strlen(RRD_TYPE_STAT)\r
 \r
-#define WEB_PATH_FILE                  "file"\r
-#define WEB_PATH_DATA                  "data"\r
-#define WEB_PATH_GRAPH                 "graph"\r
+#define WEB_PATH_FILE                          "file"\r
+#define WEB_PATH_DATA                          "data"\r
+#define WEB_PATH_GRAPH                         "graph"\r
 \r
 // internal defaults\r
 #define UPDATE_EVERY 1\r
@@ -101,13 +101,10 @@
 #define EXIT_FAILURE 1\r
 #define LISTEN_BACKLOG 100\r
 \r
-#define MAX_SOCKET_INPUT_DATA 65536\r
-#define MAX_SOCKET_OUTPUT_DATA 65536\r
+#define MAX_SOCKET_DATA_LENGTH (256 * 1024)\r
+#define SOCKET_DATA_LENGTH_INCREASE_STEP 65536\r
 \r
-#define MIN_SOCKET_INPUT_DATA 16384\r
-#define DEFAULT_DATA_BUFFER 65536\r
-\r
-#define MAX_HTTP_HEADER_SIZE 8192\r
+#define MAX_HTTP_HEADER_SIZE 16384\r
 \r
 #define MAX_PROC_NET_DEV_LINE 4096\r
 #define MAX_PROC_NET_DEV_IFACE_NAME 1024\r
@@ -1017,7 +1014,7 @@ struct web_client *web_client_create(int listener)
                if(setsockopt(w->ifd, SOL_SOCKET, SO_KEEPALIVE, (char *) &flag, sizeof(int)) != 0) error("%llu: Cannot set SO_KEEPALIVE on socket.", w->id);\r
        }\r
 \r
-       w->data = web_buffer_create(DEFAULT_DATA_BUFFER);\r
+       w->data = web_buffer_create(MAX_SOCKET_DATA_LENGTH);\r
        if(!w->data) {\r
                close(w->ifd);\r
                free(w);\r
@@ -1567,7 +1564,7 @@ ssize_t web_client_send(struct web_client *w)
 ssize_t web_client_receive(struct web_client *w)\r
 {\r
        // do we have any space for more data?\r
-       web_buffer_increase(w->data, MIN_SOCKET_INPUT_DATA);\r
+       web_buffer_increase(w->data, SOCKET_DATA_LENGTH_INCREASE_STEP);\r
 \r
        ssize_t left = w->data->size - w->data->bytes;\r
        ssize_t bytes;\r
@@ -1882,6 +1879,11 @@ int do_proc_diskstats() {
                                        if(minor % 64) continue; // partitions\r
                                        break;\r
 \r
+                               case 160: // raid\r
+                               case 161: // raid\r
+                                       if(minor % 32) continue; // partitions\r
+                                       break;\r
+\r
                                case 8: // scsi disks\r
                                case 65: // scsi disks\r
                                case 66: // scsi disks\r
@@ -1927,6 +1929,9 @@ int do_proc_diskstats() {
                                case 134: // scsi\r
                                case 135: // scsi\r
                                case 153: // raid\r
+                               case 202: // xen\r
+                               case 256: // flash\r
+                               case 257: // flash\r
                                        if(minor % 16) continue; // partitions\r
                                        break;\r
 \r
@@ -1935,6 +1940,8 @@ int do_proc_diskstats() {
                                case 144: // nfs\r
                                case 145: // nfs\r
                                case 146: // nfs\r
+                               case 199: // veritas\r
+                               case 201: // veritas\r
                                        break;\r
 \r
                                case 48: // RAID\r
@@ -1954,6 +1961,8 @@ int do_proc_diskstats() {
                                case 141: // RAID\r
                                case 142: // RAID\r
                                case 143: // RAID\r
+                               case 179: // MMC\r
+                               case 180: // USB\r
                                        if(minor % 8) continue; // partitions\r
                                        break;\r
 \r

diff --git a/netdata.start b/netdata.start
index a52b3f91a364725c512aede3c1f11493e14ff8b9..4a20686c821d1ed908351fd8214bbf651be8b9e0 100755 (executable)
--- a/netdata.start
+++ b/netdata.start
@@ -70,7 +70,7 @@ then
 fi
 
 # merge the server variables into the config
-eval "`wget -O -  http://localhost:$NETDATA_CONFIG_PORT/envlist 2>/dev/null`"
+eval "`wget -O -  http://localhost:$NETDATA_CONFIG_PORT/envlist 2>/dev/null | tr " " "_" `"
 
 # save config back
 set|grep ^NETDATA_CONFIG_      >netdata.conf