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.

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

Backport of Rename hcp-metrics-collector to consul-telemetry-collector into release/1.15.x #17386

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #17327 to be assessed for backporting due to the inclusion of the label backport/1.15.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@Achooo
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Description

We originally named the collector service name as hcp-metrics-collector. Rename the service name to follow the intended project name.

Also renamed the bind_socket_dir config key to remove the hcp reference. The collector can be used without HCP so it made sense to generalize the name

Testing & Reproduction steps

  • Unit tests have been modified to ensure everything passes.
  • Tested locally as follows:
  1. Run consul agent in dev mode: bin/consul agent -dev
  2. Register services:
  • web service: consul services register web.json
    {
    "service": {
        "name": "web",
        "port": 9191,
        "connect": {
            "sidecar_service": {
                "proxy": {
                    "config": {
                        "envoy_telemetry_collector_bind_socket_dir": "/Users/ashvitha.sridharan/tmp/"
                    }
                }
            }
        }
    }

}```

  • collector service: consul services register collector.json
{    "service":{
      "name": "consul-telemetry-collector",
      "port": 9090,
      "connect": {
          "sidecar_service": {
          }
      }
  }
}
  1. Run sidecars
  • ./bin/consul connect envoy -sidecar-for web -- -l debug
  • ./bin/consul connect envoy -admin-bind localhost:19001 -sidecar-for consul-telemetry-collector -- -l debug
  1. Run a mock metric handler (grpc service) and see metrics flow:
  2. Screenshot 2023-05-12 at 3 40 46 PM

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/f/metrics-collector-rename/highly-clean-elf branch from 7dccf73 to 0395d14 Compare May 16, 2023 18:36
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/f/metrics-collector-rename/highly-clean-elf branch from 0395d14 to 7dccf73 Compare May 16, 2023 18:36
@hashicorp-cla
Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@Achooo Achooo marked this pull request as ready for review May 17, 2023 15:28
@Achooo
Copy link
Contributor

Achooo commented May 18, 2023

Manual backport PR opened #17412

@Achooo Achooo closed this May 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants