[Checkins] SVN: Products.ZNagios/branches/frisi-multizeo/ use cdef for dbsize too

[Harald Friessnegger]

Log message for revision 105875:
  use cdef for dbsize too

Changed:
  U   Products.ZNagios/branches/frisi-multizeo/CHANGES.txt
  U   Products.ZNagios/branches/frisi-multizeo/Products/ZNagios/munin_client.py
  U   Products.ZNagios/branches/frisi-multizeo/README.txt
  U   Products.ZNagios/branches/frisi-multizeo/setup.py

-=-
Modified: Products.ZNagios/branches/frisi-multizeo/CHANGES.txt
===================================================================
--- Products.ZNagios/branches/frisi-multizeo/CHANGES.txt	2009-11-19 12:03:30 UTC (rev 105874)
+++ Products.ZNagios/branches/frisi-multizeo/CHANGES.txt	2009-11-19 14:33:44 UTC (rev 105875)
@@ -4,10 +4,9 @@
 0.4 - unreleased
 ----------------
 
-- uptime is given in days now, instead of seconds which is much more readable
-  `varnish_ plugin`_ does this too
-
-  .. _`varnish_ plugin`: http://varnish.projects.linpro.no/browser/trunk/varnish-tools/munin/varnish_
+- uptime is given in days now, instead of seconds which is much more readable.
+  `fetch` still returns seconds for backward compatibility,
+  but `config` tells to compute the value (``uptime.cdef uptime,86400,/``)
   [fRiSi]
 
 - `zeo_munin.py` can handle multiple Databases now

Modified: Products.ZNagios/branches/frisi-multizeo/Products/ZNagios/munin_client.py
===================================================================
--- Products.ZNagios/branches/frisi-multizeo/Products/ZNagios/munin_client.py	2009-11-19 12:03:30 UTC (rev 105874)
+++ Products.ZNagios/branches/frisi-multizeo/Products/ZNagios/munin_client.py	2009-11-19 14:33:44 UTC (rev 105875)
@@ -130,14 +130,14 @@
     """Database Size in MB.
     """
 
-    def do_fetch(self):
-        print "%s.value %.2f" % (self.name, self.data[self.key]/1048576)
-
     key = 'db-bytes'
     name = 'database_size'
     title = 'Size of main Database'
+    vlabel = 'MB'
+    cdef = '%s,1048576,/'
 
 
+
 class cacheconnections(GraphBase):
 
     def do_fetch(self):

Modified: Products.ZNagios/branches/frisi-multizeo/README.txt
===================================================================
--- Products.ZNagios/branches/frisi-multizeo/README.txt	2009-11-19 12:03:30 UTC (rev 105874)
+++ Products.ZNagios/branches/frisi-multizeo/README.txt	2009-11-19 14:33:44 UTC (rev 105875)
@@ -41,11 +41,9 @@
   total number of errors, conflicts and unresolved conflicts
 
 activity
-  nr of object loads, stores and
-  number of database connections
+  total number of object loads, stores and
+  total number of database connections
 
-  XXX connections is 0 for me all the time?
-
 cacheconnections
   number of active and total objects for each connection
 

Modified: Products.ZNagios/branches/frisi-multizeo/setup.py
===================================================================
--- Products.ZNagios/branches/frisi-multizeo/setup.py	2009-11-19 12:03:30 UTC (rev 105874)
+++ Products.ZNagios/branches/frisi-multizeo/setup.py	2009-11-19 14:33:44 UTC (rev 105875)
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.4dev'
+version = '0.4'
 
 setup(name='Products.ZNagios',
       version=version,
@@ -13,6 +13,7 @@
         "Framework :: Zope2",
         "License :: OSI Approved :: Zope Public License",
         "Programming Language :: Python",
+        "Topic :: System :: Monitoring",
       ],
       keywords='Zope Nagios Munin',
       author="Zope Corporation and contributors",