fluent-plugin-juniper-telemetry 0.2.11 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c6cababee592eb8a30f399415a1b99eac024fd22
+  data.tar.gz: ac660b8de786e4d4ccfb38837659f53e28de6dde
+SHA512:
+  metadata.gz: 5da21d83ec990c8ea733fa77ed2958401b892ee61f1da6cff1c05d1298a47b1ce9250c43ce6c9219e33690ef9af8ce25f03ec8ec1f6036d259cbac1d1efca45f
+  data.tar.gz: a1353850da699ba1d785f354e6fc28176d81cb37ec5d16643c0f740985741b0f5ddbf99b30b8c1a7334a91e2acee0db30e0801238787a077bc68050cdf8f491d

data/lib/cpu_memory_utilization.pb.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf'
+
+
+##
+# Imports
+#
+require 'telemetry_top.pb'
+
+
+##
+# Message Classes
+#
+class CpuMemoryUtilization < ::Protobuf::Message; end
+class CpuMemoryUtilizationSummary < ::Protobuf::Message; end
+class CpuMemoryUtilizationPerApplication < ::Protobuf::Message; end
+
+
+##
+# Message Fields
+#
+class CpuMemoryUtilization
+  repeated ::CpuMemoryUtilizationSummary, :utilization, 1
+end
+
+class CpuMemoryUtilizationSummary
+  optional :string, :name, 1
+  optional :uint64, :size, 2
+  optional :uint64, :bytes_allocated, 3
+  optional :int32, :utilization, 4
+  repeated ::CpuMemoryUtilizationPerApplication, :application_utilization, 5
+end
+
+class CpuMemoryUtilizationPerApplication
+  optional :string, :name, 1
+  optional :uint64, :bytes_allocated, 2
+  optional :uint64, :allocations, 3
+  optional :uint64, :frees, 4
+  optional :uint64, :allocations_failed, 5
+end
+
+
+##
+# Extended Message Fields
+#
+class ::JuniperNetworksSensors < ::Protobuf::Message
+  optional ::CpuMemoryUtilization, :".cpu_memory_util_ext", 1, :extension => true
+end
+

data/lib/firewall.pb.rb

@@ -3,13 +3,13 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 
 ##
 # Imports
 #
-require 'jvision_top.pb'
+require 'telemetry_top.pb'
 
 
 ##
@@ -78,6 +78,6 @@ end
 # Extended Message Fields
 #
 class ::JuniperNetworksSensors < ::Protobuf::Message
-  optional ::Firewall, :jnpr_firewall_ext, 6, :extension => true
+  optional ::Firewall, :".jnpr_firewall_ext", 6, :extension => true
 end
 

data/lib/fluent/plugin/parser_juniper_jti.rb

@@ -1,10 +1,11 @@
 require 'juniper_telemetry_lib.rb'
 require 'protobuf'
-require 'jvision_top.pb.rb'
+require 'telemetry_top.pb.rb'
 require 'port.pb.rb'
 require 'lsp_stats.pb.rb'
 require 'logical_port.pb.rb'
 require 'firewall.pb.rb'
+require 'cpu_memory_utilization.pb.rb'
 
 module Fluent
   class TextParser
@@ -58,6 +59,7 @@ module Fluent
           if sensor == "jnpr_interface_ext"
 
             resource = "/junos/system/linecard/interface/"
+            $log.debug  "Will extract info for Sensor: #{sensor} / Resource #{resource}"
 
             datas_sensors[sensor]['interface_stats'].each do |datas|
 
@@ -123,41 +125,19 @@ module Fluent
                 $log.debug  "Unable to parse " + sensor + " sensor, Data Dump : " + datas.inspect.to_s
               end
             end
