From ef7d51fb6086e7dc7194c4ddac3a0d5777c35f11 Mon Sep 17 00:00:00 2001 From: vgilc Date: Mon, 19 May 2014 09:43:18 +0000 Subject: [PATCH] 2014-05-19 Vanessa Gil * extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql pandoradb_data.sql pandoradb.data.postgreSQL.sql pandoradb.data.oracle.sql: Deleted module templates by default. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9955 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 ++++ .../pandoradb_migrate_5.0.x_to_5.1.mysql.sql | 19 ++++++++ .../pandoradb_migrate_5.0.x_to_5.1.oracle.sql | 19 ++++++++ ...doradb_migrate_5.0.x_to_5.1.postgreSQL.sql | 21 ++++++++- pandora_console/pandoradb.data.oracle.sql | 47 ++----------------- pandora_console/pandoradb.data.postgreSQL.sql | 47 ++----------------- pandora_console/pandoradb_data.sql | 6 +-- 7 files changed, 75 insertions(+), 94 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index f054c372a3..92093bf38e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2014-05-19 Vanessa Gil + + * extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql + extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql + extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql + pandoradb_data.sql + pandoradb.data.postgreSQL.sql + pandoradb.data.oracle.sql: Deleted module templates + by default. + 2014-05-19 Vanessa Gil * include/languages/ca.mo diff --git a/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql b/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql index abe71e7867..2f166cab42 100644 --- a/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql @@ -175,3 +175,22 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_report_front_logo', 'images/pandora_logo_white.jpg'), ('custom_report_front_header', ''), ('custom_report_front_footer', ''); + +/* 2014/05/19 */ +-- --------------------------------------------------------------------- +-- Table `tnetwork_profile` +-- --------------------------------------------------------------------- +DELETE FROM `tnetwork_profile` WHERE `id_np`=1; +DELETE FROM `tnetwork_profile` WHERE `id_np`=4; +DELETE FROM `tnetwork_profile` WHERE `id_np`=5; +DELETE FROM `tnetwork_profile` WHERE `id_np`=6; + +/* 2014/05/19 */ +-- --------------------------------------------------------------------- +-- Table `tnetwork_profile_component` +-- --------------------------------------------------------------------- +DELETE FROM `tnetwork_profile_component` WHERE `id_np`=1; +DELETE FROM `tnetwork_profile_component` WHERE `id_np`=4; +DELETE FROM `tnetwork_profile_component` WHERE `id_np`=5; +DELETE FROM `tnetwork_profile_component` WHERE `id_np`=6; +DELETE FROM `tnetwork_profile_component` WHERE `id_nc`=24 AND `id_np`=3; diff --git a/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql b/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql index 541f974c3f..319d9adaab 100644 --- a/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql @@ -155,3 +155,22 @@ INSERT INTO tconfig (token, value) VALUES ('custom_report_front_font', 'FreeSans INSERT INTO tconfig (token, value) VALUES ('custom_report_front_logo', 'images/pandora_logo_white.jpg'); INSERT INTO tconfig (token, value) VALUES ('custom_report_front_header', ''); INSERT INTO tconfig (token, value) VALUES ('custom_report_front_footer', ''); + +/* 2014/05/19 */ +-- --------------------------------------------------------------------- +-- Table `tnetwork_profile` +-- --------------------------------------------------------------------- +DELETE FROM tnetwork_profile WHERE id_np=1; +DELETE FROM tnetwork_profile WHERE id_np=4; +DELETE FROM tnetwork_profile WHERE id_np=5; +DELETE FROM tnetwork_profile WHERE id_np=6; + +/* 2014/05/19 */ +-- --------------------------------------------------------------------- +-- Table `tnetwork_profile_component` +-- --------------------------------------------------------------------- +DELETE FROM tnetwork_profile_component WHERE id_np=1; +DELETE FROM tnetwork_profile_component WHERE id_np=4; +DELETE FROM tnetwork_profile_component WHERE id_np=5; +DELETE FROM tnetwork_profile_component WHERE id_np=6; +DELETE FROM tnetwork_profile_component WHERE id_nc=24 AND id_np=3; diff --git a/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql index a02c6c0e7d..ba270f83c1 100644 --- a/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql @@ -128,4 +128,23 @@ INSERT INTO "tconfig" ("token", "value") VALUES ('custom_report_front_font', 'FreeSans.ttf'), ('custom_report_front_logo', 'images/pandora_logo_white.jpg'), ('custom_report_front_header', ''), -('custom_report_front_footer', ''); \ No newline at end of file +('custom_report_front_footer', ''); + +/* 2014/05/19 */ +-- --------------------------------------------------------------------- +-- Table `tnetwork_profile` +-- --------------------------------------------------------------------- +DELETE FROM "tnetwork_profile" WHERE "id_np"=1; +DELETE FROM "tnetwork_profile" WHERE "id_np"=4; +DELETE FROM "tnetwork_profile" WHERE "id_np"=5; +DELETE FROM "tnetwork_profile" WHERE "id_np"=6; + +/* 2014/05/19 */ +-- --------------------------------------------------------------------- +-- Table `tnetwork_profile_component` +-- --------------------------------------------------------------------- +DELETE FROM "tnetwork_profile_component" WHERE "id_np"=1; +DELETE FROM "tnetwork_profile_component" WHERE "id_np"=4; +DELETE FROM "tnetwork_profile_component" WHERE "id_np"=5; +DELETE FROM "tnetwork_profile_component" WHERE "id_np"=6; +DELETE FROM "tnetwork_profile_component" WHERE "id_nc"=24 AND "id_np"=3; diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql index d66b8ae29d..349da2494c 100644 --- a/pandora_console/pandoradb.data.oracle.sql +++ b/pandora_console/pandoradb.data.oracle.sql @@ -1019,12 +1019,9 @@ END;; -- BEGIN LOCK TABLE tnetwork_profile IN EXCLUSIVE MODE; -INSERT INTO tnetwork_profile (id_np, name, description) VALUES (1,'Basic Network Monitoring','This includes basic SNMP, ICMP, and TCP checks.'); INSERT INTO tnetwork_profile (id_np, name, description) VALUES (2,'Basic Monitoring','Only ICMP check'); INSERT INTO tnetwork_profile (id_np, name, description) VALUES (3,'Basic DMZ Server monitoring','This group of network checks, checks for default services located on DMZ servers...'); -INSERT INTO tnetwork_profile (id_np, name, description) VALUES (4,'Full SNMP Monitoring',''); -INSERT INTO tnetwork_profile (id_np, name, description) VALUES (5,'Linux Server','Full Monitoring of a Linux server services.'); -INSERT INTO tnetwork_profile (id_np, name, description) VALUES (6,'Basic WMI monitoring','Basic monitoring of a Windows host.'); + COMMIT; END;; @@ -1033,51 +1030,13 @@ END;; -- BEGIN LOCK TABLE tnetwork_profile_component IN EXCLUSIVE MODE; -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (24,1); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (25,1); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (27,1); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (28,1); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (30,1); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (31,1); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (34,1); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (39,1); + INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (34,2); INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (34,3); INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (37,3); INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (39,3); INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (38,3); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (24,3); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (3,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (24,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (25,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (26,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (27,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (28,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (29,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (30,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (31,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (32,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (45,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (46,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (47,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (48,4); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (3,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (50,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (53,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (24,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (30,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (27,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (34,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (1,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (2,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (49,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (4,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (51,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (52,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (39,5); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (200,6); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (201,6); -INSERT INTO tnetwork_profile_component (id_nc, id_np) VALUES (202,6); + COMMIT; END;; diff --git a/pandora_console/pandoradb.data.postgreSQL.sql b/pandora_console/pandoradb.data.postgreSQL.sql index 5be4ba4119..5874f632a6 100644 --- a/pandora_console/pandoradb.data.postgreSQL.sql +++ b/pandora_console/pandoradb.data.postgreSQL.sql @@ -969,59 +969,18 @@ INSERT INTO "tnetwork_component_group" ("id_sg", "name", "parent") VALUES (48,'M SELECT setval('tnetwork_component_group_id_sg_seq', (SELECT (SELECT MAX(id_sg) FROM tnetwork_component_group))); -- Network profile -INSERT INTO "tnetwork_profile" ("id_np", "name", "description") VALUES (1,'Basic Network Monitoring','This includes basic SNMP, ICMP, and TCP checks.'); + INSERT INTO "tnetwork_profile" ("id_np", "name", "description") VALUES (2,'Basic Monitoring','Only ICMP check'); INSERT INTO "tnetwork_profile" ("id_np", "name", "description") VALUES (3,'Basic DMZ Server monitoring','This group of network checks, checks for default services located on DMZ servers...'); -INSERT INTO "tnetwork_profile" ("id_np", "name", "description") VALUES (4,'Full SNMP Monitoring',''); -INSERT INTO "tnetwork_profile" ("id_np", "name", "description") VALUES (5,'Linux Server','Full Monitoring of a Linux server services.'); -INSERT INTO "tnetwork_profile" ("id_np", "name", "description") VALUES (6,'Basic WMI monitoring','Basic monitoring of a Windows host.'); + SELECT setval('tnetwork_profile_id_np_seq', (SELECT (SELECT MAX(id_np) FROM tnetwork_profile))); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (24,1); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (25,1); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (27,1); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (28,1); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (30,1); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (31,1); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (34,1); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (39,1); INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (34,2); INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (34,3); INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (37,3); INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (39,3); INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (38,3); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (24,3); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (3,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (24,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (25,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (26,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (27,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (28,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (29,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (30,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (31,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (32,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (45,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (46,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (47,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (48,4); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (3,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (50,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (53,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (24,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (30,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (27,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (34,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (1,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (2,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (49,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (4,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (51,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (52,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (39,5); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (200,6); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (201,6); -INSERT INTO "tnetwork_profile_component" ("id_nc", "id_np") VALUES (202,6); + -- GIS Data INSERT INTO "tgis_map" VALUES (1,'Sample',-3.708187,40.42056,0,16,'',-3.708187,40.42056,0,0,1); diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index bb4345e330..53b10c7589 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -959,17 +959,13 @@ INSERT INTO `tnetwork_component_group` VALUES (49,'DB2',15); -- Network profile -INSERT INTO `tnetwork_profile` (`id_np`, `name`, `description`) VALUES (1,'Basic Network Monitoring','This includes basic SNMP, ICMP, and TCP checks.'); INSERT INTO `tnetwork_profile` (`id_np`, `name`, `description`) VALUES (2,'Basic Monitoring','Only ICMP check'); INSERT INTO `tnetwork_profile` (`id_np`, `name`, `description`) VALUES (3,'Basic DMZ Server monitoring','This group of network checks, checks for default services located on DMZ servers...'); -INSERT INTO `tnetwork_profile` (`id_np`, `name`, `description`) VALUES (4,'Full SNMP Monitoring',''); -INSERT INTO `tnetwork_profile` (`id_np`, `name`, `description`) VALUES (5,'Linux Server','Full Monitoring of a Linux server services.'); -INSERT INTO `tnetwork_profile` (`id_np`, `name`, `description`) VALUES (6,'Basic WMI monitoring','Basic monitoring of a Windows host.'); INSERT INTO `tnetwork_profile` (`id_np`, `name`, `description`) VALUES (7,'Linux Server with SNMP','Group of "basic" modules for SNMP monitoring of Linux remote devices. This includes basic conectivity checks and a full range of System'); -INSERT INTO `tnetwork_profile_component` VALUES (24,1),(25,1),(27,1),(28,1),(30,1),(31,1),(34,1),(39,1),(34,2),(34,3),(37,3),(39,3),(38,3),(24,3),(3,4),(24,4),(25,4),(26,4),(27,4),(28,4),(29,4),(30,4),(31,4),(32,4),(45,4),(46,4),(47,4),(48,4),(3,5),(50,5),(53,5),(24,5),(30,5),(27,5),(34,5),(1,5),(2,5),(49,5),(4,5),(51,5),(52,5),(39,5),(200,6),(201,6),(202,6),(540,7),(533,7),(534,7),(537,7),(538,7),(536,7),(535,7),(539,7),(1,7),(4,7),(34,7),(30,7),(27,7),(24,7); +INSERT INTO `tnetwork_profile_component` VALUES (34,2),(34,3),(37,3),(39,3),(38,3),(540,7),(533,7),(534,7),(537,7),(538,7),(536,7),(535,7),(539,7),(1,7),(4,7),(34,7),(30,7),(27,7),(24,7);