mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unify time interval formatting (#14733)

Browse Source 
* Unify time interval formatting
Use carbon for formatting, it supports locales.

* fix style

* remove baseline exceptions

* fixes found by lint
This commit is contained in:
Tony Murray
2022-12-15 15:52:53 -06:00
committed by GitHub
parent d091788f28
commit 1d3440b943
10 changed files with 39 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
LibreNMS/Alert/RunAlerts.php
View File

@@ -38,7 +38,6 @@ use LibreNMS\Enum\AlertState;
use LibreNMS\Exceptions\AlertTransportDeliveryException;
use LibreNMS\Polling\ConnectivityHelper;
use LibreNMS\Util\Time;
use Log;
class RunAlerts
{
@@ -104,7 +103,7 @@ class RunAlerts
$obj['features'] = $device->features;
$obj['location'] = (string) $device->location;
$obj['uptime'] = $device->uptime;
$obj['uptime_short'] = Time::formatInterval($device->uptime, 'short');
$obj['uptime_short'] = Time::formatInterval($device->uptime, true);
$obj['uptime_long'] = Time::formatInterval($device->uptime);
$obj['description'] = $device->purpose;
$obj['notes'] = $device->notes;
@@ -149,7 +148,7 @@ class RunAlerts
}
}
}
$obj['elapsed'] = $this->timeFormat(time() - strtotime($alert['time_logged']));
$obj['elapsed'] = Time::formatInterval(time() - strtotime($alert['time_logged']), true) ?: 'none';
if (! empty($extra['diff'])) {
$obj['diff'] = $extra['diff'];
}
@@ -170,7 +169,7 @@ class RunAlerts
dbUpdate(['details' => gzcompress(json_encode($id['details']), 9)], 'alert_log', 'id = ?', [$alert['id']]);
$obj['title'] = $template->title_rec ?: 'Device ' . $obj['display'] . ' recovered from ' . ($alert['name'] ?: $alert['rule']);
$obj['elapsed'] = $this->timeFormat(strtotime($alert['time_logged']) - strtotime($id['time_logged']));
$obj['elapsed'] = Time::formatInterval(strtotime($alert['time_logged']) - strtotime($id['time_logged']), true) ?: 'none';
$obj['id'] = $id['id'];
foreach ($extra['rule'] as $incident) {
$i++;
@@ -200,36 +199,6 @@ class RunAlerts
return $obj;
}
/**
* Format Elapsed Time
*
* @param int $secs Seconds elapsed
* @return string
*/
public function timeFormat($secs)
{
$bit = [
'y' => round($secs / 31556926) % 12,
'w' => round($secs / 604800) % 52,
'd' => round($secs / 86400) % 7,
'h' => round($secs / 3600) % 24,
'm' => round($secs / 60) % 60,
's' => $secs % 60,
];
$ret = [];
foreach ($bit as $k => $v) {
if ($v > 0) {
$ret[] = $v . $k;
}
}
if (empty($ret)) {
return 'none';
}
return join(' ', $ret);
}
public function clearStaleAlerts()
{
$sql = 'SELECT `alerts`.`id` AS `alert_id`, `devices`.`hostname` AS `hostname` FROM `alerts` LEFT JOIN `devices` ON `alerts`.`device_id`=`devices`.`device_id` RIGHT JOIN `alert_rules` ON `alerts`.`rule_id`=`alert_rules`.`id` WHERE `alerts`.`state`!=' . AlertState::CLEAR . ' AND `devices`.`hostname` IS NULL';