Skip to content

Jjtimmons/backport otel freq 2#18600

Closed
jjti wants to merge 229 commits into
mainfrom
jjtimmons/backport-otel-freq-2
Closed

Jjtimmons/backport otel freq 2#18600
jjti wants to merge 229 commits into
mainfrom
jjtimmons/backport-otel-freq-2

Conversation

@jjti
Copy link
Copy Markdown
Contributor

@jjti jjti commented Aug 28, 2023

Description

This is a manually created backport of the change to reduce the frequency of OTEL metric exporting from Consul to HCP made in the other PR over in #18596

@jjti
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.

Testing & Reproduction steps

Links

PR Checklist

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

hc-github-team-consul-core and others added 30 commits June 7, 2023 19:01
…17608)

* backport of commit d77784b

* backport of commit f5a557d

* backport of commit 1d782d6

---------

Co-authored-by: Ronald Ekambi <ronekambi@gmail.com>
Co-authored-by: Eric <eric@haberkorn.co>
* backport of commit dc9c08d

* backport of commit 1271705

---------

Co-authored-by: Ronald Ekambi <ronekambi@gmail.com>
Co-authored-by: Ronald <roncodingenthusiast@users.noreply.github.com>
…es in synthesis code into release/1.16.x (#17616)

* backport of commit 63e8743

* backport of commit 896f117

---------

Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
Bump api, sdk versions to latest.
Bump api, envoyextensions versions to latest.
Update to new RC submodule versions. These will be updated again for the
1.16.0 release.
Co-authored-by: Ronald Ekambi <ronekambi@gmail.com>
Other recent releases have not commented out the replace directives in
go.mod. Though it would be ideal to pin our submodules in the release
artifacts we produce, we need to tidy up our build pipeline to make this
feasible.

In the meantime, revert this change to keep the dependency entry
updates, but exclude them from the effective dependency tree.
Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>
…ease/1.16.x (#17635)

* backport of commit fb2f3b6

* backport of commit 178abb8

* backport of commit 77b3998

* backport of commit a245b32

---------

Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
…c mgmt for k8s into release/1.16.x (#17645)

* backport of commit e4c2789

* backport of commit c3a2d0b

* backport of commit 81f8f7c

* backport of commit 63d12fb

* backport of commit 73d7179

* backport of commit f887336

---------

Co-authored-by: trujillo-adam <ajosetru@gmail.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
Co-authored-by: Bryce Kalow <bkalow@hashicorp.com>
…into release/1.16.x (#17652)

* backport of commit 1602c99

* backport of commit 132c6ee

* backport of commit 5e64b93

* backport of commit 83a7b3f

---------

Co-authored-by: Paul Glass <pglass@hashicorp.com>
Co-authored-by: Poonam Jadhav <poonam.jadhav@hashicorp.com>
…st when generating xDS into release/1.16.x (#17658)

* backport of commit 41a0d77

* backport of commit 9e5128d

* backport of commit de7888a

---------

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
* backport of commit 755bd95

* backport of commit 5e74587

* backport of commit 5732d3b

* backport of commit 779f003

* backport of commit c16da97

* backport of commit 7662916

* backport of commit 4ccbc67

---------

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
Co-authored-by: Tu Nguyen <im2nguyen@gmail.com>
….16.x (#17667)

* backport of commit 131d234

* backport of commit 1adc487

---------

Co-authored-by: Chris Thain <chris.m.thain@gmail.com>
…e catalog v2 resources into release/1.16.x (#17655)

* backport of commit ad6652a

* backport of commit 7a1e99b

---------

Co-authored-by: Matt Keeler <mjkeeler7@gmail.com>
Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>
* no-op commit due to failed cherry-picking

* docs: Sameness Groups (#17628)

* port from enterprise branch

* Apply suggestions from code review

Co-authored-by: shanafarkas <105076572+shanafarkas@users.noreply.github.com>

* Update website/content/docs/connect/cluster-peering/usage/create-sameness-groups.mdx

* next steps

* Update website/content/docs/connect/cluster-peering/usage/create-sameness-groups.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* Update website/content/docs/k8s/connect/cluster-peering/usage/create-sameness-groups.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

---------

Co-authored-by: shanafarkas <105076572+shanafarkas@users.noreply.github.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

---------

Co-authored-by: temp <temp@hashicorp.com>
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
Co-authored-by: shanafarkas <105076572+shanafarkas@users.noreply.github.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
#17679)

* backport of commit 6556199

* backport of commit 08204fe

* backport of commit 33cede6

---------

Co-authored-by: boruszak <jeffrey.boruszak@hashicorp.com>
…17681)

* no-op commit due to failed cherry-picking

* docs: minor fixes to JWT auth docs (#17680)

* Fixes

* service intentions fixes

---------

Co-authored-by: temp <temp@hashicorp.com>
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
Co-authored-by: Hariram Sankaran <56744845+ramramhariram@users.noreply.github.com>
Co-authored-by: trujillo-adam <ajosetru@gmail.com>
…/1.16.x (#17675)

* backport of commit 2cfd6a4

* backport of commit b7be18d

* resolve merge conflicts

---------

Co-authored-by: trujillo-adam <ajosetru@gmail.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
* no-op commit due to failed cherry-picking

* Add release notes 1.16 rc (#17665)

* Merge pull request #5773 from hashicorp/docs/rate-limiting-from-ip-addresses-1.16

updated docs for rate limiting for IP addresses - 1.16

* Merge pull request #5609 from hashicorp/docs/enterprise-utilization-reporting

Add docs for enterprise utilization reporting

* Merge pull request #5734 from hashicorp/docs/envoy-ext-1.16

Docs/envoy ext 1.16

* Add release notes for 1.16-rc

* Add consul-e license utlization reporting

* Update with rc absolute links

* Update with rc absolute links

* fix typo

* Apply suggestions from code review

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* Update to use callout component

* address typo

* docs: FIPS 140-2 Compliance (#17668)

* Page + nav + formatting

* link fix

* Update website/content/docs/enterprise/fips.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* Update website/content/docs/enterprise/fips.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* Update website/content/docs/enterprise/fips.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* Update website/content/docs/enterprise/fips.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* Update website/content/docs/enterprise/fips.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* Update website/content/docs/enterprise/fips.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* Update website/content/docs/enterprise/fips.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* Update website/content/docs/enterprise/fips.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* Update website/content/docs/enterprise/fips.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* Update website/content/docs/enterprise/fips.mdx

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>

* link fix

* Apply suggestions from code review

Co-authored-by: Jeff Apple <79924108+Jeff-Apple@users.noreply.github.com>

* Update website/content/docs/enterprise/fips.mdx

---------

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
Co-authored-by: Jeff Apple <79924108+Jeff-Apple@users.noreply.github.com>

* fix apigw install values file

* fix typos in release notes

---------

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
Co-authored-by: Jeff Apple <79924108+Jeff-Apple@users.noreply.github.com>

---------

Co-authored-by: temp <temp@hashicorp.com>
Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
Co-authored-by: Jeff Apple <79924108+Jeff-Apple@users.noreply.github.com>
Co-authored-by: Tu Nguyen <im2nguyen@gmail.com>
…to release/1.16.x (#18520)

resolve conflict

Co-authored-by: temp <temp@hashicorp.com>
…k into release/1.16.x (#18565)

* backport of commit 06d4c72

* backport of commit 42c37bb

---------

Co-authored-by: cskh <hui.kang@hashicorp.com>
* fix for #18406 , non presence of consul-version meta

Co-authored-by: Vijay <vijayraghav22@gmail.com>
… files are in commit history into release/1.16.x (#18570)

backport of commit c833fcc

Co-authored-by: NiniOak <anita.akaeze@hashicorp.com>
…e into release/1.16.x (#18537)

docs: Fix spelling errors across various pages on the site (#18533)

This commit fixes numerous spelling errors across the site and also
removes unnecessary whitespace that was present in the edited files.

Co-authored-by: Blake Covarrubias <blake@covarrubi.as>
#18588)

backport of commit 05dd1a8

Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
@jjti jjti requested a review from a team as a code owner August 28, 2023 20:23
@jjti jjti requested a review from a team August 28, 2023 20:23
@jjti jjti requested review from a team as code owners August 28, 2023 20:23
@jjti jjti requested review from claire-labry and shore and removed request for a team August 28, 2023 20:23
@jjti jjti closed this Aug 28, 2023
@github-actions github-actions Bot added type/docs Documentation needs to be created/updated/clarified theme/api Relating to the HTTP API interface theme/acls ACL and token generation theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/ui Anything related to the UI theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies type/ci Relating to continuous integration (CI) tooling for testing or releases pr/dependencies PR specifically updates dependencies of project theme/envoy/xds Related to Envoy support theme/contributing Additions and enhancements to community contributing materials theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation labels Aug 28, 2023
@github-actions github-actions Bot deleted the jjtimmons/backport-otel-freq-2 branch August 29, 2025 06:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/dependencies PR specifically updates dependencies of project theme/acls ACL and token generation theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation theme/contributing Additions and enhancements to community contributing materials theme/envoy/xds Related to Envoy support theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/ui Anything related to the UI type/ci Relating to continuous integration (CI) tooling for testing or releases type/docs Documentation needs to be created/updated/clarified

Projects

None yet

Development

Successfully merging this pull request may close these issues.