This repository has been archived by the owner on May 16, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
[metricbeat] split values for daemonset and deployment #572
Merged
Merged
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
cea4e9a
[metricbeat] split configmap for daemonset and deployment
jmlrt 61c96be
[metricbeat] use markdown implicit link name for config table
jmlrt 2a5e45d
[metricbeat] split affinity for daemonset and deployment
jmlrt c8af71b
[metricbeat] split resources for daemonset and deployment
jmlrt f667825
[metricbeat] split nodeSelector for daemonset and deployment
jmlrt bcdab45
[metricbeat] split tolerations for daemonset and deployment
jmlrt 7914ffb
[metricbeat] nit
jmlrt 07877a6
[metricbeat] split security context for daemonset and deployment
jmlrt d1a96a1
[metricbeat] nit - fix default values in README
jmlrt bc05368
metricbeat] split extraEnvs for daemonset and deployment
jmlrt 1dd2e84
[metricbeat] split envFrom for daemonset and deployment
jmlrt 593c743
[metricbeat] split volumes and volumeMounts for daemonset and deployment
jmlrt 055313c
[metricbeat] split secretMounts for daemonset and deployment
jmlrt 890428d
[metricbeat] remove unneeded if statement for envFrom
jmlrt b489901
[metricbeat] nit - add missing trailing lines
jmlrt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,11 @@ | ||
| image: docker.elastic.co/beats/metricbeat-oss | ||
|
|
||
| extraEnvs: | ||
| - name: ELASTICSEARCH_HOSTS | ||
| value: oss-master:9200 | ||
| daemonset: | ||
| extraEnvs: | ||
| - name: ELASTICSEARCH_HOSTS | ||
| value: oss-master:9200 | ||
|
|
||
| deployment: | ||
| extraEnvs: | ||
| - name: ELASTICSEARCH_HOSTS | ||
| value: oss-master:9200 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,91 +1,110 @@ | ||
| metricbeatConfig: | ||
| metricbeat.yml: | | ||
| metricbeat.modules: | ||
| - module: kubernetes | ||
| metricsets: | ||
| - container | ||
| - node | ||
| - pod | ||
| - system | ||
| - volume | ||
| period: 10s | ||
| host: "${NODE_NAME}" | ||
| hosts: ["https://${NODE_NAME}:10250"] | ||
| bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token | ||
| ssl.verification_mode: "none" | ||
| # If using Red Hat OpenShift remove ssl.verification_mode entry and | ||
| # uncomment these settings: | ||
| #ssl.certificate_authorities: | ||
| #- /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt | ||
| processors: | ||
| - add_kubernetes_metadata: ~ | ||
| - module: kubernetes | ||
| enabled: true | ||
| metricsets: | ||
| - event | ||
| - module: system | ||
| period: 10s | ||
| metricsets: | ||
| - cpu | ||
| - load | ||
| - memory | ||
| - network | ||
| - process | ||
| - process_summary | ||
| processes: ['.*'] | ||
| process.include_top_n: | ||
| by_cpu: 5 | ||
| by_memory: 5 | ||
| - module: system | ||
| period: 1m | ||
| metricsets: | ||
| - filesystem | ||
| - fsstat | ||
| processors: | ||
| - drop_event.when.regexp: | ||
| system.filesystem.mount_point: '^/(sys|cgroup|proc|dev|etc|host|lib)($|/)' | ||
|
|
||
| output.elasticsearch: | ||
| username: '${ELASTICSEARCH_USERNAME}' | ||
| password: '${ELASTICSEARCH_PASSWORD}' | ||
| protocol: https | ||
| hosts: ["security-master:9200"] | ||
| ssl.certificate_authorities: | ||
| - /usr/share/metricbeat/config/certs/elastic-certificate.pem | ||
|
|
||
| kube-state-metrics-metricbeat.yml: | | ||
| metricbeat.modules: | ||
| - module: kubernetes | ||
| enabled: true | ||
| metricsets: | ||
| - state_node | ||
| - state_deployment | ||
| - state_replicaset | ||
| - state_pod | ||
| - state_container | ||
| period: 10s | ||
| hosts: ["${KUBE_STATE_METRICS_HOSTS}"] | ||
| output.elasticsearch: | ||
| username: '${ELASTICSEARCH_USERNAME}' | ||
| password: '${ELASTICSEARCH_PASSWORD}' | ||
| protocol: https | ||
| hosts: ["security-master:9200"] | ||
| ssl.certificate_authorities: | ||
| - /usr/share/metricbeat/config/certs/elastic-certificate.pem | ||
|
|
||
| secretMounts: | ||
| daemonset: | ||
| extraEnvs: | ||
| - name: 'ELASTICSEARCH_USERNAME' | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: elastic-credentials | ||
| key: username | ||
| - name: 'ELASTICSEARCH_PASSWORD' | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: elastic-credentials | ||
| key: password | ||
| # Allows you to add any config files in /usr/share/metricbeat | ||
| # such as metricbeat.yml for daemonset | ||
| metricbeatConfig: | ||
| metricbeat.yml: | | ||
| metricbeat.modules: | ||
| - module: kubernetes | ||
| metricsets: | ||
| - container | ||
| - node | ||
| - pod | ||
| - system | ||
| - volume | ||
| period: 10s | ||
| host: "${NODE_NAME}" | ||
| hosts: ["https://${NODE_NAME}:10250"] | ||
| bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token | ||
| ssl.verification_mode: "none" | ||
| # If using Red Hat OpenShift remove ssl.verification_mode entry and | ||
| # uncomment these settings: | ||
| #ssl.certificate_authorities: | ||
| #- /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt | ||
| processors: | ||
| - add_kubernetes_metadata: ~ | ||
| - module: kubernetes | ||
| enabled: true | ||
| metricsets: | ||
| - event | ||
| - module: system | ||
| period: 10s | ||
| metricsets: | ||
| - cpu | ||
| - load | ||
| - memory | ||
| - network | ||
| - process | ||
| - process_summary | ||
| processes: ['.*'] | ||
| process.include_top_n: | ||
| by_cpu: 5 | ||
| by_memory: 5 | ||
| - module: system | ||
| period: 1m | ||
| metricsets: | ||
| - filesystem | ||
| - fsstat | ||
| processors: | ||
| - drop_event.when.regexp: | ||
| system.filesystem.mount_point: '^/(sys|cgroup|proc|dev|etc|host|lib)($|/)' | ||
| output.elasticsearch: | ||
| username: '${ELASTICSEARCH_USERNAME}' | ||
| password: '${ELASTICSEARCH_PASSWORD}' | ||
| protocol: https | ||
| hosts: ["security-master:9200"] | ||
| ssl.certificate_authorities: | ||
| - /usr/share/metricbeat/config/certs/elastic-certificate.pem | ||
| secretMounts: | ||
| - name: elastic-certificate-pem | ||
| secretName: elastic-certificate-pem | ||
| path: /usr/share/metricbeat/config/certs | ||
|
|
||
| extraEnvs: | ||
| - name: 'ELASTICSEARCH_USERNAME' | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: elastic-credentials | ||
| key: username | ||
| - name: 'ELASTICSEARCH_PASSWORD' | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: elastic-credentials | ||
| key: password | ||
| deployment: | ||
| extraEnvs: | ||
| - name: 'ELASTICSEARCH_USERNAME' | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: elastic-credentials | ||
| key: username | ||
| - name: 'ELASTICSEARCH_PASSWORD' | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: elastic-credentials | ||
| key: password | ||
| # Allows you to add any config files in /usr/share/metricbeat | ||
| # such as metricbeat.yml for deployment | ||
| metricbeatConfig: | ||
| metricbeat.yml: | | ||
| metricbeat.modules: | ||
| - module: kubernetes | ||
| enabled: true | ||
| metricsets: | ||
| - state_node | ||
| - state_deployment | ||
| - state_replicaset | ||
| - state_pod | ||
| - state_container | ||
| period: 10s | ||
| hosts: ["${KUBE_STATE_METRICS_HOSTS}"] | ||
| output.elasticsearch: | ||
| username: '${ELASTICSEARCH_USERNAME}' | ||
| password: '${ELASTICSEARCH_PASSWORD}' | ||
| protocol: https | ||
| hosts: ["security-master:9200"] | ||
| ssl.certificate_authorities: | ||
| - /usr/share/metricbeat/config/certs/elastic-certificate.pem | ||
| secretMounts: | ||
| - name: elastic-certificate-pem | ||
| secretName: elastic-certificate-pem | ||
| path: /usr/share/metricbeat/config/certs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
New line missing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed in b489901