tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-07-13 Sergio Martin <sergio.martin@artica.es>

Browse Source 
* extras/pandoradb_migrate_v3.2_to_v4.0.sql
	godmode/agentes/module_manager_editor_prediction.php: Fix a check
	bug and added to migration database schemma a fix for the prediction
	modules



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4558 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-07-13 17:16:52 +00:00
parent 35c7fef732
commit 4da9bdafcf
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2011-07-13 Sergio Martin <sergio.martin@artica.es>
* extras/pandoradb_migrate_v3.2_to_v4.0.sql
godmode/agentes/module_manager_editor_prediction.php: Fix a check
bug and added to migration database schemma a fix for the prediction
modules
2011-07-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-07-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_html.php: Fixed function print_select_groups() * include/functions_html.php: Fixed function print_select_groups()

8
pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql
View File

@ -214,3 +214,11 @@ ALTER TABLE `tplanned_downtime` ADD COLUMN `only_alerts` TINYINT(1) NOT NULL DEF
-- ----------------------------------------------------- -- -----------------------------------------------------
ALTER TABLE `talert_templates` MODIFY COLUMN `type` ENUM('regex','max_min','max','min','equal','not_equal','warning','critical','onchange','unknown', 'always') DEFAULT NULL; ALTER TABLE `talert_templates` MODIFY COLUMN `type` ENUM('regex','max_min','max','min','equal','not_equal','warning','critical','onchange','unknown', 'always') DEFAULT NULL;
-- -----------------------------------------------------
-- Table `tagente_modulo` to adapt the fields use to new prediction types and future modifications
-- -----------------------------------------------------
UPDATE tagente_modulo SET prediction_module = 2 WHERE custom_integer_1 <> 0 AND prediction_module <> 0
UPDATE tagente_modulo SET custom_integer_1 = prediction_module AND prediction_module = 1 WHERE custom_integer_1 = 0 AND prediction_module <> 0

6
pandora_console/godmode/agentes/module_manager_editor_prediction.php
View File

@ -28,6 +28,7 @@ $row = db_get_row_sql($sql);
$is_service = false; $is_service = false;
$is_synthetic = false; $is_synthetic = false;
$is_synthetic_avg = false; $is_synthetic_avg = false;
$ops = false;
if ($row !== false && is_array($row)) { if ($row !== false && is_array($row)) {
$prediction_module = $row['prediction_module']; $prediction_module = $row['prediction_module'];
$custom_integer_2 = $row ['custom_integer_2']; $custom_integer_2 = $row ['custom_integer_2'];
@ -144,8 +145,9 @@ unset ($table_advanced->data[2][3]);
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
agent_module_autocomplete ("#text_agent_name", "#id_agente", "#prediction_module"); agent_module_autocomplete ("#text_agent_name", "#id_agente", "#prediction_module");
<?php
<?php enterprise_hook('setup_services_synth', array($is_service, $is_synthetic, $is_synthetic_avg, $ops)); ?> enterprise_hook('setup_services_synth', array($is_service, $is_synthetic, $is_synthetic_avg, $ops));
?>
}); });
</script> </script>