Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
d2865d9
saving work before switching branches
daweim0 Jan 14, 2021
190b4bf
saving work
daweim0 Jan 22, 2021
845c6ff
saving work
daweim0 Jan 24, 2021
755b970
try out first e2e
gracewehner Jan 25, 2021
c99b409
add ./
gracewehner Jan 25, 2021
8006d77
new fluentd integrated with kubepodinventory, currently writes output…
daweim0 Jan 26, 2021
16db8a3
added burncpu plugin
daweim0 Jan 26, 2021
5c281df
upped the amount of burned CPU
daweim0 Jan 26, 2021
65702c2
fixed liveness probe failure
daweim0 Jan 26, 2021
48bf58f
functional with new fluentd and old omsagent plugins
daweim0 Jan 27, 2021
c65d44b
Merge remote-tracking branch 'origin/david/oneagent' into grwehner/on…
gracewehner Feb 2, 2021
a48b035
Merge branch 'grwehner/oneagent' of https://github.com/microsoft/Dock…
gracewehner Feb 2, 2021
55468e1
added fluentd4.conf
daweim0 Feb 3, 2021
25a27ee
KPI
gracewehner Feb 3, 2021
66a3c48
Merge remote-tracking branch 'origin/david/oneagent' into grwehner/on…
gracewehner Feb 3, 2021
eb71e09
fluentd conf for just KPI
gracewehner Feb 3, 2021
beb92f2
KPI changes
gracewehner Feb 3, 2021
8620391
mdsd.xml fixes
gracewehner Feb 3, 2021
1130f74
mdsd tcp config
gracewehner Feb 3, 2021
5a78b69
remove omsagent stop line
gracewehner Feb 3, 2021
d749f76
fixes
gracewehner Feb 3, 2021
20f4a6e
add traces to mdsd
gracewehner Feb 3, 2021
5e3be3c
fixes
gracewehner Feb 4, 2021
33923ec
use latest oneagent
gracewehner Feb 4, 2021
0d6178f
added process-level perf telemetry
daweim0 Feb 5, 2021
4a7a029
cleaned up plugins fluentd wasn't using
daweim0 Feb 5, 2021
af61b97
support for all of in_kubepodinventory.rb
gracewehner Feb 5, 2021
5ef7ee7
fixes
gracewehner Feb 5, 2021
9f506a1
merge
gracewehner Feb 5, 2021
e056cd0
add back in out_mdm.rb
gracewehner Feb 5, 2021
fe3639b
remove in_kubepodinventory things from omsagent.yaml
gracewehner Feb 5, 2021
03ac710
Add back in out_mdm.rb file dependency
gracewehner Feb 5, 2021
4e96b83
add file to base_container.data
gracewehner Feb 5, 2021
5729077
Actually use the right file name
gracewehner Feb 5, 2021
472bb1f
only send kpi through oneagent
gracewehner Feb 6, 2021
fea0f30
fixes
gracewehner Feb 8, 2021
9f2873e
perf fixes
gracewehner Feb 9, 2021
c50bfb0
only send cpu_usage telemetry
gracewehner Feb 10, 2021
f25b4e0
used fluentd logging
gracewehner Feb 10, 2021
6f48fc5
turn on liveness probe and include fluentd check
gracewehner Feb 10, 2021
ef812f9
cleanup file
gracewehner Feb 11, 2021
ff49c9a
added back memory_rss telemetry
daweim0 Feb 11, 2021
552b261
created a helm chart with changes
daweim0 Feb 11, 2021
f8b8841
send kubeservices to oneagent
gracewehner Feb 12, 2021
6ab9ee6
Merge branch 'grwehner/oneagent' of https://github.com/microsoft/Dock…
gracewehner Feb 12, 2021
d42f761
updated chart
daweim0 Feb 16, 2021
71ab15f
Merge branch 'grwehner/oneagent' of github.com:microsoft/Docker-Provi…
daweim0 Feb 16, 2021
9cc42e3
updated charts again
daweim0 Feb 16, 2021
e3a3b28
updating chart again
daweim0 Feb 16, 2021
650d2b8
updating chart again
daweim0 Feb 16, 2021
2b17516
updating chart again, changes don't seem to be sticking
daweim0 Feb 16, 2021
9174e6a
updating chart again, spacing in yaml
daweim0 Feb 16, 2021
aad8c27
separated helm chart, probably fixed
daweim0 Feb 16, 2021
41dba6d
updating index once more
daweim0 Feb 16, 2021
a9d08b9
forgot to change replicaset configmap
daweim0 Feb 17, 2021
e0d79f5
hopefully final chart test
daweim0 Feb 17, 2021
06f8f26
hopefully final chart test take2
daweim0 Feb 17, 2021
b2e21d1
hopefully final chart test take3
daweim0 Feb 17, 2021
8108093
adding some service test files
daweim0 Feb 17, 2021
67609ae
done with service files
daweim0 Feb 17, 2021
23c4e34
changed chart name
Michael-Sinz Feb 9, 2021
a3d54e3
adding newer oneagent
daweim0 Mar 26, 2021
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
Binary file added azure-mdsd_1.8.0-build.develop.1821_x86_64.deb
Binary file not shown.
94 changes: 94 additions & 0 deletions build/linux/installer/conf/fluentd4.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
#Kubernetes pod inventory
<source>
@type kube_podinventory
tag oms.containerinsights.KubePodInventory
run_interval 60
@log_level debug
</source>

