oci-logging-analytics-kubernetes-discovery 1.2.0 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +6 -6
- data/bin/oci-loganalytics-kubernetes-discovery +6 -6
- data/lib/oci_loganalytics_resources_discovery.rb +1 -1
- data/lib/util/service_logs.rb +3 -1
- data/lib/version.rb +1 -1
- data/oci-logging-analytics-kubernetes-discovery.gemspec +2 -2
- data/ocibuild.conf +7 -4
- metadata +4 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f1199ab8d0ac81fc5f30f69f908205ae7e8a7e1eb1142310eb8532a581a8036c
|
|
4
|
+
data.tar.gz: 02131efa98c4ce38ec97c9e32c28942be9357720e1c894914c6630b4dd8062db
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 50726236669da194d7bb92fccb9d1aa77cfbfba6f181d194485050d8475457d3f4046e87fbc4a87a52e4e263ebf3cf837390f8e34fa271599a2910e3a8cf0aa8
|
|
7
|
+
data.tar.gz: 01bcb89ce5ddea1f0a3ca4ae365bf7f337c597d5256243709234215aaf49a1ba0488d2baaca0f0f394eceefeb752a016dece5581866235afd9e4984932fbd63c
|
data/README.md
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
# OCI
|
|
1
|
+
# OCI Log Analytics Kubernetes Discovery
|
|
2
2
|
|
|
3
3
|
## Overview
|
|
4
4
|
|
|
5
|
-
A rubygem for discovering Kubernetes resources and send it to OCI
|
|
5
|
+
A rubygem for discovering Kubernetes resources and send it to OCI Log Analytics.
|
|
6
6
|
|
|
7
7
|
## Installation
|
|
8
8
|
|
|
@@ -31,9 +31,9 @@ Usage: oci-loganalytics-kubernetes-discovery [options]
|
|
|
31
31
|
--oci_la_namespace OCI_LA_NAMESPACE
|
|
32
32
|
OCI Tenancy Namespace to which the collected log data is to be uploaded
|
|
33
33
|
--oci_la_log_group_id OCI_LA_LOG_GROUP_ID
|
|
34
|
-
OCID of
|
|
34
|
+
OCID of Log Analytics Log Group to which the uploaded data is to be associated with
|
|
35
35
|
--oci_la_cluster_entity_id KUBERNETES_CLUSTER_ENTITY_ID
|
|
36
|
-
OCID of
|
|
36
|
+
OCID of Log Analytics Kubernetes Cluster entity
|
|
37
37
|
--kubernetes_cluster_name KUBERNETES_CLUSTER_NAME
|
|
38
38
|
A unique name for each kubernetes cluster must be provided
|
|
39
39
|
--kubernetes_cluster_namespace KUBERNETES_CLUSTER_NAMESPACE
|
|
@@ -42,7 +42,7 @@ Usage: oci-loganalytics-kubernetes-discovery [options]
|
|
|
42
42
|
Kubernetes cluster resourcename prefix. Defaults to oci-onm
|
|
43
43
|
--kubernetes_cluster_id KUBERNETES_CLUSTER_ID
|
|
44
44
|
Unique identifier for Kubernetes cluster
|
|
45
|
-
--endpoint ENDPOINT
|
|
45
|
+
--endpoint ENDPOINT Log Analytics Ingestion API endpoint to ingest your application logs
|
|
46
46
|
--profile_name PROFILE_NAME OCI Config Profile Name to be used from the configuration file
|
|
47
47
|
--config_file_location CONFIG_FILE_LOCATION
|
|
48
48
|
The location of the configuration file containing OCI authentication details
|
|
@@ -59,7 +59,7 @@ Usage: oci-loganalytics-kubernetes-discovery [options]
|
|
|
59
59
|
--secret_dir SECRET_DIR Path to Kubernetes service account token file to access Kubernetes API
|
|
60
60
|
--discovery DISCOVERY_MODE Discovery mode to be used: {infra|object}
|
|
61
61
|
--chunk_limit CHUNK_SIZE Max number of objects that can be fetched via K8s GET API call. Default: 1000
|
|
62
|
-
--skip_upload Flag to skip uploading data to OCI
|
|
62
|
+
--skip_upload Flag to skip uploading data to OCI Log Analytics [ONLY FOR INTERNAL TESTING]
|
|
63
63
|
--collect_warning_events_only
|
|
64
64
|
Flag to collect only warning event logs
|
|
65
65
|
--log_format LOG_FORMAT Log format to be used: {text|json}
|
|
@@ -29,8 +29,8 @@ optparse = OptionParser.new do |param|
|
|
|
29
29
|
|
|
30
30
|
# Mandatory Fields
|
|
31
31
|
param.on('--oci_la_namespace OCI_LA_NAMESPACE', 'OCI Tenancy Namespace to which the collected log data is to be uploaded') { |o| cluster_config[:oci_la_namespace] = o }
|
|
32
|
-
param.on('--oci_la_log_group_id OCI_LA_LOG_GROUP_ID', 'OCID of
|
|
33
|
-
param.on('--oci_la_cluster_entity_id KUBERNETES_CLUSTER_ENTITY_ID', 'OCID of
|
|
32
|
+
param.on('--oci_la_log_group_id OCI_LA_LOG_GROUP_ID', 'OCID of Log Analytics Log Group to which the uploaded data is to be associated with') { |o| cluster_config[:oci_la_log_group_id] = o }
|
|
33
|
+
param.on('--oci_la_cluster_entity_id KUBERNETES_CLUSTER_ENTITY_ID', 'OCID of Log Analytics Kubernetes Cluster entity') { |o| cluster_config[:oci_la_cluster_entity_id] = o }
|
|
34
34
|
param.on('--kubernetes_cluster_name KUBERNETES_CLUSTER_NAME', 'A unique name for each kubernetes cluster must be provided') { |o| cluster_config[:kubernetes_cluster_name] = o }
|
|
35
35
|
param.on('--kubernetes_cluster_namespace KUBERNETES_CLUSTER_NAMESPACE', 'Kubernetes namespace in which the discovery job is configured') { |o| cluster_config[:kubernetes_cluster_namespace] = o }
|
|
36
36
|
param.on('--kubernetes_resourcename_prefix PREFIX', 'Kubernetes cluster resourcename prefix. Defaults to oci-onm') { |o| cluster_config[:kubernetes_resourcename_prefix] = o }
|
|
@@ -44,8 +44,8 @@ optparse = OptionParser.new do |param|
|
|
|
44
44
|
param.on('--profile_name PROFILE_NAME', 'OCI Config Profile Name to be used from the configuration file') { |o| auth_config[:profile_name] = o }
|
|
45
45
|
param.on('--config_file_location CONFIG_FILE_LOCATION', 'The location of the configuration file containing OCI authentication details') { |o| auth_config[:config_file_location] = o }
|
|
46
46
|
|
|
47
|
-
# OCI
|
|
48
|
-
param.on('--endpoint ENDPOINT', '
|
|
47
|
+
# OCI Log Analytics custom endpoints
|
|
48
|
+
param.on('--endpoint ENDPOINT', 'Log Analytics Ingestion API endpoint to ingest your application logs') { |o| auth_config[:endpoint] = o }
|
|
49
49
|
|
|
50
50
|
# Kubernetes Cluster
|
|
51
51
|
# For AuthNAuth when the job is outside the cluster.
|
|
@@ -63,7 +63,7 @@ optparse = OptionParser.new do |param|
|
|
|
63
63
|
# Discovery
|
|
64
64
|
param.on('--discovery DISCOVERY_MODE', "[Deprecated] Discovery mode to be used: #{format_option_selections(DISCOVERY_OPTIONS)}") { |o| app_config[:mode] = o.downcase }
|
|
65
65
|
param.on('--chunk_limit CHUNK_SIZE', Integer, "Max number of objects that can be fetched via K8s GET API call. Default: #{CHUNK_LIMIT_DEFAULT}") { |o| app_config[:chunk_limit] = o }
|
|
66
|
-
param.on('--skip_upload', 'Flag to skip uploading data to OCI
|
|
66
|
+
param.on('--skip_upload', 'Flag to skip uploading data to OCI Log Analytics [ONLY FOR INTERNAL TESTING]') { |_o| app_config[:skip_upload] = true }
|
|
67
67
|
param.on('--collect_warning_events_only', 'Flag to collect only warning event logs') { |_o| app_config[:collect_warning_events_only] = true }
|
|
68
68
|
param.on('--tenancy_ocid TENANCY_OCID', 'Tenancy OCID') { |o| app_config[:tenancy_ocid] = o }
|
|
69
69
|
|
|
@@ -177,7 +177,7 @@ auth_config[:oci_domain] = auth_config[:oci_domain] ||= nil
|
|
|
177
177
|
auth_config[:profile_name] = auth_config[:profile_name] ||= 'DEFAULT'
|
|
178
178
|
auth_config[:config_file_location] = auth_config[:config_file_location] ||= nil
|
|
179
179
|
|
|
180
|
-
# OCI
|
|
180
|
+
# OCI Log Analytics custom endpoints
|
|
181
181
|
auth_config[:endpoint] = auth_config[:endpoint] ||= nil
|
|
182
182
|
|
|
183
183
|
# Kubernetes cluster related
|
|
@@ -123,7 +123,7 @@ module OciLogAnalyticsResourcesDiscovery
|
|
|
123
123
|
|
|
124
124
|
# Send collected data
|
|
125
125
|
if @app_config_hash[:skip_upload]
|
|
126
|
-
logger.warn('--skip_upload Flag is set: Skipping payload upload to OCI
|
|
126
|
+
logger.warn('--skip_upload Flag is set: Skipping payload upload to OCI Log Analytics.')
|
|
127
127
|
else
|
|
128
128
|
upload_failure = false
|
|
129
129
|
|
data/lib/util/service_logs.rb
CHANGED
|
@@ -20,6 +20,7 @@ module Util
|
|
|
20
20
|
|
|
21
21
|
# Prefix of resource manager stack (to be created via API)
|
|
22
22
|
RESOURCE_MANAGER_STACK_PREFIX = 'oci-kubernetes-monitoring-service-logs'.freeze
|
|
23
|
+
STACK_TF_VERSION_STRING = '1.5.x'.freeze
|
|
23
24
|
|
|
24
25
|
def invoke_resource_manager_stack(infra_objects_payload, app_config_hash,
|
|
25
26
|
oci_la_log_group_id, onm_compartment_id, oci_region, oci_domain)
|
|
@@ -397,7 +398,7 @@ module Util
|
|
|
397
398
|
client.create_stack(
|
|
398
399
|
OCI::ResourceManager::Models::CreateStackDetails.new(
|
|
399
400
|
compartment_id: compartment_id,
|
|
400
|
-
terraform_version:
|
|
401
|
+
terraform_version: STACK_TF_VERSION_STRING,
|
|
401
402
|
display_name: stack_unique_identifier,
|
|
402
403
|
description: stack_unique_identifier,
|
|
403
404
|
config_source:
|
|
@@ -521,6 +522,7 @@ module Util
|
|
|
521
522
|
response = client.update_stack(stack_ocid,
|
|
522
523
|
OCI::ResourceManager::Models::UpdateStackDetails.new(
|
|
523
524
|
variables: rms_input_variables,
|
|
525
|
+
terraform_version: STACK_TF_VERSION_STRING,
|
|
524
526
|
config_source: OCI::ResourceManager::Models::UpdateZipUploadConfigSourceDetails.new(zip_file_base64_encoded: rms_template_base64_encoded)
|
|
525
527
|
)
|
|
526
528
|
)
|
data/lib/version.rb
CHANGED
|
@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
|
|
|
9
9
|
spec.authors = ['Oracle', 'OCI Observability: Logging Analytics']
|
|
10
10
|
spec.email = ['oci_la_plugins_grp@oracle.com']
|
|
11
11
|
|
|
12
|
-
spec.summary = 'A rubygem for discovering Kubernetes resources and send it to OCI
|
|
13
|
-
spec.description = 'A rubygem for discovering Kubernetes resources and send it to OCI
|
|
12
|
+
spec.summary = 'A rubygem for discovering Kubernetes resources and send it to OCI Log Analytics.'
|
|
13
|
+
spec.description = 'A rubygem for discovering Kubernetes resources and send it to OCI Log Analytics.'
|
|
14
14
|
spec.homepage = 'https://rubygems.org/gems/oci-logging-analytics-kubernetes-discovery'
|
|
15
15
|
spec.license = 'UPL-1.0'
|
|
16
16
|
|
data/ocibuild.conf
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
runnerTag: latest
|
|
2
2
|
name: logan-kubernetes-discovery
|
|
3
3
|
team: LOGAN
|
|
4
|
-
description: Build config to build
|
|
4
|
+
description: Build config to build Log Analytics Kubernetes Discovery gem.
|
|
5
5
|
phoneBookId: logan
|
|
6
6
|
version: ${BLD_NUMBER}
|
|
7
7
|
authCompartmentOcid: ocid1.tenancy.oc1..aaaaaaaauj75yrhg54zor44qlc3chockspqc6e5c7nxlxjlcnunxo2hbs6ca
|
|
@@ -22,8 +22,11 @@ steps:
|
|
|
22
22
|
type: publishgeneric
|
|
23
23
|
dependsOn: ruby_install
|
|
24
24
|
repository: logan-release-gems-local
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
filePathsToPublish [
|
|
26
|
+
{
|
|
27
|
+
localFile: "*.gem",
|
|
28
|
+
targetDir: "gem/"
|
|
29
|
+
}
|
|
30
|
+
]
|
|
28
31
|
}
|
|
29
32
|
]
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: oci-logging-analytics-kubernetes-discovery
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.3.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Oracle
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date:
|
|
12
|
+
date: 2026-02-11 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: bundler
|
|
@@ -261,7 +261,7 @@ dependencies:
|
|
|
261
261
|
- - "~>"
|
|
262
262
|
- !ruby/object:Gem::Version
|
|
263
263
|
version: '1.0'
|
|
264
|
-
description: A rubygem for discovering Kubernetes resources and send it to OCI
|
|
264
|
+
description: A rubygem for discovering Kubernetes resources and send it to OCI Log
|
|
265
265
|
Analytics.
|
|
266
266
|
email:
|
|
267
267
|
- oci_la_plugins_grp@oracle.com
|
|
@@ -335,6 +335,5 @@ requirements: []
|
|
|
335
335
|
rubygems_version: 3.3.27
|
|
336
336
|
signing_key:
|
|
337
337
|
specification_version: 4
|
|
338
|
-
summary: A rubygem for discovering Kubernetes resources and send it to OCI
|
|
339
|
-
Analytics.
|
|
338
|
+
summary: A rubygem for discovering Kubernetes resources and send it to OCI Log Analytics.
|
|
340
339
|
test_files: []
|