4 files changed, 76 insertions, 48 deletions

diff --git a/conf/config.php b/conf/config.php
index f2fab29..ffa42cf 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -72,9 +72,14 @@ $CONFIG['max-height'] = $CONFIG['detail-height'] * 2;
 
 # collectd's unix socket (unixsock plugin)
 # enabled: 'unix:///var/run/collectd-unixsock'
+# enabled (rrdcached): 'unix:///var/run/rrdcached.sock'
 # disabled: NULL
 $CONFIG['socket'] = NULL;
 
+# flush rrd data to disk using "collectd" (unixsock plugin)
+# or a "rrdcached" server
+$CONFIG['flush_type'] = 'collectd';
+
 # system default timezone when not set
 $CONFIG['default_timezone'] = 'UTC';
 
diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php
index 7269e68..e364180 100644
--- a/inc/collectd.inc.php
+++ b/inc/collectd.inc.php
@@ -19,6 +19,26 @@ function collectd_hosts() {
         return($dir);
 }
 
+
+# return files in directory. this will recurse into subdirs
+# infinite loop may occur
+function get_host_rrd_files($dir) {
+        $files = array();
+
+        $objects = new RegexIterator(
+                new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator($dir),
+                RecursiveIteratorIterator::SELF_FIRST),
+                '/\.rrd$/');
+
+        foreach($objects as $object) {
+                $files[] = str_replace($dir.'/', '', $object->getPathname());
+        }
+
+        return $files;
+}
+
+
 # returns an array of plugins/pinstances/types/tinstances
 function collectd_plugindata($host, $plugin=NULL) {
         global $CONFIG;
@@ -26,8 +46,8 @@ function collectd_plugindata($host, $plugin=NULL) {
         if (!is_dir($CONFIG['datadir'].'/'.$host))
                 return false;
 
-        chdir($CONFIG['datadir'].'/'.$host);
-        $files = glob("*/*.rrd");
+        $hostdir = $CONFIG['datadir'].'/'.$host;
+        $files = get_host_rrd_files($hostdir);
         if (!$files)
                 return false;
 
@@ -215,6 +235,28 @@ function build_url($base, $items, $s=NULL) {
         return $base;
 }
 
+function socket_cmd($socket, $cmd) {
+        $r = fwrite($socket, $cmd, strlen($cmd));
+        if ($r === false || $r != strlen($cmd)) {
+                error_log(sprintf('ERROR: Failed to write full command to unix-socket: %d out of %d written',
+                        $r === false ? -1 : $r, strlen($cmd)));
+                return FALSE;
+        }
+
+        $resp = fgets($socket,128);
+        if ($resp === false) {
+                error_log(sprintf('ERROR: Failed to read response from collectd for command: %s',
+                        trim($cmd)));
+                return FALSE;
+        }
+
+        $n = (int)$resp;
+        while ($n-- > 0)
+                fgets($socket,128);
+
+        return TRUE;
+}
+
 # tell collectd to FLUSH all data of the identifier(s)
 function collectd_flush($identifier) {
         global $CONFIG;
@@ -226,43 +268,34 @@ function collectd_flush($identifier) {
                         !(is_string($identifier) || is_array($identifier)))
                 return FALSE;
 
+        if (!is_array($identifier))
+                $identifier = array($identifier);
+
         $u_errno  = 0;
         $u_errmsg = '';
-        if ($socket = @fsockopen($CONFIG['socket'], 0, $u_errno, $u_errmsg)) {
-                $cmd = 'FLUSH plugin=rrdtool';
-                if (is_array($identifier)) {
-                        foreach ($identifier as $val)
-                                $cmd .= sprintf(' identifier="%s"', $val);
-                } else
-                        $cmd .= sprintf(' identifier="%s"', $identifier);
-                $cmd .= "\n";
-
-                $r = fwrite($socket, $cmd, strlen($cmd));
-                if ($r === false || $r != strlen($cmd)) {
-                        error_log(sprintf('ERROR: Failed to write full command to unix-socket: %d out of %d written',
-                                $r === false ? -1 : $r, strlen($cmd)));
-                        return FALSE;
-                }
+        if (! $socket = @fsockopen($CONFIG['socket'], 0, $u_errno, $u_errmsg)) {
+                error_log(sprintf('ERROR: Failed to open unix-socket to %s (%d: %s)',
+                        $CONFIG['socket'], $u_errno, $u_errmsg));
+                return FALSE;
+        }
 
-                $resp = fgets($socket);
-                if ($resp === false) {
-                        error_log(sprintf('ERROR: Failed to read response from collectd for command: %s',
-                                trim($cmd)));
-                        return FALSE;
+        if ($CONFIG['flush_type'] == 'collectd'){
+                $cmd = 'FLUSH';
+                foreach ($identifier as $val)
+                        $cmd .= sprintf(' identifier="%s"', $val);
+                $cmd .= "\n";
+                socket_cmd($socket, $cmd);
+        }
+        elseif ($CONFIG['flush_type'] == 'rrdcached') {
+                foreach ($identifier as $val) {
+                        $cmd = sprintf("FLUSH %s.rrd\n", $val);
+                        socket_cmd($socket, $cmd);
                 }
+        }
 
-                $n = (int)$resp;
-                while ($n-- > 0)
-                        fgets($socket);
-
-                fclose($socket);
+        fclose($socket);
 
-                return TRUE;
-        } else {
-                error_log(sprintf('ERROR: Failed to open unix-socket to collectd: %d: %s',
-                        $u_errno, $u_errmsg));
-                return FALSE;
-        }
+        return TRUE;
 }
 
 ?>
diff --git a/rrd.php b/rrd.php
index 1b5997b..b4c7f68 100644
--- a/rrd.php
+++ b/rrd.php
@@ -4,7 +4,7 @@ require_once 'conf/common.inc.php';
 require_once 'inc/functions.inc.php';
 require_once 'inc/html.inc.php';
 
-if ($file = validateRRDPath($CONFIG['datadir'], $_SERVER['PATH_INFO'])) {
+if ( $file = validateRRDPath($CONFIG['datadir'], urldecode($_SERVER["QUERY_STRING"])) ) {
         header('Content-Type: application/octet-stream');
         header('Content-Disposition: attachment; filename='.basename($file));
         header("Expires: " .date(DATE_RFC822,strtotime($CONFIG['cache']." seconds")));
diff --git a/type/Default.class.php b/type/Default.class.php
index 5e19e73..2cd8560 100644
--- a/type/Default.class.php
+++ b/type/Default.class.php
@@ -34,7 +34,6 @@ class Type_Default {
                 $this->cache = $config['cache'];
                 $this->parse_get();
                 $this->rrd_files();
-                $this->identifiers = $this->file2identifier($this->files);
                 $this->width = GET('x');
                 if (empty($this->width)) $this->width = $config['width'];
                 $this->height = GET('y');
@@ -122,9 +121,9 @@ class Type_Default {
 
         function parse_filename($file) {
                 if ($this->graph_type == 'canvas') {
-                        $file = 'rrd.php/' . str_replace($this->datadir . '/', '', $file);
+                        $file = str_replace($this->datadir . '/', '', $file);
                         # rawurlencode all but /
-                        $file = str_replace('%2F', '/', rawurlencode($file));
+                        $file = 'rrd.php?' . str_replace('%2F', '/', rawurlencode($file));
                 } else {
                         # escape characters
                         $file = str_replace(array(' ', '(', ')'), array('\ ', '\(', '\)'), $file);
@@ -143,10 +142,12 @@ class Type_Default {
 
                         $this->tinstances[] = $instance;
                         $this->files[$instance] = $filename;
+                        $this->identifiers[$instance] = preg_replace("#^$this->datadir/(.*)\.rrd$#", '$1', $filename);
                 }
 
                 sort($this->tinstances);
                 ksort($this->files);
+                ksort($this->identifiers);
         }
 
         function get_filenames() {
@@ -166,17 +167,6 @@ class Type_Default {
                 return $files;
         }
 
-        function file2identifier($files) {
-                foreach($files as $key => $file) {
-                        if (is_file($file)) {
-                                $files[$key] = preg_replace("#^$this->datadir/#u", '', $files[$key]);
-                                $files[$key] = preg_replace('#\.rrd$#', '', $files[$key]);
-                        }
-                }
-
-                return $files;
-        }
-
         function rrd_graph($debug = false) {
                 if (!$this->colors)
                         $this->rainbow_colors();