diff --git a/plugins/mysql/mysql_aggregate_ b/plugins/mysql/mysql_aggregate_ index 27c09e9c..6293f8d8 100755 --- a/plugins/mysql/mysql_aggregate_ +++ b/plugins/mysql/mysql_aggregate_ @@ -39,6 +39,8 @@ # env.database mysql # env.table user # env.field Host +# env.label Mysql users +# env.vlabel users # #%# capabilities=autoconf #%# family=contrib @@ -127,17 +129,28 @@ if field != "": if len(sys.argv) == 2 and sys.argv[1] == "autoconf": print "yes" elif len(sys.argv) == 2 and sys.argv[1] == "config": + + if "label" in os.environ: + label = os.environ["label"] + else: + label = "Aggregate - %s" % table + + if "vlabel" in os.environ: + vlabel = os.environ["vlabel"] + else: + vlabel = "count(*)" + if field == "": print "graph mysql_aggregate_%s" % table - print "graph_title Aggregate - %s" % table - print "graph_vlabel count(*)" + print "graph_title %s" % label + print "graph_vlabel %s" % vlabel print "graph_category mysql" print "" print "values_count.label count" else: print "multigraph mysql_aggregate_%s" % table - print "graph_title Aggregate - %s" % table - print "graph_vlabel count(*)" + print "graph_title %s" % label + print "graph_vlabel %s" % vlabel print "graph_category mysql" print "" @@ -147,8 +160,8 @@ elif len(sys.argv) == 2 and sys.argv[1] == "config": for key in values.keys(): print "" print "multigraph mysql_aggregate_%s.%s" % (table, key.replace(".", "_")) - print "graph_title Agregate - %s, value %s" % (table, key.replace(".", "_")) - print "graph_vlabel count(*)" + print "graph_title %s, value %s" % (label, key.replace(".", "_")) + print "graph_vlabel %s" % vlabel print "graph_category mysql" print "" print "%s_count.label %s" % (key.replace(".", "_"), key)