sensu-translator 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd368436b5cde39a6ec79e55818d3ac5762b343e
-  data.tar.gz: 843998e143b6968e22da0f23682d59bf40db76d5
+  metadata.gz: 97657180e19ead6b7b0a874db896d6a8f46270c9
+  data.tar.gz: 7fdb41b462dfe2890c19355f0bf8cad69edf7035
 SHA512:
-  metadata.gz: 98673f38e12abebbcc9918e3549a1e4fa8351cf8e7a9a4c930b43afa02663c768abbec8625e92494d4d9d87048f8eb6c93482f343cf66bd9bf75876554b60f1d
-  data.tar.gz: 68a3a06cccd948fa5feb1aebb134db99fab44cfcd81bd6681c792ee0c087514cc1d0a2b3bc7567d3ef07f16ea80dc14f22a1dd90baf0dd570af00c456f2d5016
+  metadata.gz: 954321b5d117b053b9f5a63c632e19eda222fdd4d99d523361fc112c45207ef62571b3c2169e91f5b9b825ca71d6cf1daf5b4a5d4364c8f248dc936ff3de5154
+  data.tar.gz: f7abd9874b90d062e3d4f29a1435812ecd3ee59aad87d2d081d66ecffb4328c883cd116a2494fb5ba41321f25556898cb0445786031b182fd01353c4a59e5043

data/CHANGELOG.md

@@ -6,6 +6,16 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [0.4.0] - 2018-11-29
+
+### Changed
+- Renamed Sensu 2.x -> Sensu Go
+- Replaced Organization/Environment with Namespace
+- Sensu Go configuration object files now include mandatory metadata
+
+### Added
+- Custom attributes added to Go label "json_attributes"
+
 ## [0.3.0] - 2018-05-04
 
 ### Fixed

data/README.md

@@ -19,9 +19,8 @@ Usage: sensu-translator [options]
     -V, --version                    Display version
     -c, --config FILE                Sensu 1.x JSON config FILE. Default: /etc/sensu/config.json (if exists)
     -d, --config_dir DIR[,DIR]       DIR or comma-delimited DIR list for Sensu 1.x JSON config files. Default: /etc/sensu/conf.d (if exists)
-    -o, --output_dir DIR             Sensu 2.0 config output DIR. Default: /tmp/sensu_v2
-    -O, --organization ORG           Sensu 2.0 RBAC Organization. Default: default
-    -E, --environment ENV            Sensu 2.0 RBAC Environment. Default: default
+    -o, --output_dir DIR             Sensu Go config output DIR. Default: /tmp/sensu_go
+    -n, --namespace NAMESPACE        Sensu Go Namespace. Default: default
 ```
 
 ## Example
@@ -29,11 +28,11 @@ Usage: sensu-translator [options]
 1. Translate Sensu 1.x configuration into the Sensu 2.x format
 
 ```
-$ sensu-translator -c /etc/sensu/config.json -d /etc/sensu/conf.d -o /tmp/sensu_v2
+$ sensu-translator -c /etc/sensu/config.json -d /etc/sensu/conf.d -o /tmp/sensu_go
 
-$ tree /tmp/sensu_v2
+$ tree /tmp/sensu_go
 
-/tmp/sensu_v2
+/tmp/sensu_go
 ├── checks
 │   ├── website-healthz.json
 │   └── haproxy-backends.json
@@ -50,7 +49,7 @@ $ tree /tmp/sensu_v2
 2. Use a configured `sensuctl` and the newly created 2.x configuration files to manage Sensu 2.x resources
 
 ```
-sensuctl create -f /tmp/sensu_v2/checks/website-healthz.json
+sensuctl create -f /tmp/sensu_go/checks/website-healthz.json
 ```
 
 ## Development

data/lib/sensu/translator.rb

@@ -27,28 +27,27 @@ module Sensu
       end
 
       def translate(v1_settings)
-        v2_resources = []
+        go_resources = []
         Sensu::Settings::CATEGORIES.each do |category|
           method_name = "translate_#{category.to_s.chop}"
-          v1_settings[category].each do |name, settings|
-            object = {:name => name.to_s}.merge(settings)
-            v2_resources << send(method_name, object, @options[:organization], @options[:environment])
+          v1_settings[category].each do |name, object|
+            go_resources << send(method_name, object, @options[:namespace], name)
           end
         end
-        v2_resources.compact
+        go_resources.compact
       end
 
-      def create_v2_output_files!(v2_resources)
+      def create_go_output_files!(go_resources)
         output_dir = @options[:output_dir]
         Sensu::Settings::CATEGORIES.each do |category|
           category_dir = File.join(output_dir, category.to_s)
           FileUtils.mkdir_p(category_dir)
         end
-        v2_resources.each do |v2_resource|
-          category = "#{v2_resource[:type].downcase}s"
-          file_name = "#{v2_resource[:spec][:name]}.json"
+        go_resources.each do |go_resource|
+          category = "#{go_resource[:type].downcase}s"
+          file_name = "#{go_resource[:spec][:name]}.json"
           output_file = File.join(output_dir, category, file_name)
-          content = Sensu::JSON.dump(v2_resource, :pretty => true)
+          content = Sensu::JSON.dump(go_resource, :pretty => true)
           File.open(output_file, "w") do |file|
             file.write(content)
           end
@@ -57,8 +56,8 @@ module Sensu
 
       def run
         v1_settings = load_v1_settings
