diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b91c2dfcbd..13dc164695 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2011-02-15 Miguel de Dios + + * pandoradb.postgreSQL.sql, pandoradb.data.postgreSQL.sql: added column + threshold from changes in last Ramon commit in MySQL. + 2011-02-15 Miguel de Dios * godmode/alerts/alert_list.php: fixed the lost var in the audit. diff --git a/pandora_console/pandoradb.data.postgreSQL.sql b/pandora_console/pandoradb.data.postgreSQL.sql index 60a75e2872..3974bdcb2d 100644 --- a/pandora_console/pandoradb.data.postgreSQL.sql +++ b/pandora_console/pandoradb.data.postgreSQL.sql @@ -373,8 +373,8 @@ INSERT INTO "tgis_map_layer" VALUES (1,'Group All',1,0,1,0); -- example alert template INSERT INTO "talert_commands" VALUES (10,'Remote agent control','/usr/share/pandora_server/udp_client.pl _address_ 41122 "_field1_"','This command is used to send commands to the Pandora FMS agents with the UDP server enabled. The UDP server is used to order agents (Windows and UNIX) to "refresh" the agent execution: that means, to force the agent to execute and send data to s',0); -INSERT INTO "talert_actions" VALUES (1,'Mail to XXX',1,'yourmail@domain.es','[PANDORA] Alert from agent _agent_ on module _module_','',0); -INSERT INTO "talert_actions" VALUES (2,'Restart agent',10,'REFRESH AGENT','','',0); +INSERT INTO "talert_actions" VALUES (1,'Mail to XXX',1,'yourmail@domain.es','[PANDORA] Alert from agent _agent_ on module _module_','',0,0); +INSERT INTO "talert_actions" VALUES (2,'Restart agent',10,'REFRESH AGENT','','',0,0); INSERT INTO "talert_templates" VALUES (1,'Critical condition','This is a generic alert template to fire on condition CRITICAL',1,'','','Hello, this is an automated email coming from Pandora FMS\r\n\r\nThis alert has been fired because a CRITICAL condition in one of your monitored items:\r\n\r\nAgent : _agent_\r\nModule: _module_\r\nModule description: _moduledescription_\r\nTimestamp _timestamp_\r\nCurrent value: _data_\r\n\r\nThanks for your time.\r\n\r\nBest regards\r\nPandora FMS\r\n','critical','',1,0.00,0.00,86400,1,0,'12:00:00','12:00:00',1,1,1,1,1,1,1,1,'[PANDORA] Alert RECOVERED for CRITICAL status on _agent_ / _module_','Hello, this is an automated email coming from Pandora FMS\r\n\r\nThis alert has been RECOVERED from a CRITICAL condition in one of your monitored items:\r\n\r\nAgent : _agent_\r\nModule: _module_\r\nModule description: _moduledescription_\r\nTimestamp _timestamp_\r\nCurrent value: _data_\r\n\r\nThanks for your time.\r\n\r\nBest regards\r\nPandora FMS\r\n',4,0); INSERT INTO "talert_templates" VALUES (2,'Manual alert','This is a template used to fire manual alerts, condition defined here never will be executed. Use this template to assign to your actions/commands used to do remote management (Agent restart, execute commands on server, etc).',NULL,'','','','max_min','',1,0.00,1.00,86400,1,0,'12:00:00','12:00:00',1,1,1,1,1,1,1,0,'','',1,0); diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index 8ab1c1b8aa..ce740d0939 100644 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -230,7 +230,8 @@ CREATE TABLE "talert_actions" ( "field1" text NOT NULL default '', "field2" text default '', "field3" text default '', - "id_group" BIGINT NOT NULL default 0 + "id_group" BIGINT NOT NULL default 0, + "action_threshold" BIGINT NOT NULL default 0 ); CREATE TYPE type_talert_templates_alert_template AS ENUM ('regex', 'max_min', 'max', 'min', 'equal', 'not_equal', 'warning', 'critical', 'onchange', 'unknown');