From b6dc7cedfecf8844f551bb0605a678a0e407c885 Mon Sep 17 00:00:00 2001 From: chrismark Date: Fri, 3 Apr 2020 16:15:30 +0300 Subject: [PATCH] Replace HOSTNAME with NODE_NAME for consistency Signed-off-by: chrismark --- deploy/kubernetes/metricbeat-kubernetes.yaml | 2 +- .../kubernetes/metricbeat/metricbeat-daemonset-configmap.yaml | 2 +- metricbeat/docs/modules/kubernetes.asciidoc | 2 +- metricbeat/docs/running-on-kubernetes.asciidoc | 4 ++-- metricbeat/metricbeat.reference.yml | 2 +- metricbeat/module/kubernetes/_meta/config.reference.yml | 2 +- x-pack/metricbeat/metricbeat.reference.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deploy/kubernetes/metricbeat-kubernetes.yaml b/deploy/kubernetes/metricbeat-kubernetes.yaml index bd8e80eb2d8..b7d1d1edf15 100644 --- a/deploy/kubernetes/metricbeat-kubernetes.yaml +++ b/deploy/kubernetes/metricbeat-kubernetes.yaml @@ -76,7 +76,7 @@ data: - volume period: 10s host: ${NODE_NAME} - hosts: ["https://${HOSTNAME}:10250"] + 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 diff --git a/deploy/kubernetes/metricbeat/metricbeat-daemonset-configmap.yaml b/deploy/kubernetes/metricbeat/metricbeat-daemonset-configmap.yaml index 9fce281bcdc..8760c3eaa0a 100644 --- a/deploy/kubernetes/metricbeat/metricbeat-daemonset-configmap.yaml +++ b/deploy/kubernetes/metricbeat/metricbeat-daemonset-configmap.yaml @@ -76,7 +76,7 @@ data: - volume period: 10s host: ${NODE_NAME} - hosts: ["https://${HOSTNAME}:10250"] + 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 diff --git a/metricbeat/docs/modules/kubernetes.asciidoc b/metricbeat/docs/modules/kubernetes.asciidoc index 0dbf695ce95..aa4553d782a 100644 --- a/metricbeat/docs/modules/kubernetes.asciidoc +++ b/metricbeat/docs/modules/kubernetes.asciidoc @@ -140,7 +140,7 @@ metricbeat.modules: - volume period: 10s enabled: true - hosts: ["https://${HOSTNAME}:10250"] + hosts: ["https://${NODE_NAME}:10250"] bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token ssl.verification_mode: "none" #ssl.certificate_authorities: diff --git a/metricbeat/docs/running-on-kubernetes.asciidoc b/metricbeat/docs/running-on-kubernetes.asciidoc index 6d298c136c6..dfa6cbb25d4 100644 --- a/metricbeat/docs/running-on-kubernetes.asciidoc +++ b/metricbeat/docs/running-on-kubernetes.asciidoc @@ -100,7 +100,7 @@ specify the following settings under `kubernetes.yml` in the `data` section: - volume period: 10s host: ${NODE_NAME} - hosts: ["https://${HOSTNAME}:10250"] + hosts: ["https://${NODE_NAME}:10250"] bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token ssl.certificate_authorities: - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt @@ -134,7 +134,7 @@ oc patch namespace kube-system -p \ ---- + This command sets the node selector for the project to an empty string. If you -don't run this command, the default node selector will skip master nodes. +don't run this command, the default node selector will skip master nodes. [float] ==== Deploy diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index 7d0b9219e9a..8515fc6739a 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -456,7 +456,7 @@ metricbeat.modules: - volume period: 10s enabled: true - hosts: ["https://${HOSTNAME}:10250"] + hosts: ["https://${NODE_NAME}:10250"] bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token ssl.verification_mode: "none" #ssl.certificate_authorities: diff --git a/metricbeat/module/kubernetes/_meta/config.reference.yml b/metricbeat/module/kubernetes/_meta/config.reference.yml index 10de0447725..21d027ff335 100644 --- a/metricbeat/module/kubernetes/_meta/config.reference.yml +++ b/metricbeat/module/kubernetes/_meta/config.reference.yml @@ -8,7 +8,7 @@ - volume period: 10s enabled: true - hosts: ["https://${HOSTNAME}:10250"] + hosts: ["https://${NODE_NAME}:10250"] bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token ssl.verification_mode: "none" #ssl.certificate_authorities: diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index 462338ad399..33fff1c5821 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -726,7 +726,7 @@ metricbeat.modules: - volume period: 10s enabled: true - hosts: ["https://${HOSTNAME}:10250"] + hosts: ["https://${NODE_NAME}:10250"] bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token ssl.verification_mode: "none" #ssl.certificate_authorities: