Skip to content

Commit

Permalink
Merge pull request #700 from Icinga/icingadb_schema-timestamp
Browse files Browse the repository at this point in the history
MySQL/MariaDB: Fix `icingadb_schema.timestamp` not being UNX time
  • Loading branch information
julianbrost authored Mar 25, 2024
2 parents f0b9c59 + 9b213d5 commit 16333b1
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion schema/mysql/schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1343,4 +1343,4 @@ CREATE TABLE icingadb_schema (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;

INSERT INTO icingadb_schema (version, timestamp)
VALUES (4, CURRENT_TIMESTAMP() * 1000);
VALUES (4, UNIX_TIMESTAMP() * 1000);
2 changes: 1 addition & 1 deletion schema/mysql/upgrades/1.0.0-rc2.sql
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ ALTER TABLE acknowledgement_history
MODIFY is_persistent enum('n','y') DEFAULT NULL COMMENT 'NULL if ack_set event happened before Icinga DB history recording';

INSERT INTO icingadb_schema (version, timestamp)
VALUES (2, CURRENT_TIMESTAMP() * 1000);
VALUES (2, UNIX_TIMESTAMP() * 1000);

ALTER TABLE host_state
MODIFY output longtext DEFAULT NULL,
Expand Down
2 changes: 1 addition & 1 deletion schema/mysql/upgrades/1.0.0.sql
Original file line number Diff line number Diff line change
Expand Up @@ -288,4 +288,4 @@ INSERT INTO sla_history_downtime
ON DUPLICATE KEY UPDATE sla_history_downtime.downtime_id = sla_history_downtime.downtime_id;

INSERT INTO icingadb_schema (version, TIMESTAMP)
VALUES (3, CURRENT_TIMESTAMP() * 1000);
VALUES (3, UNIX_TIMESTAMP() * 1000);
2 changes: 1 addition & 1 deletion schema/mysql/upgrades/1.1.1.sql
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ ALTER TABLE history
UNLOCK TABLES;

INSERT INTO icingadb_schema (version, timestamp)
VALUES (4, CURRENT_TIMESTAMP() * 1000);
VALUES (4, UNIX_TIMESTAMP() * 1000);
1 change: 1 addition & 0 deletions schema/mysql/upgrades/1.1.2.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UPDATE icingadb_schema SET timestamp = UNIX_TIMESTAMP(timestamp / 1000) * 1000 WHERE timestamp > 20000000000000000;

0 comments on commit 16333b1

Please sign in to comment.