- OK, aggregation plugin is not going to work. am going to

rethink this into a total python plugin and just go all the way
(as usual)

Author: zzzeek

sqlalchemy.conf

@@ -26,62 +26,112 @@ LoadPlugin "network"
 </Plugin>
 
 
+LoadPlugin "aggregation"
+LoadPlugin "match_regex"
 <Plugin "aggregation">
-  <Aggregation>
-	# translate from:
-	#
-	# <host>/<plugin>-<program-name>/<type>-<process pid>
-	#
-	# hostname/sqlalchemy-nova/sqlalchemy_pool-12345
-	# hostname/sqlalchemy-nova/sqlalchemy_pool-5839
-	# hostname/sqlalchemy-nova/sqlalchemy_pool-9905
-	# hostname/sqlalchemy-neutron/sqlalchemy_pool-19385
-	# hostname/sqlalchemy-neutron/sqlalchemy_pool-6991
-	#
-	# to:
-	#
-	# <host>/<plugin>-<program-name>/<type>
-	#
-	# hostname/sqlalchemy-nova/checkouts
-	# hostname/sqlalchemy-neutron/checkouts
-
-    Plugin "sqlalchemy"
-
-    GroupBy "Host"
-    GroupBy "PluginInstance"
-
-	CalculateNum true
-    CalculateSum true
-    CalculateAverage true
-  </Aggregation>
-
-  <Aggregation>
-	# translate from:
-	#
-	# <host>/<plugin>-<program-name>/<type>-<process pid>
-	#
-	# hostname/sqlalchemy-nova/checkouts-12345
-	# hostname/sqlalchemy-nova/checkouts-5839
-	# hostname/sqlalchemy-nova/checkouts-9905
-	# hostname/sqlalchemy-neutron/checkouts-19385
-	# hostname/sqlalchemy-neutron/checkouts-6991
-	#
-	# to:
-	#
-	# <host>/<plugin>-all/<type>
-	#
-	# hostname/sqlalchemy-all/checkouts
-
-    Plugin "sqlalchemy"
-
-    GroupBy "Host"
-    SetPluginInstance "all"
-
-    CalculateSum true
-    CalculateAverage true
-  </Aggregation>
-
-
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_numpools"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		SetTypeInstance "processes"
+		CalculateNum true
+	</Aggregation>
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_numpools"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		CalculateSum true
+	</Aggregation>
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_checkedout"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		CalculateSum true
+		CalculateAverage true
+	</Aggregation>
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_checkedin"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		CalculateSum true
+		CalculateAverage true
+	</Aggregation>
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_detached"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		CalculateSum true
+		CalculateAverage true
+	</Aggregation>
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_invalidated"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		CalculateSum true
+		CalculateAverage true
+	</Aggregation>
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_connections"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		CalculateSum true
+		CalculateAverage true
+	</Aggregation>
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_newconnections"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		CalculateSum true
+		CalculateAverage true
+	</Aggregation>
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_checkouts"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		CalculateSum true
+		CalculateAverage true
+	</Aggregation>
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_commits"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		CalculateSum true
+		CalculateAverage true
+	</Aggregation>
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_rollbacks"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		CalculateSum true
+		CalculateAverage true
+	</Aggregation>
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_invalidated"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		CalculateSum true
+		CalculateAverage true
+	</Aggregation>
+	<Aggregation>
+		Plugin "sqlalchemy"
+		Type "sqlalchemy_transactions"
+		GroupBy "Host"
+		SetPlugin "sqlalchemy_aggregated"
+		CalculateSum true
+		CalculateAverage true
+	</Aggregation>
 </Plugin>
 
 <Chain "PostCache">
@@ -97,4 +147,5 @@ LoadPlugin "network"
     </Target>
     Target stop
   </Rule>
+  Target write
 </Chain>

sqlalchemy_collectd/sender.py

@@ -21,11 +21,12 @@ def __init__(self, hostname, stats_name):
         self.hostname = hostname
         self.stats_name = stats_name
 
-    def send(self, connection, collection_target, timestamp, pid):
+    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=self.stats_name, type_instance=str(pid)
+                plugin_instance=str(pid), type_instance=self.stats_name,
+                interval=interval
             )
             value = sender(collection_target)
             message_sender.send(connection, timestamp, value)

sqlalchemy_collectd/worker.py

@@ -18,12 +18,12 @@ def _check_threads_started():
     if _WORKER_THREAD is None or _PID != ospid:
 
         _PID = ospid
-        _WORKER_THREAD = threading.Thread(target=_process)
+        _WORKER_THREAD = threading.Thread(target=_process, args=(5, ))
         _WORKER_THREAD.daemon = True
         _WORKER_THREAD.start()
 
 
-def _process():
+def _process(interval):
     pid = os.getpid()
     log.info("Starting process thread in pid %s", pid)
 
@@ -32,9 +32,9 @@ def _process():
         for (
                 collection_target, connection,
                 sender, last_called) in _collection_targets:
-            if now - last_called[0] > 5:  # TODO configurable send interval
+            if now - last_called[0] > interval:
                 last_called[0] = now
-                sender.send(connection, collection_target, now, pid)
+                sender.send(connection, collection_target, now, interval, pid)
 
         time.sleep(.2)