-            ##############################################################
-            ### Support for resource /junos/system/linecard/firewall/  ##
-            ##############################################################
-            # elsif sensor == "jnpr_firewall_ext"
-            #
-            #   resource = "/junos/system/linecard/firewall"
-            #
-            #   datas_sensors[sensor]['firewall_stats'].each do |datas|
-            #
-            #     begin
-            #       ## Extract interface name and clean up
-            #       sensor_data.push({ 'device' => device_name  })
-            #       sensor_data.push({ 'filter_name' => datas['filter_name']  })
-            #
-            #       ## Clean up Current object
-            #       # datas.delete("filter_name")
-            #
-            #       $log.warn  "Sensor Filter : " + datas['filter_name']
-            #
-            #     rescue
-            #       $log.warn   "Unable to parse " + sensor + " sensor, an error occured.."
-            #       $log.debug  "Unable to parse " + sensor + " sensor, Data Dump : " + datas.inspect.to_s
-            #     end
-            #   end
-            #####################################################################
-            ### Support for resource /junos/services/label-switched-path/usage/##
-            #####################################################################
-            #datas Dump : {"name"=>"to_mx104-9", "instance_identifier"=>0,
-            #  "counter_name"=>"c-25", "packets"=>2521648779, "bytes"=>2526692076558,
-            #  "packet_rate"=>598640, "byte_rate"=>599837511}
-            elsif sensor == "jnpr_lsp_statistics_ext"
-
-              resource = "/junos/services/label-switched-path/usage/"
-
-              datas_sensors[sensor]['lsp_stats_records'].each do |datas|
+
+          #####################################################################
+          ### Support for resource /junos/services/label-switched-path/usage/##
+          #####################################################################
+          #datas Dump : {"name"=>"to_mx104-9", "instance_identifier"=>0,
+          #  "counter_name"=>"c-25", "packets"=>2521648779, "bytes"=>2526692076558,
+          #  "packet_rate"=>598640, "byte_rate"=>599837511}
+          elsif sensor == "jnpr_lsp_statistics_ext"
+
+            resource = "/junos/services/label-switched-path/usage/"
+            $log.debug  "Will extract info for Sensor: #{sensor} / Resource #{resource}"
+
+            datas_sensors[sensor]['lsp_stats_records'].each do |datas|
 
               # Save all info extracted on a list
               sensor_data = []
@@ -189,14 +169,84 @@ module Fluent
               end
             end
 
-            ##############################################################
-            ### Support for resource /junos/system/linecard/interface/logical/usage ##
-            ##############################################################
-            elsif sensor == "jnprLogicalInterfaceExt"
+          ##############################################################
+          ### Support for resource /junos/system/linecard/interface/logical/usage ##
+          ##############################################################
+          elsif sensor == "jnprLogicalInterfaceExt"
+
+            resource = "/junos/system/linecard/interface/logical/usage"
+            $log.debug  "Will extract info for Sensor: #{sensor} / Resource #{resource}"
+
+            datas_sensors[sensor]['interface_info'].each do |datas|
+
+            # Save all info extracted on a list
+            sensor_data = []
+
+            begin
+              ## Extract interface name and clean up
+              sensor_data.push({ 'device' => device_name  })
+              sensor_data.push({ 'interface' => datas['if_name']  })
+
+              ## Clean up Current object
+              datas.delete("if_name")
+              datas.delete("init_time")
+              datas.delete("snmp_if_index")
+              datas.delete("op_state")
+
+              # Check if the interface has a parent
+              if datas.key?('parent_ae_name')
+                sensor_data.push({ 'interface_parent' =>  datas['parent_ae_name']  })
+                datas.delete("parent_ae_name")
+              end
+
+              datas.each do |section, data|
+                data.each do |type, value|
+
+                  local_sensor_data = sensor_data.dup
+
+                  if value.kind_of?(Array)
+                    value.each do |entry|
+
+                      ['if_packets', 'if_octets'].each do |data_type|
+                        local_sensor_data.push({ 'forwarding_class' => entry['fc_number'] })
+                        local_sensor_data.push({ 'family' => entry['if_family'] })
+                        local_sensor_data.push({ 'type' => section + '.' + type + '.' + data_type })
+                        local_sensor_data.push({ 'value' => entry[data_type]  })
+
+                        record = build_record(output_format, local_sensor_data)
+                        yield gpb_time, record
+                      end
+                    end
+                  else
+                    local_sensor_data.push({ 'type' => section + '.' + type  })
+                    local_sensor_data.push({ 'value' => value  })
+
+                    record = build_record(output_format, local_sensor_data)
+
+                    yield gpb_time, record
+                  end
+                end
+              end
+            rescue => e
+              $log.warn   "Unable to parse " + sensor + " sensor, Error during processing: #{$!}"
+              $log.debug  "Unable to parse " + sensor + " sensor, Data Dump : " + datas.inspect.to_s
+            end
+          end
+
+          ##############################################################
+          ### Support for resource /junos/system/linecard/firewall/   ##
+          ##############################################################
+          #{"message":"Unable to parse jnpr_firewall_ext sensor, Data Dump : {\"jnpr_firewall_ext\"=>
+          #{\"firewall_stats\"=>[{\"filter_name\"=>\"__default_bpdu_filter__\", \"timestamp\"=>1465467390, \"memory_usage\"=>[{\"name\"=>\"HEAP\", \"allocated\"=>2440}]},
+          #{\"filter_name\"=>\"test\", \"timestamp\"=>1465467390, \"memory_usage\"=>[{\"name\"=>\"HEAP\", \"allocated\"=>1688}],
+          #\"counter_stats\"=>[{\"name\"=>\"cnt1\", \"packets\"=>79, \"bytes\"=>6320}]},
+          #{\"filter_name\"=>\"__default_arp_policer__\", \"timestamp\"=>1464456904, \"memory_usage\"=>[{\"name\"=>\"HEAP\", \"allocated\"=>1600}]}]}}"}
+          elsif sensor == "jnpr_firewall_ext"
 
