Skip to content
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

Jump to bottom

Byi remove container eq pod #22

Merged
merged 2 commits into from
May 6, 2019
Merged

Byi remove container eq pod #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d83ed35
drop container==POD
May 6, 2019
78d40e1
disable cookies on output plugins
May 6, 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
30 changes: 30 additions & 0 deletions deploy/helm/overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,26 +77,56 @@ prometheus:
# cadvisor container metrics
- url: http://fluentd:9888/prometheus.metrics.container
writeRelabelConfigs:
- action: drop
regex: POD
sourceLabels: [container]
- action: drop
regex: POD
sourceLabels: [container_name]
- action: keep
regex: kubelet;container_cpu_(?:load_average_10s|(?:system|usage)_seconds_total)
sourceLabels: [job, __name__]
- url: http://fluentd:9888/prometheus.metrics.container
writeRelabelConfigs:
- action: drop
regex: POD
sourceLabels: [container]
- action: drop
regex: POD
sourceLabels: [container_name]
- action: keep
regex: kubelet;container_memory_(?:usage_bytes|memory_swap)
sourceLabels: [job, __name__]
- url: http://fluentd:9888/prometheus.metrics.container
writeRelabelConfigs:
- action: drop
regex: POD
sourceLabels: [container]
- action: drop
regex: POD
sourceLabels: [container_name]
- action: keep
regex: kubelet;container_spec_memory_(?:|swap|reservation)_limit_bytes
sourceLabels: [job, __name__]
- url: http://fluentd:9888/prometheus.metrics.container
writeRelabelConfigs:
- action: drop
regex: POD
sourceLabels: [container]
- action: drop
regex: POD
sourceLabels: [container_name]
- action: keep
regex: kubelet;container_fs_(?:(?:usage|limit)_bytes|(?:reads|writes)_bytes_total)
sourceLabels: [job, __name__]
- url: http://fluentd:9888/prometheus.metrics.container
writeRelabelConfigs:
- action: drop
regex: POD
sourceLabels: [container]
- action: drop
regex: POD
sourceLabels: [container_name]
- action: keep
regex: kubelet;container_network_(?:receive|transmit)_(?:bytes|errors)_total
sourceLabels: [job, __name__]
Expand Down
7 changes: 7 additions & 0 deletions deploy/kubernetes/fluentd-sumologic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,42 +81,49 @@ data:
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_APISERVER']}"
data_type metrics
metric_data_format prometheus
disable_cookies true
</match>
<match prometheus.datapoint.kubelet**>
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBELET']}"
data_type metrics
metric_data_format prometheus
disable_cookies true
</match>
<match prometheus.datapoint.kube-controller-manager**>
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_CONTROLLER_MANAGER']}"
data_type metrics
metric_data_format prometheus
disable_cookies true
</match>
<match prometheus.datapoint.kube-scheduler**>
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_SCHEDULER']}"
data_type metrics
metric_data_format prometheus
disable_cookies true
</match>
<match prometheus.datapoint.kube-state**>
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_KUBE_STATE']}"
data_type metrics
metric_data_format prometheus
disable_cookies true
</match>
<match prometheus.datapoint.node-exporter**>
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_METRICS_NODE_EXPORTER']}"
data_type metrics
metric_data_format prometheus
disable_cookies true
</match>
<match prometheus.datapoint**>
@type sumologic
endpoint "#{ENV['SUMO_ENDPOINT_METRICS']}"
data_type metrics
metric_data_format prometheus
disable_cookies true
</match>
events.conf: |-
<source>
Expand Down