From fd119055ab30f39cc84ee3d38fe9f71eb3f07811 Mon Sep 17 00:00:00 2001
From: Jun Kuriyama <kuriyama@s2factory.co.jp>
Date: Wed, 5 Sep 2012 10:02:52 +0900
Subject: [PATCH] Fix usage of appname at munin symbol translation

FMS appname may include '-' chars, and was translated to '_' because
of Munin dislike this character.

But original appname is required to retrive values from getAppStats
API.  So preserve original appname and translate it at only actually
needed.
---
 plugins/network/fms_apps      | 15 +++++++++------
 plugins/network/fms_apps_rate | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/plugins/network/fms_apps b/plugins/network/fms_apps
index 9724c048..06beed5d 100755
--- a/plugins/network/fms_apps
+++ b/plugins/network/fms_apps
@@ -112,6 +112,8 @@ use Proc::ProcessTable;
 
 my ($host, $port, $username, $password);
 
+sub name_filter { my ($n) = @_; $n =~ s/[^a-zA-Z0-9_]/_/g; $n }
+
 sub get_apps {
 	my @applist;
 	my $ua = LWP::UserAgent->new(timeout => 30);
@@ -122,7 +124,6 @@ sub get_apps {
 		my $apps = $1;
 		while ( $apps =~ /<_[0-9]+> *([^<]*) *<\/_[0-9]+>/gi ) {
 			my $appname = $1;
-			$appname =~ s/[^a-zA-Z0-9_]/_/g;
 			push(@applist, $appname);
 		}
 	}
@@ -217,10 +218,11 @@ END_GRAPH_CONFIG
 			my @apps = get_apps();
 			if ( $#apps >= 0 ) {
 				foreach my $app (@apps) {
+					my $symbol = name_filter($app);
 					print <<"END_APP_CONFIG";
-fms_app_$app.label $app
-fms_app_$app.type GAUGE
-fms_app_$app.min 0
+fms_app_$symbol.label $app
+fms_app_$symbol.type GAUGE
+fms_app_$symbol.min 0
 END_APP_CONFIG
 				}
 				exit 0;
@@ -240,13 +242,14 @@ if ( defined($host) and defined($port) and defined($username) and defined($passw
 	if ( $#apps >= 0 ) {
 		my $ua = LWP::UserAgent->new(timeout => 30);
 		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 $response = $ua->request(HTTP::Request->new('GET', $url));
 			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 {
 				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;
diff --git a/plugins/network/fms_apps_rate b/plugins/network/fms_apps_rate
index 81f73bb8..9a9b1573 100755
--- a/plugins/network/fms_apps_rate
+++ b/plugins/network/fms_apps_rate
@@ -113,6 +113,8 @@ use Proc::ProcessTable;
 
 my ($host, $port, $username, $password);
 
+sub name_filter { my ($n) = @_; $n =~ s/[^a-zA-Z0-9_]/_/g; $n }
+
 sub get_apps {
 	my @applist;
 	my $ua = LWP::UserAgent->new(timeout => 30);
@@ -123,7 +125,6 @@ sub get_apps {
 		my $apps = $1;
 		while ( $apps =~ /<_[0-9]+> *([^<]*) *<\/_[0-9]+>/gi ) {
 			my $appname = $1;
-			$appname =~ s/[^a-zA-Z0-9_]/_/g;
 			push(@applist, $appname);
 		}
 	}
@@ -218,10 +219,11 @@ END_GRAPH_CONFIG
 			my @apps = get_apps();
 			if ( $#apps >= 0 ) {
 				foreach my $app (@apps) {
+					my $symbol = name_filter($app);
 					print <<"END_APP_CONFIG";
-fms_app_total_$app.label $app
-fms_app_total_$app.type DERIVE
-fms_app_total_$app.min 0
+fms_app_total_$symbol.label $app
+fms_app_total_$symbol.type DERIVE
+fms_app_total_$symbol.min 0
 END_APP_CONFIG
 				}
 				exit 0;
@@ -241,13 +243,14 @@ if ( defined($host) and defined($port) and defined($username) and defined($passw
 	if ( $#apps >= 0 ) {
 		my $ua = LWP::UserAgent->new(timeout => 30);
 		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 $response = $ua->request(HTTP::Request->new('GET', $url));
 			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 {
 				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;