Commit Graph

1797 Commits

Author SHA1 Message Date
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
Kyle Schochenmaier fc16f7ab6a
update helm docs for sync catalog and vault (#14733) 2022-09-23 10:16:05 -07:00
trujillo-adam b7fe014cbf fixed typos in CAPIgw usage docs 2022-09-23 09:23:21 -07:00
Roman Kunin a0b1806ba2
Fix MD markup (#14702) 2022-09-22 20:00:09 -07:00
Roman Kunin 4c95e16815
Fix md markup 2022-09-22 16:41:52 +10:00
Jared Kirschner b267d09e11
Merge pull request #14571 from hashicorp/docs/fox-peering-metrics-labels-table
docs: fix peering metrics labels table
2022-09-21 08:37:19 -04:00
Jared Kirschner 37d2d41e65 docs: address review feedback 2022-09-20 14:43:17 -07:00
Jared Kirschner e75f35533b docs: fix peering metrics labels table 2022-09-19 19:10:35 -07:00
Jared Kirschner 90aab0b3bb docs: all enterprise locality labels now optional 2022-09-19 15:00:22 -07:00
cskh 1d7c82c017
doc(peering): missing network requirement for peering and the partiti… (#14677)
* doc(peering): missing network requirement for peering and the partition parameter in the list API

* Delete API: move partition from path parameter to query parameter
2022-09-19 16:11:04 -04:00
alex 6a70477aec
add health metric docs (#14382) 2022-09-19 10:33:24 -04:00
boruszak b4cc55d766 Clean up 2022-09-16 11:15:55 -05:00
boruszak f797d128c7 Spacing and title fixes 2022-09-16 10:28:32 -05:00
boruszak 0e042654dc Merge 'main' into docs/search-metadata-headers 2022-09-15 15:34:36 -05:00
Jeff Boruszak 57d410a717
Merge pull request #14621 from hashicorp/docs/search-desc-batch05
docs: Search Metadata Batch 05
2022-09-15 14:33:59 -05:00
Jeff Boruszak 7c2b8e4f5b
Apply suggestions from code review
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
2022-09-15 14:33:39 -05:00
Jeff Boruszak bd39e1b25c
Merge pull request #14596 from hashicorp/docs/search-desc-batch04
docs: Search Metadata Batch 04
2022-09-15 14:30:09 -05:00
Jeff Boruszak 72e53c7698
Apply suggestions from code review
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
2022-09-15 14:29:34 -05:00
Jeff Boruszak 78c53efc25
Merge pull request #14593 from hashicorp/docs/search-desc-batch03
docs: Search Metadata Batch 03
2022-09-15 13:59:18 -05:00
Jeff Boruszak 2b171fc893
Apply suggestions from code review
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
2022-09-15 13:58:47 -05:00
Jeff Boruszak 21621f314c
Merge pull request #14589 from hashicorp/docs/search-desc-batch02
docs: Search Metadata Batch 02
2022-09-15 12:11:49 -05:00
Jeff Boruszak 0dba086cdb
Apply suggestions from code review
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
2022-09-15 12:10:20 -05:00
Gabriel Santos e53af28bd7
Middleware: `RequestRecorder` reports calls below 1ms as decimal value (#12905)
* Typos

* Test failing

* Convert values <1ms to decimal

* Fix test

* Update docs and test error msg

* Applied suggested changes to test case

* Changelog file and suggested changes

* Update .changelog/12905.txt

Co-authored-by: Chris S. Kim <kisunji92@gmail.com>

* suggested change - start duration with microseconds instead of nanoseconds

* fix error

* suggested change - floats

Co-authored-by: alex <8968914+acpana@users.noreply.github.com>
Co-authored-by: Chris S. Kim <kisunji92@gmail.com>
2022-09-15 13:04:37 -04:00
Blake Covarrubias 25cfe31507
docs: Fix spelling errors on website (#14634) 2022-09-15 09:03:12 -07:00
Jeff Boruszak 2a86195f22
Apply suggestions from code review
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
2022-09-15 10:32:23 -05:00
Jeff Boruszak a208928c2f
Update website/content/docs/enterprise/admin-partitions.mdx 2022-09-15 09:46:06 -05:00
David Yu 6d9df7aedb
docs: add nginx ingress controller example (#14615)
Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
2022-09-14 19:43:01 -07:00
Bryce Kalow 605b850b1f
docs: update /install -> /downloads (#14631) 2022-09-14 18:34:25 -05:00
trujillo-adam 6f21f5f799
Merge branch 'main' into docs/what-is-consul-devdot-update 2022-09-14 15:57:04 -07:00
boruszak 46499d2ca7 /docs/k8s/connect/observability 2022-09-14 17:49:29 -05:00
boruszak beee474916 /docs/k8s/connect 2022-09-14 17:48:49 -05:00
Bryce Kalow 85c1a33c42
website: content updates for developer (#14419)
Co-authored-by: Ashlee Boyer <ashlee.boyer@hashicorp.com>
Co-authored-by: Ashlee M Boyer <43934258+ashleemboyer@users.noreply.github.com>
Co-authored-by: Tu Nguyen <im2nguyen@gmail.com>
Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
Co-authored-by: HashiBot <62622282+hashibot-web@users.noreply.github.com>
Co-authored-by: Kevin Wang <kwangsan@gmail.com>
2022-09-14 17:45:42 -05:00
boruszak 906ebb9769 /docs/k8s/installation + /installation/platforms 2022-09-14 17:44:13 -05:00
trujillo-adam 77ea91458a applied feedback from review 2022-09-14 15:42:19 -07:00
boruszak acfbda94e7 /docs/k8s/operations 2022-09-14 17:29:21 -05:00
boruszak 0de4184b95 /docs/k8s 2022-09-14 17:26:14 -05:00
boruszak e339379291 /docs/k8s/upgrades 2022-09-14 17:21:47 -05:00
boruszak 2a70eef7c8 /docs/k8s/crds 2022-09-14 17:20:05 -05:00
Derek Menteer 2721fc9a6e
Improve grpc_tls wording in docs. (#14608)
Improve grpc_tls wording in docs.

Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
2022-09-14 15:25:39 -05:00
Evan Culver d0416f593c
connect: Bump latest Envoy to 1.23.1 in test matrix (#14573) 2022-09-14 13:20:16 -07:00
trujillo-adam 9a3c7816a1 updated meta desc for consistency 2022-09-14 13:07:16 -07:00
trujillo-adam a2f6c97796 update to main what is consul page 2022-09-13 16:00:44 -07:00
trujillo-adam b80b91d516 minor updates to dup docs landing page 2022-09-13 15:21:25 -07:00
DanStough 0150e88200 feat: add PeerThroughMeshGateways to mesh config 2022-09-13 17:19:54 -04:00
boruszak 2b69d809ce /docs/connect/config-entries 2022-09-13 16:04:13 -05:00
boruszak 38fd65bb2c /docs/connect/proxies 2022-09-13 15:58:57 -05:00
boruszak ebcb557ebf /docs/connect/gateways/mesh-gateways 2022-09-13 15:55:24 -05:00
boruszak f60da88228 /docs/connect/gateways 2022-09-13 15:52:02 -05:00
boruszak 76f044d7a3 /connect/cluster-peering 2022-09-13 15:50:15 -05:00
boruszak 653cfb431d /docs/connect 2022-09-13 15:48:39 -05:00
boruszak 2b122dd262 /docs/connect/observability 2022-09-13 15:34:10 -05:00
boruszak b79fb73468 /docs/connect/ca 2022-09-13 15:30:45 -05:00
boruszak df9702f9d1 /docs/connect/l7-traffic 2022-09-13 15:26:51 -05:00
boruszak 4b6fef4c97 /docs/connect/native 2022-09-13 15:24:43 -05:00
boruszak f76983f1fb /docs/connect/registration 2022-09-13 15:22:38 -05:00
boruszak 9c5de92d9f /docs/concepts 2022-09-13 15:00:43 -05:00
boruszak a95a7ec40f /docs/architecture 2022-09-13 14:58:34 -05:00
boruszak 76c064d1fd /docs/internals 2022-09-13 14:55:30 -05:00
boruszak f91f01c891 /docs/agent 2022-09-13 14:45:42 -05:00
boruszak add1b0a61c /docs/agent/config 2022-09-13 14:41:42 -05:00
boruszak 977ac69f1d /docs/discovery 2022-09-13 14:38:47 -05:00
boruszak 8d742d5fe7 /docs/integrate 2022-09-13 14:36:17 -05:00
boruszak 6c0f27f427 /docs/security/acl 2022-09-13 14:32:13 -05:00
boruszak 8a58aab610 /docs/security 2022-09-13 14:27:16 -05:00
boruszak dd8907c137 /docs/security/security-models 2022-09-13 14:26:07 -05:00
cskh f22685b969
Config-entry: Support proxy config in service-defaults (#14395)
* Config-entry: Support proxy config in service-defaults

* Update website/content/docs/connect/config-entries/service-defaults.mdx

Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
2022-09-12 10:41:58 -04:00
Eric Haberkorn 45a5f28a60
Update the service resolver documentation to include cluster peering failover and redirects (#14513)
Update the service resolver documentation to include cluster peering failover and redirects
2022-09-09 16:57:23 -04:00
Kyle Schochenmaier 208dd1452a
[docs] use values.yaml instead of config.yaml everywhere for helm configurations (#14554)
* use values.yaml instead of config.yaml everywhere for helm values
* update docs
2022-09-09 13:56:33 -07:00
boruszak 8d181dacd6 /docs/enterprise/license 2022-09-09 14:57:15 -05:00
boruszak eba36ba9b9 /docs/enterprise 2022-09-09 13:46:33 -05:00
boruszak a6cd059335 /docs/intro 2022-09-09 13:35:24 -05:00
boruszak 18e18440ed /docs/troubleshoot 2022-09-09 13:32:41 -05:00
boruszak e3f6a3a060 /docs/install/index.mdx 2022-09-09 13:30:04 -05:00
boruszak 7d09a93824 /docs/install pages 2022-09-09 13:27:35 -05:00
Kyle Schochenmaier 6e046315c6
[docs] update CNI docs to indicate how the CNI plugin is installed (#14546)
* update CNI docs to indicate that the CNI plugin is installed through the helm chart
Co-authored-by: Tu Nguyen <im2nguyen@users.noreply.github.com>
Co-authored-by: Paul Banks <banks@banksco.de>
2022-09-09 12:28:15 -05:00
Krastin Krastev b0218ea35b
docs: fix helm stanza in admin-partitions (#14523) 2022-09-09 09:58:53 -07:00
Dan Upton 1c2c975b0b
xDS Load Balancing (#14397)
Prior to #13244, connect proxies and gateways could only be configured by an
xDS session served by the local client agent.

In an upcoming release, it will be possible to deploy a Consul service mesh
without client agents. In this model, xDS sessions will be handled by the
servers themselves, which necessitates load-balancing to prevent a single
server from receiving a disproportionate amount of load and becoming
overwhelmed.

This introduces a simple form of load-balancing where Consul will attempt to
achieve an even spread of load (xDS sessions) between all healthy servers.
It does so by implementing a concurrent session limiter (limiter.SessionLimiter)
and adjusting the limit according to autopilot state and proxy service
registrations in the catalog.

If a server is already over capacity (i.e. the session limit is lowered),
Consul will begin draining sessions to rebalance the load. This will result
in the client receiving a `RESOURCE_EXHAUSTED` status code. It is the client's
responsibility to observe this response and reconnect to a different server.

Users of the gRPC client connection brokered by the
consul-server-connection-manager library will get this for free.

The rate at which Consul will drain sessions to rebalance load is scaled
dynamically based on the number of proxies in the catalog.
2022-09-09 15:02:01 +01:00
Jeff Apple deda99a387
Merge pull request #14534 from hashicorp/docs/capigw-tech-spec-update
Docs: add limitations to Tech Specs
2022-09-08 14:47:39 -07:00
Jeff Apple 776c98d109
Update website/content/docs/api-gateway/tech-specs.mdx 2022-09-08 14:41:06 -07:00
Nathan Coleman f0e8d44c80
Update website/content/docs/api-gateway/tech-specs.mdx 2022-09-08 15:56:28 -04:00
Jeff Apple 86754cfe5a
Update website/content/docs/api-gateway/tech-specs.mdx
Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
2022-09-08 12:55:15 -07:00
Jeff Apple 402ddd6dcd
Update website/content/docs/api-gateway/tech-specs.mdx
Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
2022-09-08 12:54:02 -07:00
Derek Menteer f7c884f0af Merge branch 'main' of github.com:hashicorp/consul into derekm/split-grpc-ports 2022-09-08 14:53:08 -05:00
Jeff Apple a1eb38213a
Update website/content/docs/api-gateway/tech-specs.mdx
Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
2022-09-08 12:51:44 -07:00
Jeff Apple 16f5d7c381
Docs: add limitations to Tech Specs 2022-09-08 11:38:27 -07:00
trujillo-adam 2ef4d2f4d9
Merge branch 'main' into nia/docs-0.7.0 2022-09-08 10:03:57 -07:00
trujillo-adam fc04fb1b51 updated HA configuration ref 2022-09-07 14:13:39 -07:00
trujillo-adam 7ced09c8aa
Apply suggestions from code review
Co-authored-by: Michael Wilkerson <62034708+wilkermichael@users.noreply.github.com>
2022-09-07 14:00:56 -07:00
trujillo-adam d974e1903c
Apply suggestions from code review
Co-authored-by: Michael Wilkerson <62034708+wilkermichael@users.noreply.github.com>
2022-09-07 12:53:58 -07:00
Krastin Krastev 0abb923d66
docs: licensing improvements (#14488)
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
2022-09-06 18:39:07 -07:00
David Yu 7d580b3857
docs: small typos in single dc k8s clusters (#14484)
* docs: small typos in single dc k8s clusters

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
2022-09-06 16:55:09 -07:00
trujillo-adam 87e4a66c0d fixed bad links in status/cluster endpoint ref 2022-09-06 16:13:28 -07:00
trujillo-adam 120e8b43ec applied AJs feedback and made a few additional improvements 2022-09-06 16:00:09 -07:00
trujillo-adam 321044312f udpated how to ID the leader in the usage docs 2022-09-06 12:09:03 -07:00
trujillo-adam 47f3a00969 added no-HA API status error message to EMs page 2022-09-06 11:59:21 -07:00
trujillo-adam c76116fec2 added cluster endpoint to status API docs 2022-09-06 11:55:07 -07:00
Derek Menteer bf769daae4 Merge branch 'main' of github.com:hashicorp/consul into derekm/split-grpc-ports 2022-09-06 10:51:04 -05:00
Tu Nguyen 110139a4df revert links to learn 2022-09-06 08:35:01 -07:00
David Yu 97606d94a3
docs: Update single dc multiple k8s clusters doc (#14476)
Co-authored-by: Jona Apelbaum <jona@hashicorp.com>
2022-09-02 15:34:15 -07:00
Kyle Schochenmaier 25d272a67a
update helm docs for release 0.48.0 (#14459) 2022-09-01 17:21:27 -07:00
trujillo-adam 61291ef9c5
Docs cni plugin (#14009)
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
2022-09-01 16:22:11 -07:00
David Yu 16e8179a9a
docs: Consul K8s 0.48.0 release notes (#14414)
Co-authored-by: Thomas Eckert <teckert@hashicorp.com>
2022-09-01 16:21:36 -07:00
DanStough e617e7df3e feat(cli): add initial peering cli commands 2022-09-01 17:20:13 -04:00
Kyle Schochenmaier c02b841a3f
[docs] update docs for kube-1.24 support (#14339)
* update docs for kube-1.24 support.
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
2022-09-01 13:33:37 -05:00
David Yu e36650c49c
docs: minor changes to cluster peering k8s docs and typos (#14442)
* docs: minor changes to cluster peering k8s docs and typos
2022-09-01 10:10:32 -07:00
malizz b3ac8f48ca
Add additional parameters to envoy passive health check config (#14238)
* draft commit

* add changelog, update test

* remove extra param

* fix test

* update type to account for nil value

* add test for custom passive health check

* update comments and tests

* update description in docs

* fix missing commas
2022-09-01 09:59:11 -07:00
Chris S. Kim e62f830fa8
Merge pull request #13998 from jorgemarey/f-new-tracing-envoy
Add new envoy tracing configuration
2022-09-01 08:57:23 -04:00
Jorge Marey f476a80aa9 Fix typo on documentation 2022-08-31 23:14:25 +02:00
Tu Nguyen c94f8c26c2
Merge branch 'main' into dev-portal 2022-08-31 11:21:14 -07:00
Jared Kirschner a88ca9518d
docs: node lookups don't support filtering on tag 2022-08-31 13:58:23 -04:00
Chris S. Kim e12a13d277 Fix code example 2022-08-31 12:11:15 -04:00
Thomas Kula 436bc8f3e3 Typo fix in service-splitter.mdx 2022-08-30 17:51:17 -07:00
David Yu 9e726e7691
docs: re-organize service and node lookups for Consul Enterprise (#14389)
* docs: re-organize service and node lookups for Consul Enterprise

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>
2022-08-30 15:17:35 -07:00
Josh Roose 7345432c3b
events compiled to JSON sentence structure (#13717) 2022-08-30 09:53:18 -07:00
Jorge Marey 3f3bb8831e Fix typos. Add test. Add documentation 2022-08-30 16:59:02 +02:00
Tu Nguyen 8e76d38db9
Apply suggestions from code review 2022-08-29 15:33:22 -07:00
Max Bowsher decc9231ee Merge branch 'main' into fix-kv_entries-metric 2022-08-29 22:22:10 +01:00
David Yu e6b63221eb
docs: Cluster peering with Transparent Proxy updates (#14369)
* Update Cluster Peering docs to show example with Transparent Proxy 
Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
2022-08-29 13:07:08 -07:00
Derek Menteer ce99ccd390 Add documentation and changelog entry. 2022-08-29 13:43:49 -05:00
David Yu daa30a03c3
docs: Update Consul K8s release notes (#14379) 2022-08-29 11:34:39 -07:00
Tu Nguyen 04d66e78c3 Merge branch 'dev-portal' into replace-references-to-learn 2022-08-28 19:34:45 -07:00
Tu Nguyen f06348c73e fix merge conflicts 2022-08-28 19:33:37 -07:00
Tu Nguyen 5e86650306
Merge pull request #14355 from hashicorp/consul-docs-ia-reshuffle 2022-08-28 14:31:23 -07:00
trujillo-adam 211b593a54
Update website/content/docs/nia/usage/run-ha.mdx 2022-08-26 15:48:55 -07:00
trujillo-adam 2fe7c588cd
Merge branch 'main' into nia/docs-0.7.0 2022-08-26 15:41:33 -07:00
trujillo-adam dda670044e final content tweaks for CTS 0.7 docs 2022-08-26 14:46:13 -07:00
trujillo-adam d5145629c3
Apply suggestions from code review
Co-authored-by: lornasong <lornasong@users.noreply.github.com>
2022-08-26 14:28:20 -07:00
David Yu b1ba0a89bc
docs: Release notes for Consul 1.12, 1.13 and Consul K8s 0.47.0 (#14352)
* consul 1.12, consul 1.13, and consul-k8s release notes

Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
2022-08-26 13:37:41 -07:00
trujillo-adam 8593e712c1
Apply suggestions from code review
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
Co-authored-by: Michael Wilkerson <62034708+wilkermichael@users.noreply.github.com>
2022-08-26 12:20:29 -07:00
trujillo-adam 134f996df0
Apply suggestions from code review
Co-authored-by: Michael Wilkerson <62034708+wilkermichael@users.noreply.github.com>
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
2022-08-26 12:18:28 -07:00
trujillo-adam 56470630fb
Apply suggestions from code review
Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
2022-08-26 11:58:19 -07:00
Thomas Eckert e64a28516d
Merge pull request #14347 from hashicorp/update-terminating-gateway-docs
Update Kubernetes Terminating Gateway Docs
2022-08-26 12:52:09 -04:00
smamindla57 eb0c5bb9a1
Updated consul monitoring with Newrelic APM (#14360)
* added newrelic consul quickstart link
* adding HCP Consul

Co-authored-by: David Yu <dyu@hashicorp.com>
2022-08-26 09:13:46 -07:00
trujillo-adam c56afd4913 replaced HA diagrams with SVG files 2022-08-26 08:38:51 -07:00
Tu Nguyen e00e0666ca Replace references to Learn 2022-08-25 23:05:08 -07:00
Tu Nguyen 6dcc2a2110 Update Learn links in prep for devdot 2022-08-25 22:49:29 -07:00
trujillo-adam 8405908bca updated the compatibility table for 0.7 2022-08-25 19:36:54 -07:00
trujillo-adam 7ab3a3052a add HA to configuration reference, updated other configuration params 2022-08-25 19:34:22 -07:00
trujillo-adam da0bbd80e8 added ha information to the API endpoints docs 2022-08-25 17:59:49 -07:00