";
foreach ($group['hosts'] as $host) {
@@ -255,7 +259,7 @@ function monitorRenderGroupCards(string $grouping, array $groups, int $maxlen):
$body .= '
';
- $out .= "
+ $out .= "
";
@@ -623,6 +627,15 @@ function monitorRenderTreeTitleSections(array $titles, int $maxlen): string {
return $result;
}
+/**
+ * Translatable label for the card/section holding devices not on any tree.
+ *
+ * @return string
+ */
+function monitorNonTreeLabel(): string {
+ return __('Non-Tree Devices', 'monitor');
+}
+
/**
* Render section for monitored hosts that are not attached to any tree.
*
@@ -660,7 +673,7 @@ function monitorRenderNonTreeSection(): string {
$result .= "
";
@@ -674,6 +687,93 @@ function monitorRenderNonTreeSection(): string {
return $result;
}
+/**
+ * Render tree grouping as device cards (one card per tree, plus a Non-Tree
+ * card), mirroring the Site and Device Template card layouts.
+ *
+ * @param array $tree_list Allowed trees for the current filter.
+ *
+ * @return string
+ */
+function monitorRenderTreeCards(array $tree_list): string {
+ $groups = [];
+ $host_ids = [];
+
+ if (cacti_sizeof($tree_list)) {
+ $tree_ids = [];
+
+ foreach ($tree_list as $tree) {
+ $tree_ids[$tree['id']] = $tree['id'];
+ }
+
+ $sql_where = '';
+ $sql_join = '';
+ renderWhereJoin($sql_where, $sql_join);
+
+ $hosts = db_fetch_assoc('SELECT DISTINCT h.*, gt.id AS graph_tree_id, gt.name AS graph_tree_name
+ FROM host AS h
+ INNER JOIN graph_tree_items AS gti
+ ON h.id = gti.host_id
+ INNER JOIN graph_tree AS gt
+ ON gt.id = gti.graph_tree_id
+ ' . $sql_join . '
+ ' . $sql_where . '
+ AND gti.host_id > 0
+ AND gti.graph_tree_id IN (' . implode(',', $tree_ids) . ')
+ ORDER BY gt.sequence, h.description');
+
+ if (cacti_sizeof($hosts)) {
+ [$hosts, $ids] = monitorFilterAllowedHosts($hosts);
+
+ $host_ids = array_merge($host_ids, $ids);
+
+ foreach ($hosts as $host) {
+ $gid = 'tree_' . $host['graph_tree_id'];
+
+ if (!isset($groups[$gid])) {
+ $groups[$gid] = ['label' => $host['graph_tree_name'], 'hosts' => []];
+ }
+
+ $groups[$gid]['hosts'][] = $host;
+ }
+ }
+ }
+
+ // Devices not attached to any tree get their own card, unless a specific
+ // tree is selected in the filter.
+ if (get_request_var('tree') < 0) {
+ $nontree = getHostNonTreeArray();
+
+ if (cacti_sizeof($nontree)) {
+ [$nontree, $ids] = monitorFilterAllowedHosts($nontree);
+
+ if (cacti_sizeof($nontree)) {
+ $host_ids = array_merge($host_ids, $ids);
+
+ $groups['nontree'] = ['label' => monitorNonTreeLabel(), 'hosts' => $nontree];
+ }
+ }
+ }
+
+ if (!cacti_sizeof($groups)) {
+ return '';
+ }
+
+ // Size the trim length from the hosts actually rendered here (including the
+ // Non-Tree card) so labels aren't trimmed against unrelated tree devices.
+ $maxlen = 10;
+
+ if (get_request_var('view') == 'default' && cacti_sizeof($host_ids)) {
+ $maxlen = (int) db_fetch_cell('SELECT MAX(LENGTH(description))
+ FROM host AS h
+ WHERE id IN (' . implode(',', $host_ids) . ')');
+ }
+
+ $maxlen = getMonitorTrimLength($maxlen);
+
+ return monitorRenderGroupCards('tree', $groups, $maxlen);
+}
+
/**
* Render monitor tree grouping view, including tree and non-tree sections.
*
@@ -694,6 +794,12 @@ function renderTree(): string {
$tree_list = [];
}
+ // Card-based views group each tree (and non-tree devices) into panels, the
+ // same as the Site and Device Template groupings.
+ if (monitorUseCardLayout()) {
+ return monitorRenderTreeCards($tree_list);
+ }
+
$function = 'renderHeader' . ucfirst(get_request_var('view'));
if (function_exists($function)) {