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

Fix es initial cluster formation & update es to 7.2.0 #80421

Merged
merged 1 commit into from
Jul 25, 2019
Merged

Fix es initial cluster formation & update es to 7.2.0 #80421

merged 1 commit into from
Jul 25, 2019

Conversation

lostick
Copy link
Contributor

@lostick lostick commented Jul 22, 2019 •
edited
Loading

What type of PR is this?
/kind bug
/kind feature

What this PR does / why we need it:
• Fix elasticseatch broken service discovery 7.1.1 upgrade
• Bump elasticsearch / kibana to latest stable (7.2.0)
• Fix makefile indentation

Which issue(s) this PR fixes:
Fixes #80282

Special notes for your reviewer:
• Changes to be pushed onquay.io/fluentd_elasticsearch/elasticsearch before merging.
• Both 7.1.1 and 7.2.0 were built and tested with lostick/fluentd-elasticsearch image.

# elasticsearch health endpoint
$ curl -s  http://elasticsearch-logging:9200/_cluster/health | jq .
{
  "cluster_name": "kubernetes-logging",
  "status": "green",
  "timed_out": false,
  "number_of_nodes": 2,
  "number_of_data_nodes": 2,
  "active_primary_shards": 4,
  "active_shards": 8,
  "relocating_shards": 0,
  "initializing_shards": 0,
  "unassigned_shards": 0,
  "delayed_unassigned_shards": 0,
  "number_of_pending_tasks": 0,
  "number_of_in_flight_fetch": 0,
  "task_max_waiting_in_queue_millis": 0,
  "active_shards_percent_as_number": 100
}

# kibana health endpoint
$ curl -s http://kibana-logging:5601/api/status | jq .status.overall
{
  "state": "green",
  "title": "Green",
  "nickname": "Looking good",
  "icon": "success",
  "uiColor": "secondary",
  "since": "2019-07-22T09:25:01.239Z"
}

Does this PR introduce a user-facing change?:

Kibana has been slightly revamped/improved in the latest version

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. kind/feature Categorizes issue or PR as related to a new feature. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jul 22, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @lostick. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 22, 2019
@lostick
Copy link
Contributor Author

lostick commented Jul 22, 2019 •
edited
Loading

/hold
/assign monotek

@monotek , could you push the changes on quay.io ? thanks.

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. area/dependency Issues or PRs related to dependency changes sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jul 22, 2019
@k8s-ci-robot k8s-ci-robot requested review from monotek and piosz July 22, 2019 10:02
@lostick
Copy link
Contributor Author

lostick commented Jul 23, 2019

/assign @monotek

@monotek
Copy link
Member

monotek commented Jul 24, 2019

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 24, 2019
@monotek
Copy link
Member

monotek commented Jul 24, 2019 •
edited
Loading

/assign @coffeepac

I've already pushed the 7.2.0 image to the docker registry.

@lostick
Copy link
Contributor Author

lostick commented Jul 24, 2019

@monotek did you push a 7.2.0 tag with the fixes in https://quay.io/repository/fluentd_elasticsearch/elasticsearch?

monotek
monotek suggested changes Jul 24, 2019
View reviewed changes
cluster/addons/fluentd-elasticsearch/es-image/Makefile

build:
docker build --tag ${PREFIX}/${IMAGE}:${TAG} .
docker build --tag ${PREFIX}/${IMAGE}:${TAG} .
Copy link
Member

Choose a reason for hiding this comment

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

please add:

docker build --tag ${PREFIX}/${IMAGE}:latest .

@monotek
Copy link
Member

monotek commented Jul 24, 2019

@monotek did you push a 7.2.0 tag with the fixes in https://quay.io/repository/fluentd_elasticsearch/elasticsearch?

latest tag was missing... therefore push failed...
added latest tag and repushed it...

@lostick lostick force-pushed the fix-es-master-discovery branch from 16858b1 to 19c0aa9 Compare July 24, 2019 15:43
@lostick
Copy link
Contributor Author

lostick commented Jul 24, 2019 •
edited
Loading

@monotek did you push a 7.2.0 tag with the fixes in https://quay.io/repository/fluentd_elasticsearch/elasticsearch?

latest tag was missing... therefore push failed...
added latest tag and repushed it...

Thanks heaps!

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 24, 2019
monotek
monotek approved these changes Jul 24, 2019
View reviewed changes
Copy link
Member

@monotek monotek left a comment •
edited
Loading

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 24, 2019
@monotek
Copy link
Member

monotek commented Jul 25, 2019

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lostick, monotek

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 25, 2019
@k8s-ci-robot k8s-ci-robot merged commit 10005d2 into kubernetes:master Jul 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@monotek monotek monotek approved these changes

@piosz piosz Awaiting requested review from piosz

Assignees

@coffeepac coffeepac

@monotek monotek

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Service discovery binary seems outdated for es v7.1.1 in fluentd-elasticsearch
4 participants
@lostick @k8s-ci-robot @monotek @coffeepac