Db: Fix current week timeframe end

Icinga · Aug 28, 2024 · a22a39f · a22a39f
1 parent 239dd71
commit a22a39f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/schema/mysql-upgrades/1.1.0.sql b/schema/mysql-upgrades/1.1.0.sql
@@ -0,0 +1 @@
+UPDATE timeframe SET end = 'now' WHERE name = 'Current Week';
diff --git a/schema/mysql.schema.sql b/schema/mysql.schema.sql
@@ -28,7 +28,7 @@ INSERT INTO timeframe (name, title, start, end, ctime, mtime) VALUES
   ('One Year', null, '-1 year', 'now', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000),
   ('Current Day', null, 'midnight', 'now', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000),
   ('Last Day', null, 'yesterday midnight', 'yesterday 23:59:59', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000),
-  ('Current Week', null, 'monday this week midnight', 'sunday this week 23:59:59', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000),
+  ('Current Week', null, 'monday this week midnight', 'now', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000),
   ('Last Week', null, 'monday last week midnight', 'sunday last week 23:59:59', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000),
   ('Current Month', null, 'first day of this month midnight', 'now', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000),
   ('Last Month', null, 'first day of last month midnight', 'last day of last month 23:59:59', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000),

diff --git a/schema/pgsql-upgrades/1.1.0.sql b/schema/pgsql-upgrades/1.1.0.sql
@@ -0,0 +1 @@
+UPDATE timeframe SET end = 'now' WHERE name = 'Current Week';
diff --git a/schema/pgsql.schema.sql b/schema/pgsql.schema.sql
@@ -31,7 +31,7 @@ INSERT INTO timeframe (name, title, start, "end") VALUES
   ('One Year', null, '-1 year', 'now'),
   ('Current Day', null, 'midnight', 'now'),
   ('Last Day', null, 'yesterday midnight', 'yesterday 23:59:59'),
-  ('Current Week', null, 'monday this week midnight', 'sunday this week 23:59:59'),
+  ('Current Week', null, 'monday this week midnight', 'now'),
   ('Last Week', null, 'monday last week midnight', 'sunday last week 23:59:59'),
   ('Current Month', null, 'first day of this month midnight', 'now'),
   ('Last Month', null, 'first day of last month midnight', 'last day of last month 23:59:59'),
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		UPDATE timeframe SET end = 'now' WHERE name = 'Current Week';