Browse Source

Split APC graph into drupal_apc (memory) and drupal_apc_entries (entries).

Frederic G. MARAND 13 years ago
parent
commit
113d4e77ef
1 changed files with 12 additions and 5 deletions
  1. 12 5
      modules/munin_apc/munin_apc.module

+ 12 - 5
modules/munin_apc/munin_apc.module

@@ -25,11 +25,11 @@ function munin_apc_munin_api_info() {
 
   $ret = array(
     '#title'       => t('APC'),
-    '#description' => t('Graphs about PHP APC'),
+    '#description' => t('Graphs about PHP APC memory yse'),
 
     'munin_apc' => array(
       '#title'     => t('APC Caching'),
-      '#info'      => t('Collect cache information for the Alternative PHP Cache. This graph uses IEC binary sizes.'),
+      '#info'      => t('Collect memory-level information for the Alternative PHP Cache. This graph uses IEC binary sizes.'),
       '#graph_args'=> '--base 1024 --lower-limit 0',
 
       'total_size' => $int + array(
@@ -42,6 +42,13 @@ function munin_apc_munin_api_info() {
         '#type'      => MUNIN_API_GAUGE,
         '#info'      => t('Number of bytes actually used by APC, either cached or deleted'),
       ),
+    ),
+
+    'munin_apc_entries' => array(
+      '#title'     => t('APC Entries'),
+      '#info'      => t('Collect entries-level information for the Alternative PHP Cache.'),
+      '#graph_args'=> '--base 1000 --lower-limit 0',
+
       'num_hits'   => $int + array(
         '#label'     => t('Hits since last restart'),
         '#type'      => MUNIN_API_COUNTER,
@@ -110,11 +117,11 @@ function munin_apc_munin_api_fetch($graph_name) {
     $info = apc_cache_info();
     $cache['munin_apc_uptime']['uptime'] = (time() - $info['start_time']) / 86400;
     foreach (array('num_hits', 'num_misses', 'num_inserts') as $field) {
-      $cache['munin_apc'][$field] = $info[$field];
+      $cache['munin_apc_entries'][$field] = $info[$field];
     }
 
-    $cache['munin_apc']['cache_entries']   = count($info['cache_list']);
-    $cache['munin_apc']['deleted_entries'] = count($info['deleted_list']);
+    $cache['munin_apc_entries']['cache_entries']   = count($info['cache_list']);
+    $cache['munin_apc_entries']['deleted_entries'] = count($info['deleted_list']);
   }
 
   $ret = $cache[$graph_name];