Commit Graph

1948 Commits

Author SHA1 Message Date
trujillo-adam e70215dd62 clarification that Consul K8s in these instructions refers to the the CLI tool 2022-10-18 09:14:26 -07:00
freddygv 73ff2e933f Fixup links 2022-10-18 10:12:45 -06:00
freddygv 56b153e57f Add docs about upgrading primary mesh gateways
Care must be taken when replacing mesh gateways in the primary
datacenter, because if the old addresses become unreachable before the
secondary datacenters receive the new addresses then the primary
datacenter overall will become unreachable.

This commit adds docs related to this class of upgrades.
2022-10-18 10:08:43 -06:00
trujillo-adam aba377cee4 removed quotation marks around front matter and revised the introduction 2022-10-18 08:56:38 -07:00
freddygv f08acdc092 Update upgrade docs for 1.13.2.
In 1.13.2 we added a new flag called use_auto_cert to address issues
previously documented in the upgrade guide. Originally there was no way
to disable TLS for gRPC when auto-encrypt was in use, because TLS was
enabled for gRPC due to the presence of auto-encrypt certs.

As of 1.13.2, using auto-encrypt certs as the signal to enable TLS for
gRPC is opt-in only. Meaning that if anyone who had upgraded to 1.13
relied on that side-effect, they now need to explicitly configure it.
2022-10-18 09:43:32 -06:00
David Yu 4ba1e75259
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 58c041eb6e
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 096ca5e4b0 Extend tcp keepalive settings to work for terminating gateways as well 2022-10-14 17:05:46 -07:00
Kyle Havlovitz f8e745315f Update docs and add tcp_keepalive_probes setting 2022-10-14 17:05:46 -07:00
David Yu 5fbb4aaac0
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 3b9297f95a
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
David Yu e1093b8576
1.14 dataplane docs beta: Bump to beta3 (#14979)
Bump to beta
2022-10-13 14:40:40 -07:00
malizz 27d0181806
increase protobuf size limit for cluster peering (#14976) 2022-10-13 13:46:51 -07:00
Paul Glass be1a4438a9
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
Stuart 5eb5fe41c1
Fixed broken links referring to tutorials running as local agent (#14954) 2022-10-11 13:01:29 -07:00
Bryce Kalow 6a41e0ad94
docs: fix malformed yaml (#14952) 2022-10-11 12:25:19 -05:00
John Murret d42938b90e
[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 24b351e9ac Deployment issue fix 2022-10-11 10:22:41 -05:00
boruszak a434240d19 Merge branch 'main' into docs/search-refresh06 2022-10-11 10:17:22 -05:00
boruszak ba1c4705e1 Mergimg 2022-10-11 10:10:00 -05:00
Bryce Kalow 8889253d7a
website: fix broken links (#14943) 2022-10-11 09:58:52 -05:00
boruszak 841970e6fb Merge branch 'main' into docs/search-refresh06 2022-10-11 09:43:43 -05:00
Jeff Boruszak b08f598927
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 ecdaf9b7c9
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 3c30b64220
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
Geoffrey Grosenbach 93422ea1f1
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 300471bd9e
update helm docs (#14912) 2022-10-07 16:07:57 -07:00
Tim Rosenblatt 9335a5e2e1
Fixes broken URLs in Dataplane docs (#14910) 2022-10-06 19:23:02 -07:00
Jared Kirschner 4ffa54d8b7 docs: vault ca provider patch upgrade guidance 2022-10-06 16:04:43 -07:00
Alex Oskotsky 4d9309327f
Add the ability to retry on reset connection to service-routers (#12890) 2022-10-05 13:06:44 -04:00
Tu Nguyen 71a4c5cce4
fix broken links (#14892) 2022-10-05 09:54:49 -07:00
Nathan Coleman 4f4ad4ce2f
Merge pull request #14880 from hashicorp/nathancoleman-patch-1
Update CAPIGW comparison docs
2022-10-04 20:14:23 -04:00
Ashlee M Boyer 16dca09a62
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 a93b1b510c
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 5bdfbf2c21
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 7ac4fca0b9
Use consistent casing for "Consul API Gateway" vs. "API gateway" 2022-10-04 17:35:58 -04:00
Nathan Coleman 94963f90b6
Update documentation link to improve readability 2022-10-04 17:34:32 -04:00
Evan Culver 42423ffce2
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 d54966effc
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 25c0d6951b
update helm docs for consul-k8s 1.0.0-beta1 (#14875) 2022-10-04 12:59:53 -07:00
Eric Haberkorn 2178e38204
Rename `PeerName` to `Peer` on prepared queries and exported services (#14854) 2022-10-04 14:46:15 -04:00
Ashlee M Boyer d6149eaeb2
Remove unneeded in params 2022-10-04 14:13:57 -04:00
Ashlee M Boyer b821755bf3
Fixing broken links 2022-10-04 14:00:32 -04:00
boruszak d4bf900032 Link fix 2022-10-04 12:42:59 -05:00
boruszak 89d986d2c4 Tutorial link fix 2022-10-04 12:19:24 -05:00
Jeff Boruszak 2a56d02992
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 0ec726a959
Merge pull request #14770 from hashicorp/docs/agentless-beta
docs: Consul Dataplane (Agentless) Beta
2022-10-04 10:41:43 -05:00
Jeff Boruszak 1761c31fab
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 f3299a0c55
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 673935d55c list 2022-10-04 10:37:39 -05:00
boruszak eeb3c45a6c Reverts + fix 2022-10-04 10:37:39 -05:00
boruszak 8321c88480 More group fix attempts 2022-10-04 10:20:14 -05:00
boruszak 40f1070271 Tabs fix again 2022-10-04 10:00:53 -05:00
boruszak a4e9427883 Tab groups fix 2022-10-04 09:49:10 -05:00
trujillo-adam e3a8a35358
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 dc3da3882d Minor fixes 2022-10-04 09:31:31 -05:00
boruszak b07c78d9da Installation instructions moved 2022-10-04 09:29:16 -05:00
Jeff Boruszak edde48b3e4
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 960555233f Move Installation instructions 2022-10-04 09:07:37 -05:00
vanphan24 cdc3a9d2fc
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 21e9341e1b PeerName changed to Peer - fix 2022-10-03 14:18:59 -05:00
boruszak 19a9a56580 Tutorial links 2022-10-03 14:08:57 -05:00
Jeff Boruszak d42f7214f7
Update website/content/docs/connect/proxies/envoy.mdx 2022-10-03 14:03:00 -05:00
Jeff Boruszak c820ef645f
Update website/content/docs/connect/proxies/envoy.mdx 2022-10-03 13:59:41 -05:00
Jeff Boruszak 3fc915aca2
Update website/content/docs/connect/proxies/envoy.mdx 2022-10-03 13:54:08 -05:00
Jeff Boruszak f81db7992d
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 908ef42f41 Installation isntructions 2022-10-03 12:52:07 -05:00
Jeff Boruszak a637702413
Apply suggestions from code review 2022-10-03 11:38:43 -05:00
Jeff Boruszak fe82906dfb
Update website/content/docs/connect/cluster-peering/index.mdx 2022-10-03 11:36:48 -05:00
Luke Kysow e30f4c3a8a
Update tech-specs.mdx (#14840) 2022-10-03 09:21:42 -07:00
Jeff Boruszak 2dde03f0a3
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 57bf426dec Removed external server constraint 2022-10-03 11:15:12 -05:00
boruszak 7fab79569c proxy default behavior constraint 2022-10-03 11:14:34 -05:00
Jeff Boruszak 60eef6a22d
Apply suggestions from code review
Co-authored-by: Riddhi Shah <riddhi@hashicorp.com>
2022-10-03 10:58:43 -05:00
Jeff Boruszak 319758864e
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 52a28d51c5 applied feedback from review 2022-10-01 13:09:36 -07:00
boruszak 9e9e31be65 Dynamic routing clarifications 2022-09-30 15:32:43 -05:00
David Yu 1caafc1f5b
updated 0.49.x helm docs (#14824) 2022-09-30 12:17:16 -07:00
boruszak b5902ee459 service-resolver alignment 2022-09-30 14:00:55 -05:00
Jeff Boruszak 167b935bc4
Apply suggestions from code review
Co-authored-by: Eric Haberkorn <erichaberkorn@gmail.com>
2022-09-30 14:00:37 -05:00
Curt Bushko f00aa7b045
Add OpenShift CNI to list of install options for kubernetes (#14793) 2022-09-30 11:52:15 -07:00
David Yu dc3d2d00dc
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 0884e08304
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 a045c46aca
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 c560999df5
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 c850a1d028
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 913a5a9d24
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 d89968bd23 added missing links per davids advice 2022-09-30 11:29:14 -04:00
nrichu-hcp aada2d73dc
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 d5a56b92b8
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 5397d05240
Update website/content/docs/connect/proxies/envoy.mdx 2022-09-30 10:01:43 -05:00
Jeff Boruszak 2ac74f3404
Update website/content/docs/connect/proxies/envoy.mdx 2022-09-30 09:59:21 -05:00
Jeff Boruszak 872c9193e5
Update website/content/docs/connect/proxies/envoy.mdx 2022-09-30 09:58:03 -05:00
Jeff Boruszak c1629d6bfd
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 ea37704518 Codeblock Added 2022-09-30 09:51:58 -05:00
Jeff Boruszak cfbeccad6f
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 b0f6d2feb0
Merge pull request #14783 from hashicorp/bear359-patch-1
Bear359 patch 1
2022-09-29 16:50:09 -06:00
nrichu-hcp fecae65418 finalized 0.49 release notes 2022-09-29 17:12:12 -04:00
boruszak d93b1d71ff Page location/nav edits 2022-09-29 14:52:31 -05:00
boruszak 9b3b24fada Fixes 2022-09-29 14:48:09 -05:00
Eric Haberkorn 5fd1e6daea
Add exported services event to cluster peering replication. (#14797) 2022-09-29 15:37:19 -04:00
trujillo-adam ae7a8c0a99
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 a754386fe5
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 85051cee19 applied additional feedback from review 2022-09-29 11:13:19 -07:00
nrichu-hcp 1c98e9f69c draft release notes 2022-09-29 13:58:43 -04:00
Adam Rowan ebd0e47655
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 a659d8c43c
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 e3e514b7d7
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 f81db0e3a5
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 fde9f12941
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 b5b5790569
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 b6e1839de6
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 c2a5e8584d
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 f41971f679
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 89b2459d18 applied feedback from review 2022-09-28 20:29:05 -07:00
boruszak 5b1c233fab Typo fix 2022-09-28 16:19:24 -05:00
boruszak e8549ee314 Typo fix 2022-09-28 16:10:36 -05:00
boruszak 0561241104 Typo fix 2022-09-28 16:09:23 -05:00
boruszak 70f71ec3ff Fixes 2022-09-28 16:03:32 -05:00
boruszak 7deb8cc29f Traffic Management 2022-09-28 15:52:03 -05:00
boruszak 12df7d2c8e k8s page updates 2022-09-28 15:42:21 -05:00
boruszak 9c2e7df3b4 Tab groupings 2022-09-28 14:13:38 -05:00
boruszak 156b4d924a Kyle Rarey - requested constraints added 2022-09-28 14:00:21 -05:00
boruszak 576effccb1 Mike Morris clean up requests 2022-09-28 13:57:04 -05:00
cskh 4ece020bf1
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 099f29387b
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 c03be32ebb
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 afe1422281 CLI reference page relocation 2022-09-28 11:03:30 -05:00
trujillo-adam 4cb82b9d7d missed unsaved changes 2022-09-27 20:01:57 -07:00
trujillo-adam f5cea5fd1c added docs for invoking services from lambda functions 2022-09-27 20:00:51 -07:00
boruszak ce3762c458 Fixes 2022-09-27 15:42:05 -05:00
boruszak a00228ff97 Bootstrap Consul on Windows VMs instructions 2022-09-27 15:16:39 -05:00
Luke Kysow b5e3bfdc05
Make defaulting behaviour of connect.enabled clear (#14768) 2022-09-27 13:04:59 -07:00
Luke Kysow a858e64d62
Update k8s.mdx (#14765) 2022-09-27 09:51:12 -07:00
boruszak 42360df5d4 Minor fixes 2022-09-27 11:27:11 -05:00
Jared Kirschner 7659f6f397
docs: clarify license behavior on restart 2022-09-27 12:24:56 -04:00
boruszak 8092f3d273 k8s installation pages updates 2022-09-27 11:17:17 -05:00
boruszak 545a1b72fd consul-dataplane command + main Dataplane pages 2022-09-27 10:25:25 -05:00
David Yu f289526a63
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 2367e6ffbe
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 3c482bdfeb refresh of the Consul architecture overview page 2022-09-26 11:21:08 -07:00
Derek Menteer d9e42b0f1c
Add envoy connection balancing. (#14616)
Add envoy connection balancing config.
2022-09-26 11:29:06 -05:00
boruszak 0d305cdd09 /docs/dynamic-app-config/ 2022-09-23 16:31:00 -05:00
boruszak d940df095b /docs/lambda/ 2022-09-23 16:29:28 -05:00
boruszak 285eaa61e3 /docs/ecs/manual/ 2022-09-23 16:23:47 -05:00
boruszak 739c836adb /docs/ecs/terraform/ 2022-09-23 16:21:03 -05:00
boruszak 6aee39e87d /docs/ecs/ 2022-09-23 16:16:35 -05:00
boruszak 88ae6487b3 /docs/k8s/deployment-configuration/ 2022-09-23 16:11:23 -05:00
boruszak aacfc13996 /docs/k8s/deployment-configurations/multi-cluster/ 2022-09-23 16:08:05 -05:00
boruszak 85a76cbab5 /docs/security/acl/auth-methods 2022-09-23 16:04:00 -05:00