- we will build network / filter / aggregate ourselves.

go back to the preferred types layout

Author: zzzeek

sqlalchemy_collectd/sender.py

@@ -1,14 +1,11 @@
 from . import collectd
+from . import types
 
 
 senders = []
 
 
-def sends(name, type_):
-    collectd_type = collectd.Type(
-        name, ("value", type_)
-    )
-
+def sends(collectd_type):
     def decorate(fn):
         senders.append((collectd_type, fn))
         return fn
@@ -25,39 +22,20 @@ def send(self, connection, collection_target, timestamp, interval, pid):
         for collectd_type, sender in senders:
             message_sender = collectd.MessageSender(
                 collectd_type, self.hostname, "sqlalchemy",
-                plugin_instance=str(pid), type_instance=self.stats_name,
+                plugin_instance=self.stats_name, type_instance=str(pid),
                 interval=interval
             )
-            value = sender(collection_target)
-            message_sender.send(connection, timestamp, value)
-
-
-@sends("sqlalchemy_numpools", collectd.VALUE_GAUGE)
-def _numpools(collection_target):
-    return collection_target.num_pools
-
-
-@sends("sqlalchemy_checkedout", collectd.VALUE_GAUGE)
-def _checkedout(collection_target):
-    return collection_target.num_checkedout
-
-
-@sends("sqlalchemy_checkedin", collectd.VALUE_GAUGE)
-def _checkedin(collection_target):
-    return collection_target.num_checkedin
-
-
-@sends("sqlalchemy_detached", collectd.VALUE_GAUGE)
-def _detached(collection_target):
-    return collection_target.num_detached
-
-
-@sends("sqlalchemy_invalidated", collectd.VALUE_GAUGE)
-def _invalidated(collection_target):
-    return collection_target.num_invalidated
-
-
-@sends("sqlalchemy_connections", collectd.VALUE_GAUGE)
-def _connections(collection_target):
-    return collection_target.num_connections
-
+            sender(message_sender, connection, collection_target, timestamp)
+
+
+@sends(types.pool)
+def _send_pool(message_sender, connection, collection_target, timestamp):
+    message_sender.send(
+        connection, timestamp,
+        collection_target.num_pools,
+        collection_target.num_checkedout,
+        collection_target.num_checkedin,
+        collection_target.num_detached,
+        collection_target.num_invalidated,
+        collection_target.num_connections
+    )

sqlalchemy_collectd/types.py

@@ -0,0 +1,27 @@
+from . import collectd
+
+pool = collectd.Type(
+	"sqlalchemy_pool",
+	("numpools", collectd.VALUE_GAUGE),
+	("checkedout", collectd.VALUE_GAUGE),
+	("checkedin", collectd.VALUE_GAUGE),
+	("detached", collectd.VALUE_GAUGE),
+	("invalidated", collectd.VALUE_GAUGE),
+	("total", collectd.VALUE_GAUGE),
+)
+
+checkouts = collectd.Type(
+	"sqlalchemy_checkouts", ("count", collectd.VALUE_DERIVE))
+
+commits = collectd.Type(
+	"sqlalchemy_commits", ("count", collectd.VALUE_DERIVE))
+
+rollbacks = collectd.Type(
+	"sqlalchemy_rollbacks", ("count", collectd.VALUE_DERIVE))
+
+invalidated = collectd.Type(
+	"sqlalchemy_invalidated", ("count", collectd.VALUE_DERIVE))
+
+transactions = collectd.Type(
+	"sqlalchemy_transactions", ("count", collectd.VALUE_DERIVE))
+

types.db

@@ -1,16 +1,6 @@
-
-sqlalchemy_numpools value:GAUGE:0:U
-sqlalchemy_checkedout value:GAUGE:0:U
-sqlalchemy_checkedin value:GAUGE:0:U
-sqlalchemy_detached value:GAUGE:0:U
-sqlalchemy_invalidated value:GAUGE:0:U
-sqlalchemy_connections value:GAUGE:0:U
-sqlalchemy_newconnections value:DERIVE:0:U
-sqlalchemy_checkouts value:DERIVE:0:U
-sqlalchemy_commits value:DERIVE:0:U
-sqlalchemy_rollbacks value:DERIVE:0:U
-sqlalchemy_invalidated value:DERIVE:0:U
-sqlalchemy_transactions value:GAUGE:0:U
-
-
-
+sqlalchemy_pool numpools:GAUGE:0:U, checkedout:GAUGE:0:U, checkedin:GAUGE:0:U, detached:GAUGE:0:U, invalidated:GAUGE:0:U, total:GAUGE:0:U
+sqlalchemy_checkouts count:DERIVE:0:U
+sqlalchemy_commits count:DERIVE:0:U
+sqlalchemy_rollbacks count:DERIVE:0:U
+sqlalchemy_invalidated count:DERIVE:0:U
+sqlalchemy_transactions count:GAUGE:0:U