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

Cherry-pick #17469 to 7.7: Replace HOSTNAME with NODE_NAME when accessing Kubelet API #17565

Merged
merged 1 commit into from
Apr 7, 2020
Merged

Cherry-pick #17469 to 7.7: Replace HOSTNAME with NODE_NAME when accessing Kubelet API #17565

merged 1 commit into from
Apr 7, 2020

Conversation

ChrsMark
Copy link
Member

@ChrsMark ChrsMark commented Apr 7, 2020 •
edited by andresrc
Loading

Cherry-pick of PR #17469 to 7.7 branch. Original message:

Follow up of #16063.

More info on elastic/helm-charts#471 (comment).

When hostNetwork: true these 2 variables are identical:

[root@gke-cluster-1-default-pool-d5378bbe-9kxv metricbeat]# env | grep NODE_NAME
NODE_NAME=gke-cluster-1-default-pool-d5378bbe-9kxv
[root@gke-cluster-1-default-pool-d5378bbe-9kxv metricbeat]# env | grep HOSTNAME
HOSTNAME=gke-cluster-1-default-pool-d5378bbe-9kxv

When not hostNetwork: true these 2 variables are like:

[root@metricbeat-q2dgr metricbeat]# env | grep NODE
NODE_NAME=gke-cluster-1-default-pool-d5378bbe-rvgw
[root@metricbeat-q2dgr metricbeat]# env | grep HOST
HOSTNAME=metricbeat-q2dgr

@ChrsMark
Replace HOSTNAME with NODE_NAME for consistency (elastic#17469)
fe0ff20 
Signed-off-by: chrismark <chrismarkou92@gmail.com>
(cherry picked from commit 27a03f1)
@ChrsMark ChrsMark self-assigned this Apr 7, 2020
@ChrsMark ChrsMark added the Team:Platforms Label for the Integrations - Platforms team label Apr 7, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

@ChrsMark ChrsMark requested review from a team April 7, 2020 11:04
ycombinator
ycombinator reviewed Apr 7, 2020
View reviewed changes
Copy link
Contributor

@ycombinator ycombinator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backport LGTM.

@ChrsMark ChrsMark merged commit f26f1dd into elastic:7.7 Apr 7, 2020
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@ChrsMark
Replace HOSTNAME with NODE_NAME for consistency (elastic#17469) (elas…
80d6aad 
…tic#17565)

Signed-off-by: chrismark <chrismarkou92@gmail.com>
(cherry picked from commit 690fd31)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ycombinator ycombinator ycombinator approved these changes

Assignees

@ChrsMark ChrsMark

Labels
backport review Team:Platforms Label for the Integrations - Platforms team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ChrsMark @elasticmachine @ycombinator