-              resource = "/junos/system/linecard/interface/logical/usage"
+            resource = "/junos/system/linecard/firewall/"
+            $log.debug  "Will extract info for Sensor: #{sensor} / Resource #{resource}"
 
-              datas_sensors[sensor]['interface_info'].each do |datas|
+            datas_sensors[sensor]['firewall_stats'].each do |datas|
 
               # Save all info extracted on a list
               sensor_data = []
@@ -204,28 +254,81 @@ module Fluent
               begin
                 ## Extract interface name and clean up
                 sensor_data.push({ 'device' => device_name  })
-                sensor_data.push({ 'interface' => datas['if_name']  })
+                sensor_data.push({ 'filter_name' => datas['filter_name']  })
+                sensor_data.push({ 'filter_timestamp' => datas['timestamp']  })
 
                 ## Clean up Current object
-                datas.delete("if_name")
-                datas.delete("init_time")
-                datas.delete("snmp_if_index")
-                datas.delete("op_state")
+                datas.delete("filter_name")
+                datas.delete("timestamp")
 
-                datas.each do |section, data|
-                  data.each do |type, value|
-
-                    sensor_data.push({ 'type' => section + '.' + type  })
-                    sensor_data.push({ 'value' => value  })
+                if datas.key?('memory_usage')
+                  datas['memory_usage'].each do |memory_usage|
+                    sensor_data.push({ 'type' =>  'memory_usage.' + memory_usage['name'] })
+                    sensor_data.push({ 'value' =>  memory_usage['allocated']  })
+                    memory_usage.delete("name")
+                    memory_usage.delete("allocated")
 
                     record = build_record(output_format, sensor_data)
                     yield gpb_time, record
+                  end
 
+                  ## Clean up Current object
+                  datas.delete("memory_usage")
+                end
+
+                if datas.key?('counter_stats')
+                  datas['counter_stats'].each do |counters|
+                    sensor_data.push({ 'filter_counter_name' => counters['name']  })
+                    counters.delete("name")
+                    counters.each do |type, value|
+                      sensor_data.push({ 'type' =>  'filter_counter.' + type  })
+                      sensor_data.push({ 'value' => value  })
+                      record = build_record(output_format, sensor_data)
+                      yield gpb_time, record
+                    end
                   end
                 end
+
               rescue => e
                 $log.warn   "Unable to parse " + sensor + " sensor, Error during processing: #{$!}"
-                $log.debug  "Unable to parse " + sensor + " sensor, Data Dump : " + datas.inspect.to_s
+                $log.debug  "Unable to parse " + sensor + " sensor, Data Dump : " + datas_sensors.inspect.to_s
+              end
+            end
+          #####################################################################
+          ### Support for resource /junos/TBD /##
+          #####################################################################
+          elsif sensor == "cpu_memory_util_ext"
+
+            resource = "/junos/TBD/"
+            $log.debug  "Will extract info for Sensor: #{sensor} / Resource #{resource}"
+
+            datas_sensors[sensor]['utilization'].each do |datas|
+
+              # Save all info extracted on a list
+              sensor_data = []
+
+              begin
+                ## Extract interface name and clean up
+                sensor_data.push({ 'device' => device_name  })
+
+                name = clean_up_name(datas['name'])
+
+                ## Clean up Current object
+                datas.delete("name")
+
+                datas.each do |type, value|
+
+                  sensor_data.push({ 'type' =>  'cpu_mem.' + type })
+                  sensor_data.push({ 'name' => name  })
+                  sensor_data.push({ 'value' => value  })
+
+                  record = build_record(output_format, sensor_data)
+                  yield gpb_time, record
+
+                end
+              rescue => e
+                $log.warn   "Unable to parse " + sensor + " sensor, Error during processing: #{$!}"
+                $log.debug  "Unable to parse " + sensor + " sensor, Data Dump : " + datas_sensors.inspect.to_s
               end
             end
           else

data/lib/google/protobuf/descriptor.pb.rb

@@ -3,10 +3,11 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 module Google
   module Protobuf
+    ::Protobuf::Optionable.inject(self) { ::Google::Protobuf::FileOptions }
 
     ##
     # Message Classes

data/lib/juniper_telemetry_lib.rb

