Catrope has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/92604


Change subject: Clean up Icinga timezone definitions
......................................................................

Clean up Icinga timezone definitions

* Made PDT actually PDT rather than PST
* Added real PST
* Added CEST
* Added EDT and EST_early to complement EDT_early and EST
* Fix typos (s/til/till/g)

Note that this will affect people whose paging hours are set to PDT.
Right now, PDT means 8am-midnight in winter and 7am-11pm in summer,
which is broken. This commit changes PDT to actually mean 8am-midnight
in summer; once DST goes away on Sunday every PDT contact should be set
to PST so as to maintain the 8am-midnight behavior.

Change-Id: I5d00bfebc818d37f9e6f7ac20a00f8d07f830d8e
---
M files/icinga/timeperiods.cfg
1 file changed, 60 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/92604/1

diff --git a/files/icinga/timeperiods.cfg b/files/icinga/timeperiods.cfg
index b4050a4..ce5720b 100644
--- a/files/icinga/timeperiods.cfg
+++ b/files/icinga/timeperiods.cfg
@@ -8,7 +8,7 @@
     thursday        00:00-24:00
     friday          00:00-24:00
     saturday        00:00-24:00
-    }
+}
 
 define timeperiod {
     timeperiod_name    CET_awake_hours
@@ -23,20 +23,20 @@
 }
 
 define timeperiod {
-    timeperiod_name    EDT_awake_early_hours
-    alias           EDT 0700 til 2300, 7 days a week
-    sunday          00:00-03:00,11:00-24:00
-    monday          00:00-03:00,11:00-24:00
-    tuesday         00:00-03:00,11:00-24:00
-    wednesday       00:00-03:00,11:00-24:00
-    thursday        00:00-03:00,11:00-24:00
-    friday          00:00-03:00,11:00-24:00
-    saturday        00:00-03:00,11:00-24:00
+    timeperiod_name    CEST_awake_hours
+    alias           CET 8 am till midnight, 7 days a week
+    sunday          06:00-22:00
+    monday          06:00-22:00
+    tuesday         06:00-22:00
+    wednesday       06:00-22:00
+    thursday        06:00-22:00
+    friday          06:00-22:00
+    saturday        06:00-22:00
 }
 
 define timeperiod {
     timeperiod_name    EST_awake_hours
-    alias           EST 0800 til midnight, 7 days a week
+    alias           EST 0800 till midnight, 7 days a week
     sunday          00:00-05:00,13:00-24:00
     monday          00:00-05:00,13:00-24:00
     tuesday         00:00-05:00,13:00-24:00
@@ -47,8 +47,44 @@
 }
 
 define timeperiod {
-    timeperiod_name    PDT_awake_hours
-    alias           PDT 8 am till midnight, 7 days a week
+    timeperiod_name    EST_awake_early_hours
+    alias           EST 0700 till 2300, 7 days a week
+    sunday          00:00-04:00,12:00-24:00
+    monday          00:00-04:00,12:00-24:00
+    tuesday         00:00-04:00,12:00-24:00
+    wednesday       00:00-04:00,12:00-24:00
+    thursday        00:00-04:00,12:00-24:00
+    friday          00:00-04:00,12:00-24:00
+    saturday        00:00-04:00,12:00-24:00
+}
+
+define timeperiod {
+    timeperiod_name    EDT_awake_hours
+    alias           EDT 0800 till midnight, 7 days a week
+    sunday          00:00-04:00,12:00-24:00
+    monday          00:00-04:00,12:00-24:00
+    tuesday         00:00-04:00,12:00-24:00
+    wednesday       00:00-04:00,12:00-24:00
+    thursday        00:00-04:00,12:00-24:00
+    friday          00:00-04:00,12:00-24:00
+    saturday        00:00-04:00,12:00-24:00
+}
+
+define timeperiod {
+    timeperiod_name    EDT_awake_early_hours
+    alias           EDT 0700 till 2300, 7 days a week
+    sunday          00:00-03:00,11:00-24:00
+    monday          00:00-03:00,11:00-24:00
+    tuesday         00:00-03:00,11:00-24:00
+    wednesday       00:00-03:00,11:00-24:00
+    thursday        00:00-03:00,11:00-24:00
+    friday          00:00-03:00,11:00-24:00
+    saturday        00:00-03:00,11:00-24:00
+}
+
+define timeperiod {
+    timeperiod_name    PST_awake_hours
+    alias           PST 8 am till midnight, 7 days a week
     sunday          00:00-08:00,16:00-24:00
     monday          00:00-08:00,16:00-24:00
     tuesday         00:00-08:00,16:00-24:00
@@ -58,3 +94,14 @@
     saturday        00:00-08:00,16:00-24:00
 }
 
+define timeperiod {
+    timeperiod_name    PDT_awake_hours
+    alias           PDT 8 am till midnight, 7 days a week
+    sunday          00:00-07:00,15:00-24:00
+    monday          00:00-07:00,15:00-24:00
+    tuesday         00:00-07:00,15:00-24:00
+    wednesday       00:00-07:00,15:00-24:00
+    thursday        00:00-07:00,15:00-24:00
+    friday          00:00-07:00,15:00-24:00
+    saturday        00:00-07:00,15:00-24:00
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/92604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d00bfebc818d37f9e6f7ac20a00f8d07f830d8e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Catrope <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to