Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-25 18:38:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #181 from kuriyama/master

Browse source 
Fix usage of appname at munin symbol translation
This commit is contained in:
Steve Schnepp 2012-09-06 05:19:35 -07:00
commit 9ec0760ec2
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/network/fms_apps
View file

@ -112,6 +112,8 @@ use Proc::ProcessTable;
my ($host, $port, $username, $password); my ($host, $port, $username, $password);
sub name_filter { my ($n) = @_; $n =~ s/[^a-zA-Z0-9_]/_/g; $n }
sub get_apps { sub get_apps {
my @applist; my @applist;
my $ua = LWP::UserAgent->new(timeout => 30); my $ua = LWP::UserAgent->new(timeout => 30);
@ -122,7 +124,6 @@ sub get_apps {
my $apps = $1; my $apps = $1;
while ( $apps =~ /<_[0-9]+> *([^<]*) *<\/_[0-9]+>/gi ) { while ( $apps =~ /<_[0-9]+> *([^<]*) *<\/_[0-9]+>/gi ) {
my $appname = $1; my $appname = $1;
$appname =~ s/[^a-zA-Z0-9_]/_/g;
push(@applist, $appname); push(@applist, $appname);
} }
} }
@ -217,10 +218,11 @@ END_GRAPH_CONFIG
my @apps = get_apps(); my @apps = get_apps();
if ( $#apps >= 0 ) { if ( $#apps >= 0 ) {
foreach my $app (@apps) { foreach my $app (@apps) {
my $symbol = name_filter($app);
print <<"END_APP_CONFIG"; print <<"END_APP_CONFIG";
fms_app_$app.label $app fms_app_$symbol.label $app
fms_app_$app.type GAUGE fms_app_$symbol.type GAUGE
fms_app_$app.min 0 fms_app_$symbol.min 0
END_APP_CONFIG END_APP_CONFIG
} }
exit 0; exit 0;
@ -240,13 +242,14 @@ if ( defined($host) and defined($port) and defined($username) and defined($passw
if ( $#apps >= 0 ) { if ( $#apps >= 0 ) {
my $ua = LWP::UserAgent->new(timeout => 30); my $ua = LWP::UserAgent->new(timeout => 30);
foreach my $app (@apps) { foreach my $app (@apps) {
my $symbol = name_filter($app);
my $url = sprintf("http://%s:%d/admin/getAppStats?auser=%s\&apswd=%s\&app=%s", $host, $port, $username, $password, $app); my $url = sprintf("http://%s:%d/admin/getAppStats?auser=%s\&apswd=%s\&app=%s", $host, $port, $username, $password, $app);
my $response = $ua->request(HTTP::Request->new('GET', $url)); my $response = $ua->request(HTTP::Request->new('GET', $url));
if ( $response->content =~ /<data>.*<connected>[^0-9]*([0-9]+)[^0-9]*<\/connected>.*<\/data>/is ) { if ( $response->content =~ /<data>.*<connected>[^0-9]*([0-9]+)[^0-9]*<\/connected>.*<\/data>/is ) {
print("fms_app_$app.value $1\n"); print("fms_app_$symbol.value $1\n");
} else { } else {
print(STDERR "Failed to get number of active streams for the \"$app\" application from the Flash Media Administration Server!\n"); print(STDERR "Failed to get number of active streams for the \"$app\" application from the Flash Media Administration Server!\n");
print("fms_app_$app.value U\n"); print("fms_app_$symbol.value U\n");
} }
} }
exit 0; exit 0;

15
plugins/network/fms_apps_rate
View file

@ -113,6 +113,8 @@ use Proc::ProcessTable;
my ($host, $port, $username, $password); my ($host, $port, $username, $password);
sub name_filter { my ($n) = @_; $n =~ s/[^a-zA-Z0-9_]/_/g; $n }
sub get_apps { sub get_apps {
my @applist; my @applist;
my $ua = LWP::UserAgent->new(timeout => 30); my $ua = LWP::UserAgent->new(timeout => 30);
@ -123,7 +125,6 @@ sub get_apps {
my $apps = $1; my $apps = $1;
while ( $apps =~ /<_[0-9]+> *([^<]*) *<\/_[0-9]+>/gi ) { while ( $apps =~ /<_[0-9]+> *([^<]*) *<\/_[0-9]+>/gi ) {
my $appname = $1; my $appname = $1;
$appname =~ s/[^a-zA-Z0-9_]/_/g;
push(@applist, $appname); push(@applist, $appname);
} }
} }
@ -218,10 +219,11 @@ END_GRAPH_CONFIG
my @apps = get_apps(); my @apps = get_apps();
if ( $#apps >= 0 ) { if ( $#apps >= 0 ) {
foreach my $app (@apps) { foreach my $app (@apps) {
my $symbol = name_filter($app);
print <<"END_APP_CONFIG"; print <<"END_APP_CONFIG";
fms_app_total_$app.label $app fms_app_total_$symbol.label $app
fms_app_total_$app.type DERIVE fms_app_total_$symbol.type DERIVE
fms_app_total_$app.min 0 fms_app_total_$symbol.min 0
END_APP_CONFIG END_APP_CONFIG
} }
exit 0; exit 0;
@ -241,13 +243,14 @@ if ( defined($host) and defined($port) and defined($username) and defined($passw
if ( $#apps >= 0 ) { if ( $#apps >= 0 ) {
my $ua = LWP::UserAgent->new(timeout => 30); my $ua = LWP::UserAgent->new(timeout => 30);
foreach my $app (@apps) { foreach my $app (@apps) {
my $symbol = name_filter($app);
my $url = sprintf("http://%s:%d/admin/getAppStats?auser=%s\&apswd=%s\&app=%s", $host, $port, $username, $password, $app); my $url = sprintf("http://%s:%d/admin/getAppStats?auser=%s\&apswd=%s\&app=%s", $host, $port, $username, $password, $app);
my $response = $ua->request(HTTP::Request->new('GET', $url)); my $response = $ua->request(HTTP::Request->new('GET', $url));
if ( $response->content =~ /<data>.*<total_connects>[^0-9]*([0-9]+)[^0-9]*<\/total_connects>.*<\/data>/is ) { if ( $response->content =~ /<data>.*<total_connects>[^0-9]*([0-9]+)[^0-9]*<\/total_connects>.*<\/data>/is ) {
print("fms_app_total_$app.value $1\n"); print("fms_app_total_$symbol.value $1\n");
} else { } else {
print(STDERR "Failed to get total number of played streams for the \"$app\" application from the Flash Media Administration Server!\n"); print(STDERR "Failed to get total number of played streams for the \"$app\" application from the Flash Media Administration Server!\n");
print("fms_app_total_$app.value U\n"); print("fms_app_total_$symbol.value U\n");
} }
} }
exit 0; exit 0;