Now reads /proc/net/snmp as well

ironsmile · ironsmile · commit 5c8ade337c13 · 2015-08-07T18:22:35.000+03:00
diff --git a/network/netstats/README.md b/network/netstats/README.md
@@ -1,6 +1,7 @@
 netstats
 =====
 
+Exports raw stats found in `/proc/net/netstat` and /proc/net/snmp`.
 
 Install 
 -------
@@ -14,7 +15,7 @@ Copy netstats.pyconf to the gmond conf.d directory, e.g. :
 
  - /etc/ganglia/conf.d/
 
-Tune the netstats.pyconf file to match your server interfaces and then restart gmond.
+Tune the netstats.pyconf file to match your needs and then restart gmond.
 
 ## AUTHOR
 
diff --git a/network/netstats/conf.d/netstats.basic.pyconf b/network/netstats/conf.d/netstats.basic.pyconf
@@ -5,3 +5,27 @@ modules {
     language = "python"
   }
 }
+
+
+collection_group {
+  collect_every = 1
+  time_threshold = 45
+
+  # You can enumerate all metrics you want to see from the /proc/net/netstat and
+  # /proc/net/snmp files. The name of the metric will be "netstat_CATEGORY_NAME".
+  # Where CATEGORY is a row like Tcp from snmp or TcpExt from netstat and
+  # NAME is a column like RcvbufErrors from the snmp or InMcastPkts in netstat.
+  #
+  # Few examples below:
+
+  metric {
+    name = "netstat_TcpExt_SyncookiesRecv"
+    title = "TCP syncookies received"
+  }
+
+  metric {
+    name = "netstat_Tcp_ActiveOpens"
+    title = "TCP active opened connections"
+  }
+
+}
diff --git a/network/netstats/python_modules/netstats.py b/network/netstats/python_modules/netstats.py
@@ -10,6 +10,7 @@
 
 MODULE_NAME = "netstat"
 STATS_FILE = "/proc/net/netstat"
+SNMP_FILE = "/proc/net/snmp"
 
 descriptors = list()
 Desc_Skel = {}
@@ -82,11 +83,11 @@ def update_metric(self):
         }
 
         try:
-            for stat_type, key, value in netstat_iterator():
+            for stat_type, key, value in netstats_iterator():
                 update_dict['%s_%s_%s' % (self.mp, stat_type, key)] = int(value)
 
-        except IOError:
-            dprint("unable to open " + STATS_FILE)
+        except IOError as err:
+            dprint("unable to open stats file. %s" % err)
             return False
 
         self.metric.update(update_dict)
@@ -115,7 +116,7 @@ def metric_init(params):
         'call_back': metric_delta,
         'time_max': 60,
         'value_type': 'float',
-        'format': '%d',
+        'format': '%.2f',
         'units': 'XXX',
         'slope': 'XXX',  # zero|positive|negative|both
         'description': 'XXX',
@@ -134,7 +135,7 @@ def metric_init(params):
     mp = params["metrix_prefix"]
 
     try:
-        for stat_type, key, value in netstat_iterator():
+        for stat_type, key, value in netstats_iterator():
             descriptors.append(create_desc(Desc_Skel, {
                 "name": '%s_%s_%s' % (mp, stat_type, key),
                 "units": "number",
@@ -147,8 +148,8 @@ def metric_init(params):
     return descriptors
 
 
-def netstat_iterator():
-    f = open(STATS_FILE, 'r')
+def file_iterator(file_name):
+    f = open(file_name, 'r')
 
     line_number = -1
     labels = []
@@ -181,6 +182,14 @@ def netstat_iterator():
                 yield values_type, labels[ind], value
 
 
+def netstats_iterator():
+    for vt, key, val in file_iterator(STATS_FILE):
+        yield vt, key, val
+
+    for vt, key, val in file_iterator(SNMP_FILE):
+        yield vt, key, val
+
+
 def create_desc(skel, prop):
     d = skel.copy()
     for k, v in prop.iteritems():
