starlingx
/
config
Code Issues Proposed changes

Merge "Fix beat fails to parse kubernetes.pod.labels.app"

This commit is contained in:
Zuul 2020-04-20 14:38:52 +00:00 committed by Gerrit Code Review
parent d4c5c3df83 b1a290f0cc
commit 8030524e96
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysinv/sysinv/sysinv/sysinv/helm/filebeat.py
View File

@ -39,6 +39,8 @@ class FilebeatHelm(elastic.ElasticBaseHelm):
'processors': [
{
'add_kubernetes_metadata': {
'labels.dedot': True,
'annotations.dedot': True
# If kube_config is not set, KUBECONFIG environment variable will be checked
# and if not present it will fall back to InCluster
}

4
sysinv/sysinv/sysinv/sysinv/helm/metricbeat.py
View File

@ -174,6 +174,8 @@ class MetricbeatHelm(elastic.ElasticBaseHelm):
# If kube_config is not set, KUBECONFIG environment variable will be checked
# and if not present it will fall back to InCluster
"add_metadata": True,
"labels.dedot": True,
"annotations.dedot": True,
"metricsets": [
"node",
"system",
@ -201,6 +203,8 @@ class MetricbeatHelm(elastic.ElasticBaseHelm):
# If kube_config is not set, KUBECONFIG environment variable will be checked
# and if not present it will fall back to InCluster
"add_metadata": True,
"labels.dedot": True,
"annotations.dedot": True,
"metricsets": [
"state_node",
"state_deployment",