aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--host.php4
-rw-r--r--inc/collectd.inc.php11
2 files changed, 5 insertions, 10 deletions
diff --git a/host.php b/host.php
index 363e9d5..453cfb4 100644
--- a/host.php
+++ b/host.php
@@ -22,13 +22,11 @@ if(!$plugins) {
22 22
23plugins_list($host, $selected_plugins); 23plugins_list($host, $selected_plugins);
24 24
25$overview = empty($plugin) ? true : false;
26
27echo '<div class="graphs">'; 25echo '<div class="graphs">';
28foreach ($selected_plugins as $selected_plugin) { 26foreach ($selected_plugins as $selected_plugin) {
29 if (in_array($selected_plugin, $plugins)) { 27 if (in_array($selected_plugin, $plugins)) {
30 plugin_header($host, $selected_plugin); 28 plugin_header($host, $selected_plugin);
31 graphs_from_plugin($host, $selected_plugin, $overview); 29 graphs_from_plugin($host, $selected_plugin, empty($plugin));
32 } 30 }
33} 31}
34echo '</div>'; 32echo '</div>';
diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php
index e8f3662..ad15774 100644
--- a/inc/collectd.inc.php
+++ b/inc/collectd.inc.php
@@ -154,15 +154,12 @@ function graphs_from_plugin($host, $plugin, $overview=false) {
154 $plugindata = group_plugindata($plugindata); 154 $plugindata = group_plugindata($plugindata);
155 $plugindata = plugin_sort($plugindata); 155 $plugindata = plugin_sort($plugindata);
156 156
157 $f = array();
158
159 if ($overview == true && isset($CONFIG['overview_filter'][$plugin])) {
160 $f = $CONFIG['overview_filter'][$plugin];
161 }
162
163 foreach ($plugindata as $items) { 157 foreach ($plugindata as $items) {
164 158
165 if (!empty($f) && ($f !== array_intersect_assoc($f, $items))) { 159 if (
160 $overview && isset($CONFIG['overview_filter'][$plugin]) &&
161 $CONFIG['overview_filter'][$plugin] !== array_intersect_assoc($CONFIG['overview_filter'][$plugin], $items)
162 ) {
166 continue; 163 continue;
167 } 164 }
168 165