sysdig 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 976ab5bf9c0d56e508aabe8cce280db889904138
-  data.tar.gz: 951c22606a8f96b4d4f74d5d3590a15c038318dc
+  metadata.gz: 7b60fd31dd65eec996331f14d9d49ed12a8bae20
+  data.tar.gz: 14044e9a5d576997010f004e49e3197eeba123ad
 SHA512:
-  metadata.gz: 41ae7f0e86f9717310d8b327531a594f5afc1ce593ee1171ab98f9f5729f8509681a44a7691bc25e3c7671478adfe9b0e63b81d101da75db398663d4e57b2393
-  data.tar.gz: 5d15fc64b7900fba201241aa6a43bba690102e5f129b89bf37cb9b91e71419f97a588a20b0f30fe55805f2248ed77658ab8281968a2b7edbffaefe0faa862eef
+  metadata.gz: a7ce69fd877635ce055a49d596b8a38608241b2119949672a1e771de3e6f9aa290af9de17b36e39d15ab0b59514e2e7cab4d35089ac0662c41ea193ac02f0c75
+  data.tar.gz: ee96c4e902ae142ab244f72d24b34d4b3941f3184c57e7b5e358324a912961c0392e81dcb7220f528ec317d7da3dffa7ba0e809734ad284023b3bd29acf661b2

data/lib/sysdig.rb

@@ -12,7 +12,6 @@ class Sysdig
   include Cistern::Client
 
   recognizes :url, :adapter, :logger, :token, :username, :password
-
 end
 
 # clients
@@ -35,6 +34,7 @@ require 'sysdig/update_alert'
 
 require 'sysdig/get_alert_notification'
 require 'sysdig/get_alert_notifications'
+require 'sysdig/update_alert_notification'
 require 'sysdig/alert_notification'
 require 'sysdig/alert_notifications'
 

data/lib/sysdig/alert.rb

@@ -18,8 +18,8 @@ class Sysdig::Alert < Sysdig::Model
   attribute :segment_condition,  alias: "segmentCondition"
   attribute :severity,           type:  :integer
   attribute :targets,            type:  :array
-  attribute :timespan,           parser: lambda { |v, _| i = v.to_i; i > 1_000_000 ? i / 1_000_000 : i }
-  attribute :type,               parser: lambda { |v, _| v.to_s.upcase }
+  attribute :timespan,           parser: method(:microsecond_datetime)
+  attribute :type,               parser: method(:upcase)
   attribute :version,            type:  :integer
 
   def destroy

data/lib/sysdig/alert_filter.rb

@@ -16,6 +16,6 @@ class Sysdig::AlertFilter
   end
 
   def self.normalize_condition(string)
-    string.gsub(/(^\\?\")|(\\?\"$)/, "")
+    string.gsub(/(^\\?['"])|(\\?['"]$)/, "")
   end
 end

data/lib/sysdig/alert_notification.rb

@@ -1,17 +1,56 @@
 class Sysdig::AlertNotification < Sysdig::Model
 
+  # @arg v String like "container.name = 'deis-builder' and agent.tag.id = '8dbf0cfb-7b4b-42ea-b1f1-b742a5bdebf4'"
+  def self.load_filter(s, _)
+    case s
+    when String
+      s.split(" and ").
+        map        { |c| c.split(" = ") }.
+        inject({}) { |r,(k,v)| r.merge(k => Sysdig::AlertFilter.normalize_condition(v)) }
+    else s
+    end
+  end
+
+  def self.dump_filter(h)
+    case h
+    when Hash
+      h.each_with_object([]) { |(k,v),r|
+        r << "#{k} = #{Sysdig::AlertFilter.normalize_condition(v).inspect}"
+      }.join(" and ")
+    else h
+    end
+  end
+
   identity :id, type: :integer
 
-  attribute :timespan,           type: :integer
-  attribute :severity,           type: :integer
-  attribute :target
-  attribute :alert_id,           type: :integer, alias: "alert"
-  attribute :type
-  attribute :criteria
-  attribute :resolved,           type: :boolean
+  attribute :alert_id,  type: :integer, alias: "alert"
   attribute :condition
-  attribute :state
-  attribute :group_aggregations, type: :array,   alias: "groupAggregations"
-  attribute :entities,           type: :array
+  attribute :entities,  type: :array # @todo map to object
+  attribute :filter,    parser: method(:load_filter)
+  attribute :resolved,  type: :boolean
+  attribute :severity,  type: :integer
+  attribute :state,     parser: method(:upcase)
+  attribute :timespan,  parser: method(:microsecond_datetime)
+  attribute :timestamp, parser: method(:epoch_time), divisor: 1_000_000
+
+  # @todo get target information out of an alert notification
+  def save
+    params = {
+      "alert"     => self.alert_id,
+      "filter"    => self.class.dump_filter(self.filter),
+      "resolved"  => self.resolved,
+      "severity"  => self.severity,
+      "state"     => self.state,
+      "timestamp" => self.timestamp.to_i * 1_000_000,
+    }
+
+    data = service.update_alert_notification(self.identity, params).body.fetch("notification")
+
+    merge_attributes(data)
+  end
 
+  def resolve!
+    self.resolved = true
+    self.save
+  end
 end

data/lib/sysdig/alert_notifications.rb

@@ -6,6 +6,12 @@ class Sysdig::AlertNotifications < Sysdig::Collection
     to   = options[:to]   || Time.now
     from = options[:from] || Time.at(Time.now.to_i - 86400) # 1 day
 
-    load(service.get_notifications(from, to).body.fetch("notifications"))
+    load(service.get_alert_notifications(from, to).body.fetch("notifications"))
+  end
+
+  def get(identity)
+    new(
+      service.get_alert_notification(identity).body.fetch("notification")
+    )
   end
 end

data/lib/sysdig/get_alert_notification.rb

@@ -1,7 +1,15 @@
 class Sysdig::GetAlertNotification < Sysdig::Request
   def real(notification_id)
     service.request(
-      :path => "/api/notifications/#{notification_id}",
+      :path => File.join("/api/notifications", notification_id.to_s),
+    )
+  end
+
+  def mock(notification_id)
+    service.response(
+      :body => {
+        "notification" => service.data[:alert_notifications].fetch(notification_id)
+      },
     )
   end
 end

data/lib/sysdig/get_alert_notifications.rb

@@ -1,11 +1,26 @@
 class Sysdig::GetAlertNotifications < Sysdig::Request
   def real(from, to)
-    from_i = from.to_i * 1_000_000
-    to_i   = to.to_i   * 1_000_000
+    from_i, to_i = timestamps(from, to)
 
     service.request(
       :path   => "/api/notifications",
       :params => {"from" => from_i, "to" => to_i},
     )
   end
+
+  def timestamps(*args)
+    args.map { |a| a.to_i * 1_000_000 }
+  end
+
+  def mock(from, to)
+    from_i, to_i = timestamps(from, to)
+
+    notifications = service.data[:alert_notifications].values.select { |an|
+      an["timestamp"] >= from_i && an["timestamp"] <= to_i
+    }
+
+    service.response(
+      :body => { "notifications" => notifications },
+    )
+  end
 end

data/lib/sysdig/mock.rb

@@ -9,6 +9,7 @@ class Sysdig::Mock
     @@data ||= Hash.new { |h,url|
       h[url] = {
         :alerts => {},
+        :alert_notifications => {},
         :user_notifications => {
           "email" => {
             "enabled"    => false,
@@ -75,4 +76,27 @@ class Sysdig::Mock
     @id ||= 0
     @id += 1
   end
+
+  def create_alert_notification(alert, state: "ACTIVE", resolved: false)
+    alert_notification_id = self.serial_id
+    alert_data = self.data[:alerts].fetch(alert.identity)
+
+    alert_notification = self.data[:alert_notifications][alert_notification_id] = {
+      "id"        => alert_notification_id,
+      "timestamp" => (Time.now.to_i - rand(60..300)) * 1_000_000,
+      "timespan"  => alert_data["timespan"].to_i,
+      "filter"    => alert_data["filter"],
+      "condition" => alert_data["condition"],
+      "state"     => state.upcase,
+      "resolved"  => resolved,
+      "alert"     => alert.identity.to_s,
+      "entities"  => [
+        "filter" => alert_data["filter"],
+        "target" => {}, # @fixme the hell
+        "metricValues" => {}, # @fixme breakdown of condition
+      ]
+    }
+
+    self.alert_notifications.new(alert_notification)
+  end
 end

data/lib/sysdig/model.rb

@@ -1,5 +1,21 @@
 class Sysdig::Model
-  def self.epoch_time(v, _)
-    Time.at(v / 1000)
+  def self.epoch_time(v, options={})
+    divisor = options[:divisor] || 1_000
+
+    case v
+    when Time then v
+    when Numeric then Time.at(v / divisor)
+    else nil
+    end
+  end
+
+  def self.microsecond_datetime(v, *)
+    i = v.to_i
+
+    i > 1_000_000 ? i / 1_000_000 : i
+  end
+
+  def self.upcase(v, *)
+    v.nil? ? v : v.to_s.upcase
   end
 end

data/lib/sysdig/update_alert_notification.rb

@@ -0,0 +1,45 @@
+class Sysdig::UpdateAlertNotification < Sysdig::Request
+  def self.params
+    %w[alert condition entities filter resolved severity state timespan timestamp]
+  end
+
+  def slice(notification)
+    Cistern::Hash.slice(notification, *Cistern::Hash.stringify_keys(self.class.params))
+  end
+
+  # "notification"=>
+  # {"timestamp"=>1445878320000000,
+  #  "severity"=>2,
+  #  "filter"=>
+  # "container.name = 'deis-builder' and agent.tag.id = '8dbf0cfb-7b4b-42ea-b1f1-b742a5bdebf4'",
+  #   "timespan"=>60000000,
+  #   "condition"=>"timeAvg(uptime) = 0",
+  #   "entities"=>
+  # [{"filter"=>
+  #   "container.name = 'deis-builder' and agent.tag.id = '8dbf0cfb-7b4b-42ea-b1f1-b742a5bdebf4'",
+  #     "target"=>
+  #   {"id"=>"group@agent_tag_id-8dbf0cfb-7b4b-42ea-b1f1-b742a5bdebf4",
+  #    "type"=>"GROUP",
+  #    "subTarget"=>[{"metric"=>"container.name", "value"=>"deis-builder"}]},
+  #   "metricValues"=>
+  #   [{"metric"=>"uptime", "aggregation"=>"timeAvg", "value"=>0}]}],
+  # "state"=>"ACTIVE",
+  # "resolved"=>true,
+  # "alert"=>"31586"}}
+  def real(notification_id, notification)
+    service.request(
+      :method => :put,
+      :path   => File.join("/api/notifications", notification_id.to_s),
+      :body   => { "notification" => self.slice(notification) },
+    )
+  end
+
+  def mock(notification_id, notification)
+    update_notification   = self.slice(notification)
+    existing_notification = service.data[:alert_notifications].fetch(notification_id)
+
+    service.response(
+      :body => { "notification" => existing_notification.merge!(update_notification) },
+    )
+  end
+end

data/lib/sysdig/version.rb

@@ -1,3 +1,3 @@
 class Sysdig
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sysdig
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,6 +167,7 @@ files:
 - lib/sysdig/real.rb
 - lib/sysdig/response.rb
 - lib/sysdig/update_alert.rb
+- lib/sysdig/update_alert_notification.rb
 - lib/sysdig/update_user_notifications.rb
 - lib/sysdig/user_notifications.rb
 - lib/sysdig/version.rb