Clean up imports and comments

src/collectors/conntrack/conntrack.py

@@ -1,12 +1,10 @@
-
-from diamond import *
 import diamond.collector
 import subprocess
 import os
+import re
 
 _RE = re.compile(r'^([a-z\._]*) = ([0-9]*)$')
 
-
 class ConnTrackCollector(diamond.collector.Collector):
     """
     Shells out to get the value of sysctl net.netfilter.nf_conntrack_count

src/collectors/cpu/cpu.py

@@ -1,6 +1,5 @@
-
-from diamond import *
 import diamond.collector
+import os
 
 try:
     import psutil

src/collectors/diskspace/diskspace.py

@@ -1,8 +1,7 @@
-
-from diamond import *
 import diamond.collector
 import diamond.convertor
 import os
+import re
 
 try:
     import psutil

src/collectors/diskusage/diskusage.py

@@ -1,11 +1,8 @@
-
-# http://www.kernel.org/doc/Documentation/iostats.txt
-
-from diamond import *
 import diamond.collector
 import diamond.convertor
 import time
 import os
+import re
 
 try:
     import psutil
@@ -15,6 +12,9 @@
 class DiskUsageCollector(diamond.collector.Collector):
     """
     Collect IO Stats
+    
+     * http://www.kernel.org/doc/Documentation/iostats.txt
+     
     """
     MAX_VALUES = {
         'reads':                    4294967295,

src/collectors/example/example.py

@@ -1,4 +1,3 @@
-
 import diamond.collector
 
 class ExampleCollector(diamond.collector.Collector):

src/collectors/exim/exim.py

@@ -1,4 +1,3 @@
-from diamond import *
 import diamond.collector
 import subprocess
 import os

src/collectors/filestat/filestat.py

@@ -1,6 +1,6 @@
-
-from diamond import *
 import diamond.collector
+import re
+import os
 
 _RE = re.compile(r'(\d+)\s+(\d+)\s+(\d+)')
 

src/collectors/hadoop/hadoop.py

@@ -1,17 +1,15 @@
-#
-# Diamond collector for Hadoop metrics, see:
-#
-#  * http://www.cloudera.com/blog/2009/03/hadoop-metrics/
-
-from diamond import *
 from diamond.metric import Metric
 import diamond.collector
 import glob
 import re
+import os
 
 class HadoopCollector(diamond.collector.Collector):
     """
-    Processes Hadoop metrics.
+    Diamond collector for Hadoop metrics, see:
+    
+    * http://www.cloudera.com/blog/2009/03/hadoop-metrics/
+    
     """
 
     re_log = re.compile(r'^(?P<timestamp>\d+) (?P<name>\S+): (?P<metrics>.*)$')

src/collectors/haproxy/haproxy.py

@@ -1,12 +1,10 @@
-
 import re
 import sys
 import urllib2
 import base64
 import csv
 import logging
 from urlparse import urlparse
-
 import diamond.collector
 
 class HAProxyCollector(diamond.collector.Collector):

src/collectors/httpd/httpd.py

@@ -1,10 +1,8 @@
-
 import os
 import sys
 import re
 import httplib
 import urlparse
-
 import diamond.collector
 
 class HttpdCollector(diamond.collector.Collector):

src/collectors/interrupt/interrupt.py

@@ -1,7 +1,5 @@
-
 import platform
 import os
-
 import diamond.collector
 
 # Detect the architecture of the system

src/collectors/kvm/kvm.py

@@ -1,5 +1,3 @@
-
-from diamond import *
 import diamond.collector
 import os
 

src/collectors/loadavg/loadavg.py

@@ -1,6 +1,6 @@
-
-from diamond import *
 import diamond.collector
+import re
+import os
 
 _RE = re.compile(r'([\d.]+) ([\d.]+) ([\d.]+) (\d+)/(\d+)')
 

src/collectors/memcached/memcached.py

@@ -1,6 +1,4 @@
-
 import subprocess
-
 import diamond.collector
 import socket
 

src/collectors/memory/memory.py

@@ -1,7 +1,6 @@
-
-from diamond import *
 import diamond.collector
 import diamond.convertor
+import os
 
 try:
     import psutil

src/collectors/mongodb/mongodb.py

@@ -1,13 +1,12 @@
+import diamond.collector
+
 try:
     from numbers import Number
     import pymongo
     from pymongo import ReadPreference
 except ImportError:
     Number = None
 
-import diamond
-
-
 class MongoDBCollector(diamond.collector.Collector):
     """Collects data from MongoDB's db.serverStatus() command
 

src/collectors/mysql/mysql.py

@@ -1,11 +1,12 @@
+import diamond.collector
+import re
+import time
+
 try:
     import MySQLdb
     from MySQLdb import MySQLError
 except ImportError:
     MySQLdb = None
-import diamond
-import re
-import time
 
 class MySQLCollector(diamond.collector.Collector):
 

src/collectors/network/network.py

@@ -1,7 +1,7 @@
-
-from diamond import *
 import diamond.collector
 import diamond.convertor
+import os
+import re
 
 try:
     import psutil

src/collectors/nfsd/nfsd.py

@@ -1,6 +1,5 @@
-
-from diamond import *
 import diamond.collector
+import os
 
 class NfsdCollector(diamond.collector.Collector):
     """

src/collectors/nginx/nginx.py

@@ -1,6 +1,5 @@
 import urllib2
 import re
-
 import diamond.collector
 
 class NginxCollector(diamond.collector.Collector):

src/collectors/onewire/onewire.py

@@ -1,8 +1,6 @@
-
 import os
 import diamond.collector
 
-
 class OneWireCollector(diamond.collector.Collector):
     """
     The OneWireCollector collects data from 1-Wire Filesystem

src/collectors/openvpn/openvpn.py

@@ -1,7 +1,3 @@
-#
-# Diamond collector for OpenVPN metrics
-
-from diamond import *
 from diamond.metric import Metric
 import diamond.collector
 import os.path

src/collectors/ping/ping.py

@@ -1,6 +1,4 @@
-
 import subprocess
-
 import diamond.collector
 
 class PingCollector(diamond.collector.Collector):

src/collectors/postqueue/postqueue.py

@@ -1,6 +1,4 @@
-
 import subprocess
-
 import diamond.collector
 
 class PostqueueCollector(diamond.collector.Collector):

src/collectors/rabbitmq/rabbitmq.py

@@ -1,11 +1,10 @@
+import diamond.collector
+
 try:
     from numbers import Number
     import pyrabbit.api
 except ImportError:
     Number = None
-import diamond
-
-from pprint import pprint
 
 class RabbitMQCollector(diamond.collector.Collector):
     """Collects data from RabbitMQ through the admin interface

src/collectors/redisstat/redisstat.py

@@ -1,5 +1,6 @@
 import diamond.collector
 import time
+
 try:
     import redis
 except ImportError:

src/collectors/snmp/snmp.py

@@ -1,4 +1,3 @@
-
 import os
 import sys
 import string

src/collectors/snmpinterface/snmpinterface.py

@@ -1,4 +1,3 @@
-
 import os
 import sys
 import string

src/collectors/sockstat/sockstat.py

@@ -1,6 +1,6 @@
-
-from diamond import *
 import diamond.collector
+import re
+import os
 
 _RE = re.compile('|'.join([
     r'sockets: used (?P<used>\d+)',

src/collectors/tcp/tcp.py

@@ -1,6 +1,5 @@
-
-from diamond import *
 import diamond.collector
+import os
 
 class TCPCollector(diamond.collector.Collector):
     """

src/collectors/ups/ups.py

@@ -1,6 +1,5 @@
-from diamond import *
 import diamond.collector
-
+import os
 import subprocess
 
 class UPSCollector(diamond.collector.Collector):

src/collectors/userscripts/userscripts.py

@@ -1,8 +1,6 @@
-
-from diamond import *
 import diamond.collector
 import diamond.convertor
-
+import os
 import commands
 
 class UserScriptsCollector(diamond.collector.Collector):

src/collectors/varnish/varnish.py

@@ -1,5 +1,3 @@
-
-from diamond import *
 import diamond.collector
 import re
 import subprocess

src/collectors/vmstat/vmstat.py

@@ -1,6 +1,6 @@
-
-from diamond import *
 import diamond.collector
+import os
+import re
 
 class VMStatCollector(diamond.collector.Collector):
     """