From librenms, 7 Years ago, written in Plain Text.
Embed
  1. diff --git a/includes/alerts.inc.php b/includes/alerts.inc.php
  2. index 3db929b..26524a3 100644
  3. --- a/includes/alerts.inc.php
  4. +++ b/includes/alerts.inc.php
  5. @@ -186,18 +186,13 @@ function RunRules($device)
  6.          } else { //( $s > 0 && $inv == false ) {
  7.              $doalert = false;
  8.          }
  9. -        $extra['contacts'] = GetContacts($qry);
  10. -        $extra['rule']     = $qry;
  11. -        $extra = gzcompress(json_encode($extra), 9);
  12.          if ($doalert) {
  13.              if ($chk['state'] === "2") {
  14.                  c_echo('Status: %ySKIP');
  15.              } elseif ($chk['state'] >= "1") {
  16. -                // NOCHG here doesn't mean no change full stop. It means no change to the alert state
  17. -                // So we update the details column with any fresh changes to the alert output we might have.
  18. -                dbUpdate(array('details' => $extra), 'alert_log', 'device_id = ? && rule_id = ?', array($device,$rule['id']));
  19.                  c_echo('Status: %bNOCHG');
  20.              } else {
  21. +                $extra = gzcompress(json_encode(array('contacts' => GetContacts($qry), 'rule'=>$qry)), 9);
  22.                  if (dbInsert(array('state' => 1, 'device_id' => $device, 'rule_id' => $rule['id'], 'details' => $extra), 'alert_log')) {
  23.                      if (!dbUpdate(array('state' => 1, 'open' => 1), 'alerts', 'device_id = ? && rule_id = ?', array($device,$rule['id']))) {
  24.                          dbInsert(array('state' => 1, 'device_id' => $device, 'rule_id' => $rule['id'], 'open' => 1,'alerted' => 0), 'alerts');
  25.