From 55dd42be99f51eca3123f34293f4fff650f70258 Mon Sep 17 00:00:00 2001
From: TheWitness <thewitness@cacti.net>
Date: Sun, 17 Mar 2024 19:05:01 -0400
Subject: [PATCH] Fixing #220 - Program Queries fail

* Error when creating an Alert Rules based on program name
* Preparing for release 4.2
---
 CHANGELOG.md    |  2 ++
 INFO            |  2 +-
 config.php.dist |  7 ++++---
 functions.php   | 12 ++++++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34bc05a..58a13ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@
 
 * issue#218: SQL errors when deleting messages
 
+* issue#220: Error when creating an Alert Rules based on program name
+
 * issue#222: PHP Deprecation Errors in PHP 8.2
 
 --- 4.1 ---
diff --git a/INFO b/INFO
index 53671fa..bfbd09b 100644
--- a/INFO
+++ b/INFO
@@ -1,5 +1,5 @@
 ; +-------------------------------------------------------------------------+
-; | Copyright (C) 2004-2023 The Cacti Group                                 |
+; | Copyright (C) 2004-2024 The Cacti Group                                 |
 ; |                                                                         |
 ; | This program is free software; you can redistribute it and/or           |
 ; | modify it under the terms of the GNU General Public License             |
diff --git a/config.php.dist b/config.php.dist
index cd859e9..6ae9393 100644
--- a/config.php.dist
+++ b/config.php.dist
@@ -1,7 +1,7 @@
 <?php
 /*
  +-------------------------------------------------------------------------+
- | Copyright (C) 2004-2023 The Cacti Group                                 |
+ | Copyright (C) 2004-2024 The Cacti Group                                 |
  |                                                                         |
  | This program is free software; you can redistribute it and/or           |
  | modify it under the terms of the GNU General Public License             |
@@ -64,10 +64,11 @@ if (!$use_cacti_db) {
 //$syslog_install_options['id']           = 'syslog';
 
 /* field in the incomming table */
-$syslog_incoming_config['timeField']          = 'logtime';
 $syslog_incoming_config['priorityField']      = 'priority_id';
 $syslog_incoming_config['facilityField']      = 'facility_id';
-$syslog_incoming_config['hostField']          = 'host_id';
+$syslog_incoming_config['programField']       = 'program';
+$syslog_incoming_config['timeField']          = 'logtime';
+$syslog_incoming_config['hostField']          = 'host';
 $syslog_incoming_config['textField']          = 'message';
 $syslog_incoming_config['id']                 = 'seq';
 
diff --git a/functions.php b/functions.php
index 2f9dc6e..5f3d7d4 100644
--- a/functions.php
+++ b/functions.php
@@ -1612,6 +1612,10 @@ function syslog_process_alert($alert, $sql, $params, $count, $hostname = '') {
 function syslog_get_alert_sql(&$alert, $uniqueID) {
 	global $syslogdb_default, $syslog_incoming_config;
 
+	if (!isset($syslog_incoming_config['programField'])) {
+		$syslog_incoming_config['programField'] = 'program';
+	}
+
 	$params = array();
 	$sql    = '';
 
@@ -1653,6 +1657,14 @@ function syslog_get_alert_sql(&$alert, $uniqueID) {
 			WHERE `' . $syslog_incoming_config['hostField'] . '` = ?
 			AND `status` = ?' . $uniqueID;
 
+		$params[] = $alert['message'];
+		$params[] = $uniqueID;
+	} elseif ($alert['type'] == 'program') {
+		$sql = 'SELECT *
+			FROM `' . $syslogdb_default . '`.`syslog_incoming`
+			WHERE `' . $syslog_incoming_config['programField'] . '` = ?
+			AND `status` = ?' . $uniqueID;
+
 		$params[] = $alert['message'];
 		$params[] = $uniqueID;
 	} elseif ($alert['type'] == 'sql') {