From: Nicolas Boisselier Date: Sun, 13 Oct 2024 21:44:52 +0000 (+0200) Subject: etc/dbq/data.php X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=8f32c9ffed36fb62a48e065cec84f658b9ec83e0;p=nb.git etc/dbq/data.php --- diff --git a/etc/dbq/data.php b/etc/dbq/data.php index 542fb4f7..e9ef679b 100644 --- a/etc/dbq/data.php +++ b/etc/dbq/data.php @@ -7,20 +7,7 @@ $DBQ['data'] = [ ." OR (key LIKE '%.exit_code' AND val<> '0')" , ], - 'host_git' => [ - 'sql_' => preg_replace('/[\t\r\n]+/',' '," - SELECT host,max(CAST(val as INTEGER)) FROM host_info WHERE key LIKE 'git.%exit_code' GROUP BY host - "), - 'sql_' => preg_replace('/[\t\r\n]+/',' '," - SELECT host - ,max(updated) as last_updated - ,min(updated) as first_updated - ,(SELECT count(path.val) FROM host_info path WHERE path.host=hi.host AND path.key LIKE 'git.%.path') as repos - ,max(val) as exit - FROM host_info hi - WHERE key LIKE 'git.%exit_code' - GROUP BY host ORDER BY last_updated DESC, host - "), + 'host_info_git' => [ 'sql' => preg_replace('/[\t\r\n]/',''," SELECT host ,max(updated) as last_updated @@ -34,25 +21,6 @@ $DBQ['data'] = [ GROUP BY host ORDER BY last_updated DESC, host "), 'row_parse_pre' => function(&$row,$t) { - # NB 13.10.24 if ($row['exit'] === null) debug( - # NB 13.10.24 $t->db()->row("SELECT max(cast(val as integer)) FROM host_info" - # NB 13.10.24 ." WHERE host=".$t->db()->quote($row['host']) - # NB 13.10.24 ." AND key like ".$t->db()->quote('%exit_code') - # NB 13.10.24 ) - # NB 13.10.24 ); - # NB 13.10.24 if ($row['exit'] === null) $row['exit'] = - # NB 13.10.24 $t->db()->row("SELECT max(cast(val as integer)) FROM host_info" - # NB 13.10.24 ." WHERE host=".$t->db()->quote($row['host']) - # NB 13.10.24 ." AND key like ".$t->db()->quote('%exit_code') - # NB 13.10.24 ) - # NB 13.10.24 ; - # NB 13.10.24 $row['exit'] = - # NB 13.10.24 $t->db()->row("SELECT max(val) FROM host_info" - # NB 13.10.24 ." WHERE host=".$t->db()->quote($row['host']) - # NB 13.10.24 ." AND key like ".$t->db()->quote('git.%exit_code') - # NB 13.10.24 ) - # NB 13.10.24 ; - foreach ($row as $k=>$v) { if (strpos($k,'updated') !== false) { $row[$k] = preg_replace('/\..*$/','',$v);