diff --git a/pkg/icingadb/v1/command.go b/pkg/icingadb/v1/command.go index 7080e95a..cd4db2a7 100644 --- a/pkg/icingadb/v1/command.go +++ b/pkg/icingadb/v1/command.go @@ -25,6 +25,7 @@ type CommandArgument struct { RepeatKey types.Bool `json:"repeat_key"` Required types.Bool `json:"required"` SetIf types.String `json:"set_if"` + Separator types.String `json:"separator"` SkipKey types.Bool `json:"skip_key"` } diff --git a/schema/mysql/schema.sql b/schema/mysql/schema.sql index 645b1c0f..a5ed7acd 100644 --- a/schema/mysql/schema.sql +++ b/schema/mysql/schema.sql @@ -411,6 +411,7 @@ CREATE TABLE checkcommand_argument ( repeat_key enum('n', 'y') NOT NULL, required enum('n', 'y') NOT NULL, set_if varchar(255) DEFAULT NULL, + `separator` varchar(255) DEFAULT NULL, skip_key enum('n', 'y') NOT NULL, PRIMARY KEY (id) @@ -474,6 +475,7 @@ CREATE TABLE eventcommand_argument ( repeat_key enum('n', 'y') NOT NULL, required enum('n', 'y') NOT NULL, set_if varchar(255) DEFAULT NULL, + `separator` varchar(255) DEFAULT NULL, skip_key enum('n', 'y') NOT NULL, PRIMARY KEY (id) @@ -535,6 +537,7 @@ CREATE TABLE notificationcommand_argument ( repeat_key enum('n', 'y') NOT NULL, required enum('n', 'y') NOT NULL, set_if varchar(255) DEFAULT NULL, + `separator` varchar(255) DEFAULT NULL, skip_key enum('n', 'y') NOT NULL, PRIMARY KEY (id) diff --git a/schema/mysql/upgrades/1.0.0.sql b/schema/mysql/upgrades/1.0.0.sql index 4286ac9d..61a24e2e 100644 --- a/schema/mysql/upgrades/1.0.0.sql +++ b/schema/mysql/upgrades/1.0.0.sql @@ -11,6 +11,15 @@ ALTER TABLE host_state ALTER TABLE service_state ADD COLUMN previous_soft_state tinyint unsigned NOT NULL AFTER hard_state; +ALTER TABLE checkcommand_argument + ADD COLUMN `separator` varchar(255) DEFAULT NULL AFTER set_if; + +ALTER TABLE eventcommand_argument + ADD COLUMN `separator` varchar(255) DEFAULT NULL AFTER set_if; + +ALTER TABLE notificationcommand_argument + ADD COLUMN `separator` varchar(255) DEFAULT NULL AFTER set_if; + ALTER TABLE acknowledgement_history ADD index idx_acknowledgement_history_clear_time (clear_time) COMMENT 'Filter for history retention'; diff --git a/schema/pgsql/schema.sql b/schema/pgsql/schema.sql index afce6f62..6caa77b3 100644 --- a/schema/pgsql/schema.sql +++ b/schema/pgsql/schema.sql @@ -670,6 +670,7 @@ CREATE TABLE checkcommand_argument ( repeat_key boolenum NOT NULL DEFAULT 'n', required boolenum NOT NULL DEFAULT 'n', set_if varchar(255) DEFAULT NULL, + separator varchar(255) DEFAULT NULL, skip_key boolenum NOT NULL DEFAULT 'n', CONSTRAINT pk_checkcommand_argument PRIMARY KEY (id) @@ -775,6 +776,7 @@ CREATE TABLE eventcommand_argument ( repeat_key boolenum NOT NULL DEFAULT 'n', required boolenum NOT NULL DEFAULT 'n', set_if varchar(255) DEFAULT NULL, + separator varchar(255) DEFAULT NULL, skip_key boolenum NOT NULL DEFAULT 'n', CONSTRAINT pk_eventcommand_argument PRIMARY KEY (id) @@ -878,6 +880,7 @@ CREATE TABLE notificationcommand_argument ( repeat_key boolenum NOT NULL DEFAULT 'n', required boolenum NOT NULL DEFAULT 'n', set_if varchar(255) DEFAULT NULL, + separator varchar(255) DEFAULT NULL, skip_key boolenum NOT NULL DEFAULT 'n', CONSTRAINT pk_notificationcommand_argument PRIMARY KEY (id)