From 695846ffcc9f1c693663166579d001a2e194e580 Mon Sep 17 00:00:00 2001 From: saveline Date: Tue, 25 Aug 2015 11:06:05 +0200 Subject: [PATCH 1/2] Add locale for Paris --- phplib/base.php | 2 +- phplib/nav.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phplib/base.php b/phplib/base.php index f61f3de..d880902 100644 --- a/phplib/base.php +++ b/phplib/base.php @@ -24,7 +24,7 @@ $nagios_tag_categories = array("" => "Untagged", "action" => "Action Taken", "noaction" => "No Action Taken"); $nagios_tag_category_map = array("issue" => "action", "issuetimeperiod" => "action", "viewissue" => "action", "incorrecttimeperiod" => "noaction", "downtimeexpired" => "noaction", "downtimenotset" => "noaction", "thresholdincorrect" => "noaction", "checkfaulty" => "noaction"); -$locales = array("UK" => "Europe/London", "ET" => "America/New_York", "PT" => "America/Los_Angeles"); +$locales = array("UK" => "Europe/London", "ET" => "America/New_York", "PT" => "America/Los_Angeles","FR"=>"Europe/Paris"); $sleep_states = array(-1 => "Unknown", 0 => "Awake", 1 => "Asleep"); $sleep_state_icons = array(0 => "icon-eye-open", 1 => "icon-eye-close"); $sleep_state_levels = array(-1 => "Unknown", 1 => "NREM Stage 1", 2 => "NREM Stage 2", 3 => "NREM Stage 3", 4 => "REM"); diff --git a/phplib/nav.php b/phplib/nav.php index 77d478c..26870f4 100644 --- a/phplib/nav.php +++ b/phplib/nav.php @@ -52,6 +52,7 @@
  • London, UK
  • Brooklyn, NY
  • San Francisco, CA
    • +
  • Paris, FR
  • From 0d2c32bc247c2fda4e9b4dcb8193499b2c398748 Mon Sep 17 00:00:00 2001 From: saveline Date: Thu, 27 Aug 2015 16:39:54 +0200 Subject: [PATCH 2/2] simple add working hours filter mechanism for alert's survey --- assets/sleep/kmoon.png | Bin 0 -> 1722 bytes phplib/base.php | 22 ++++++++++++++++++++++ phplib/config.php.example | 9 +++++++++ phplib/oncall.php | 8 +++++++- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 assets/sleep/kmoon.png diff --git a/assets/sleep/kmoon.png b/assets/sleep/kmoon.png new file mode 100644 index 0000000000000000000000000000000000000000..1c69af1ce4db02d0df50464413877458fd8fa4e1 GIT binary patch literal 1722 zcmV;r21WUaP)Fb*d5pN(nB5d5IqbxQ*wz03XBPba>+j#sAHThPdjH|oXP1s1c>nzA zuK(|!+++Cjn&I!8+YAhhEDQ|)-U3bd3pNKJfEXE4&mc_w&%n;b!PaXk{yjmS_d6#y zH^)CNVHp-aaY+Uyb|!`w9~l^a{sdXh!0`0i)#vB-?O*)t;Pifm&yQX(FmnOTL>LSZ zK#UBU0SJQ`nOK>Bdhz$q!iBde*e?-K2<>)@~P_ihx{A3av<2@xWnf_A1X>`)!0`C|`B$eW#l-#ld~GMpD1ZQBW)M;V zYG#CBVE8h8egd@g2h0aR3>5nhas}g;pYI+XzIEor6?si_MnpZ*D)jb^Do)ormv#ZcgUk zz%c*wg@J)rR)PQR%g@q3pB>%|RQwAdfS4J?4S-(#3DJnxU~pIg5gWtrkGHP;Ws}v> zv@y~729)~u2Q0(zjYUrBJ`| z82%uo5THxBl^GZ{+ZhBqMp-{S_RGESa<4D38W zgMlf9LC9DiXtM@D0I`5w`WLA9%U=d2#*YmD8CefETH;L>HFs|3?fp(44;^p8JKyc1phK{$O8lr3p^}= zxr2$32S`dV{1x?NU=T0?`r;!ZctAb?h2-C#Kua7Mgrt4EwRL3-KY#tnpeW79AS2Gq z@bxv&6ecbUXkeM~@h8LEcRv{T*clnbcsLmT0^M-)9?*bSH-Q=c=W~DnVgb1Y zoUGsmGco{^J%bSQ8-|Bh76KE>S5T0Ae|?K-%Fe@#uKyY3col8q?2SY11!U#e85Ds* z@D7+*t^)DdgTQe4cIY}#!ySMCVq#$Bb^)5r4^HKf(u3h2&@N7P76vI9dtfTD1*RBa z(fI1ZqF-IQUoNdq`}h0%ZHB*p!I1EftiJci-}L9)*{y>fJcCd;SKe3$Q7NfmUq+c^n{snE$;vdtN|0Dp%hnq==o9kMHZNho2bP zr2eq+h%@~B`itYsm!FaX{H&JRrm}sOk;Xn8LYxd=fd$WBU=*=21Dy>F^}xh%JBcy5}-M!Ayy#(KmZ{O{tGmi3FtQlP$Bb6nt@5i ziIGdel9fkXl9iK(lac8^6T{C>zkYsr`1<#kTUUWe1sG8bmylhF3;+TQ0OCY3hBztj QY5)KL07*qoM6N<$g7fPnga7~l literal 0 HcmV?d00001 diff --git a/phplib/base.php b/phplib/base.php index d880902..fd1964d 100644 --- a/phplib/base.php +++ b/phplib/base.php @@ -682,3 +682,25 @@ function getPrettyTime($referencedate=0, $timepointer='', $measureby='', $autote return false; } } + +function IsWorkingHoursWithTZ($date) { + // This function is like the one above, except takes the timezone into account for accurate + // retrieval of the alerts sent to the user from Splunk. Can't afford to be an hour out here. + $oncall_timezone = getTeamOncallConfig('timezone'); + //we extract working hours from config + $wanted_working_hours = getTeamOncallConfig('workinghours'); + date_default_timezone_set($oncall_timezone); + $return_work_hours=explode("-",$wanted_working_hours[date("l",$date)]); + //we build to timestamp one with the starting working hours + // the second with the en of working hours for the selected day of week of our alert + $fork1=strtotime(date("Y/m/d",$date)." ".$return_work_hours[0]); + $fork2=strtotime(date("Y/m/d",$date)." ".$return_work_hours[1]); + //test if my date is between fork1 and fork2 and if yes, alert was fired during working hours + if ($date<$fork2 and $date>$fork1) { + return(true); + } + else { + return(false); + } +} + diff --git a/phplib/config.php.example b/phplib/config.php.example index 8ad504e..5be87d0 100644 --- a/phplib/config.php.example +++ b/phplib/config.php.example @@ -71,6 +71,15 @@ $teams = array( "timezone" => "America/New_York", "start" => "friday 18:00", "end" => "friday 18:00", + "workinghours" => array( + "Monday" => "08:00-18:00", + "Tuesday" => "08:00-18:00", + "Wednesday" =>"08:00-18:00", + "Thursday" =>"08:00-18:00", + "Friday" => "08:00-18:00", + "Saturday" => "", + "Sunday" => "", + ), ), "weekly_hints" => array("jira", "github"), "irc_channel" => "#ops" diff --git a/phplib/oncall.php b/phplib/oncall.php index f6f30c1..37003d3 100644 --- a/phplib/oncall.php +++ b/phplib/oncall.php @@ -108,7 +108,13 @@ function printOnCallNotifications($on_call_name, $start, $end, $oncall_start, $o } else { $html .= ""; } - $html .= "{$pretty_date}{$n['hostname']}{$n['service']}
    {$n['output']}
    "; + if (IsWorkingHoursWithTZ($n['time'])) { + $html .= "{$pretty_date}{$n['hostname']}{$n['service']}
    {$n['output']}
    "; + } + else { + $ROOT_URL=getTeamConfig('root_url'); + $html .= " {$pretty_date}{$n['hostname']}{$n['service']}
    {$n['output']}
    "; + } $html .= "{$n['state']}"; # Need to populate all the information into hidden fields so we get all the data back nicely when the form is submitted