status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
19,312 Commits 445 Branches 179 Tags 489 MiB
Commit Graph

2111 Commits

Author SHA1 Message Date
Iryna Shustava 5cd0ccfc75
Support auth method with snapshot agent [ENT] (#15020) 
Port of hashicorp/consul-enterprise#3303
 2022-10-17 15:57:48 -06:00
David Yu efe25cfe46
docs: formatting on backend application and delete peering CRDs (#15007) 
* docs: formatting on backend application and delete peering CRDs

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-10-17 10:34:05 -07:00
Chris S. Kim 3d2dffff16
Merge pull request #13388 from deblasis/feature/health-checks_windows_service 
Feature: Health checks windows service
 2022-10-17 09:26:19 -04:00
Kyle Havlovitz aaf892a383 Extend tcp keepalive settings to work for terminating gateways as well 2022-10-14 17:05:46 -07:00
Kyle Havlovitz 2c569f6b9c Update docs and add tcp_keepalive_probes setting 2022-10-14 17:05:46 -07:00
David Yu 1a883891a7
docs: improvements on language from cluster peering steps (#14993) 
* docs: improvements on language from cluster peering steps

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-10-14 14:29:11 -07:00
Dan Upton 328e3ff563
proxycfg: rate-limit delivery of config snapshots (#14960) 
Adds a user-configurable rate limiter to proxycfg snapshot delivery,
with a default limit of 250 updates per second.

This addresses a problem observed in our load testing of Consul
Dataplane where updating a "global" resource such as a wildcard
intention or the proxy-defaults config entry could starve the Raft or
Memberlist goroutines of CPU time, causing general cluster instability.
 2022-10-14 15:52:00 +01:00
Alessandro De Blasis 5f99f578a9
Update website/content/api-docs/agent/check.mdx 2022-10-14 12:32:55 +01:00
David Yu 2c5f6a4678
1.14 dataplane docs beta: Bump to beta3 (#14979) 
Bump to beta
 2022-10-13 14:40:40 -07:00
malizz b0b0cbb8ee
increase protobuf size limit for cluster peering (#14976) 2022-10-13 13:46:51 -07:00
Paul Glass bcda205f88
Add consul.xds.server.streamStart metric (#14957) 
This adds a new consul.xds.server.streamStart metric to measure the time taken to first generate xDS resources after an xDS stream is opened.
 2022-10-12 14:17:58 -05:00
Iryna Shustava 4bc4ef135c
cli: Add -node-name flag to redirect-traffic command (#14933) 2022-10-12 11:53:41 -06:00
Stuart e2a6028e8e
Fixed broken links referring to tutorials running as local agent (#14954) 2022-10-11 13:01:29 -07:00
Bryce Kalow eb6254c96d
docs: fix malformed yaml (#14952) 2022-10-11 12:25:19 -05:00
John Murret d1f89458b3
[Docs] Add docs for memberlist metrics (#14753) 
* Add metrics for consul.memberlist.node.instances, consul.memberlist.queue.broadcast, consul.memberlist.size.local, and consul.memberlist.size.remote

* Fixing last table on page that does not render properly

* fixing queue name
 2022-10-11 10:02:51 -06:00
boruszak 8293a2b97b Deployment issue fix 2022-10-11 10:22:41 -05:00
boruszak 212298fd5c Merge branch 'main' into docs/search-refresh06 2022-10-11 10:17:22 -05:00
boruszak 38b1a515f1 Mergimg 2022-10-11 10:10:00 -05:00
Bryce Kalow 6a09b284c9
website: fix broken links (#14943) 2022-10-11 09:58:52 -05:00
boruszak 9e1aecc73c Merge branch 'main' into docs/search-refresh06 2022-10-11 09:43:43 -05:00
Jeff Boruszak d31be1e949
Update website/content/docs/dynamic-app-config/watches.mdx 
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
 2022-10-11 09:35:24 -05:00
Jeff Boruszak 9cd63ba543
Apply suggestions from code review 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-10-11 09:34:36 -05:00
Jeff Boruszak 74f08b9667
Apply suggestions from code review 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
 2022-10-11 09:34:17 -05:00
cskh 7770be3d57
docs: fix missing agent caching method (#14928) 2022-10-10 14:38:04 -04:00
Geoffrey Grosenbach 58c8a10b98
Fix outdated support email address (#14907) 
The software delivery support email address is no longer valid. This replaces it with a link to the official support website.
 2022-10-07 16:29:38 -07:00
Kyle Schochenmaier 2f1845a4fa
update helm docs (#14912) 2022-10-07 16:07:57 -07:00
Tim Rosenblatt 97ad73ad24
Fixes broken URLs in Dataplane docs (#14910) 2022-10-06 19:23:02 -07:00
Jared Kirschner 2603c0da52 docs: vault ca provider patch upgrade guidance 2022-10-06 16:04:43 -07:00
Alex Oskotsky 13da2c5fad
Add the ability to retry on reset connection to service-routers (#12890) 2022-10-05 13:06:44 -04:00
Tu Nguyen f650aa0044
fix broken links (#14892) 2022-10-05 09:54:49 -07:00
Nathan Coleman 78b437760b
Merge pull request #14880 from hashicorp/nathancoleman-patch-1 
Update CAPIGW comparison docs
 2022-10-04 20:14:23 -04:00
Ashlee M Boyer c6ace151dc
Merge pull request #14878 from hashicorp/docs/amb.fix-broken-links 
[docs] Fix broken Learn link
 2022-10-04 19:11:06 -05:00
Nathan Coleman 90db6f4fd0
Update website/content/docs/consul-vs-other/api-gateway-compare.mdx 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-10-04 19:41:16 -04:00
Nathan Coleman 86722af89f
Update website/content/docs/consul-vs-other/api-gateway-compare.mdx 
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
 2022-10-04 18:05:03 -04:00
Nathan Coleman e22d575240
Use consistent casing for "Consul API Gateway" vs. "API gateway" 2022-10-04 17:35:58 -04:00
Nathan Coleman 710e010594
Update documentation link to improve readability 2022-10-04 17:34:32 -04:00
Evan Culver a3be5a5a82
connect: Bump Envoy 1.20 to 1.20.7, 1.21 to 1.21.5 and 1.22 to 1.22.5 (#14831) 2022-10-04 13:15:01 -07:00
Paul Glass 23e52a1040
docs: Consul Dataplane Version Compatibility (#14710) 
Co-authored-by: David Yu <dyu@hashicorp.com>
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
 2022-10-04 15:02:28 -05:00
Kyle Schochenmaier f64ff29d43
update helm docs for consul-k8s 1.0.0-beta1 (#14875) 2022-10-04 12:59:53 -07:00
Eric Haberkorn 1b565444be
Rename `PeerName` to `Peer` on prepared queries and exported services (#14854) 2022-10-04 14:46:15 -04:00
Ashlee M Boyer bf2edc4414
Remove unneeded in params 2022-10-04 14:13:57 -04:00
Ashlee M Boyer c9236128bf
Fixing broken links 2022-10-04 14:00:32 -04:00
boruszak 904ab64a57 Link fix 2022-10-04 12:42:59 -05:00
boruszak 213b50b170 Tutorial link fix 2022-10-04 12:19:24 -05:00
Jeff Boruszak 87d7bd8a40
Merge pull request #14794 from hashicorp/docs/cluster-peering 
docs: Cluster peering 1.14 beta release
 2022-10-04 10:46:57 -05:00
Jeff Boruszak 9b99795530
Merge pull request #14770 from hashicorp/docs/agentless-beta 
docs: Consul Dataplane (Agentless) Beta
 2022-10-04 10:41:43 -05:00
Jeff Boruszak eedfca25c8
Merge pull request #14769 from hashicorp/docs/consul-on-windows-vms 
docs: Consul on Windows VMs Envoy bootstrapping
 2022-10-04 10:41:11 -05:00
trujillo-adam 6f1d7fcd02
Merge pull request #14779 from hashicorp/docs/invoke-services-from-lambda 
Docs/invoke services from lambda
 2022-10-04 08:37:48 -07:00
boruszak c1f71e3ef8 list 2022-10-04 10:37:39 -05:00
boruszak 9792f9ea26 Reverts + fix 2022-10-04 10:37:39 -05:00
boruszak cf796ce330 More group fix attempts 2022-10-04 10:20:14 -05:00
boruszak b455e0d5c8 Tabs fix again 2022-10-04 10:00:53 -05:00
boruszak 631e7c1d7b Tab groups fix 2022-10-04 09:49:10 -05:00
trujillo-adam 6a7cda41a6
Apply suggestions from code review 
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
 2022-10-04 07:39:37 -07:00
boruszak 6d0f58ffe5 Minor fixes 2022-10-04 09:31:31 -05:00
boruszak 99639b1316 Installation instructions moved 2022-10-04 09:29:16 -05:00
Jeff Boruszak 9e7c83a129
Apply suggestions from code review 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-10-04 09:26:07 -05:00
boruszak aa4b44c27f Move Installation instructions 2022-10-04 09:07:37 -05:00
vanphan24 f5cb922dd0
first commit with overview page (#14827) 
* Why Choose Consul

Co-authored-by: David Yu <dyu@hashicorp.com>
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
 2022-10-03 19:32:43 -07:00
boruszak 71b14a13fc PeerName changed to Peer - fix 2022-10-03 14:18:59 -05:00
boruszak 6eefbe0e9d Tutorial links 2022-10-03 14:08:57 -05:00
Jeff Boruszak 6b4d15f233
Update website/content/docs/connect/proxies/envoy.mdx 2022-10-03 14:03:00 -05:00
Jeff Boruszak c1fedba08e
Update website/content/docs/connect/proxies/envoy.mdx 2022-10-03 13:59:41 -05:00
Jeff Boruszak 64dcb64d31
Update website/content/docs/connect/proxies/envoy.mdx 2022-10-03 13:54:08 -05:00
Jeff Boruszak dc61cc1914
Update website/content/docs/connect/dataplane/consul-dataplane.mdx 
Co-authored-by: David Yu <dyu@hashicorp.com>
 2022-10-03 12:55:55 -05:00
boruszak f4731bf0df Installation isntructions 2022-10-03 12:52:07 -05:00
Jeff Boruszak 12aa3cac4a
Apply suggestions from code review 2022-10-03 11:38:43 -05:00
Jeff Boruszak 69189e0381
Update website/content/docs/connect/cluster-peering/index.mdx 2022-10-03 11:36:48 -05:00
Luke Kysow de04344e47
Update tech-specs.mdx (#14840) 2022-10-03 09:21:42 -07:00
Jeff Boruszak d1d9fd0a5c
Update website/content/docs/connect/dataplane/index.mdx 
Co-authored-by: Riddhi Shah <riddhi@hashicorp.com>
 2022-10-03 11:16:00 -05:00
boruszak 80bbf8995b Removed external server constraint 2022-10-03 11:15:12 -05:00
boruszak d80601e96e proxy default behavior constraint 2022-10-03 11:14:34 -05:00
Jeff Boruszak eb9895422d
Apply suggestions from code review 
Co-authored-by: Riddhi Shah <riddhi@hashicorp.com>
 2022-10-03 10:58:43 -05:00
Jeff Boruszak b530c14032
Update website/content/docs/connect/dataplane/index.mdx 
Co-authored-by: Riddhi Shah <riddhi@hashicorp.com>
 2022-10-03 10:51:24 -05:00
trujillo-adam 70865aa0d6 applied feedback from review 2022-10-01 13:09:36 -07:00
boruszak 80e3f15d47 Dynamic routing clarifications 2022-09-30 15:32:43 -05:00
David Yu a74d826b0e
updated 0.49.x helm docs (#14824) 2022-09-30 12:17:16 -07:00
boruszak 6866e89630 service-resolver alignment 2022-09-30 14:00:55 -05:00
Jeff Boruszak 443dc35c31
Apply suggestions from code review 
Co-authored-by: Eric Haberkorn <erichaberkorn@gmail.com>
 2022-09-30 14:00:37 -05:00
Curt Bushko 3faaa02a0c
Add OpenShift CNI to list of install options for kubernetes (#14793) 2022-09-30 11:52:15 -07:00
David Yu eb5713ccbc
docs: admin partition docs improvements (#14774) 
* docs: Update admin partitions versions and add requirement for unique `global.name`

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-09-30 09:13:44 -07:00
nrichu-hcp 47eb44fe35
Merge pull request #14807 from hashicorp/docs/nick-release-notes 
docs: Consul K8s 0.49.x release notes
 2022-09-30 11:39:35 -04:00
nrichu-hcp a9b8b1e48f
Update website/content/docs/release-notes/consul-k8s/v0_49_x.mdx 
Co-authored-by: David Yu <dyu@hashicorp.com>
 2022-09-30 11:38:36 -04:00
nrichu-hcp f04cdeb991
Update website/content/docs/release-notes/consul-k8s/v0_49_x.mdx 
Co-authored-by: David Yu <dyu@hashicorp.com>
 2022-09-30 11:38:29 -04:00
nrichu-hcp 1daf4dcaba
Update website/content/docs/release-notes/consul-k8s/v0_49_x.mdx 
Co-authored-by: David Yu <dyu@hashicorp.com>
 2022-09-30 11:38:20 -04:00
nrichu-hcp d4f994a433
Update website/content/docs/release-notes/consul-k8s/v0_49_x.mdx 
Co-authored-by: David Yu <dyu@hashicorp.com>
 2022-09-30 11:38:10 -04:00
nrichu-hcp b95ccf166e added missing links per davids advice 2022-09-30 11:29:14 -04:00
nrichu-hcp 560eb2b4a9
Update website/content/docs/release-notes/consul-k8s/v0_49_x.mdx 
Co-authored-by: David Yu <dyu@hashicorp.com>
 2022-09-30 11:22:12 -04:00
nrichu-hcp 848e989df9
Update website/content/docs/release-notes/consul-k8s/v0_49_x.mdx 
Co-authored-by: David Yu <dyu@hashicorp.com>
 2022-09-30 11:22:03 -04:00
Jeff Boruszak 722881fb40
Update website/content/docs/connect/proxies/envoy.mdx 2022-09-30 10:01:43 -05:00
Jeff Boruszak 57154548f8
Update website/content/docs/connect/proxies/envoy.mdx 2022-09-30 09:59:21 -05:00
Jeff Boruszak 2d72feffda
Update website/content/docs/connect/proxies/envoy.mdx 2022-09-30 09:58:03 -05:00
Jeff Boruszak ebc069aeb6
Apply suggestions from code review 
Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-09-30 09:52:53 -05:00
boruszak 10cfc9bbb4 Codeblock Added 2022-09-30 09:51:58 -05:00
Jeff Boruszak 76d4f6e309
Apply suggestions from code review 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-09-30 09:29:20 -05:00
Adam Rowan f85ca92921
Merge pull request #14783 from hashicorp/bear359-patch-1 
Bear359 patch 1
 2022-09-29 16:50:09 -06:00
nrichu-hcp c847ee2446 finalized 0.49 release notes 2022-09-29 17:12:12 -04:00
boruszak 35303f5f79 Page location/nav edits 2022-09-29 14:52:31 -05:00
boruszak 622ccb6ce3 Fixes 2022-09-29 14:48:09 -05:00
Eric Haberkorn 80e51ff907
Add exported services event to cluster peering replication. (#14797) 2022-09-29 15:37:19 -04:00
trujillo-adam fdd6e9d0d2
Merge pull request #14752 from hashicorp/docs/updated-consul-arch-no-agentless 
refresh of the Consul architecture overview page
 2022-09-29 11:58:48 -07:00
trujillo-adam 12ffd608c0
Apply suggestions from code review 
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
 2022-09-29 11:40:59 -07:00
trujillo-adam 4d1fb3b11b applied additional feedback from review 2022-09-29 11:13:19 -07:00
nrichu-hcp df7b7a6b3d draft release notes 2022-09-29 13:58:43 -04:00
Adam Rowan 15ef06f742
Update website/content/docs/integrate/partnerships.mdx 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-09-29 09:06:31 -06:00
Adam Rowan e410bf50c8
Update website/content/docs/integrate/partnerships.mdx 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-09-29 09:06:10 -06:00
Adam Rowan b8f2f0b2f0
Update website/content/docs/integrate/partnerships.mdx 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-09-29 09:05:55 -06:00
Adam Rowan 23d92eae59
Update website/content/docs/integrate/partnerships.mdx 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-09-29 09:05:28 -06:00
Adam Rowan c04d66c057
Update website/content/docs/integrate/partnerships.mdx 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-09-29 09:05:21 -06:00
Adam Rowan 4fdcd0ad0e
Update website/content/docs/integrate/partnerships.mdx 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-09-29 09:05:11 -06:00
Adam Rowan a77d17f2d5
Update website/content/docs/integrate/partnerships.mdx 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-09-29 09:04:59 -06:00
Adam Rowan bb5b46ac8a
Update website/content/docs/integrate/partnerships.mdx 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-09-29 09:04:43 -06:00
Adam Rowan 816a652795
Update website/content/docs/integrate/partnerships.mdx 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
 2022-09-29 09:04:27 -06:00
trujillo-adam fc5fdc27d0 applied feedback from review 2022-09-28 20:29:05 -07:00
boruszak dfd5903c8e Typo fix 2022-09-28 16:19:24 -05:00
boruszak 055bb88ee5 Typo fix 2022-09-28 16:10:36 -05:00
boruszak efcb466e38 Typo fix 2022-09-28 16:09:23 -05:00
boruszak 2589f07659 Fixes 2022-09-28 16:03:32 -05:00
boruszak 66f8c65e89 Traffic Management 2022-09-28 15:52:03 -05:00
boruszak 3e2a650e5f k8s page updates 2022-09-28 15:42:21 -05:00
boruszak 6fd154ec73 Tab groupings 2022-09-28 14:13:38 -05:00
boruszak 6f52816680 Kyle Rarey - requested constraints added 2022-09-28 14:00:21 -05:00
boruszak ff9348f877 Mike Morris clean up requests 2022-09-28 13:57:04 -05:00
cskh 69f40df548
feat(ingress gateway: support configuring limits in ingress-gateway c… (#14749) 
* feat(ingress gateway: support configuring limits in ingress-gateway config entry

- a new Defaults field with max_connections, max_pending_connections, max_requests
  is added to ingress gateway config entry
- new field max_connections, max_pending_connections, max_requests in
  individual services to overwrite the value in Default
- added unit test and integration test
- updated doc

Co-authored-by: Chris S. Kim <ckim@hashicorp.com>
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
Co-authored-by: Dan Stough <dan.stough@hashicorp.com>
 2022-09-28 14:56:46 -04:00
Jared Kirschner bd4a95756f
Merge pull request #14764 from hashicorp/docs/clarify-license-behavior-on-restart 
docs: clarify license behavior on restart
 2022-09-28 13:34:44 -04:00
Adam Rowan 142141f2f0
Updating Consul Integration Program 
Updating Consul Integration Program to include additional links to better server as a one-stop solution for Partners wanting to integrate with Consul.
 2022-09-28 10:27:34 -06:00
boruszak 38a873b114 CLI reference page relocation 2022-09-28 11:03:30 -05:00
trujillo-adam 67c4216822 missed unsaved changes 2022-09-27 20:01:57 -07:00
trujillo-adam 6615c60e57 added docs for invoking services from lambda functions 2022-09-27 20:00:51 -07:00
boruszak 347e2295fb EnterpriseAlert inline fix 2022-09-27 16:15:26 -05:00
boruszak b0fc58474a Fixes 2022-09-27 15:42:05 -05:00
boruszak b0cbecae7d Bootstrap Consul on Windows VMs instructions 2022-09-27 15:16:39 -05:00
Luke Kysow 4638753168
Make defaulting behaviour of connect.enabled clear (#14768) 2022-09-27 13:04:59 -07:00
Luke Kysow 84f8b87967
Update k8s.mdx (#14765) 2022-09-27 09:51:12 -07:00
boruszak 2c7d2f9f8a Minor fixes 2022-09-27 11:27:11 -05:00
Jared Kirschner 99e0d23226
docs: clarify license behavior on restart 2022-09-27 12:24:56 -04:00
boruszak 30999a0c47 k8s installation pages updates 2022-09-27 11:17:17 -05:00
boruszak 4cbf63bb5d consul-dataplane command + main Dataplane pages 2022-09-27 10:25:25 -05:00
David Yu 126f77f40d
docs: update to Vault secrets backend for partition init service account and Helm values for injector (#14745) 
* docs: update to Vault secrets backend
 2022-09-27 00:35:59 -07:00
David Fleming 0edf2f69d0
Fix Link: Consul Enterprise Admin Partitions - Usage - CLI (#14755) 
Admin partition CLI documentation was pointing at /commands/admin-partition.  Updated to point at /commands/partition. https://www.consul.io/commands/admin-partition returns not found.
 2022-09-26 23:22:49 -07:00
trujillo-adam 09d2ae9e04 refresh of the Consul architecture overview page 2022-09-26 11:21:08 -07:00
Derek Menteer aa4709ab74
Add envoy connection balancing. (#14616) 
Add envoy connection balancing config.
 2022-09-26 11:29:06 -05:00
boruszak 0b742a0d75 /docs/dynamic-app-config/ 2022-09-23 16:31:00 -05:00
boruszak cbc8d5df55 /docs/lambda/ 2022-09-23 16:29:28 -05:00
boruszak 8f85805c80 /docs/ecs/manual/ 2022-09-23 16:23:47 -05:00
boruszak 848a1dec68 /docs/ecs/terraform/ 2022-09-23 16:21:03 -05:00
boruszak 5b82975ebf /docs/ecs/ 2022-09-23 16:16:35 -05:00
boruszak bcc227e285 /docs/k8s/deployment-configuration/ 2022-09-23 16:11:23 -05:00
boruszak 77d584d433 /docs/k8s/deployment-configurations/multi-cluster/ 2022-09-23 16:08:05 -05:00
boruszak 53129941b5 /docs/security/acl/auth-methods 2022-09-23 16:04:00 -05:00