<match oms.containerinsights.KubePodInventory>
@type forward
@log_level debug
<server>
host 0.0.0.0
port 29230
</server>
keepalive true
<format>
@type msgpack
</format>
</match>

<match oms.containerinsights.KubeServices>
@type forward
@log_level debug
<server>
host 0.0.0.0
port 29230
</server>
keepalive true
<format>
@type msgpack
</format>
</match>

<match mdm.kubepodinventory**>
@type mdm
@log_level debug
num_threads 5
buffer_chunk_limit 4m
buffer_type file
buffer_path %STATE_DIR_WS%/out_mdm_*.buffer
buffer_queue_limit 20
buffer_queue_full_action drop_oldest_chunk
flush_interval 20s
retry_limit 10
retry_wait 5s
max_retry_wait 5m
retry_mdm_post_wait_minutes 30
</match>

<match oms.api.KubePerf**>
@type oms
@log_level debug
num_threads 5
buffer_chunk_limit 4m
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 5s
max_retry_wait 5m
</match>

<match oms.containerinsights.ContainerInventory**>
@type oms
@log_level debug
num_threads 2
buffer_chunk_limit 4m
buffer_type file
buffer_path %STATE_DIR_WS%/out_oms_containerinventory*.buffer
buffer_queue_limit 20
buffer_queue_full_action drop_oldest_chunk
flush_interval 20s
retry_limit 10
retry_wait 5s
max_retry_wait 5m
</match>

<match oms.api.InsightsMetrics**>
@type oms
@log_level debug
num_threads 5
buffer_chunk_limit 4m
buffer_type file
buffer_path %STATE_DIR_WS%/out_oms_insightsmetrics*.buffer
buffer_queue_limit 20
buffer_queue_full_action drop_oldest_chunk
flush_interval 20s
retry_limit 10
retry_wait 5s
max_retry_wait 5m
</match>
40 changes: 1 addition & 39 deletions build/linux/installer/conf/kube.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@
chunk_size_limit 4m
</source>

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

#Kubernetes Persistent Volume inventory
<source>
type kubepvinventory
Expand Down Expand Up @@ -88,21 +80,6 @@
type filter_health_model_builder
</filter>

<match oms.containerinsights.KubePodInventory**>
type out_oms
log_level debug
num_threads 5
buffer_chunk_limit 4m
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 5s
max_retry_wait 5m
</match>

<match oms.containerinsights.KubePVInventory**>
type out_oms
log_level debug
Expand Down Expand Up @@ -133,21 +110,6 @@
max_retry_wait 5m
</match>

<match oms.containerinsights.KubeServices**>
type out_oms
log_level debug
num_threads 2
buffer_chunk_limit 4m
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 5s
max_retry_wait 5m
</match>

<match oms.containerinsights.KubeNodeInventory**>
type out_oms
log_level debug
Expand Down Expand Up @@ -192,7 +154,7 @@
max_retry_wait 5m
</match>

<match mdm.kubepodinventory** mdm.kubenodeinventory** >
<match mdm.kubenodeinventory** >
type out_mdm
log_level debug
num_threads 5
Expand Down
33 changes: 33 additions & 0 deletions build/linux/installer/conf/telegraf-rs.conf
Original file line number Diff line number Diff line change
Expand Up @@ -653,3 +653,36 @@ $AZMON_RS_PROM_PLUGINS_WITH_NAMESPACE_FILTER
#[inputs.prometheus.tagpass]
# operation_type = ["create_container", "remove_container", "pull_image"]



[[inputs.procstat]]
#name_prefix="container.azm.ms/"
exe = "ruby"
interval = "2s"
pid_finder = "native"
pid_tag = true
name_override = "agent_telemetry"
fieldpass = ["cpu_usage", "memory_rss"]
[inputs.procstat.tags]
Computer = "$NODE_NAME"
AgentVersion = "$AGENT_VERSION"
ControllerType = "$CONTROLLER_TYPE"
AKS_RESOURCE_ID = "$TELEMETRY_AKS_RESOURCE_ID"
ACSResourceName = "$TELEMETRY_ACS_RESOURCE_NAME"
Region = "$TELEMETRY_AKS_REGION"

[[inputs.procstat]]
#name_prefix="container.azm.ms/"
exe = "mdsd"
interval = "2s"
pid_finder = "native"
pid_tag = true
name_override = "agent_telemetry"
fieldpass = ["cpu_usage", "memory_rss"]
[inputs.procstat.tags]
Computer = "$NODE_NAME"
AgentVersion = "$AGENT_VERSION"
ControllerType = "$CONTROLLER_TYPE"
AKS_RESOURCE_ID = "$TELEMETRY_AKS_RESOURCE_ID"
ACSResourceName = "$TELEMETRY_ACS_RESOURCE_NAME"
Region = "$TELEMETRY_AKS_REGION"
Loading