diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2ed2f5386b..f7220e4a43 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2012-01-03 Juan Manuel Ramon + + * pandoradb.data.postgreSQL.sql + pandoradb.postgreSQL.sql: Fixed queries in these scripts. + 2012-01-02 Vanessa Gil * pandoradb.oracle.sql: Added netflow tables. diff --git a/pandora_console/pandoradb.data.postgreSQL.sql b/pandora_console/pandoradb.data.postgreSQL.sql index 2fb14ba6b9..6580afa42d 100644 --- a/pandora_console/pandoradb.data.postgreSQL.sql +++ b/pandora_console/pandoradb.data.postgreSQL.sql @@ -416,9 +416,3 @@ INSERT INTO "treport_custom_sql" ("id", "name", "sql") VALUES (2, 'Monitoring&#x INSERT INTO "treport_custom_sql" ("id", "name", "sql") VALUES (3, 'Monitoring Report Alerts', 'select t1.nombre as agent_name, t2.nombre as module_name, (select talert_templates.name from talert_templates where talert_templates.id = t3.id_alert_template) as template, (select group_concat(t02.name) from talert_template_module_actions as t01 inner join talert_actions as t02 on t01.id_alert_action = t02.id where t01.id_alert_template_module = t3.id group by t01.id_alert_template_module) as actions from tagente as t1 inner join tagente_modulo as t2 on t1.id_agente = t2.id_agente inner join talert_template_modules as t3 on t2.id_agente_modulo = t3.id_agent_module order by agent_name, module_name;'); INSERT INTO "treport_custom_sql" ("id", "name", "sql") VALUES (4, 'Group view', 'select t1.nombre, (select count(t3.id_agente) from tagente as t3 where t1.id_grupo = t3.id_grupo) as agents, (SELECT COUNT(t4.id_agente) FROM tagente as t4 WHERE t4.id_grupo = t1.id_grupo AND t4.disabled = 0 AND t4.ultimo_contacto < NOW() - (intervalo / (1/2))) as agent_unknown, (SELECT COUNT(tagente_estado.id_agente_estado) FROM tagente_estado, tagente, tagente_modulo WHERE tagente.id_grupo = t1.id_grupo AND tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND utimestamp > 0 AND tagente_modulo.id_tipo_modulo NOT IN(21,22,23,24,100) AND (UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) >= (tagente_estado.current_interval / (1/2))) as monitor_unknow, (SELECT COUNT(tagente_estado.id_agente_estado) FROM tagente_estado, tagente, tagente_modulo WHERE tagente.id_grupo = t1.id_grupo AND tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND tagente_modulo.id_tipo_modulo NOT IN (21,22,23,24) AND utimestamp = 0) as monitor_no_init, (SELECT COUNT(tagente_estado.id_agente_estado) FROM tagente_estado, tagente, tagente_modulo WHERE tagente.id_grupo = t1.id_grupo AND tagente.disabled = 0 AND tagente_estado.id_agente = tagente.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND estado = 0 AND ((UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) < (tagente_estado.current_interval / (1/2)) OR (tagente_modulo.id_tipo_modulo IN(21,22,23,24,100))) AND (utimestamp > 0 OR (tagente_modulo.id_tipo_modulo IN(21,22,23,24)))) as monitor_ok, (SELECT COUNT(tagente_estado.id_agente_estado) FROM tagente_estado, tagente, tagente_modulo WHERE tagente.id_grupo = t1.id_grupo AND tagente.disabled = 0 AND tagente_estado.id_agente = tagente.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND estado = 1 AND ((UNIX_TIMESTAMP(NOW()) - tagente_estado.utimestamp) < (tagente_estado.current_interval / (1/2)) OR (tagente_modulo.id_tipo_modulo IN(21,22,23,24,100))) AND utimestamp > 0) as monitor_critical, (SELECT COUNT(talert_template_modules.id) FROM talert_template_modules, tagente_modulo, tagente_estado, tagente WHERE tagente.id_grupo = t1.id_grupo AND tagente_modulo.id_agente = tagente.id_agente AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.disabled = 0 AND tagente.disabled = 0 AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo AND times_fired > 0) as monitor_alert_fired from tgrupo as t1 where 0 < (select count(t2.id_agente) from tagente as t2 where t1.id_grupo = t2.id_grupo)'); SELECT setval('treport_custom_sql_id_seq', (SELECT (SELECT MAX(id) FROM treport_custom_sql))); - --- --- Dumping data for table `tskin` --- -INSERT INTO "tskin" VALUES (1,'skin default', 'skin_default', 'Default skin for Pandora FMS web console', 1); -SELECT setval('tskin_id_seq', (SELECT (SELECT MAX(id) FROM tskin))); diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index 4977a34017..512467a760 100644 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -30,18 +30,10 @@ CREATE LANGUAGE plpgsql; CREATE OR REPLACE FUNCTION unix_timestamp(TIMESTAMP without time zone = CURRENT_TIMESTAMP) RETURNS double precision AS 'SELECT ceil(date_part(''epoch'', $1)); ' LANGUAGE SQL; -CREATE TABLE "taddress" ( - "id_a" SERIAL NOT NULL PRIMARY KEY, - "ip" VARCHAR(60) NOT NULL default '', - "ip_pack" INTEGER NOT NULL default 0 -); +CREATE TABLE "taddress" ("id_a" SERIAL NOT NULL PRIMARY KEY,"ip" VARCHAR(60) NOT NULL default '',"ip_pack" INTEGER NOT NULL default 0); CREATE INDEX "taddress_ip_idx" ON "taddress"("ip"); -CREATE TABLE "taddress_agent" ( - "id_ag" BIGSERIAL NOT NULL PRIMARY KEY, - "id_a" BIGINT NOT NULL default 0, - "id_agent" BIGINT NOT NULL default 0 -); +CREATE TABLE "taddress_agent" ("id_ag" BIGSERIAL NOT NULL PRIMARY KEY,"id_a" BIGINT NOT NULL default 0,"id_agent" BIGINT NOT NULL default 0); CREATE TABLE "tagente" ( "id_agente" SERIAL NOT NULL PRIMARY KEY, @@ -1119,7 +1111,7 @@ CREATE TABLE "tnetwork_map" ( "distance_nodes" DOUBLE PRECISION default 2.5, "center" INTEGER NOT NULL default 0, "contracted_nodes" TEXT, - "show_snmp_modules" SMALLINT NOT NULL default 0, + "show_snmp_modules" SMALLINT NOT NULL default 0 ); -- ----------------------------------------------------- @@ -1156,7 +1148,7 @@ CREATE TABLE "tagent_custom_data" ( CREATE TABLE "ttag" ( "id_tag" SERIAL NOT NULL PRIMARY KEY, - "name" VARCHAR2(100) NOT NULL default '', + "name" VARCHAR(100) NOT NULL default '', "description" text NOT NULL default '', "url" text NOT NULL default '' ); @@ -1191,7 +1183,7 @@ CREATE INDEX "ttag_poli_mod_id_pol_mo_idx" ON "ttag_policy_module"("id_policy_mo CREATE TABLE "ttag_event" ( id_tag INTEGER NOT NULL, - id_evento BIGINT(20) NOT NULL DEFAULT 0, + id_evento BIGINT NOT NULL DEFAULT 0, PRIMARY KEY (id_tag, id_evento) );