@@ -15,7 +15,7 @@ def epoc_to_sec(epoc)
   elsif nbr_digit == 16
     return (epoc.to_i/1000000).to_i
   end
-  
+
   return epoc
 end
 
@@ -28,6 +28,7 @@ def clean_up_name(name)
     tmp.gsub!('/', '_')
     tmp.gsub!(':', '_')
     tmp.gsub!('.', '_')
+    tmp.gsub!(' ', '_')
 
     return tmp
 end

data/lib/logical_port.pb.rb

@@ -3,13 +3,13 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 
 ##
 # Imports
 #
-require 'jvision_top.pb'
+require 'telemetry_top.pb'
 
 
 ##
@@ -69,6 +69,6 @@ end
 # Extended Message Fields
 #
 class ::JuniperNetworksSensors < ::Protobuf::Message
-  optional ::LogicalPort, :jnprLogicalInterfaceExt, 7, :extension => true
+  optional ::LogicalPort, :".jnprLogicalInterfaceExt", 7, :extension => true
 end
 

data/lib/lsp_mon.pb.rb

@@ -3,7 +3,7 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 
 ##

data/lib/lsp_stats.pb.rb

@@ -3,13 +3,13 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 
 ##
 # Imports
 #
-require 'jvision_top.pb'
+require 'telemetry_top.pb'
 
 
 ##
@@ -41,6 +41,6 @@ end
 # Extended Message Fields
 #
 class ::JuniperNetworksSensors < ::Protobuf::Message
-  optional ::LspStats, :jnpr_lsp_statistics_ext, 5, :extension => true
+  optional ::LspStats, :".jnpr_lsp_statistics_ext", 5, :extension => true
 end
 

data/lib/port.pb.rb

@@ -3,13 +3,13 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 
 ##
 # Imports
 #
-require 'jvision_top.pb'
+require 'telemetry_top.pb'
 
 
 ##
@@ -84,6 +84,6 @@ end
 # Extended Message Fields
 #
 class ::JuniperNetworksSensors < ::Protobuf::Message
-  optional ::GPort, :jnpr_interface_ext, 3, :extension => true
+  optional ::GPort, :".jnpr_interface_ext", 3, :extension => true
 end
 

data/lib/{jvision_top.pb.rb → telemetry_top.pb.rb}

@@ -3,7 +3,7 @@
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 
 ##
@@ -50,10 +50,10 @@ end
 # Extended Message Fields
 #
 class ::Google::Protobuf::FieldOptions < ::Protobuf::Message
-  optional ::TelemetryFieldOptions, :telemetry_options, 1024, :extension => true
+  optional ::TelemetryFieldOptions, :".telemetry_options", 1024, :extension => true
 end
 
 class ::EnterpriseSensors < ::Protobuf::Message
-  optional ::JuniperNetworksSensors, :juniperNetworks, 2636, :extension => true
+  optional ::JuniperNetworksSensors, :".juniperNetworks", 2636, :extension => true
 end
 

metadata

@@ -1,65 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-juniper-telemetry
 version: !ruby/object:Gem::Version
-  version: 0.2.11
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Damien Garros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.58
+        version: 0.12.29
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.58
+        version: 0.12.29
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Input plugin for Fluentd for Juniper devices telemetry data streaming
+description: 'Input plugin for Fluentd for Juniper devices telemetry data streaming
   : Jvision / analyticsd etc ..'
 email:
 - dgarros@gmail.com
@@ -67,41 +60,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/fluent/plugin/parser_juniper_jti.rb
+- lib/cpu_memory_utilization.pb.rb
+- lib/firewall.pb.rb
 - lib/fluent/plugin/parser_juniper_analyticsd.rb
+- lib/fluent/plugin/parser_juniper_jti.rb
 - lib/fluent/plugin/parser_juniper_na.rb
+- lib/google/protobuf/descriptor.pb.rb
 - lib/juniper_telemetry_lib.rb
-- lib/jvision_top.pb.rb
-- lib/port.pb.rb
-- lib/firewall.pb.rb
-- lib/lsp_mon.pb.rb
 - lib/logical_port.pb.rb
+- lib/lsp_mon.pb.rb
 - lib/lsp_stats.pb.rb
-- lib/google/protobuf/descriptor.pb.rb
+- lib/port.pb.rb
+- lib/telemetry_top.pb.rb
 homepage: https://github.com/JNPRAutomate/fluentd-plugin-juniper-telemetry
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
-summary: ! 'Input plugin for Fluentd for Juniper devices telemetry data streaming
-  : Jvision / analyticsd etc ..'
+specification_version: 4
+summary: 'Input plugin for Fluentd for Juniper devices telemetry data streaming :
+  Jvision / analyticsd etc ..'
 test_files: []