commit version 22.12.12447

This commit is contained in:
2023-01-01 22:36:12 -05:00
parent af1b03d79f
commit b948283a96
744 changed files with 620715 additions and 27381 deletions

View File

@ -6,12 +6,12 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2022 Observium Limited
*
*/
$sql = "SELECT * FROM `sensors` WHERE 1";
$sql .= generate_query_values(array_keys($config['counter_types']), 'sensor_class');
$sql .= generate_query_values_and(array_keys($config['counter_types']), 'sensor_class');
$sensors = dbFetchRows($sql);
if (count($sensors))

View File

@ -13,7 +13,7 @@
/* Canceled converting
$sql = "SELECT * FROM `device_graphs` WHERE 1";
$sql .= generate_query_values(['hr_processes', 'hr_users'], 'graph');
$sql .= generate_query_values_and(['hr_processes', 'hr_users'], 'graph');
$device_graphs = dbFetchRows($sql);
if (count($device_graphs))

View File

@ -6,15 +6,15 @@
*
* @package observium
* @subpackage update
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2022 Observium Limited
*
*/
$sql = "SELECT * FROM `devices_locations` WHERE 1";
$sql .= generate_query_values(['Unknown', ''], 'location_country', '!=');
$sql .= generate_query_values_and([ 'Unknown', '' ], 'location_country', '!=');
$devices_locations = dbFetchRows($sql);
if (count($devices_locations))
if (count((array)$devices_locations))
{
echo 'Unificate GEO Country names: ';
@ -24,8 +24,8 @@ if (count($devices_locations))
$country = country_from_code($entry['location_country']);
if ($country != $entry['location_country'])
{
$update_array = ['location_country' => $country,
'location_updated' => $entry['location_updated']]; // Keep updated timestamp
$update_array = [ 'location_country' => $country,
'location_updated' => $entry['location_updated'] ]; // Keep updated timestamp
dbUpdate($update_array, 'devices_locations', '`location_id` = ?', [$entry['location_id']]);
echo('.');
}

2
update/466.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `roles_users` CHANGE `user_id` `user_id` BIGINT NOT NULL;
--ALTER TABLE `users_perms` CHANGE `user_id` `user_id` BIGINT NOT NULL;

1
update/467.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `users` ADD `type` VARCHAR(16) NOT NULL DEFAULT 'mysql' AFTER `user_options`;

2
update/468.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `users` CHANGE `type` `type` VARCHAR(16) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT 'mysql';
ALTER TABLE `users` DROP INDEX `username`, ADD UNIQUE `username` (`username`, `type`) USING BTREE;

6
update/469.sql Normal file
View File

@ -0,0 +1,6 @@
ALTER TABLE `storage` ADD `storage_object` VARCHAR(64) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL AFTER `storage_mib`;
UPDATE `storage` SET `storage_object` = 'volEntry' WHERE `storage_mib` = 'NIMBLE-MIB';
UPDATE `storage` SET `storage_object` = 'nasArrayTable' WHERE `storage_mib` = 'BUFFALO-NAS-MIB';
UPDATE `storage` SET `storage_object` = 'ifsFilesystem' WHERE `storage_mib` = 'ISILON-MIB';
UPDATE `storage` SET `storage_object` = 'gpfsFileSystemPerfEntry' WHERE `storage_mib` = 'GPFS-MIB';
UPDATE `storage` SET `storage_object` = 'swStorageConfig' WHERE `storage_mib` = 'EMBEDDED-NGX-MIB';

2
update/470.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `neighbours` ADD `remote_device_id` INT NULL DEFAULT NULL AFTER `port_id`;
UPDATE `neighbours` INNER JOIN `ports` ON `neighbours`.`remote_port_id` = `ports`.`port_id` SET `neighbours`.`remote_device_id` = `ports`.`device_id`;

1
update/471.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `devices` CHANGE `asset_tag` `asset_tag` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `type` `type` VARCHAR(20) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `serial` `serial` VARCHAR(128) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `icon` `icon` VARCHAR(255) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `distro` `distro` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `distro_ver` `distro_ver` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `kernel` `kernel` VARCHAR(64) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `arch` `arch` VARCHAR(8) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL;

1
update/472.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `entPhysical` CHANGE `entPhysicalContainedIn` `entPhysicalContainedIn` INT NULL DEFAULT NULL, CHANGE `entPhysicalParentRelPos` `entPhysicalParentRelPos` INT NULL DEFAULT NULL;

9
update/473.sql Normal file
View File

@ -0,0 +1,9 @@
ALTER TABLE `oids_entries` ADD INDEX `device_id` (`device_id`);
ALTER TABLE `notifications_queue` CHANGE `aca_type` `aca_type` ENUM('alert','syslog','web') CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL;
ALTER TABLE `notifications_queue` ADD INDEX `device_id` (`device_id`);
ALTER TABLE `syslog_rules` ADD INDEX `la_cache` (`la_disable`);
ALTER TABLE `cef_prefix` ADD INDEX `cef_cache` (`device_id`);
ALTER TABLE `wifi_aps` ADD INDEX `device_id` (`device_id`);
ALTER TABLE `wifi_aps_members` ADD INDEX `device_id` (`device_id`);
ALTER TABLE `groups` ADD INDEX `entity_type` (`entity_type`);
ALTER TABLE `ports` ADD INDEX `port_descr_type` (`port_id`, `device_id`, `port_descr_type`);

1
update/474.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `probes` ADD `probe_disabled` BOOLEAN NOT NULL DEFAULT FALSE AFTER `probe_no_default`;

1
update/475.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `devices` ADD `snmpable` TEXT CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL AFTER `snmp_context`;

1
update/476.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `ports` MODIFY `ifIndex` VARCHAR(16);

11
update/477.sql Normal file
View File

@ -0,0 +1,11 @@
ALTER TABLE `ospf_instances` CHANGE `ospfRouterId` `ospfRouterId` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ospfAdminStat` `ospfAdminStat` ENUM('enabled','disabled') CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT 'disabled', CHANGE `ospfVersionNumber` `ospfVersionNumber` ENUM('version2','version3') CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL;
ALTER TABLE `ospf_instances` CHANGE `ospfAreaBdrRtrStatus` `ospfAreaBdrRtrStatus` ENUM('true','false') CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfASBdrRtrStatus` `ospfASBdrRtrStatus` ENUM('true','false') CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfTOSSupport` `ospfTOSSupport` ENUM('true','false') CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfDemandExtensions` `ospfDemandExtensions` ENUM('true','false') CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL;
ALTER TABLE `ospf_instances` DROP INDEX `device_id`;
ALTER TABLE `ospf_instances` ADD UNIQUE `device` (`device_id`, `ospfVersionNumber`);
ALTER TABLE `ospf_areas` CHANGE `ospfAreaId` `ospfAreaId` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ospfAuthType` `ospfAuthType` VARCHAR(64) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ospfImportAsExtern` `ospfImportAsExtern` VARCHAR(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ospfAreaSummary` `ospfAreaSummary` VARCHAR(16) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ospfAreaStatus` `ospfAreaStatus` VARCHAR(16) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL;
ALTER TABLE `ospf_areas` CHANGE `ospfAuthType` `ospfAuthType` VARCHAR(64) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT 'none';
ALTER TABLE `ospf_areas` ADD `ospfVersionNumber` ENUM('version2','version3') CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT 'version2' AFTER `device_id`;
ALTER TABLE `ospf_areas` DROP INDEX `device_area`;
ALTER TABLE `ospf_areas` ADD UNIQUE `device_area` (`device_id`, `ospfVersionNumber`, `ospfAreaId`);
ALTER TABLE `ospf_ports` CHANGE `ospf_port_id` `ospf_port_id` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ospfIfIpAddress` `ospfIfIpAddress` VARCHAR(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ospfIfAreaId` `ospfIfAreaId` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ospfIfType` `ospfIfType` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfIfAdminStat` `ospfIfAdminStat` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfIfState` `ospfIfState` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfIfDesignatedRouter` `ospfIfDesignatedRouter` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfIfBackupDesignatedRouter` `ospfIfBackupDesignatedRouter` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfIfAuthKey` `ospfIfAuthKey` VARCHAR(128) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfIfStatus` `ospfIfStatus` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfIfMulticastForwarding` `ospfIfMulticastForwarding` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfIfDemand` `ospfIfDemand` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfIfAuthType` `ospfIfAuthType` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL;
ALTER TABLE `ospf_nbrs` CHANGE `ospf_nbr_id` `ospf_nbr_id` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ospfNbrIpAddr` `ospfNbrIpAddr` VARCHAR(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ospfNbrRtrId` `ospfNbrRtrId` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ospfNbrState` `ospfNbrState` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL, CHANGE `ospfNbmaNbrStatus` `ospfNbmaNbrStatus` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfNbmaNbrPermanence` `ospfNbmaNbrPermanence` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NULL DEFAULT NULL, CHANGE `ospfNbrHelloSuppressed` `ospfNbrHelloSuppressed` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL;