ymlex 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 96899ffafbcb57f7b2ef8792a957ddad8ccbcc99
-  data.tar.gz: 9c0f1b151ac551d9b2d66e3b7cb3e434c892b1e3
-!binary "U0hBNTEy":
-  metadata.gz: 2c7ace21693d73fe0ba227a6921cade42911875baf75f4ff319231871ca9e96982cec4e80b240dd51995eb344da231275b2714d8729a41da20cc3d2513c0e5fd
-  data.tar.gz: 0cb37911343551d6c23d7057843997077ae69640434f5bf3ddee0ec53e691bdd77e12a30948b1f69a5710559e650758606e5165af35083832933671faee90a8b
+SHA1:
+  metadata.gz: 51463b53ee65452aed0a159e5f6e19b31bc4605e
+  data.tar.gz: 3a8365b2fef1a5182653cd473147d159db3420c7
+SHA512:
+  metadata.gz: 576d8866fdff540341249c3f489b768dce385749c31630c37e994f9e82f64a0cabf0e82549f80ded56862a8d745ea5c15c30aa03592465c395ee89e9689cbf60
+  data.tar.gz: fe838e6ddd70c6278e409a75579f41d5674029352de2251b3f30580c5fd884496b7eb9db9e27b1c32aced6fc2ad8c42240735215672286a570c5052364ba813e

data/lib/ymlex/argusyml.rb

@@ -23,6 +23,11 @@ class Alert
     manager = level["manager"]
     op_mail = level["op_mail"]
 
+#    # change g_ecomop_maop_all to #z_ecomop_maop_oncall_bak
+#    if @contacts["op"] != nil
+#      @contacts["op"].gsub!(/g_ecomop_maop_all/,'#z_ecomop_maop_oncall_bak')
+#    end
+#
     mail = ""
     sms = ""
     hi = ""
@@ -47,18 +52,41 @@ class Alert
     else
         remind_time = "0"
     end
+
+    if lvl =~ /fatal/
+      merge_window = "0"
+      rule_level = "4"
+    elsif lvl =~ /err/
+      merge_window = "300"
+      rule_level = "3"
+    elsif lvl =~ /warn/
+      merge_window = "600"
+      rule_level = "2"
+    elsif lvl =~ /info/
+      merge_window = "600"
+      rule_level = "1"
+    else
+      merge_window = "600"
+      rule_level = "1"
+    end
+
+    sms.gsub!(/g_ecomop_maop_all/,'#z_ecomop_maop_oncall;#z_ecomop_maop_oncall_bak')
     alt = {
       "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,
+      "other" => {
+          "merge_window" => merge_window,
+          "level" => rule_level,
+      },
       "mail" => mail,
       "sms" => sms,
       "hi" => hi,
     }
     if lvl =~ /err/
       alt["level1_upgrade_interval"] = "10800"
-      alt["level1_upgrade_sms"] = @contacts["op"]
+      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
@@ -66,7 +94,7 @@ class Alert
     end
     if lvl =~ /fatal/ and manager != ""
       alt["level1_upgrade_interval"] = "900"
-      alt["level1_upgrade_sms"] = "#{manager};#{@contacts['op']}"
+      alt["level1_upgrade_sms"] = "#{manager};#{@contacts['op']}".gsub(/g_ecomop_maop_all/,'#z_ecomop_maop_oncall;#z_ecomop_maop_oncall_bak')
     end
     alt
   end
@@ -213,13 +241,16 @@ class ArgusYml
         if value["alert"]
           alt = @alert.get_alert value["alert"]
           alt["name"] = rule_name
+          other = alt.delete "other"
           @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" => '600',
+                           "merge_window" => other["merge_window"] || "300",
+                           "level" => other["level"] || "2",
                            "alert" => alert_name }
       end
     end
@@ -242,13 +273,16 @@ class ArgusYml
       if rule_value["alert"]
         alt = @alert.get_alert rule_value["alert"]
         alt["name"] = rule_name
+        other = alt.delete "other"
         @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" => '600',
+                             "merge_window" => other["merge_window"] || "300",
+                             "level" => other["level"] || "2",
                              "alert" => alert_name }
     end
   end
@@ -282,13 +316,16 @@ class ArgusYml
         if raw_value["alert"]
           alt = @alert.get_alert raw_value["alert"]
           alt["name"] = item_name_prefix
+          other = alt.delete "other"
           @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" => '600',
+                               "merge_window" => other["merge_window"] || "300",
+                               "level" => other["level"] || "2",
                                "alert" => alert_name,
                              }
       end
@@ -311,13 +348,16 @@ class ArgusYml
         if rule_value["alert"]
           alt = @alert.get_alert rule_value["alert"]
           alt["name"] = rule_name
+          other = alt.delete "other"
           @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" => '600',
+                               "merge_window" => other["merge_window"] || "300",
+                               "level" => other["level"] || "2",
                                "alert" => alert_name }
       end
     end
@@ -337,15 +377,18 @@ class ArgusYml
       if raw_value["alert"]
         alt = @alert.get_alert raw_value["alert"]
         alt["name"] = raw_name
+        other = alt.delete "other"
         @instance["alert"] << alt
         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" => '600',
+                             "merge_window" => other["merge_window"] || "300",
+                             "level" => other["level"] || "2",
                              "alert" => alert_name }
     end
   end
@@ -364,12 +407,14 @@ class ArgusYml
   def default_alert
     alt = @alert.get_alert
     alt["name"] = "default_alert"
+    alt.delete "other"
     alt
   end
 
   def noah_error_alert
     alt = @alert.get_alert({"rd" => nil, "qa" => nil, "op" => "warn" })
     alt["name"] = "noah_error_alert"
+    alt.delete "other"
     alt
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ymlex
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Wen Li
@@ -10,17 +10,17 @@ bindir: bin
 cert_chain: []
 date: 2014-08-01 00:00:00.000000000 Z
 dependencies: []
-description: ! 'extend ymal: support inherit and valueize'
+description: 'extend ymal: support inherit and valueize'
 email: wenli@baidu.com
 executables:
 - ymlex
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/ymlex
 - lib/ymlex.rb
-- lib/ymlex/ymlex.rb
 - lib/ymlex/argusyml.rb
-- bin/ymlex
+- lib/ymlex/ymlex.rb
 homepage: https://github.com/cruelwen/ymlex
 licenses:
 - MIT
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.preview3.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: extend ymal!