oci-logging-analytics-kubernetes-discovery 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40cb1255cc1125f85989f0abea5d0c6afb113327ed376c5920e2c3bc05124807
-  data.tar.gz: 2b7538d6052d87229aebdf934d51800e711d6da4017a9184c6bf0c3e236f3705
+  metadata.gz: 358cc8651c1361741c8232f14c77c4d40aec7a9981a491c5b0f835baada853c6
+  data.tar.gz: deb40680dae588f0c26580679c2c4ff35afd941dfb14447ea8ec09e2ddbd4985
 SHA512:
-  metadata.gz: 889778a1de60813ec7c955b027f0b5668706d6484c980cf861a4c05de76b237043dcb47ff01a841aa191b1d8fcd90a47c45ce7652574f8c2fe614faabcd264e5
-  data.tar.gz: e5d84ff26835e2102c0bc7b25f1b5e7aee4a49ac083c14c7e1d3d910af1e69dbfd97e9669cd6763b46a87661b8158c5217b10b7fe605a3ef4e8fff4a1cec8e1c
+  metadata.gz: a4cb5609901d156a1c1d792e60c352e30a1bcae3a777388dde13dbce966671982489263e954cc12ad2ce6e7061e7f066a04a8f8d9e7921c2bb0f4d7bafe9f1e8
+  data.tar.gz: 3e3f52a6ea9d8c7f2bf0e59b15aeb7525e8b0649b71bfb4bec6c1be31d2505a901b1e13260e4a51a9ded9112f5d3aae58a7fe39c9d001d042b9f825cc5004520

data/Makefile

@@ -0,0 +1,13 @@
+# Makefile for installing Ruby and building the gem
+
+ruby_install:
+	@echo "Setting up ruby..."
+	dnf install ruby
+	ruby -v
+	@echo "Ruby installation complete..."
+
+	@echo "Building gem..."
+	gem build oci-logging-analytics-kubernetes-discovery.gemspec
+	
+	@echo "Build completed. Generated files:"
+	ls -la *.gem

data/Rakefile

@@ -12,4 +12,4 @@ Rake::TestTask.new do |t|
 
   # If you want your tests to output what they should do, then set this to true.
   t.verbose = true
-end
+end

data/lib/discover/object.rb

@@ -21,7 +21,7 @@ module Discover
     End_point_slice = Struct.new(:name, :namespace, :uid, :endpoints, :ports)
     Job = Struct.new(:name, :namespace, :uid, :controller)
     Node = Struct.new(:name, :displayName, :uid, :internalIP, :externalIP)
-    Pod = Struct.new(:name, :namespace, :uid, :podIP, :hostIP, :nodeIP, :controller, :phase, :startTime, :finishTime)
+    Pod = Struct.new(:name, :namespace, :uid, :podIP, :hostIP, :nodeIP, :controller, :phase, :startTime, :finishTime, :containerStartedAt)
     Replica_set = Struct.new(:name, :namespace, :uid, :controller)
     Service = Struct.new(:name, :namespace, :uid, :clusterIP, :externalIP, :loadBalancerIP, :serviceType, :ports)
     Namespace = Struct.new(:name, :uid)
@@ -201,6 +201,30 @@ module Discover
           hostIP = item[:status][:hostIP]
           nodeIP = item[:status][:nodeIP]
           phase =  item[:status][:phase]
+
+          containerStartedAt = nil
+          begin
+            if !item[:status][:containerStatuses].nil? && !item[:status][:containerStatuses].empty?
+              containers = item[:status][:containerStatuses]
+              containers.each do |container|
+                next if container.nil?
+                if !container[:state].nil? && !container[:state].empty?
+                  container[:state].each do |key, value|
+                    if !value.nil? && value.is_a?(Hash) && !value[:startedAt].nil?
+                        current_started_at_str = value[:startedAt]
+                        if containerStartedAt.nil? || 
+                          Time.parse(current_started_at_str) < Time.parse(containerStartedAt)
+                          containerStartedAt = current_started_at_str
+                        end
+                    end
+                  end
+                end
+              end
+            end
+          rescue StandardError => e
+            logger.warn("Error parsing containerStartedAt time: '#{e.message}'")
+          end
+
           startTime =  item[:status][:startTime]
           controller = nil
           if !item[:metadata][:ownerReferences].nil? && !item[:metadata][:ownerReferences].empty?
