Skip to content

Rashmi/kubenodeinventory #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rashmichandrashekar merged 18 commits into from
Dec 26, 2018
Merged

Rashmi/kubenodeinventory #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2b1866f
containernodeinventory changes
Dec 5, 2018
b5b6c0e
changes for containernodeinventory
Dec 6, 2018
f48c26a
changes to add node telemetry
Dec 15, 2018
5336e55
pod telemetry cahnges
Dec 15, 2018
7c67c04
updated telemetry changes
Dec 16, 2018
0c3ccef
changes to get uid of owner references as controller id
Dec 17, 2018
7f7b98b
updating socket to the new mount location
Dec 18, 2018
91b0816
Merge remote-tracking branch 'refs/remotes/origin/ci_feature'
Dec 19, 2018
7a4c2be
Adding exception telemetry and heartbeat
Dec 19, 2018
d2b043c
changes to fix controller type
Dec 20, 2018
e048d9b
Fixing typo
Dec 20, 2018
e4242d0
fixing method signature
Dec 20, 2018
d6f746a
updating plugins to get controller type from env
Dec 20, 2018
081ba8a
fixing bugs
Dec 21, 2018
f3577b8
changes to fixed type
Dec 21, 2018
145e920
Merge remote-tracking branch 'origin/ci_feature' into rashmi/kubenode…
Dec 21, 2018
5ea2d17
removing comments
Dec 21, 2018
6d64894
changes for fixed type
Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions installer/conf/kube.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#Kubernetes events
<source>
type kubeevents
tag oms.api.KubeEvents.CollectionTime
tag oms.containerinsights.KubeEvents
run_interval 60s
log_level debug
</source>
Expand All @@ -26,7 +26,7 @@
#Kubernetes services
<source>
type kubeservices
tag oms.api.KubeServices.CollectionTime
tag oms.containerinsights.KubeServices
run_interval 60s
log_level debug
</source>
Expand Down Expand Up @@ -62,18 +62,19 @@
max_retry_wait 9m
</match>

<match oms.api.KubeEvents**>
type out_oms_api
<match oms.containerinsights.KubeEvents**>
type out_oms
log_level debug
num_threads 5
num_threads 5
buffer_chunk_limit 5m
buffer_type file
buffer_path %STATE_DIR_WS%/out_oms_api_kubeevents*.buffer
buffer_path %STATE_DIR_WS%/out_oms_kubeevents*.buffer
buffer_queue_limit 10
buffer_queue_full_action drop_oldest_chunk
buffer_queue_full_action drop_oldest_chunk
flush_interval 20s
retry_limit 10
retry_wait 30s
max_retry_wait 9m
</match>

<match oms.api.KubeLogs**>
Expand All @@ -88,8 +89,8 @@
retry_wait 30s
</match>

<match oms.api.KubeServices**>
type out_oms_api
<match oms.containerinsights.KubeServices**>
type out_oms
log_level debug
num_threads 5
buffer_chunk_limit 20m
Expand Down
9 changes: 7 additions & 2 deletions source/code/plugin/in_kube_events.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def initialize
end

config_param :run_interval, :time, :default => '1m'
config_param :tag, :string, :default => "oms.api.KubeEvents.CollectionTime"
config_param :tag, :string, :default => "oms.containerinsights.KubeEvents"

def configure (conf)
super
Expand Down Expand Up @@ -88,7 +88,12 @@ def enumerate(eventList = nil)
end
record['ClusterName'] = KubernetesApiClient.getClusterName
record['ClusterId'] = KubernetesApiClient.getClusterId
eventStream.add(emitTime, record) if record
wrapper = {
"DataType"=>"KUBE_EVENTS_BLOB",
"IPName"=>"ContainerInsights",
"DataItems"=>[record.each{|k,v| record[k]=v}]
}
eventStream.add(emitTime, wrapper) if wrapper
end
router.emit_stream(@tag, eventStream) if eventStream
end
Expand Down
9 changes: 7 additions & 2 deletions source/code/plugin/in_kube_services.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def initialize
end

config_param :run_interval, :time, :default => '1m'
config_param :tag, :string, :default => "oms.api.KubeServices.CollectionTime"
config_param :tag, :string, :default => "oms.containerinsights.KubeServices"

def configure (conf)
super
Expand Down Expand Up @@ -65,7 +65,12 @@ def enumerate
record['ClusterIP'] = items['spec']['clusterIP']
record['ServiceType'] = items['spec']['type']
#<TODO> : Add ports and status fields
eventStream.add(emitTime, record) if record
wrapper = {
"DataType"=>"KUBE_SERVICES_BLOB",
"IPName"=>"ContainerInsights",
"DataItems"=>[record.each{|k,v| record[k]=v}]
}
eventStream.add(emitTime, wrapper) if wrapper
end
router.emit_stream(@tag, eventStream) if eventStream
end
Expand Down