munin/tahoe-stats.py: category is 'counters' not 'stats', use DERIVE

diff --git a/misc/munin/tahoe-stats.py b/misc/munin/tahoe-stats.py
index 60ba01a1e9b2a6bfa7fd8fe96451c96be2ef5739..1bbf9c3bd140c7dfa94cb54e3b2149b226494fcc 100644 (file)
--- a/misc/munin/tahoe-stats.py
+++ b/misc/munin/tahoe-stats.py
@@ -201,13 +201,15 @@ PLUGINS = {
 
     'tahoe_helper_upload_requests':
         { 'statid': 'chk_upload_helper.upload_requests',
-          'category': 'stats',
+          'category': 'counters',
           'configheader': '\n'.join(['graph_title Tahoe Upload Helper Upload Requests',
                                      'graph_vlabel requests',
                                      'graph_category tahoe_helper',
                                      'graph_info This graph shows the number of upload requests arriving at the helper',
                                      ]),
           'graph_config': '\n'.join(['%(name)s.label %(name)s',
+                                     '%(name)s.type DERIVE',
+                                     '%(name)s.min 0',
                                      '%(name)s.draw LINE1',
                                      ]),
           'graph_render': '\n'.join(['%(name)s.value %(value)s',
@@ -215,13 +217,15 @@ PLUGINS = {
         },
     'tahoe_helper_upload_already_present':
         { 'statid': 'chk_upload_helper.upload_already_present',
-          'category': 'stats',
+          'category': 'counters',
           'configheader': '\n'.join(['graph_title Tahoe Upload Helper Uploads Already Present',
                                      'graph_vlabel requests',
                                      'graph_category tahoe_helper',
                                      'graph_info This graph shows the number of uploads whose files are already present in the grid',
                                      ]),
           'graph_config': '\n'.join(['%(name)s.label %(name)s',
+                                     '%(name)s.type DERIVE',
+                                     '%(name)s.min 0',
                                      '%(name)s.draw LINE1',
                                      ]),
           'graph_render': '\n'.join(['%(name)s.value %(value)s',
@@ -229,13 +233,15 @@ PLUGINS = {
         },
     'tahoe_helper_upload_need_upload':
         { 'statid': 'chk_upload_helper.upload_need_upload',
-          'category': 'stats',
+          'category': 'counters',
           'configheader': '\n'.join(['graph_title Tahoe Upload Helper Uploads Needing Upload',
                                      'graph_vlabel requests',
                                      'graph_category tahoe_helper',
                                      'graph_info This graph shows the number of uploads whose files are not already present in the grid',
                                      ]),
           'graph_config': '\n'.join(['%(name)s.label %(name)s',
+                                     '%(name)s.type DERIVE',
+                                     '%(name)s.min 0',
                                      '%(name)s.draw LINE1',
                                      ]),
           'graph_render': '\n'.join(['%(name)s.value %(value)s',
@@ -243,13 +249,15 @@ PLUGINS = {
         },
     'tahoe_helper_encoded_bytes':
         { 'statid': 'chk_upload_helper.encoded_bytes',
-          'category': 'stats',
+          'category': 'counters',
           'configheader': '\n'.join(['graph_title Tahoe Upload Helper Encoded Bytes',
                                      'graph_vlabel bytes',
                                      'graph_category tahoe_helper',
                                      'graph_info This graph shows the number of bytes encoded by the helper',
                                      ]),
           'graph_config': '\n'.join(['%(name)s.label %(name)s',
+                                     '%(name)s.type DERIVE',
+                                     '%(name)s.min 0',
                                      '%(name)s.draw LINE1',
                                      ]),
           'graph_render': '\n'.join(['%(name)s.value %(value)s',
@@ -257,13 +265,15 @@ PLUGINS = {
         },
     'tahoe_helper_fetched_bytes':
         { 'statid': 'chk_upload_helper.fetched_bytes',
-          'category': 'stats',
+          'category': 'counters',
           'configheader': '\n'.join(['graph_title Tahoe Upload Helper Fetched Bytes',
                                      'graph_vlabel bytes',
                                      'graph_category tahoe_helper',
                                      'graph_info This graph shows the number of bytes fetched by the helper',
                                      ]),
           'graph_config': '\n'.join(['%(name)s.label %(name)s',
+                                     '%(name)s.type DERIVE',
+                                     '%(name)s.min 0',
                                      '%(name)s.draw LINE1',
                                      ]),
           'graph_render': '\n'.join(['%(name)s.value %(value)s',