tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

DB IDO: Fix agent_version column.

Browse Source 
Fixes #5729
This commit is contained in:
Michael Friedrich 2014-03-08 15:03:59 +01:00
parent 3885885aac
commit aa2c45f83e
3 changed files with 124 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
components/db_ido_mysql/schema/mysql.sql
View File

@ -152,10 +152,10 @@ CREATE TABLE IF NOT EXISTS icinga_conninfo (
conninfo_id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
instance_id bigint unsigned default 0,
agent_name varchar(32) character set latin1 default '',
agent_version varchar(16) character set latin1 default '',
disposition varchar(16) character set latin1 default '',
connect_source varchar(16) character set latin1 default '',
connect_type varchar(16) character set latin1 default '',
agent_version varchar(32) character set latin1 default '',
disposition varchar(32) character set latin1 default '',
connect_source varchar(32) character set latin1 default '',
connect_type varchar(32) character set latin1 default '',
connect_time timestamp default '0000-00-00 00:00:00',
disconnect_time timestamp default '0000-00-00 00:00:00',
last_checkin_time timestamp default '0000-00-00 00:00:00',
@ -1338,6 +1338,61 @@ CREATE TABLE IF NOT EXISTS icinga_timeperiod_timeranges (
) ENGINE=InnoDB COMMENT='Timeperiod definitions';
-- --------------------------------------------------------
-- Icinga 2 specific schema extensions
-- --------------------------------------------------------
--
-- Table structure for table icinga_endpoints
--
CREATE TABLE IF NOT EXISTS icinga_endpoints (
endpoint_id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
instance_id bigint unsigned default 0,
endpoint_object_id bigint(20) unsigned DEFAULT '0',
config_type smallint(6) DEFAULT '0',
identity varchar(255) DEFAULT NULL,
node varchar(255) DEFAULT NULL,
PRIMARY KEY (endpoint_id)
) ENGINE=InnoDB COMMENT='Endpoint configuration';
-- --------------------------------------------------------
--
-- Table structure for table icinga_endpointstatus
--
CREATE TABLE IF NOT EXISTS icinga_endpointstatus (
endpointstatus_id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
instance_id bigint unsigned default 0,
endpoint_object_id bigint(20) unsigned DEFAULT '0',
status_update_time timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
identity varchar(255) DEFAULT NULL,
node varchar(255) DEFAULT NULL,
is_connected smallint(6),
PRIMARY KEY (endpointstatus_id)
) ENGINE=InnoDB COMMENT='Endpoint status';
ALTER TABLE icinga_servicestatus ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_hoststatus ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_acknowledgements ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_commenthistory ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_contactnotifications ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_downtimehistory ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_eventhandlers ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_externalcommands ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_flappinghistory ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_hostchecks ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_logentries ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_notifications ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_processevents ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_servicechecks ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_statehistory ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_systemcommands ADD COLUMN endpoint_object_id bigint default NULL;
-- -----------------------------------------
-- add index (delete)
-- -----------------------------------------

8
components/db_ido_mysql/schema/upgrade/0.0.8.sql
View File

@ -5,6 +5,14 @@
-- -----------------------------------------
ALTER TABLE icinga_statehistory ADD COLUMN check_source varchar(255) character set latin1 default NULL;
-- -----------------------------------------
-- #5731
-- -----------------------------------------
ALTER TABLE icinga_conninfo MODIFY agent_version VARCHAR(32);
ALTER TABLE icinga_conninfo MODIFY disposition VARCHAR(32);
ALTER TABLE icinga_conninfo MODIFY connect_source VARCHAR(32);
ALTER TABLE icinga_conninfo MODIFY connect_type VARCHAR(32);
-- --------------------------------------------------------
-- Icinga 2 specific schema extensions
-- --------------------------------------------------------

57
components/db_ido_pgsql/schema/pgsql.sql
View File

@ -1364,6 +1364,63 @@ CREATE TABLE icinga_timeperiod_timeranges (
) ;
-- --------------------------------------------------------
-- Icinga 2 specific schema extensions
-- --------------------------------------------------------
--
-- Table structure for table icinga_endpoints
--
CREATE TABLE IF NOT EXISTS icinga_endpoints (
endpoint_id bigserial,
instance_id bigint default 0,
endpoint_object_id bigint default 0,
config_type integer default 0,
identity text DEFAULT NULL,
node text DEFAULT NULL,
CONSTRAINT PK_endpoint_id PRIMARY KEY (endpoint_id) ,
CONSTRAINT UQ_endpoints UNIQUE (instance_id,config_type,endpoint_object_id)
) ;
-- --------------------------------------------------------
--
-- Table structure for table icinga_endpointstatus
--
CREATE TABLE IF NOT EXISTS icinga_endpointstatus (
endpointstatus_id bigserial,
instance_id bigint default 0,
endpoint_object_id bigint default 0,
status_update_time timestamp with time zone default '1970-01-01 00:00:00',
identity text DEFAULT NULL,
node text DEFAULT NULL,
is_connected integer default 0,
CONSTRAINT PK_endpointstatus_id PRIMARY KEY (endpointstatus_id) ,
CONSTRAINT UQ_endpointstatus UNIQUE (endpoint_object_id)
) ;
ALTER TABLE icinga_servicestatus ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_hoststatus ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_acknowledgements ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_commenthistory ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_contactnotifications ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_downtimehistory ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_eventhandlers ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_externalcommands ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_flappinghistory ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_hostchecks ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_logentries ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_notifications ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_processevents ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_servicechecks ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_statehistory ADD COLUMN endpoint_object_id bigint default NULL;
ALTER TABLE icinga_systemcommands ADD COLUMN endpoint_object_id bigint default NULL;
-- -----------------------------------------
-- add index (delete)
-- -----------------------------------------