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

Backport of Net 3181 consul gh issue 15709 allow log file naming like nomad - fix bug into release/1.16.x #18642

Merged
merged 346 commits into from
Sep 4, 2023
Merged

Backport of Net 3181 consul gh issue 15709 allow log file naming like nomad - fix bug into release/1.16.x #18642

merged 346 commits into from
Sep 4, 2023

Conversation

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

Backport

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

🚨

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:
@absolutelightning
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: unable to process merge commit: "4b9586e3d6113ce1efb67d7194edc51e7dc14dd2", automatic backport requires rebase workflow

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

Description

Fixes issue where if consul.log is already present and server starts the file gets truncated.

Testing & Reproduction steps

Manual testing.

Links

Reference taken from - hashicorp/nomad#11386

PR Checklist

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

jmurret and others added 30 commits June 26, 2023 18:40
@jmurret
Changelog - add 1.13.9, 1.14.8, and 1.15.4 (#17889)
a96a9e7
@nvanthao @trujillo-adam
docs: update config enable_debug (#17866)
6bc2222 
* update doc for config enable_debug

* Update website/content/docs/agent/config/config-files.mdx

Co-authored-by: trujillo-adam <[email protected]>

---------

Co-authored-by: trujillo-adam <[email protected]>
Update wording on WAN fed and intermediate_pki_path (#17850)
601490b
@roncodingenthusiast
Allow service identity tokens the ability to read jwt-providers (#17893)
767ef2d 
* Allow service identity tokens the ability to read jwt-providers

* more tests

* service_prefix tests
@mr-miles @trujillo-adam
Update docs (#17476)
c8cfa60 
Co-authored-by: trujillo-adam <[email protected]>
Add emit_tags_as_labels to envoy bootstrap config when using Consul T…
55056be 
…elemetry Collector (#17888)
@lkysow
Fix command from kg to kubectl get (#17903)
abeeea1
@im2nguyen
Create and update release notes for 1.16 and 1.2 (#17895)
1c819e6 
* update release notes for 1.16 and 1.2

* update latest consul core release
@im2nguyen
Propose new changes to APIgw upgrade instructions (#17693)
b76c4d7 
* Propose new changes to APIgw upgrade instructions

* fix build error

* update callouts to render correctly

* Add hideClipboard to log messages

* Added clarification around consul k8s and crds
@jmurret @nathancoleman
Add workflow to verify linux release packages (#17904)
3368f14 
* adding docker files to verify linux packages.

* add verifr-release-linux.yml

* updating name

* pass inputs directly into jobs

* add other linux package platforms

* remove on push

* fix TARGETARCH on debian and ubuntu so it can check arm64 and amd64

* fixing amazon to use the continue line

* add ubuntu i386

* fix comment lines

* working

* remove commented out workflow jobs

* Apply suggestions from code review

Co-authored-by: Nathan Coleman <[email protected]>

* update fedora and ubuntu to use latest tag

---------

Co-authored-by: Nathan Coleman <[email protected]>
@nathancoleman
Reference hashicorp/consul instead of consul for Docker image (#17914)
f787088 
* Reference hashicorp/consul instead of consul for Docker image

* Update Make targets that pull consul directly
@natemollica-nm
Update Consul K8s Upgrade Doc Updates (#17921)
310bc68 
Updating upgrade procedures to encompass expected errors during upgrade process from v1.13.x to v1.14.x.
Update sameness-group.mdx (#17915)
6f5da97
Update create-sameness-groups.mdx (#17927)
b168132
@loshz
deps: coredns v1.10.1 (#17912)
7dbba6c
@jm96441n
Ensure RSA keys are at least 2048 bits in length (#17911)
67a239a 
* Ensure RSA keys are at least 2048 bits in length

* Add changelog

* update key length check for FIPS compliance

* Fix no new variables error and failing to return when error exists from
validating

* clean up code for better readability

* actually return value
@beautifulentropy @trujillo-adam
tlsutil: Fix check TLS configuration (#17481)
f019457 
* tlsutil: Fix check TLS configuration
* Rewording docs.
* Update website/content/docs/services/configuration/checks-configuration-reference.mdx
Co-authored-by: trujillo-adam <[email protected]>
* Fix typos and add changelog entry.
---------

Co-authored-by: trujillo-adam <[email protected]>
@trujillo-adam
docs: Deprecations for connect-native SDK and specific connect native…
6f660e5 
… APIs (#17937)

* Update v1_16_x.mdx
* Update connect native golang page

---------

Co-authored-by: trujillo-adam <[email protected]>
@jmurret
Revert "Add workflow to verify linux release packages (#17904)" (#17942)
bdf4fad 
This reverts commit 3368f14.
@Ranjandas
Fixes Secondary ConnectCA update (#17846)
1b1f33f 
This fixes a bug that was identified which resulted in subsequent
ConnectCA configuration update not to persist in the cluster.
@jm96441n
fixing typo in link to jwt-validations-with-intentions doc (#17955)
a60b363
Fix streaming backend link (#17958)
85b78fe 
* Fix streaming backend link
* Update health.mdx
@roncodingenthusiast
Dynamically create jwks clusters for jwt-providers (#17944)
1512ea3
@loshz
website: remove deprecated agent rpc docs (#17962)
f7305b2
@hashi-derek
Fix missing BalanceOutboundConnections in v2 catalog. (#17964)
2736e64
@absolutelightning
feature - [NET - 4005] - [Supportability] Reloadable Configuration - …
2af6bc4 
…enable_debug (#17565)

* # This is a combination of 9 commits.
# This is the 1st commit message:

init without tests

# This is the commit message #2:

change log

# This is the commit message #3:

fix tests

# This is the commit message #4:

fix tests

# This is the commit message #5:

added tests

# This is the commit message #6:

change log breaking change

# This is the commit message #7:

removed breaking change

# This is the commit message #8:

fix test

# This is the commit message #9:

keeping the test behaviour same

* # This is a combination of 12 commits.
# This is the 1st commit message:

init without tests

# This is the commit message #2:

change log

# This is the commit message #3:

fix tests

# This is the commit message #4:

fix tests

# This is the commit message #5:

added tests

# This is the commit message #6:

change log breaking change

# This is the commit message #7:

removed breaking change

# This is the commit message #8:

fix test

# This is the commit message #9:

keeping the test behaviour same

# This is the commit message #10:

made enable debug atomic bool

# This is the commit message #11:

fix lint

# This is the commit message #12:

fix test true enable debug

* parent 10f500e
author absolutelightning <[email protected]> 1687352587 +0530
committer absolutelightning <[email protected]> 1687352592 +0530

init without tests

change log

fix tests

fix tests

added tests

change log breaking change

removed breaking change

fix test

keeping the test behaviour same

made enable debug atomic bool

fix lint

fix test true enable debug

using enable debug in agent as atomic bool

test fixes

fix tests

fix tests

added update on correct locaiton

fix tests

fix reloadable config enable debug

fix tests

fix init and acl 403

* revert commit
@im2nguyen
Fix formatting codeblocks on APIgw docs (#17970)
5b7f360 
* fix formatting codeblocks

* remove unnecessary indents
Remove POC code (#17974)
50a9d1b
@xwa153
update doc (#17910)
9ce89c4 
* update doc

* update link
@cthain
Remove duplicate and unused newDecodeConfigEntry func (#17979)
0b1299c
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-3181-consul-GH-Issue-15709-Allow-log-file-naming-like-Nomad/entirely-intense-oriole branch from a40cb52 to 7d5a3d5 Compare September 1, 2023 09:24
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-3181-consul-GH-Issue-15709-Allow-log-file-naming-like-Nomad/entirely-intense-oriole branch from 7e92eed to a8152d7 Compare September 1, 2023 09:24
github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Sep 1, 2023
View reviewed changes
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

@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 theme/telemetry Anything related to telemetry or observability 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 Sep 1, 2023
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging September 1, 2023 09:26 Inactive
@vercel vercel bot temporarily deployed to Preview – consul September 1, 2023 09:30 Inactive
absolutelightning and others added 4 commits September 4, 2023 16:48
@absolutelightning
merge rel.1.16
6c2013f
@absolutelightning
fix changelog
3875d91
@absolutelightning
Net 3181 consul gh issue 15709 allow log file naming like nomad - fix…
02d85de 
… bug (#18631)

* fixes file name for consul

* added log file

* added tests for rename method

* append instead of trunc

* fix file truncate issue

* added changelog

* fix for build destros ci

* removed changelog

* solaris
@absolutelightning
fix change logmd
906583d
@absolutelightning absolutelightning marked this pull request as ready for review September 4, 2023 11:24
@absolutelightning absolutelightning merged commit 11bb928 into release/1.16.x Sep 4, 2023
80 checks passed
@absolutelightning absolutelightning deleted the backport/NET-3181-consul-GH-Issue-15709-Allow-log-file-naming-like-Nomad/entirely-intense-oriole branch September 4, 2023 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@absolutelightning absolutelightning absolutelightning approved these changes

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

Assignees

@absolutelightning absolutelightning

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/telemetry Anything related to telemetry or observability 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.