fluent-plugin-viaq_data_model 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d9843f79f5f9c77f2d7e846d2db2f9603ef97bb
-  data.tar.gz: c2c3d05a6f76e75274246a11af13d870a6bdf84f
+  metadata.gz: f0eb13933dfd280f189d13bdb1990bb8d41aab5b
+  data.tar.gz: 821d55c5f7a85a8a2fa42c9cb64cfd9223c0289e
 SHA512:
-  metadata.gz: 9799e82962f80305db119f3134f36ad9040e3a72515c56c82872e3d72326ca427f54d902a6f765c9c189f0b28d5c1935d83e922971de2d4ae805f2f2cb3a98cd
-  data.tar.gz: dbdff538da0efa79bb3a07891364984c77c78712230fbf6d5460dc164458b35d194a6a79f8cf4911c0e8d19a5f0c730fdc9c2eac184399315e594c453efebf56
+  metadata.gz: 274c56353afc59f26b34f2a04439260d5b3267ac94a6eaf47aa09ccd23f2aa6b9f0b6424bdbc22a85206f0366112853fc6d3ffde97941fbb4a55090e07cca473
+  data.tar.gz: f13e59ee0b21d33842ee4b3850a3e1b6e8f64d90ecd9359eb5a5657939c8946bde0a4a6e2996f0f0aa5451bf3fd8c147e74f7d07ab423ceb64bbaabef152b31a

data/fluent-plugin-viaq_data_model.gemspec

@@ -7,7 +7,7 @@ FLUENTD_VERSION = ENV['FLUENTD_VERSION'] || "0.12.0"
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-viaq_data_model"
-  gem.version       = "0.0.12"
+  gem.version       = "0.0.13"
   gem.authors       = ["Rich Megginson"]
   gem.email         = ["rmeggins@redhat.com"]
   gem.description   = %q{Filter plugin to ensure data is in the ViaQ common data model}

data/lib/fluent/plugin/filter_viaq_data_model.rb

@@ -143,6 +143,8 @@ module Fluent
     desc 'Optionally turn off processing of kubernetes events'
     config_param :process_kubernetes_events, :bool, default: true
 
+    config_param :orphaned_namespace_name, :string, default: '.orphaned'
+
     def configure(conf)
       super
       @keep_fields = {}
@@ -381,18 +383,24 @@ module Fluent
           when :operations_full, :operations_prefix
             prefix = ".operations"
           when :project_full, :project_prefix
-            if (k8s = record['kubernetes']).nil?
-              log.error("record cannot use elasticsearch index name type #{ein.name_type}: record is missing kubernetes field: #{record}")
-              break
-            elsif (name = k8s['namespace_name']).nil?
-              log.error("record cannot use elasticsearch index name type #{ein.name_type}: record is missing kubernetes.namespace_name field: #{record}")
-              break
-            elsif (uuid = k8s['namespace_id']).nil?
-              log.error("record cannot use elasticsearch index name type #{ein.name_type}: record is missing kubernetes.namespace_id field: #{record}")
-              break
+            name, uuid = nil
+            unless record['kubernetes'].nil?
+              k8s = record['kubernetes']
+              name = k8s['namespace_name']
+              uuid = k8s['namespace_id']
+              if name.nil?
+                log.error("record cannot use elasticsearch index name type #{ein.name_type}: record is missing kubernetes.namespace_name field: #{record}")
+              end
+              if uuid.nil?
+                log.error("record cannot use elasticsearch index name type #{ein.name_type}: record is missing kubernetes.namespace_id field: #{record}")
+              end
             else
-              prefix = "project." + name + "." + uuid
+              log.error("record cannot use elasticsearch index name type #{ein.name_type}: record is missing kubernetes field: #{record}")
+            end
+            if name.nil? || uuid.nil?
+              name = @orphaned_namespace_name
             end
+            prefix = name == @orphaned_namespace_name ? @orphaned_namespace_name : "project.#{name}.#{uuid}"
           end
 
           if ENV['CDM_DEBUG']

data/test/test_filter_viaq_data_model.rb

@@ -1141,8 +1141,10 @@ class ViaqDataModelFilterTest < Test::Unit::TestCase
           tag "**"
           name_type project_prefix
         </elasticsearch_index_name>
+        elasticsearch_index_prefix_field my_index_prefix
       ')
       assert_match /record is missing kubernetes field/, @dlog.logs[0]
+      assert_equal('.orphaned', rec['my_index_prefix'])
     end
     test 'log error if missing kubernetes.namespace_name field' do
       input = normal_input.merge({})
@@ -1157,6 +1159,7 @@ class ViaqDataModelFilterTest < Test::Unit::TestCase
           tag "kubernetes.journal.container**"
           type k8s_journal
           remove_keys log,stream,MESSAGE,_SOURCE_REALTIME_TIMESTAMP,__REALTIME_TIMESTAMP,CONTAINER_ID,CONTAINER_ID_FULL,CONTAINER_NAME,PRIORITY,_BOOT_ID,_CAP_EFFECTIVE,_CMDLINE,_COMM,_EXE,_GID,_HOSTNAME,_MACHINE_ID,_PID,_SELINUX_CONTEXT,_SYSTEMD_CGROUP,_SYSTEMD_SLICE,_SYSTEMD_UNIT,_TRANSPORT,_UID,_AUDIT_LOGINUID,_AUDIT_SESSION,_SYSTEMD_OWNER_UID,_SYSTEMD_SESSION,_SYSTEMD_USER_UNIT,CODE_FILE,CODE_FUNCTION,CODE_LINE,ERRNO,MESSAGE_ID,RESULT,UNIT,_KERNEL_DEVICE,_KERNEL_SUBSYSTEM,_UDEV_SYSNAME,_UDEV_DEVNODE,_UDEV_DEVLINK,SYSLOG_FACILITY,SYSLOG_IDENTIFIER,SYSLOG_PID
+          elasticsearch_index_name_field my_index_name
         </formatter>
         <elasticsearch_index_name>
           tag "journal.system** system.var.log** **_default_** **_openshift_** **_openshift-infra_** mux.ops"
@@ -1166,8 +1169,10 @@ class ViaqDataModelFilterTest < Test::Unit::TestCase
           tag "**"
           name_type project_prefix
         </elasticsearch_index_name>
+        elasticsearch_index_prefix_field my_index_prefix
       ')
       assert_match /record is missing kubernetes.namespace_name field/, @dlog.logs[0]
+      assert_equal('.orphaned', rec['my_index_prefix'])
     end
     test 'log error if missing kubernetes.namespace_id field' do
       input = normal_input.merge({})
@@ -1191,8 +1196,10 @@ class ViaqDataModelFilterTest < Test::Unit::TestCase
           tag "**"
           name_type project_prefix
         </elasticsearch_index_name>
+        elasticsearch_index_prefix_field my_index_prefix
       ')
       assert_match /record is missing kubernetes.namespace_id field/, @dlog.logs[0]
+      assert_equal('.orphaned', rec['my_index_prefix'])
     end
     test 'construct a kubernetes index prefix' do
       input = normal_input.merge({})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-viaq_data_model
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Rich Megginson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd