Skip to content

Fix indentation in kube.conf and update readme #184

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 29 commits into from
Jan 11, 2019
Merged

Fix indentation in kube.conf and update readme #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 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
5d22e5f
adding kubelet version as a dimension
Dec 28, 2018
b5a6722
Merge remote-tracking branch 'origin/ci_feature' into rashmi/kubenode…
Dec 28, 2018
3c2f791
Excluding raw docker containers from container inventory
Jan 4, 2019
c297ee8
Merge remote-tracking branch 'origin/ci_feature' into rashmi/kubenode…
Jan 4, 2019
3f4aafb
making labels key case insensitive
Jan 7, 2019
4b35301
make poduid label case insensitive
Jan 7, 2019
f93deda
Merge branch 'ci_feature' into rashmi/kubenodeinventory
Jan 8, 2019
1ad4419
changes to exclude pause amd 64 containers
Jan 8, 2019
7118d02
fixing indentation so that kube.conf contents can be used in config m…
Jan 11, 2019
5c930bb
Merge branch 'ci_feature' into rashmi/kubenodeinventory
Jan 11, 2019
d38aaf9
updating readme to fix date and agent version
Jan 11, 2019
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ additional questions or comments.

Note : The agent version(s) below has dates (ciprod<mmddyyyy>), which indicate the agent build dates (not release dates)

### 10/09/2018 - Version microsoft/oms:ciprod01092019
### 01/09/2018 - Version microsoft/oms:ciprod01092019-2
- Omsagent - 1.8.1.256 (nov 2018 release)
- Persist fluentbit state between container restarts
- Populate 'TimeOfCommand' for agent ingest time for container logs
- Get node cpu usage from cpuusagenanoseconds (and convert to cpuusgaenanocores)
- Container Node Inventory - move to fluentD from OMI
- Mount docker.sock (Daemon set) as /var/run/host
- Liveness probe (Daemon set) - check for omsagent user permissions in docker.sock and update as necessary (required when docker daemon gets restarted)
- Add omsagent user to docker group
- Move to fixed type for kubeevents & kubeservices
- Disable collecting ENV for our oms agent container (daemonset & replicaset)
- Disable container inventory collection for 'sandbox' containers & non kubernetes managed containers
- Agent telemetry - ContainerLogsAgentSideLatencyMs
- Agent telemetry - PodCount
- Agent telemetry - ControllerCount
- Agent telemetry - K8S Version
- Agent telemetry - K8S Version
- Agent telemetry - NodeCoreCapacity
- Agent telemetry - NodeMemoryCapacity
- Agent telemetry - KubeEvents (exceptions)
Expand Down
270 changes: 135 additions & 135 deletions installer/conf/kube.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,148 +1,148 @@
# Fluentd config file for OMS Docker - cluster components (kubeAPI)
# Fluentd config file for OMS Docker - cluster components (kubeAPI)

#Kubernetes pod inventory
<source>
type kubepodinventory
tag oms.containerinsights.KubePodInventory
run_interval 60s
log_level debug
</source>
#Kubernetes pod inventory
<source>
type kubepodinventory
tag oms.containerinsights.KubePodInventory
run_interval 60s
log_level debug
</source>

#Kubernetes events
<source>
type kubeevents
tag oms.containerinsights.KubeEvents
run_interval 60s
log_level debug
</source>
#Kubernetes events
<source>
type kubeevents
tag oms.containerinsights.KubeEvents
run_interval 60s
log_level debug
</source>

#Kubernetes logs
<source>
type kubelogs
tag oms.api.KubeLogs
run_interval 60s
</source>
#Kubernetes logs
<source>
type kubelogs
tag oms.api.KubeLogs
run_interval 60s
</source>

#Kubernetes services
<source>
type kubeservices
tag oms.containerinsights.KubeServices
run_interval 60s
log_level debug
</source>
#Kubernetes services
<source>
type kubeservices
tag oms.containerinsights.KubeServices
run_interval 60s
log_level debug
</source>

#Kubernetes Nodes
<source>
type kubenodeinventory
tag oms.containerinsights.KubeNodeInventory
run_interval 60s
log_level debug
</source>
#Kubernetes Nodes
<source>
type kubenodeinventory
tag oms.containerinsights.KubeNodeInventory
run_interval 60s
log_level debug
</source>

#Kubernetes perf
<source>
type kubeperf
tag oms.api.KubePerf
run_interval 60s
log_level debug
</source>
#Kubernetes perf
<source>
type kubeperf
tag oms.api.KubePerf
run_interval 60s
log_level debug
</source>

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

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

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

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

<match oms.api.ContainerNodeInventory**>
type out_oms_api
log_level debug
buffer_chunk_limit 20m
buffer_type file
buffer_path %STATE_DIR_WS%/out_oms_containernodeinventory*.buffer
buffer_queue_limit 20
flush_interval 20s
retry_limit 10
retry_wait 15s
max_retry_wait 9m
</match>
<match oms.api.ContainerNodeInventory**>
type out_oms_api
log_level debug
buffer_chunk_limit 20m
buffer_type file
buffer_path %STATE_DIR_WS%/out_oms_containernodeinventory*.buffer
buffer_queue_limit 20
flush_interval 20s
retry_limit 10
retry_wait 15s
max_retry_wait 9m
</match>

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