-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
Docs/add lic use reporting #18239
Closed
Closed
Docs/add lic use reporting #18239
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Dan Bond <[email protected]> Co-authored-by: Dan Bond <[email protected]>
Co-authored-by: mr-miles <[email protected]>
…ing Consul Telemetry Collector into release/1.15.x (#17900) * backport of commit 94584cf * backport of commit aed6a00 * backport of commit 2eb7a2a --------- Co-authored-by: josh <[email protected]>
Co-authored-by: Luke Kysow <[email protected]>
…mage into release/1.15.x (#17919) * backport of commit d490377 * Reference hashicorp/consul instead of consul for Docker image (#17914) * Reference hashicorp/consul instead of consul for Docker image * Update Make targets that pull consul directly --------- Co-authored-by: Nathan Coleman <[email protected]>
Co-authored-by: Dan Bond <[email protected]>
) * backport of commit afa1f42 * backport of commit e097002 * backport of commit 2f2aad5 * backport of commit 4a5c9c1 --------- Co-authored-by: Ranjandas <[email protected]> Co-authored-by: Chris S. Kim <[email protected]>
* backport of commit 4f7d21d * backport of commit d1ba0e8 --------- Co-authored-by: David Yu <[email protected]>
Co-authored-by: natemollica-dev <[email protected]> Co-authored-by: David Yu <[email protected]>
…iguration - enable_debug into release/1.15.x (#17968) * backport of commit 10f500e * merge conf resolved * removed experiments --------- Co-authored-by: Ashesh Vidyut <[email protected]> Co-authored-by: Ashesh Vidyut <[email protected]>
…, nodes, service into release/1.15.x (#17986) * backport to 1.15.x --------- Co-authored-by: cskh <[email protected]>
Co-authored-by: Evan Phoenix <[email protected]>
Co-authored-by: J.C. Jones <[email protected]>
…t annotation into release/1.15.x (#18039) * backport of commit e1bf428 * backport of commit ddf214e * backport of commit e41bd9c * backport of commit b9cfc86 * backport of commit 0ddf013 * backport of commit 1b0b513 * backport of commit 29442ad * backport of commit 5e7ddf5 * backport of commit f2b6fa7 * backport of commit 83b84a9 * backport of commit 56d8173 * backport of commit 0ab44f0 * backport of commit 69c99fb * backport of commit b79e124 * backport of commit fb14419 * backport of commit 3b7b2a0 --------- Co-authored-by: David Yu <[email protected]>
…e/1.15.x (#18042) * manually resolve conflicts * remove extraneous heading * address feedback --------- Co-authored-by: temp <[email protected]> Co-authored-by: David Yu <[email protected]>
…/1.15.x (#18018) * no-op commit due to failed cherry-picking * Fix removed service-to-service peering links (#17221) * docs: fix removed service-to-service peering links * docs: extend peering-via-mesh-gateways intro (thanks @trujillo-adam) --------- Co-authored-by: trujillo-adam <[email protected]> --------- Co-authored-by: temp <[email protected]> Co-authored-by: Michael Hofer <[email protected]> Co-authored-by: trujillo-adam <[email protected]>
* add helm chart changes * ran again with updated values Co-authored-by: Dan Stough <[email protected]>
…rces into release/1.15.x (#18064) * fix(connect): set initial_fetch_time to wait indefinitely * changelog * PR feedback 1 --------- Co-authored-by: DanStough <[email protected]>
…elease/1.15.x (#18083) * backport of commit 58ef5fd * backport of commit 857427a --------- Co-authored-by: josh <[email protected]>
Co-authored-by: Krastin Krastev <[email protected]>
…ect CA into release/1.15.x (#18098) * backport of commit 4034bb2 * backport of commit 9c4c3c5 * backport of commit 7282078 --------- Co-authored-by: Tom Davies <[email protected]>
…18093) Co-authored-by: Nick Irvine <[email protected]>
…8104) * backport of commit 0d7bee8 * backport of commit 408cbe8 * backport of commit a085478 * backport of commit 71c4c65 * backport of commit 0c060fa --------- Co-authored-by: Luke Kysow <[email protected]> Co-authored-by: David Yu <[email protected]>
Co-authored-by: John Murret <[email protected]>
Co-authored-by: Dan Bond <[email protected]>
Co-authored-by: nv-hashi <[email protected]>
…r because of dependency bugs with go 1.20.6. Pin go to 1.20.5. into release/1.15.x (#18127) ## Backport This PR is auto-generated from #18124 to be assessed for backporting due to the inclusion of the label backport/1.15. :rotating_light: >**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: @jmurret 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 The following jobs started failing when go 1.20.6 was released: - `go-test-api-1-19` - `go-test-api-1-20` - `compatibility-integration-tests` - `upgrade-integration-tests` `compatibility-integration-tests` and `compatibility-integration-tests` to this testcontainers issue: testcontainers/testcontainers-go#1359. This issue calls for testcontainers to release a new version when one of their dependencies is fixed. When that is done, we will unpin the go versions in `compatibility-integration-tests` and `compatibility-integration-tests`. ### Testing & Reproduction steps See these jobs broken in CI and then see them work with this PR. --- <details> <summary> Overview of commits </summary> - 747195f - 5164924 - f4d6ca1 - a474071 - 8c03b36 - c50b17c - 7b55f66 - 93ce5fc </details> --------- Co-authored-by: temp <[email protected]> Co-authored-by: John Murret <[email protected]> Co-authored-by: Chris Thain <[email protected]>
…elease/1.15.x (#18136) ## Backport This PR is auto-generated from #18134 to be assessed for backporting due to the inclusion of the label backport/1.15. The below text is copied from the body of the original PR. --- ### Description - Fix unmatched bracket in the [doc](https://developer.hashicorp.com/consul/docs/services/usage/checks#ttl-check-configuration) (see the following screenshot of the page) <img width="618" alt="Screenshot 2023-07-13 at 9 01 19 PM" src="https://github.com/hashicorp/consul/assets/463631/20707735-906f-4b06-999d-44e6329a9fec"> ### Testing & Reproduction steps <!-- * In the case of bugs, describe how to replicate * If any manual tests were done, document the steps and the conditions to replicate * Call out any important/ relevant unit tests, e2e tests or integration tests you have added or are adding --> ### Links <!-- Include any links here that might be helpful for people reviewing your PR (Tickets, GH issues, API docs, external benchmarks, tools docs, etc). If there are none, feel free to delete this section. Please be mindful not to leak any customer or confidential information. HashiCorp employees may want to use our internal URL shortener to obfuscate links. --> ### PR Checklist * [ ] updated test coverage * [ ] external facing docs updated * [ ] appropriate backport labels added * [ ] not a security concern --- <details> <summary> Overview of commits </summary> - d40243b </details> Co-authored-by: cskh <[email protected]>
…st.host that contains socked now error into release/1.15.x (#18144) ## Backport This PR is auto-generated from #18129 to be assessed for backporting due to the inclusion of the label backport/1.15. :rotating_light: >**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: @jmurret 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 This is related to #18124 where we pinned the go versions in CI to 1.20.5 and 1.19.10. go 1.20.6 and 1.19.11 now validate request host headers for validity, including the hostname cannot be prefixed with slashes. For local communications (npipe://, unix://), the hostname is not used, but we need valid and meaningful hostname. Prior versions go Go would clean the host header, and strip slashes in the process, but go1.20.6 and go1.19.11 no longer do, and reject the host header. Around the community we are seeing that others are intercepting the req.host and if it starts with a slash or ends with .sock, they changing the host to localhost or another dummy value. [client: define a "dummy" hostname to use for local connections by thaJeztah · Pull Request #45942 · moby/moby](moby/moby#45942) ### Testing & Reproduction steps Check CI tests. ### Links * [ ] updated test coverage * [ ] external facing docs updated * [ ] appropriate backport labels added * [ ] not a security concern --- <details> <summary> Overview of commits </summary> - 747195f - 5164924 - f4d6ca1 - a474071 - 8c03b36 - c50b17c - cc8eaf8 - ce10138 - 133c7ec - b0bd440 - 8f22308 - f8578b0 - 4452224 - 19634a4 </details> --------- Co-authored-by: temp <[email protected]> Co-authored-by: John Murret <[email protected]>
…ge_max into release/1.15.x (#18155) ## Backport This PR is auto-generated from #18154 to be assessed for backporting due to the inclusion of the label backport/1.15. The below text is copied from the body of the original PR. --- ### Description Addresses #17171 (comment) ### Testing & Reproduction steps <!-- * In the case of bugs, describe how to replicate * If any manual tests were done, document the steps and the conditions to replicate * Call out any important/ relevant unit tests, e2e tests or integration tests you have added or are adding --> ### Links <!-- Include any links here that might be helpful for people reviewing your PR (Tickets, GH issues, API docs, external benchmarks, tools docs, etc). If there are none, feel free to delete this section. Please be mindful not to leak any customer or confidential information. HashiCorp employees may want to use our internal URL shortener to obfuscate links. --> ### PR Checklist * [ ] updated test coverage * [ ] external facing docs updated * [ ] appropriate backport labels added * [ ] not a security concern --- <details> <summary> Overview of commits </summary> - f5a6411 </details> Co-authored-by: David Yu <[email protected]>
… name 1.15.x (#18163) Fix a bug that wrongly trims domains when there is an overlap with DC name (#17160) * Fix a bug that wrongly trims domains when there is an overlap with DC name Before this change, when DC name and domain/alt-domain overlap, the domain name incorrectly trimmed from the query. Example: Given: datacenter = dc-test, alt-domain = test.consul. Querying for "test-node.node.dc-test.consul" will faile, because the code was trimming "test.consul" instead of just ".consul" This change, fixes the issue by adding dot (.) before trimming * trimDomain: ensure domain trimmed without modyfing original domains * update changelog --------- Co-authored-by: Alex Simenduev <[email protected]>
…4743] into release/1.15.x (#18147) Co-authored-by: Nick Irvine <[email protected]>
….15.x (#18188) Backport of [NET-4865] Bump golang.org/x/net to 0.12.0 into release/1.16.x (#18189) Bump golang.org/x/net to 0.12.0 While not necessary to directly address CVE-2023-29406 (which should be handled by using a patched version of Go when building), an accompanying change to HTTP/2 error handling does impact agent code. See https://go-review.googlesource.com/c/net/+/506995 for the HTTP/2 change. Bump this dependency across our submodules as well for the sake of potential indirect consumers of `x/net/http`. Manual backport of 84cbf09.
…ease/1.15.x (#18194) backport of commit 93f3209 Co-authored-by: Michael Zalimeni <[email protected]>
…18202) Fix Backport Assistant PR commenting (#18200) * Fix Backport Assistant failure PR commenting For general comments on a PR, it looks like you have to use the `/issue` endpoint rather than `/pulls`, which requires commit/other review-specific target details. This matches the endpoint used in `backport-reminder.yml`. * Remove Backport Reminder workflow This is noisy (even when adding multiple labels, individual comments per label are generated), and likely no longer needed: we haven't had this work in a long time due to an expired GH token, and we now have better automation for backport PR assignment. Manual backport of 1c7fcdf.
…18210) This PR explicitly enables WebSocket upgrades in Envoy's UpgradeConfig for all proxy types. (API Gateway, Ingress, and Sidecar.) Fixes #8283 Co-authored-by: Blake Covarrubias <[email protected]>
backport of commit 45700f1 Co-authored-by: Dan Bond <[email protected]>
…rs into release/1.15.x (#18232) backport of commit c5522ca Co-authored-by: Michael Zalimeni <[email protected]>
trujillo-adam
added
type/docs
Documentation needs to be created/updated/clarified
pr/no-changelog
PR does not need a corresponding .changelog entry
pr/no-metrics-test
pr/no-backport
labels
Jul 21, 2023
github-actions
bot
added
theme/api
Relating to the HTTP API interface
theme/cli
Flags and documentation for the CLI interface
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
labels
Jul 21, 2023
🤔 This PR has changes in the |
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
pr/no-backport
pr/no-changelog
PR does not need a corresponding .changelog entry
pr/no-metrics-test
theme/api
Relating to the HTTP API interface
theme/cli
Flags and documentation for the CLI interface
theme/connect
Anything related to Consul Connect, Service Mesh, Side Car Proxies
theme/contributing
Additions and enhancements to community contributing materials
theme/envoy/xds
Related to Envoy support
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The automated license utilization functionality was backported to this version, but we only added docs to 1.16. This PR manually adds the docs.
PR Checklist