stax-datadog 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c75f53213c26a5e49fb6a4f284ffa0fd7b3099c4
-  data.tar.gz: 0e1c05cd75862de9d4e32872b500d0624e251273
+SHA256:
+  metadata.gz: 8e3a1010fda206a77ec3f8377d6ecdee06fa549834570220d46e05d9e9da7990
+  data.tar.gz: f6f72e74cab7b68554d69d20512185f12672430b6baa771e56b894bad95a4afc
 SHA512:
-  metadata.gz: f1188f686cfb465f6b2bf67a242026711e2d4faa903db04cbf261217bdc0ba5170c07566b33e08c0fcb4b504205e3142f89e7cf034fda5048cd60b7654b5483a
-  data.tar.gz: f33352ec51b8a1c8affec478215e4d75827c404714790e943e3acb6b110a1ee47ab7fa5cac6243c21d7467531fbda9593d7679edd3553ff7a7ad70c61cdfefc1
+  metadata.gz: c549c24dc00d3d285b11f1d90a1a1ce38528424a0edf9f7dec4bc630ee64528594640b92186fa5a142a4f45ce3c693a6cefe069c36005d1a743f38fda7e6be0b
+  data.tar.gz: 5a6d48da14ce7e21ab670aa57533b4c29c6c74bc7fda56237e0c62ab1a2503e9cf700ad7d86cc6bf9eb7c09358e2b9c5769b9f1f845844d2ed54e53b412a8d30

data/lib/stax/datadog.rb

@@ -1,2 +1,3 @@
 require 'stax/datadog/api'
-require 'stax/datadog/cmd'
+require 'stax/datadog/cmd'
+Stax.add_command(:datadog, Stax::Datadog::Cmd)

data/lib/stax/datadog/api.rb

@@ -6,9 +6,58 @@ module Stax
     class Api
       class << self
 
+        ## override to set these values in a different way, eg from SSM param store
+        def datadog_api_key
+          ENV['DATADOG_API_KEY']
+        end
+
+        def datadog_app_key
+          ENV['DATADOG_APP_KEY']
+        end
+
         def client
-          # ensure_env('DATADOG_API_KEY', 'DATADOG_APP_KEY')
-          @_client ||= Dogapi::Client.new(ENV['DATADOG_API_KEY'], ENV['DATADOG_APP_KEY'])
+          @_client ||= Dogapi::Client.new(datadog_api_key, datadog_app_key)
+        rescue RuntimeError => e
+          abort("Stax::Datadog: #{e.message}")
+        end
+
+        def lists
+          handle_response(client.get_all_dashboard_lists)['dashboard_lists']
+        end
+
+        ## find all lists with name or id
+        def find_lists(x)
+          lists.select do |l|
+            (l['name'] == x) || (l['id'] == x)
+          end
+        end
+
+        def list_exists?(name)
+          !find_lists(name).empty?
+        end
+
+        ## create list, unless there is already a list with this name
+        def create_or_get_list(name)
+          list = find_lists(name)&.first || handle_response(client.create_dashboard_list(name))
+          get_list(list['id'])
+        end
+
+        def get_list(id)
+          handle_response(client.get_dashboard_list(id))
+        end
+
+        def get_list_items(id)
+          handle_response(client.get_items_of_dashboard_list(id))
+        end
+
+        def add_to_list(id, dashboards)
+          resp = client.add_items_to_dashboard_list(id, Array(dashboards))
+          handle_response(resp)
+        end
+
+        def delete_from_list(id, dashboards)
+          resp = client.delete_items_from_dashboard_list(id, Array(dashboards))
+          handle_response(resp)
         end
 
         def dashboards
@@ -27,8 +76,11 @@ module Stax
         end
 
         def handle_response(resp)
-          unless resp[0].match(/^2\d\d$/)
+          if resp[0].match(/^2\d\d$/)
+            resp[1]
+          else
             warn(resp[1].fetch('errors', 'datadog error'))
+            nil
           end
         end
 
@@ -36,7 +88,7 @@ module Stax
           if dashboard_exists?(args[0])
             warn("Dashboard #{args[0]} already exists")
           else
-            handle_response(client.create_dashboard(*args))
+            handle_response(client.create_dashboard(*args)).dig('dash', 'id')
           end
         end
 
@@ -61,4 +113,4 @@ module Stax
     end
 
   end
-end
+end

data/lib/stax/datadog/cmd.rb

@@ -3,6 +3,11 @@ module Stax
     class Cmd < Base
 
       no_commands do
+        ## if this is defined, dashboard will be added to this list
+        def list_name
+          app_name
+        end
+
         def dashboard_name
           app_name + '-' + branch_name
         end
@@ -20,18 +25,34 @@ module Stax
         end
       end
 
+      desc 'list', 'dashboard list'
+      def list
+        Datadog::Api.find_lists(list_name).each do |list|
+          debug("Datadog list #{list['name']} (#{list['id']})")
+          print_table Datadog::Api.get_list_items(list['id']).fetch('dashboards', []).map { |d|
+            [d['title'], d['id'], d['modified']]
+          }
+        end
+      end
+
       desc 'create', 'create dashboard'
       def create
-        Datadog::Api.create_dashboard(
+        debug("Creating datadog dashboard #{dashboard_name}")
+        id = Datadog::Api.create_dashboard(
           dashboard_name,
           dashboard_description,
           graph_definitions,
           template_variables,
         )
+
+        ## add it to list (create as needed)
+        list = Datadog::Api.create_or_get_list(list_name)
+        Datadog::Api.add_to_list(list['id'], [{type: :custom_timeboard, id: id}])
       end
 
       desc 'update', 'update dashboard'
       def update
+        debug("Updating datadog dashboard #{dashboard_name}")
         Datadog::Api.update_dashboard(
           dashboard_name,
           dashboard_description,
@@ -43,10 +64,11 @@ module Stax
       desc 'delete [TITLE/ID]', 'delete timeboards'
       def delete(title_or_id = nil)
         if yes?("Delete dashboards with name #{dashboard_name}?", :yellow)
+          debug("Deleting datadog dashboard #{dashboard_name}")
           Datadog::Api.delete_dashboards(dashboard_name)
         end
       end
 
     end
   end
-end
+end

data/lib/stax/datadog/version.rb

@@ -1,5 +1,5 @@
 module Stax
   module Datadog
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stax-datadog
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Richard Lister
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,7 +93,7 @@ homepage: https://github.com/rlister/stax-datadog
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,9 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Control datadog dashboards with stax.
 test_files: []