-        v2_resources = translate(v1_settings)
-        create_v2_output_files!(v2_resources)
+        go_resources = translate(v1_settings)
+        create_go_output_files!(go_resources)
         puts "DONE!"
       end
     end

data/lib/sensu/translator/cli.rb

@@ -12,9 +12,8 @@ module Sensu
       # @return [Hash] options
       def self.read(arguments=ARGV)
         options = {
-          :output_dir => "/tmp/sensu_v2",
-          :organization => "default",
-          :environment => "default"
+          :output_dir => "/tmp/sensu_go",
+          :namespace => "default"
         }
         if File.exist?("/etc/sensu/config.json")
           options[:config_file] = "/etc/sensu/config.json"
@@ -37,14 +36,11 @@ module Sensu
           opts.on("-d", "--config_dir DIR[,DIR]", "DIR or comma-delimited DIR list for Sensu 1.x JSON config files. Default: /etc/sensu/conf.d (if exists)") do |dir|
             options[:config_dirs] = dir.split(",")
           end
-          opts.on("-o", "--output_dir DIR", "Sensu 2.0 config output DIR. Default: /tmp/sensu_v2") do |dir|
+          opts.on("-o", "--output_dir DIR", "Sensu 2.0 config output DIR. Default: /tmp/sensu_go") do |dir|
             options[:output_dir] = dir
           end
-          opts.on("-O", "--organization ORG", "Sensu 2.0 RBAC Organization. Default: default") do |org|
-            options[:organization] = org
-          end
-          opts.on("-E", "--environment ENV", "Sensu 2.0 RBAC Environment. Default: default") do |env|
-            options[:environment] = env
+          opts.on("-n", "--namespace NAMESPACE", "Sensu 2.0 Namespace. Default: default") do |namespace|
+            options[:namespace] = namespace
           end
         end
         optparse.parse!(arguments)

data/lib/sensu/translator/translations.rb

@@ -1,44 +1,69 @@
 module Sensu
   module Translator
     module Translations
-      def v2_spec(type, object, organization, environment)
+      def go_spec(type, spec, namespace, name, labels={}, annotations={})
+        metadata = {
+          :namespace => namespace,
+          :name => name,
+          :labels => labels,
+          :annotations => annotations
+        }
         {
+          :api_version => "core/v2",
           :type => type.to_s.capitalize,
-          :spec => object.merge(:organization => organization, :environment => environment)
+          :metadata => metadata,
+          :spec => spec
         }
       end
 
-      def translate_check(check, organization, environment)
-        check[:subscriptions] = check.delete(:subscribers) || []
-        if check[:standalone]
-          check.delete(:standalone)
-          check[:subscriptions] << "standalone"
+      def translate_check(object, namespace, name)
+        check = {}
+        check[:command] = object.delete(:command)
+        if object[:standalone]
+          object.delete(:standalone)
+          check[:subscriptions] = ["standalone"]
+        else
+          check[:subscriptions] = object.delete(:subscribers) || []
         end
-        check[:publish] = check.fetch(:publish, true)
-        check[:handlers] ||= [check.fetch(:handler, "default")]
-        if check[:source]
-          check[:proxy_entity_id] = check.delete(:source)
+        publish = object.delete(:publish)
+        publish = true if publish.nil?
+        check[:publish] = publish
+        check[:interval] = object.delete(:interval) if object[:interval]
+        check[:cron] = object.delete(:cron) if object[:cron]
+        check[:handlers] = object.delete(:handlers) || ["default"]
+        check[:handlers] << object.delete(:handler) if object[:handler]
+        check[:handlers].uniq!
+        check[:proxy_entity_name] = object.delete(:source) if object[:source]
+        check[:stdin] = object.delete(:stdin) if object[:stdin]
+        check[:ttl] = object.delete(:ttl) if object[:ttl]
+        check[:ttl_status] = object.delete(:ttl_status) if object[:ttl_status]
+        check[:low_flap_threshold] = object.delete(:low_flap_threshold) if object[:low_flap_threshold]
+        check[:high_flap_threshold] = object.delete(:high_flap_threshold) if object[:high_flap_threshold]
+        # TODO: subdue, hooks
+        labels = {}
+        unless object.empty?
+          labels[:json_attributes] = Sensu::JSON.dump(object)
         end
-        v2_spec(:check, check, organization, environment)
+        go_spec(:check, check, namespace, name, labels)
       end
 
-      def translate_filter(filter, organization, environment)
+      def translate_filter(object, namespace, name)
         puts "Sensu 1.x filter translation is not yet supported"
-        puts "Unable to translate Sensu 1.x filter: #{filter}"
+        puts "Unable to translate Sensu 1.x filter: #{name} - #{filter}"
         nil
       end
 
-      def translate_mutator(mutator, organization, environment)
-        v2_spec(:mutator, mutator, organization, environment)
+      def translate_mutator(object, namespace, name)
+        go_spec(:mutator, object, namespace, name)
       end
 
-      def translate_handler(handler, organization, environment)
-        v2_spec(:handler, handler, organization, environment)
+      def translate_handler(object, namespace, name)
+        go_spec(:handler, object, namespace, name)
       end
 
-      def translate_extension(extension, organization, environment)
+      def translate_extension(object, namespace, name)
         puts "Sensu 1.x extension translation is not yet supported"
-        puts "Unable to translate Sensu 1.x extension: #{extension}"
+        puts "Unable to translate Sensu 1.x extension: #{name} - #{extension}"
         nil
       end
     end

data/lib/sensu/translator/version.rb

@@ -1,5 +1,5 @@
 module Sensu
   module Translator
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-translator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json