@@ -223,7 +247,7 @@ module Discover
             end
           end
           processed_data.push(Pod.new(generic_object[:name], generic_object[:namespace], generic_object[:uid],
-           podIP, hostIP, nodeIP, controller.to_h, phase, startTime, finishTime))
+           podIP, hostIP, nodeIP, controller.to_h, phase, startTime, finishTime, containerStartedAt))
         end
       rescue StandardError => e
         logger.error("Unable to fetch '#{resource_name}'")

data/lib/dto/kubernetes_objects_payload.rb

@@ -10,11 +10,11 @@ module Dto
 
     attr_accessor :cluster, :nodes, :pods, :services, :endpointslices, :deployments,
                   :replicasets, :daemonsets, :cronjobs, :jobs, :statefulsets, :events, :namespaces,
-                  :infra
+                  :infra, :payloadCreationTime
 
     def initialize(cluster, nodes, pods, services, endpointslices, deployments,
                    replicasets, daemonsets, cronjobs, jobs, statefulsets, events, namespaces,
-                   infra)
+                   infra, payloadCreationTime)
       @cluster = cluster
       @nodes = nodes
       @pods = pods
@@ -29,6 +29,7 @@ module Dto
       @events = events
       @namespaces = namespaces
       @infra = infra
+      @payloadCreationTime = payloadCreationTime
     end
 
     def get_hash(obj, obj_name)
@@ -55,7 +56,8 @@ module Dto
         statefulsets: get_hash(@statefulsets, STATEFUL_SETS.to_s),
         events: get_hash(@events, EVENTS.to_s),
         namespaces: get_hash(@namespaces, NAMESPACES.to_s),
-        infra: @infra.nil? ? nil : @infra.to_hash
+        infra: @infra.nil? ? nil : @infra.to_hash,
+        payloadCreationTime: @payloadCreationTime
       }.compact
     end
   end

data/lib/oci_loganalytics_resources_discovery.rb

@@ -115,7 +115,7 @@ module OciLogAnalyticsResourcesDiscovery
     combined_data = Dto::KubernetesObjectsPayLoad.new(
       processed_objects[:cluster], processed_objects[:nodes], processed_objects[:pods], processed_objects[:services], processed_objects[:endpoint_slices],
       processed_objects[:deployments], processed_objects[:replica_sets], processed_objects[:daemon_sets], processed_objects[:cron_jobs],
-      processed_objects[:jobs], processed_objects[:stateful_sets], processed_objects[:events], processed_objects[:namespaces], infra_objects_payload
+      processed_objects[:jobs], processed_objects[:stateful_sets], processed_objects[:events], processed_objects[:namespaces], infra_objects_payload, @snapshot_id
     )
 
     logger.info('Combined discovery payload created.')

data/lib/version.rb

@@ -2,5 +2,5 @@
 ## The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 module Discovery
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/ocibuild.conf

@@ -0,0 +1,29 @@
+runnerTag: latest
+name: logan-kubernetes-discovery
+team: LOGAN
+description: Build config to build Logging Analytics Kubernetes Discovery gem.
+phoneBookId: logan
+version: ${BLD_NUMBER}
+authCompartmentOcid: ocid1.tenancy.oc1..aaaaaaaauj75yrhg54zor44qlc3chockspqc6e5c7nxlxjlcnunxo2hbs6ca
+scheduleOnOl9Hosts: true
+steps:
+  [
+    {
+        name: ruby_install
+		runnerImage: build-runner-make-ol9
+        type: make
+        makeCommands: [
+            { target: ruby_install }
+        ]
+        artifacts: ["**"]
+    },
+	{
+		name: publish-gem
+		type: publishgeneric
+		dependsOn: ruby_install
+		repository: logan-release-gems-local
+		filesToPublish: [
+			      "*.gem"
+		]
+	}
+  ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oci-logging-analytics-kubernetes-discovery
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Oracle
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -274,6 +274,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - bin/console
@@ -311,6 +312,7 @@ files:
 - lib/util/string_utils.rb
 - lib/version.rb
 - oci-logging-analytics-kubernetes-discovery.gemspec
+- ocibuild.conf
 homepage: https://rubygems.org/gems/oci-logging-analytics-kubernetes-discovery
 licenses:
 - UPL-1.0