mirror of
https://github.com/munin-monitoring/contrib.git
synced 2025-07-21 18:41:03 +00:00
mysql_size_all: use clean fieldnames for databsaes with invalid characters
Thanks, Lokutos! See: #1032
This commit is contained in:
parent
704a88ecda
commit
e641c80284
1 changed files with 10 additions and 11 deletions
|
@ -39,11 +39,8 @@
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
|
|
||||||
# unless ($0 =~ /mysql_size(?:_([^_]+)|)_(.+)\s*$/)
|
use Munin::Plugin;
|
||||||
# {
|
|
||||||
# die "Could not parse name $0.\n";
|
|
||||||
# }
|
|
||||||
# my $db = $2;
|
|
||||||
|
|
||||||
my $COMMAND;
|
my $COMMAND;
|
||||||
my $MYSQLADMIN = $ENV{mysqladmin} || "mysql";
|
my $MYSQLADMIN = $ENV{mysqladmin} || "mysql";
|
||||||
|
@ -103,7 +100,8 @@ foreach my $db (getDBList()) {
|
||||||
close(SERVICE);
|
close(SERVICE);
|
||||||
|
|
||||||
}
|
}
|
||||||
print("$db.value $total_size\n");
|
my $fieldname = clean_fieldname($db);
|
||||||
|
print("$fieldname.value $total_size\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -121,11 +119,11 @@ graph_info Plugin available at <a href="http://rodolphe.quiedeville.org/hack/mun
|
||||||
');
|
');
|
||||||
|
|
||||||
for my $db (@dbs) {
|
for my $db (@dbs) {
|
||||||
my $title = "$db";
|
my $fieldname = clean_fieldname($db);
|
||||||
print("$title.label ${title}\n",
|
print("$fieldname.label $db\n",
|
||||||
"$title.min 0\n",
|
"$fieldname.min 0\n",
|
||||||
"$title.type GAUGE\n",
|
"$fieldname.type GAUGE\n",
|
||||||
"$title.draw ", ($num) ? "STACK" : "AREA" , "\n",
|
"$fieldname.draw AREASTACK\n",
|
||||||
);
|
);
|
||||||
$num++;
|
$num++;
|
||||||
}
|
}
|
||||||
|
@ -162,6 +160,7 @@ sub getDBList {
|
||||||
foreach my $f (glob("/var/lib/mysql/*")) {
|
foreach my $f (glob("/var/lib/mysql/*")) {
|
||||||
if (-d $f) {
|
if (-d $f) {
|
||||||
$f =~ s/\@002d/-/g;
|
$f =~ s/\@002d/-/g;
|
||||||
|
$f =~ s/\@002e/./g;
|
||||||
$f =~ s!.*/!!;
|
$f =~ s!.*/!!;
|
||||||
@dbs[$#dbs+1]=$f };
|
@dbs[$#dbs+1]=$f };
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue