ymlex 1.1.8 → 1.1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9f11856130933a6430587a61d31657f166d5d2d
-  data.tar.gz: c335533f3d41ef9aee376fe41757cd3274434d9f
+  metadata.gz: c8018b3351d992e2182d6bf75bf3a54823801bc0
+  data.tar.gz: 7365db545c0ce43cc21e85a2bfb3fff6c232f98e
 SHA512:
-  metadata.gz: 57a829367210c7449af6689f9f7cdf75609af1d67732abe0270c10921928570da07bb2c060843502c98b1e380a113ff0561eab9e82004b6cf52bc29d889f3d28
-  data.tar.gz: f0fcb3bff96c7fb1f139f9a8b2e90ba794d7179f03a5003eaa10e138339fdbfef1d8695ba90372cafa57a3dff66d66f91466f352eb9bdd39b7701912e64efb6e
+  metadata.gz: 74115ea70861e100ef264be157ff44069c387d7330e3c8ca10f028ea78f1fbc2883d2bc2e7ec87400c0648f97c365b168e84d3d4955dcc9bea33aee66ab38502
+  data.tar.gz: 9ac74eb08e5875b74034224e6effe934f104738bf3562421e210f90ca090f41096665a59ee050bae92c5eb6fac81adef03ec09e239c62c6c1718a510eb01c986

data/lib/ymlex/argusyml.rb

@@ -10,7 +10,6 @@ class Alert
   def initialize contacts, level={}
     @contacts = contacts
     @default_level = { "oncall" => "#z_ecomop_maop_oncall", 
-                       "op_mail" => "ma-op",
                        "manager" => "g_ecomop_maop_manager",
                        "rd" => "err", 
                        "op" => "warn", 
@@ -21,7 +20,6 @@ class Alert
     level = @default_level.merge(lvl)
     oncall = level["oncall"]
     manager = level["manager"]
-    op_mail = level["op_mail"]
 
 #    # change g_ecomop_maop_all to #z_ecomop_maop_oncall_bak
 #    if @contacts["op"] != nil
@@ -31,6 +29,7 @@ class Alert
     mail = ""
     sms = ""
     hi = ""
+    web = ""
     level.each do |role, lvl|
       if ["op","rd","qa"].include? role
         mail = "#{@contacts[role]};#{mail}" if lvl != nil
@@ -40,15 +39,15 @@ class Alert
       end
     end
     lvl = level["op"]
-    mail = "#{op_mail};#{mail}" if lvl != nil
+    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/
 
     if lvl =~ /fatal/
-        remind_time = "300"
+        remind_time = "900"
     elsif lvl =~ /err/
-        remind_time = "7200"
+        remind_time = "0"
     else
         remind_time = "0"
     end
@@ -70,7 +69,9 @@ class Alert
       rule_level = "1"
     end
 
+    web = "g_ecomop_maop_all;g_ecomop_maop_manager;" if sms.include? "g_ecomop_maop_all" or sms.include? "#z_ecomop_maop_oncall"
     sms.gsub!(/g_ecomop_maop_all/,'#z_ecomop_maop_oncall;#z_ecomop_maop_oncall_bak')
+    mail.gsub!(/g_ecomop_maop_all/,'ma-op')
     alt = {
       "max_alert_times" => level["max_alert_times"] || "1",
       "alert_threshold_percent" => level["alert_threshold_percent"] || "0",
@@ -79,19 +80,13 @@ class Alert
       "other" => {
           "merge_window" => merge_window,
           "level" => rule_level,
+          "lvl" => lvl,
       },
       "mail" => mail,
       "sms" => sms,
       "hi" => hi,
+      "web" => web,
     }
-    if lvl =~ /err/
-      alt["level1_upgrade_interval"] = "10800"
-      alt["level1_upgrade_sms"] = @contacts["op"].gsub(/g_ecomop_maop_all/,'#z_ecomop_maop_oncall;#z_ecomop_maop_oncall_bak')
-      if manager != ""
-        alt["level2_upgrade_interval"] = "36000"
-        alt["level2_upgrade_sms"] = manager
-      end
-    end
     if lvl =~ /fatal/ and manager != ""
       alt["level1_upgrade_interval"] = "900"
       alt["level1_upgrade_sms"] = "#{manager};#{@contacts['op']}".gsub(/g_ecomop_maop_all/,'#z_ecomop_maop_oncall;#z_ecomop_maop_oncall_bak')
@@ -238,6 +233,7 @@ class ArgusYml
       if value["formula"]
         rule_name = "#{@name}_aggr_#{rule_name}"
         alert_name = "default_alert"
+        other = default_alert_level
         if value["alert"]
           alt = @alert.get_alert value["alert"]
           alt["name"] = rule_name
@@ -245,12 +241,11 @@ class ArgusYml
           @service_alert << alt
           alert_name = rule_name
         end
-        other = other || {}
         @service_rule << { "name" => rule_name,
                            "formula" => value["formula"],
                            "filter" => value["filter"] || "1/1",
-                           "merge_window" => other["merge_window"] || "300",
-                           "level" => other["level"] || "2",
+                           "merge_window" => other["merge_window"],
+                           "level" => other["level"],
                            "alert" => alert_name }
       end
     end
@@ -270,6 +265,7 @@ class ArgusYml
     list.each do | rule_key, rule_value |
       rule_name = "#{@name}_other_#{rule_key}"
       alert_name = "default_alert"
+      other = default_alert_level
       if rule_value["alert"]
         alt = @alert.get_alert rule_value["alert"]
         alt["name"] = rule_name
@@ -277,12 +273,11 @@ class ArgusYml
         @instance["alert"] << alt
         alert_name = rule_name
       end
-      other = other || {}
       @instance["rule"] << { "name" => rule_name,
                              "formula" => rule_value["formula"],
                              "filter" => rule_value["filter"] || "1/1",
-                             "merge_window" => other["merge_window"] || "300",
-                             "level" => other["level"] || "2",
+                             "merge_window" => other["merge_window"],
+                             "level" => other["level"],
                              "alert" => alert_name }
     end
   end
@@ -313,6 +308,7 @@ class ArgusYml
         log_conf["item"] << item
         next unless raw_value["formula"]
         alert_name = "default_alert"
+        other = default_alert_level
         if raw_value["alert"]
           alt = @alert.get_alert raw_value["alert"]
           alt["name"] = item_name_prefix
@@ -320,12 +316,11 @@ class ArgusYml
           @instance["alert"] << alt
           alert_name = item_name_prefix
         end
-        other = other || {}
         @instance["rule"] << { "name" => item_name_prefix, 
                                "formula" => raw_value["formula"],
                                "filter" => raw_value["filter"] || "1/1",
-                               "merge_window" => other["merge_window"] || "300",
-                               "level" => other["level"] || "2",
+                               "merge_window" => other["merge_window"],
+                               "level" => other["level"],
                                "alert" => alert_name,
                              }
       end
@@ -345,6 +340,7 @@ class ArgusYml
         next if (rule_key == "path" || !rule_value["formula"])
         rule_name = "#{raw_name}_#{rule_key}"
         alert_name = "default_alert"
+        other = default_alert_level
         if rule_value["alert"]
           alt = @alert.get_alert rule_value["alert"]
           alt["name"] = rule_name
@@ -352,12 +348,11 @@ class ArgusYml
           @instance["alert"] << alt
           alert_name = rule_name
         end
-        other = other || {}
         @instance["rule"] << { "name" => rule_name,
                                "formula" => rule_value["formula"],
                                "filter" => rule_value["filter"]||"3/3",
-                               "merge_window" => other["merge_window"] || "300",
-                               "level" => other["level"] || "2",
+                               "merge_window" => other["merge_window"],
+                               "level" => other["level"],
                                "alert" => alert_name }
       end
     end
@@ -374,6 +369,7 @@ class ArgusYml
                   "req_type" => "port",
                 }
       alert_name = "default_alert"
+      other = default_alert_level
       if raw_value["alert"]
         alt = @alert.get_alert raw_value["alert"]
         alt["name"] = raw_name
@@ -382,13 +378,12 @@ class ArgusYml
         alert_name = raw_name
         raw_value.delete "alert"
       end
-      other = other || {}
       @instance["request"] << dft_raw.merge(raw_value)
       @instance["rule"] << { "name" => raw_name,
                              "formula" => "#{raw_name} != 'ok'",
                              "filter" => raw_value["filter"]||"3/3",
-                             "merge_window" => other["merge_window"] || "300",
-                             "level" => other["level"] || "2",
+                             "merge_window" => other["merge_window"],
+                             "level" => other["level"],
                              "alert" => alert_name }
     end
   end
@@ -411,6 +406,11 @@ class ArgusYml
     alt
   end
 
+  def default_alert_level
+    alt = @alert.get_alert
+    alt["other"]
+  end
+
   def noah_error_alert
     alt = @alert.get_alert({"rd" => nil, "qa" => nil, "op" => "warn" })
     alt["name"] = "noah_error_alert"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ymlex
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9.2
 platform: ruby
 authors:
 - Wen Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies: []
 description: 'extend ymal: support inherit and valueize'
 email: wenli@baidu.com