2014-05-11 Junichi Satoh <junichi@rworks.jp>

* extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql: Changed the order
	of 'ALTER TABLE' and 'INSERT INTO' for trecon_script to avoid error.
	Added a missing column for trecon_script.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9915 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,9 @@
+2014-05-11  Junichi Satoh  <junichi@rworks.jp>
+
+	* extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql: Changed the order
+	of 'ALTER TABLE' and 'INSERT INTO' for trecon_script to avoid error.
+	Added a missing column for trecon_script.
+
 2014-05-11  Junichi Satoh  <junichi@rworks.jp>
 
 	* install.php: Improved to adjust program paths in pandora db for

pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql

@@ -142,16 +142,6 @@ CREATE TABLE  IF NOT EXISTS  `talert_snmp_action` (
 -- ---------------------------------------------------------------------
 ALTER TABLE `treport` ADD COLUMN `non_interactive` tinyint(1) UNSIGNED NOT NULL default 0;
 
--- ---------------------------------------------------------------------
--- Table `trecon_script`
--- ---------------------------------------------------------------------
-INSERT INTO `trecon_script` (`name`, `description`, `script`, `macros`) VALUES ('SNMP L2 Recon','Pandora FMS SNMP Recon Plugin for level 2 network topology discovery.
(c) Artica ST 2014 <info@artica.es>

Usage:

   ./snmp-recon.pl <task_id> <group_id> <create_incident> <custom_field1> <custom_field2> [custom_field3] [custom_field4]

 * custom_field1 = comma separated list of networks (i.e.: 192.168.1.0/24,192.168.2.0/24)
 * custom_field2 = comma separated list of snmp communities to try.
 * custom_field3 = a router in the network. Optional but recommended.

 * custom_field4 = set to -a to add all network interfaces (by default only interfaces that are up are added).

 Additional information:
When the script is called from a recon task the task_id, group_id and create_incident parameters are automatically filled by the Pandora FMS Server.','/usr/share/pandora_server/util/recon_scripts/snmp-recon.pl');
-
-INSERT INTO `trecon_script` (`name`, `description`, `script`, `macros`) VALUES ('WMI Recon Script','This script is used to automatically gather host information via WMI.
Available parameters:

* Network = network to scan (e.g. 192.168.100.0/24).
* WMI auth = comma separated list of WMI authentication tokens in the format username%password (e.g. Administrador%pass).

See the documentation for more information.','/usr/share/pandora_server/util/recon_scripts/wmi-recon.pl','{\"1\":{\"macro\":\"_field1_\",\"desc\":\"Network\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"},\"2\":{\"macro\":\"_field2_\",\"desc\":\"WMI auth\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"}}');
-
-/* 2014/04/10 */
-ALTER TABLE `treport_content` ADD COLUMN `name` varchar(150) NULL;
-
 /* 2014/04/11 */
 -- ---------------------------------------------------------------------
 -- Table `trecon_script` and `trecon_task`
@@ -159,6 +149,16 @@ ALTER TABLE `treport_content` ADD COLUMN `name` varchar(150) NULL;
 ALTER TABLE `trecon_script` ADD COLUMN `macros` TEXT;
 ALTER TABLE `trecon_task` ADD COLUMN `macros` TEXT;
 
+-- ---------------------------------------------------------------------
+-- Table `trecon_script`
+-- ---------------------------------------------------------------------
+INSERT INTO `trecon_script` (`name`, `description`, `script`, `macros`) VALUES ('SNMP L2 Recon','Pandora FMS SNMP Recon Plugin for level 2 network topology discovery.
(c) Artica ST 2014 <info@artica.es>

Usage:

   ./snmp-recon.pl <task_id> <group_id> <create_incident> <custom_field1> <custom_field2> [custom_field3] [custom_field4]

 * custom_field1 = comma separated list of networks (i.e.: 192.168.1.0/24,192.168.2.0/24)
 * custom_field2 = comma separated list of snmp communities to try.
 * custom_field3 = a router in the network. Optional but recommended.

 * custom_field4 = set to -a to add all network interfaces (by default only interfaces that are up are added).

 Additional information:
When the script is called from a recon task the task_id, group_id and create_incident parameters are automatically filled by the Pandora FMS Server.','/usr/share/pandora_server/util/recon_scripts/snmp-recon.pl','{\"1\":{\"macro\":\"_field1_\",\"desc\":\"Network\",\"help\":\"Comma separated list of networks (i.e.: 192.168.1.0/24,192.168.2.0/24)\",\"value\":\"\",\"hide\":\"\"},\"2\":{\"macro\":\"_field2_\",\"desc\":\"Community\",\"help\":\"Comma separated list of snmp communities to try.\",\"value\":\"\",\"hide\":\"\"},\"3\":{\"macro\":\"_field3_\",\"desc\":\"Router\",\"help\":\"A router in the network. Optional but recommended.\",\"value\":\"\",\"hide\":\"\"},\"4\":{\"macro\":\"_field4_\",\"desc\":\"Optional parameter\",\"help\":\"Set to -a to add all network interfaces (by default only interfaces that are up are added).\",\"value\":\"\",\"hide\":\"\"}}');
+
+INSERT INTO `trecon_script` (`name`, `description`, `script`, `macros`) VALUES ('WMI Recon Script','This script is used to automatically gather host information via WMI.
Available parameters:

* Network = network to scan (e.g. 192.168.100.0/24).
* WMI auth = comma separated list of WMI authentication tokens in the format username%password (e.g. Administrador%pass).

See the documentation for more information.','/usr/share/pandora_server/util/recon_scripts/wmi-recon.pl','{\"1\":{\"macro\":\"_field1_\",\"desc\":\"Network\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"},\"2\":{\"macro\":\"_field2_\",\"desc\":\"WMI auth\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"}}');
+
+/* 2014/04/10 */
+ALTER TABLE `treport_content` ADD COLUMN `name` varchar(150) NULL;
+
 /* 2014/05/05 */
 -- ---------------------------------------------------------------------
 -- Table `tlink`