WebApps/Observium_CE
1
0
Fork 0
Code Pull Requests Activity

Commit version 24.12.13800

Browse Source
This commit is contained in:
Chris Hammer
2025-01-06 17:35:06 -05:00
parent b7f6a79c2c
commit 55d9218816
6133 changed files with 4239740 additions and 1374287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
update/074.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/095.php
View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/127.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/128.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/129.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/153.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/164.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/165.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/170.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/176.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/177.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/187.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/191.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/210.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/212.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/256.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/257.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/258.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/260.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/262.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/268.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

39
update/269.php
View File

@ -1,5 +1,4 @@
<?php
/**
* Observium
*
@ -7,25 +6,37 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/
foreach (dbFetchRows("SELECT * FROM `alert_tests` ". $where, $args) as $entry)
{
$conditions = json_decode($entry['conditions'], TRUE);
for ($i = 0; $i < count($conditions); $i++)
{
if ($conditions[$i]['value'] == '' && $conditions[$i]['metric'] == '' && $conditions[$i]['condition'] == '')
{
// Remove invalid condition entry
unset($conditions[$i]);
}
}
// Check if $conditions is an array before proceeding
if ($conditions = safe_json_decode($entry['conditions'])) {
// Use a temporary array to store valid conditions
$validConditions = [];
foreach ($conditions as $condition) {
// Check if all values are empty
if ($condition['value'] !== '' || $condition['metric'] !== '' || $condition['condition'] !== '') {
// If not all values are empty, add to valid conditions
$validConditions[] = $condition;
}
}
// Update the database with the valid conditions only
dbUpdate(array('conditions' => safe_json_encode($validConditions)), 'alert_tests', '`alert_test_id` = ?', array($entry['alert_test_id']));
echo('.');
} else {
// Handle the case where $conditions is not an array (e.g., null or false)
// Depending on your application logic, you might want to log this or take other actions
print_debug("Invalid JSON in alert_tests for alert_test_id: " . $entry['alert_test_id']);
echo('E');
}
dbUpdate(array('conditions' => json_encode($conditions)), 'alert_tests', '`alert_test_id` = ?', array($entry['alert_test_id']));
echo('.');
}
// EOF

2
update/274.php
View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/279.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/280.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/282.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/284.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/285.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/288.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/293.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/302.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/315.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/333.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/335.php
View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage db
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/350.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/355.php
View File

@ -8,7 +8,7 @@
* @package observium
* @subpackage syslog
* @author Adam Armstrong <adama@observium.org>
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/360.php
View File

@ -8,7 +8,7 @@
* @package observium
* @subpackage update
* @author Adam Armstrong <adama@observium.org>
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/410.php
View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2022 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/413.php
View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/415.php
View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2022 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/424.php
View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/432.php
View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage db
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2020 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/455.php
View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage db
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/464.php
View File

@ -7,7 +7,7 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/

2
update/478.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `pollers` ADD `poller_version` VARCHAR(32) NULL DEFAULT NULL AFTER `host_uname`;
ALTER TABLE `pollers` ADD INDEX `host` (`host_id`);

1
update/479.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `alert_log` ADD `log_state` VARCHAR(512) NULL DEFAULT NULL AFTER `notified`;

1
update/480.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `ports` DROP `ifHardType`;

1
update/481.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `entPhysical` CHANGE `entPhysicalIndex` `entPhysicalIndex` BIGINT NOT NULL, CHANGE `entPhysicalContainedIn` `entPhysicalContainedIn` BIGINT NULL DEFAULT NULL;

8
update/482.sql Normal file
View File

@ -0,0 +1,8 @@
ALTER TABLE `ip_mac` ADD `device_id` INT NOT NULL AFTER `mac_id`;
UPDATE `ip_mac` SET `ip_mac`.`device_id` = (SELECT `ports`.`device_id` FROM `ports` WHERE `ports`.`port_id` = `ip_mac`.`port_id`);
ALTER TABLE `ip_mac` ADD `virtual_name` VARCHAR(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `port_id`;
ALTER TABLE `ip_mac` CHANGE `mac_address` `mac_address` CHAR(12) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ip_address` `ip_address` VARCHAR(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL;
ALTER TABLE `ip_mac` CHANGE `port_id` `port_id` INT NULL DEFAULT NULL;
ALTER TABLE `ip_mac` ADD `mac_ifIndex` VARCHAR(16) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL AFTER `port_id`;
UPDATE `ip_mac` SET `ip_mac`.`mac_ifIndex` = (SELECT `ports`.`ifIndex` FROM `ports` WHERE `ports`.`port_id` = `ip_mac`.`port_id`);
ALTER TABLE `ip_mac` ADD INDEX `cache` (`device_id`, `port_id`);

2
update/483.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `alerts_maint` ADD COLUMN `maint_interval` ENUM('daily', 'weekly', 'monthly') COLLATE utf8_unicode_ci DEFAULT NULL;
ALTER TABLE `alerts_maint` ADD COLUMN `maint_interval_count` int NOT NULL DEFAULT '1';

1
update/484.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `vlans_fdb` DROP INDEX `device_id`, ADD INDEX `device` (`device_id`, `deleted`) USING BTREE;

1
update/485.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `oids_entries` CHANGE `event` `event` ENUM('ok','warning','alert','ignore') CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT 'ignore';

3
update/486.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE `sensors` CHANGE `measured_class` `measured_class` VARCHAR(16) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `entPhysicalIndex` `entPhysicalIndex` VARCHAR(16) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `entPhysicalClass` `entPhysicalClass` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `sensor_status` `sensor_status` VARCHAR(64) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL;
ALTER TABLE `status` CHANGE `entPhysicalIndex` `entPhysicalIndex` VARCHAR(16) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `entPhysicalClass` `entPhysicalClass` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `measured_class` `measured_class` VARCHAR(16) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `status_map` `status_map` VARCHAR(64) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `status_name` `status_name` VARCHAR(64) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL;
ALTER TABLE `counters` CHANGE `counter_unit` `counter_unit` VARCHAR(16) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `entPhysicalIndex_measured` `entPhysicalIndex_measured` VARCHAR(16) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `measured_class` `measured_class` VARCHAR(16) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `entPhysicalIndex` `entPhysicalIndex` VARCHAR(16) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `entPhysicalClass` `entPhysicalClass` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `counter_status` `counter_status` VARCHAR(64) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL;

3
update/487.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE `pollers` CHANGE `poller_version` `poller_version` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `poller_stats` `poller_stats` TEXT CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL;
ALTER TABLE `pollers` ADD `sysName` VARCHAR(253) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL AFTER `host_id`;
ALTER TABLE `pollers` ADD `timestamp` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `poller_stats`;

1
update/488.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `pollers` ADD `device_id` INT NULL DEFAULT NULL AFTER `poller_name`;

2
update/489.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `processors` ADD `processor_mib` VARCHAR(64) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL AFTER `device_id`, ADD `processor_object` VARCHAR(64) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL AFTER `processor_mib`;
ALTER TABLE `processors` CHANGE `processor_type` `processor_type` VARCHAR(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL;

3
update/490.sql Normal file
View File

@ -0,0 +1,3 @@
CREATE TABLE `weathermaps` ( `wmap_id` int NOT NULL, `wmap_name` varchar(32) NOT NULL, `wmap_descr` varchar(128) DEFAULT NULL, `wmap_conf` mediumtext NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
ALTER TABLE `weathermaps` ADD PRIMARY KEY (`wmap_id`), ADD UNIQUE KEY `wmap_name` (`wmap_name`);
ALTER TABLE `weathermaps` MODIFY `wmap_id` int NOT NULL AUTO_INCREMENT;

4
update/491.sql Normal file
View File

@ -0,0 +1,4 @@
DROP TABLE IF EXISTS `netmaps`;
CREATE TABLE `netmaps` ( `netmap_id` int NOT NULL, `name` char(64) NOT NULL, `info` mediumtext NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
ALTER TABLE `netmaps` ADD PRIMARY KEY (`netmap_id`);
ALTER TABLE `netmaps` MODIFY `netmap_id` int NOT NULL AUTO_INCREMENT;

4
update/492.sql Normal file
View File

@ -0,0 +1,4 @@
DELETE FROM ports_stack WHERE NOT EXISTS ( SELECT 1 FROM ports WHERE ports_stack.device_id = ports.device_id AND (ports_stack.port_id_high = ports.ifIndex OR ports_stack.port_id_low = ports.ifIndex));
UPDATE ports_stack ps SET port_id_high = ( SELECT p.port_id FROM ports p WHERE p.device_id = ps.device_id AND p.ifIndex = ps.port_id_high);
UPDATE ports_stack ps SET port_id_low = ( SELECT p.port_id FROM ports p WHERE p.device_id = ps.device_id AND p.ifIndex = ps.port_id_low);
DELETE FROM `ports_stack` WHERE `port_id_high` = 0 OR `port_id_low` = 0

8
update/493.sql Normal file
View File

@ -0,0 +1,8 @@
ALTER TABLE `ospf_ports` ADD `ospfVersionNumber` ENUM('version2','version3') CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT 'version2' AFTER `port_id`;
UPDATE `ospf_ports` SET `ospfVersionNumber` = 'version3' WHERE `ospf_port_id` REGEXP '^[[:digit:]]+\.[[:digit:]]+$';
ALTER TABLE `ospf_ports` DROP INDEX `device_id`;
ALTER TABLE `ospf_ports` ADD UNIQUE `device_ports` (`device_id`, `ospfVersionNumber`, `ospf_port_id`);
ALTER TABLE `ospf_nbrs` ADD `ospfVersionNumber` ENUM('version2','version3') CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT 'version2' AFTER `port_id`;
UPDATE `ospf_nbrs` SET `ospfVersionNumber` = 'version3' WHERE `ospf_nbr_id` REGEXP '^[[:digit:]]+(\.[[:digit:]]+){2}$';
ALTER TABLE `ospf_nbrs` DROP INDEX `device_id`;
ALTER TABLE `ospf_nbrs` ADD UNIQUE `device_nbrs` (`device_id`, `ospfVersionNumber`, `ospf_nbr_id`);

1
update/494.sql Normal file
View File

@ -0,0 +1 @@
TRUNCATE `vminfo`;

1
update/495.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `alert_log` CHANGE `log_type` `log_type` ENUM('ALERT_NOTIFY','REMINDER_NOTIFY','FAIL','FAIL_DELAYED','FAIL_SUPPRESSED','OK','RECOVER_NOTIFY','RECOVER_SUPPRESSED') CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL;