ymlex 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: aa709a6bc0c4f33aeb0e80dc686af225be43b329
-  data.tar.gz: a5474c089f705435529e25d61153de85e10dcbf5
+  metadata.gz: 96899ffafbcb57f7b2ef8792a957ddad8ccbcc99
+  data.tar.gz: 9c0f1b151ac551d9b2d66e3b7cb3e434c892b1e3
 !binary "U0hBNTEy":
-  metadata.gz: a42b77b976601c6d48c03a7f6f3c6cc68baeac43afb74953fb6e5a695288aa338d9fdf7063ca6056613173a1a23a12f8367aa39d9b6a9e4297137fb84a07c6f3
-  data.tar.gz: 7831d9dc406f0c15b8edc9fd014deeec7a86146f610cbb15e00bfb5945507211aff5b96ff3d13a199155426ff46c974b3d3f8a6d9e83bc81c60752c330ced4fb
+  metadata.gz: 2c7ace21693d73fe0ba227a6921cade42911875baf75f4ff319231871ca9e96982cec4e80b240dd51995eb344da231275b2714d8729a41da20cc3d2513c0e5fd
+  data.tar.gz: 0cb37911343551d6c23d7057843997077ae69640434f5bf3ddee0ec53e691bdd77e12a30948b1f69a5710559e650758606e5165af35083832933671faee90a8b

data/lib/ymlex/argusyml.rb

@@ -9,7 +9,8 @@ class Alert
   attr :contacts, :default_level
   def initialize contacts, level={}
     @contacts = contacts
-    @default_level = { "oncall" => "g_ecomop_maop_oncall", 
+    @default_level = { "oncall" => "#z_ecomop_maop_oncall", 
+                       "op_mail" => "ma-op",
                        "manager" => "g_ecomop_maop_manager",
                        "rd" => "err", 
                        "op" => "warn", 
@@ -20,31 +21,42 @@ class Alert
     level = @default_level.merge(lvl)
     oncall = level["oncall"]
     manager = level["manager"]
+    op_mail = level["op_mail"]
 
     mail = ""
     sms = ""
+    hi = ""
     level.each do |role, lvl|
       if ["op","rd","qa"].include? role
         mail = "#{@contacts[role]};#{mail}" if lvl != nil
-        if lvl =~ /err/ or lvl =~ /fatal/ or (lvl =~ /warn/ and role != "op")
+        if lvl =~ /fatal/ or (lvl =~ /(warn|err)/ and role != "op")
           sms = "#{@contacts[role]};#{sms}" 
         end
       end
     end
     lvl = level["op"]
-    sms = "#{oncall};#{sms}" if lvl =~ /warn/ or lvl =~ /err/ or lvl =~ /fatal/
+    mail = "#{op_mail};#{mail}" if lvl != nil
+    sms = "#{oncall};#{sms}" if lvl =~ /err/ or lvl =~ /fatal/
     sms = "#{manager};#{sms}" if lvl =~ /fatal/
+    hi = "#{oncall}" if lvl =~ /warn/
 
-    remind_time = (lvl =~ /fatal/)? "300" : "7200"
+    if lvl =~ /fatal/
+        remind_time = "300"
+    elsif lvl =~ /err/
+        remind_time = "7200"
+    else
+        remind_time = "0"
+    end
     alt = {
-      "max_alert_times" => level["max_alert_times"] || "2",
+      "max_alert_times" => level["max_alert_times"] || "1",
       "alert_threshold_percent" => level["alert_threshold_percent"] || "0",
       "sms_threshold_percent" => level["sms_threshold_percent"] || "0",
       "remind_interval_second" => level["remind_interval_second"] || remind_time,
       "mail" => mail,
       "sms" => sms,
+      "hi" => hi,
     }
-    if lvl =~ /warn/
+    if lvl =~ /err/
       alt["level1_upgrade_interval"] = "10800"
       alt["level1_upgrade_sms"] = @contacts["op"]
       if manager != ""
@@ -52,9 +64,9 @@ class Alert
         alt["level2_upgrade_sms"] = manager
       end
     end
-    if lvl =~ /err/ and manager != ""
-      alt["level1_upgrade_interval"] = "10800"
-      alt["level1_upgrade_sms"] = manager
+    if lvl =~ /fatal/ and manager != ""
+      alt["level1_upgrade_interval"] = "900"
+      alt["level1_upgrade_sms"] = "#{manager};#{@contacts['op']}"
     end
     alt
   end
@@ -69,6 +81,10 @@ class Alert
     alert_info["sms"]
   end
 
+  def get_hi lvl=nil
+    alert_info = get_alert lvl
+    alert_info["hi"]
+  end
 end
 
 class ArgusYml
@@ -203,6 +219,7 @@ class ArgusYml
         @service_rule << { "name" => rule_name,
                            "formula" => value["formula"],
                            "filter" => value["filter"] || "1/1",
+                           "merge_window" => '600',
                            "alert" => alert_name }
       end
     end
@@ -231,6 +248,7 @@ class ArgusYml
       @instance["rule"] << { "name" => rule_name,
                              "formula" => rule_value["formula"],
                              "filter" => rule_value["filter"] || "1/1",
+                             "merge_window" => '600',
                              "alert" => alert_name }
     end
   end
@@ -270,6 +288,7 @@ class ArgusYml
         @instance["rule"] << { "name" => item_name_prefix, 
                                "formula" => raw_value["formula"],
                                "filter" => raw_value["filter"] || "1/1",
+                               "merge_window" => '600',
                                "alert" => alert_name,
                              }
       end
@@ -298,6 +317,7 @@ class ArgusYml
         @instance["rule"] << { "name" => rule_name,
                                "formula" => rule_value["formula"],
                                "filter" => rule_value["filter"]||"3/3",
+                               "merge_window" => '600',
                                "alert" => alert_name }
       end
     end
@@ -325,6 +345,7 @@ class ArgusYml
       @instance["rule"] << { "name" => raw_name,
                              "formula" => "#{raw_name} != 'ok'",
                              "filter" => raw_value["filter"]||"3/3",
+                             "merge_window" => '600',
                              "alert" => alert_name }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ymlex
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Wen Li