php-collection: graph definition improvements for bind plugin

Add new dns_qtype_cached type for metagraph and switch memory metagraph
to line-based for bind plugin as the values from bind plugin are not
cumulative.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>

diff --git a/contrib/php-collection/definitions.php b/contrib/php-collection/definitions.php
index a0f381805b9acc012d5cf9e1cc172b0ab29f1c42..c84aabeae4427f31e5126274c1861650d8bc3e59 100644 (file)
--- a/contrib/php-collection/definitions.php
+++ b/contrib/php-collection/definitions.php
@@ -1590,6 +1590,7 @@ function load_graph_definitions($logarithmic = false, $tinylegend = false) {
        $MetaGraphDefs['tcp_connections']   = 'meta_graph_tcp_connections';
        $MetaGraphDefs['dns_opcode']        = 'meta_graph_dns_event';
        $MetaGraphDefs['dns_qtype']         = 'meta_graph_dns_event';
+       $MetaGraphDefs['dns_qtype_cached']  = 'meta_graph_dns_event';
        $MetaGraphDefs['dns_rcode']         = 'meta_graph_dns_event';
        $MetaGraphDefs['dns_request']       = 'meta_graph_dns_event';
        $MetaGraphDefs['dns_resolver']      = 'meta_graph_dns_event';
@@ -1757,7 +1758,10 @@ function meta_graph_memory($host, $plugin, $plugin_instance, $type, $type_instan
                $sources[] = array('name'=>$inst, 'file'=>$file);
        }
 
-       return collectd_draw_meta_stack($opts, $sources);
+       if ($plugin == 'bind')
+               return collectd_draw_meta_line($opts, $sources);
+       else
+               return collectd_draw_meta_stack($opts, $sources);
 }
 
 function meta_graph_vs_threads($host, $plugin, $plugin_instance, $type, $type_instances, $opts = array()) {