Reduce number of categories, use more generic terms

plugins/streaming/icecast2

@@ -36,7 +36,7 @@ case $1 in
 graph_title Icecast2 Stream Listeners
 graph_args --base 1000 -l 0
 graph_vlabel Listeners for Streams
-graph_category stream
+graph_category streaming
 cool_ogg.label cool_ogg
 cool_ogg.draw AREA
 cool_ogg.type GAUGE

plugins/streaming/icecast2_

@@ -49,7 +49,7 @@ def hent_XML():
     total_lyttere = xmldoc.getElementsByTagName("clients")[0].firstChild.nodeValue
     #Totalt antall kilder
     total_kilder = xmldoc.getElementsByTagName("sources")[0].firstChild.nodeValue
-    #Status for enkelt strøm
+    #Status for enkelt strøm
     sources = xmldoc.getElementsByTagName("source")
     sourcelist = {}
     for source in sources:
@@ -68,7 +68,7 @@ def hent_XML():
 	if sourcename == "total":
 	    print "graph_title Totalt antall lyttere"
             print "graph_vlabel lyttere"
-	    print "graph_category Icecast"
+	    print "graph_category streaming"
 	    print "totallyttere.label Totalt antall lyttere"
 	    print "totalkilder.label Totalt antall kilder"
 	    chanlist = {}
@@ -101,7 +101,7 @@ def hent_XML():
 		graphtitle = sourcename
 	    print "graph_title %s" % graphtitle
 	    print "graph_vlabel lyttere"
-	    print "graph_category Icecast"
+	    print "graph_category streaming"
 	    for bitrate in mp3bitrates:
 		print "%s_%s.label %s-%s" % (sourcename, bitrate, "/" + sourcename.replace("_", "-"), bitrate)
 		sumstring += "%s_%s " % (sourcename, bitrate)

plugins/streaming/icecast2_all

@@ -33,7 +33,7 @@ def hent_XML():
     total_lyttere = xmldoc.getElementsByTagName("clients")[0].firstChild.nodeValue
     #Totalt antall kilder
     total_kilder = xmldoc.getElementsByTagName("sources")[0].firstChild.nodeValue
-    #Status for enkelt strøm
+    #Status for enkelt strøm
     sources = xmldoc.getElementsByTagName("source")
     sourcelist = {}
     for source in sources:
@@ -56,7 +56,7 @@ def hent_XML():
     elif sys.argv[1] == "config":
         print "graph_title Total number of listeners"
         print "graph_vlabel listeners"
-	print "graph_category Icecast"
+	print "graph_category streaming"
         print "totallyttere.label Total number of listeners"
         print "totalkilder.label Totalt number of sources"
 	sourcesort = sourcelist.keys()

plugins/streaming/icecast2_simple

@@ -61,7 +61,7 @@ if ARGV[0] == 'autoconf'
 elsif ARGV[0] == 'config'
   puts "graph_title Total sources and clients for Icecast"
   puts "graph_vlabel listeners"
-  puts "graph_category Icecast"
+  puts "graph_category streaming"
   puts "sources.label Total number of sources"
   puts "clients.label Total number of clients"
 else

plugins/streaming/icecast_

@@ -89,7 +89,7 @@ try:
 			print "graph_title Icecast client listening duration"
 			print "graph_args --base 1000 -l 0"
 			print "graph_scale no"
-			print "graph_category Icecast"
+			print "graph_category streaming"
 			print "graph_vlabel minutes"
 			print "avg.label average listening duration"
 			print "mdn.label median listening duration"
@@ -97,14 +97,14 @@ try:
 			print "graph_title Icecast source uptime"
 			print "graph_args --base 1000 -l 0"
 			print "graph_scale no"
-			print "graph_category Icecast"
+			print "graph_category streaming"
 			print "graph_vlabel hours"
 			for s in sources:
 				print "%s.label source %s" % (s["mount"].strip("/").replace(".","_").replace("-","_"), s["mount"])
 		elif plugin_name == "icecast_traffic":
 			print "graph_title Icecast outgoing traffic"
 			print "graph_args --base 1024 -l 0"
-			print "graph_category Icecast"
+			print "graph_category streaming"
 			print "graph_vlabel bytes / second"
 			is_first = True
 			for s in sources:
@@ -121,7 +121,7 @@ try:
 			print "graph_title Icecast listeners count"
 			print "graph_args --base 1000 -l 0"
 			print "graph_scale no"
-			print "graph_category Icecast"
+			print "graph_category streaming"
 			print "graph_vlabel listeners"
 			is_first = True
 			for s in sources: