Commit graph

10109 commits

Author SHA1 Message Date
Lucas Manuel Rodriguez
d2015d1a36
Remotely configure fleetd update channels (#15848)
#13825

- [X] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [x] Added/updated tests
- [X] Manual QA for all new/changed functionality
  - For Orbit and Fleet Desktop changes:
- [X] Manual QA must be performed in the three main OSs, macOS, Windows
and Linux.
- [X] Auto-update manual QA, from released version of component to new
version (see [tools/tuf/test](../tools/tuf/test/README.md)).

---------

Co-authored-by: Victor Lyuboslavsky <victor.lyuboslavsky@gmail.com>
2024-01-02 17:59:40 -03:00
Lucas Manuel Rodriguez
38b8c9cc58
Move external dependency goose to monorepo (#15859)
#15555

Probably the best way to review this is commit by commit:
- First commit does the actual moving.
- Second commit fixes golangci-lint issues (in the least effort way to
avoid refactoring or rearrangement of some of the code).
- Third commit moves a printf to before the migration step is executed.
In the past some customers hitting migration issues (like migration
steps hanging or taking long to execute) and wanted to know which one
was it. The only way to know was to look at the repository and looking
for the next migration after the last one logged.

Checks:
- [X] Manual QA for all new/changed functionality

Manual tests:
- `make fleet && make db-reset`.
- Adding a new migration via `make migration name=Foobar` and then
running `./build/fleet prepare db`.
- Enrolling a new device to Fleet (smoke test).
2024-01-02 17:52:00 -03:00
Sarah Gillespie
583d31b721
Update fleetd for macOS hosts to look for custom end user email field in Fleet MDM enrollment profile (#15761)
Issue #15057 (macOS flow)

Manual QA: 
1. Download a manual enrollment profile for a macOS device from the "My
device" page (click on "Turn on MDM" banner).
2. Open the profile in a text editor and find the following plist entry:
```xml
<key>PayloadIdentifier</key>
<string>com.fleetdm.fleet.mdm.apple.mdm</string>
```
3. Below that entry add a new entry as follows:
```xml
<key>EndUserEmail</key>
<string>user@example.com</string>
```
4. Save the file, then double-click in Finder to activate the MDM
enrollment notification.
5. Run orbit from source:
```sh
go run github.com/fleetdm/fleet/v4/orbit/cmd/orbit \  
    --dev-mode \
    --disable-updates \
    --root-dir /tmp/orbit \
    --fleet-url https://localhost:8080 \
    --insecure \
    --enroll-secret <YOUR ENROLL SECRET GOES HERE> \
    -- --verbose
```
6. Look for the following log entries in the terminal where you are
running orbit:
<img width="679" alt="Screenshot 2023-12-21 at 3 03 03 PM"
src="https://github.com/fleetdm/fleet/assets/73313222/cefc77e3-e209-49b3-a03e-abff0f7f982b">


7. In the UI, navigate to the host details page and check "Used by" in
the "About" section:
<img width="679" alt="Screenshot 2023-12-21 at 3 02 09 PM"
src="https://github.com/fleetdm/fleet/assets/73313222/c58fff3e-cee7-4a94-a53b-f30f5b4bcfa0">


# Checklist for submitter
- [x] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
- [x] Added/updated tests
- [x] Manual QA for all new/changed functionality
  - For Orbit and Fleet Desktop changes:
- [ ] Manual QA must be performed in the three main OSs, macOS, Windows
and Linux.
- [ ] Auto-update manual QA, from released version of component to new
version (see [tools/tuf/test](../tools/tuf/test/README.md)).

---------

Co-authored-by: Martin Angers <martin.n.angers@gmail.com>
2024-01-02 17:45:11 -03:00
Victor Lyuboslavsky
cde104dbd2
On Software page, CVE tooltip no longer has bullets. (#15856)
On Software page, CVE tooltip no longer has bullets.
#15724 

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

<!-- Note that API documentation changes are now addressed by the
product design team. -->

- [x] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [x] Manual QA for all new/changed functionality
2024-01-02 14:04:34 -06:00
Victor Lyuboslavsky
8c9feedc98
API change: add host_count_updated_at to policies (#15765)
API Change for #15323
2024-01-02 13:41:54 -06:00
Sam Pfluger
946eef0da2
Update ceo.md (#15870)
Fix outdated link in "All hands" publish recording template
2024-01-02 13:09:18 -06:00
Eric
0df9f1fcbd
Website: Update MDM landpage's page script (#15869)
Closes: #15868

Changes:
- Updated the device management page script to not reset form validation
rules when the modal is closed.
2024-01-02 11:58:18 -06:00
dependabot[bot]
736ea4b1e3
Bump github.com/go-git/go-git/v5 from 5.4.2 to 5.11.0 in /infrastructure/sandbox/PreProvisioner/lambda (#15842)
Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git)
from 5.4.2 to 5.11.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/go-git/go-git/releases">github.com/go-git/go-git/v5's
releases</a>.</em></p>
<blockquote>
<h2>v5.11.0</h2>
<h2>What's Changed</h2>
<ul>
<li>git: validate reference names (<a
href="https://redirect.github.com/go-git/go-git/issues/929">#929</a>) by
<a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/950">go-git/go-git#950</a></li>
<li>git: stop iterating at oldest shallow when pulling. Fixes <a
href="https://redirect.github.com/go-git/go-git/issues/305">#305</a> by
<a href="https://github.com/dhoizner"><code>@​dhoizner</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/939">go-git/go-git#939</a></li>
<li>plumbing: object, enable renames in getFileStatsFromFilePatches by
<a href="https://github.com/djmoch"><code>@​djmoch</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/941">go-git/go-git#941</a></li>
<li>storage: filesystem, Add option to set a specific FS for alternates
by <a href="https://github.com/pjbgf"><code>@​pjbgf</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/953">go-git/go-git#953</a></li>
<li>Align worktree validation with upstream and remove build warnings by
<a href="https://github.com/pjbgf"><code>@​pjbgf</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/958">go-git/go-git#958</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/dhoizner"><code>@​dhoizner</code></a>
made their first contribution in <a
href="https://redirect.github.com/go-git/go-git/pull/939">go-git/go-git#939</a></li>
<li><a href="https://github.com/djmoch"><code>@​djmoch</code></a> made
their first contribution in <a
href="https://redirect.github.com/go-git/go-git/pull/941">go-git/go-git#941</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/go-git/go-git/compare/v5.10.1...v5.11.0">https://github.com/go-git/go-git/compare/v5.10.1...v5.11.0</a></p>
<h2>v5.10.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Worktree, ignore ModeSocket files by <a
href="https://github.com/steiler"><code>@​steiler</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/930">go-git/go-git#930</a></li>
<li>git: add tracer package by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/916">go-git/go-git#916</a></li>
<li>remote: Flip clause for fast-forward only check by <a
href="https://github.com/adityasaky"><code>@​adityasaky</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/875">go-git/go-git#875</a></li>
<li>plumbing: transport/ssh, Fix nil pointer dereference caused when an
unreachable proxy server is set. Fixes <a
href="https://redirect.github.com/go-git/go-git/issues/900">#900</a> by
<a href="https://github.com/anandf"><code>@​anandf</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/901">go-git/go-git#901</a></li>
<li>plumbing: uppload-server-info, implement upload-server-info by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/896">go-git/go-git#896</a></li>
<li>plumbing: optimise memory consumption for filesystem storage by <a
href="https://github.com/pjbgf"><code>@​pjbgf</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/799">go-git/go-git#799</a></li>
<li>plumbing: format/packfile, Refactor patch delta by <a
href="https://github.com/pjbgf"><code>@​pjbgf</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/908">go-git/go-git#908</a></li>
<li>plumbing: fix empty uploadpack request error by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/932">go-git/go-git#932</a></li>
<li>plumbing: transport/git, Improve tests error message by <a
href="https://github.com/pjbgf"><code>@​pjbgf</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/752">go-git/go-git#752</a></li>
<li>plumbing: format/pktline, Respect pktline error-line errors by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/936">go-git/go-git#936</a></li>
<li>utils: remove ioutil.Pipe and use std library io.Pipe by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/922">go-git/go-git#922</a></li>
<li>utils: move trace to utils by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/931">go-git/go-git#931</a></li>
<li>cli: separate go module for cli by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/914">go-git/go-git#914</a></li>
<li>build: bump github.com/google/go-cmp from 0.5.9 to 0.6.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/887">go-git/go-git#887</a></li>
<li>build: bump actions/setup-go from 3 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/891">go-git/go-git#891</a></li>
<li>build: bump github.com/skeema/knownhosts from 1.2.0 to 1.2.1 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/888">go-git/go-git#888</a></li>
<li>build: bump actions/checkout from 3 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/890">go-git/go-git#890</a></li>
<li>build: bump golang.org/x/sys from 0.13.0 to 0.14.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/907">go-git/go-git#907</a></li>
<li>build: bump golang.org/x/text from 0.13.0 to 0.14.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/906">go-git/go-git#906</a></li>
<li>build: bump golang.org/x/crypto from 0.14.0 to 0.15.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/917">go-git/go-git#917</a></li>
<li>build: bump golang.org/x/net from 0.17.0 to 0.18.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/918">go-git/go-git#918</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/anandf"><code>@​anandf</code></a> made
their first contribution in <a
href="https://redirect.github.com/go-git/go-git/pull/901">go-git/go-git#901</a></li>
<li><a href="https://github.com/steiler"><code>@​steiler</code></a> made
their first contribution in <a
href="https://redirect.github.com/go-git/go-git/pull/930">go-git/go-git#930</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/go-git/go-git/compare/v5.10.0...v5.10.1">https://github.com/go-git/go-git/compare/v5.10.0...v5.10.1</a></p>
<h2>v5.10.0</h2>
<h2>What's Changed</h2>
<ul>
<li>PlainInitOptions.Bare and allow using InitOptions with
PlainInitWithOptions by <a
href="https://github.com/ThinkChaos"><code>@​ThinkChaos</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/782">go-git/go-git#782</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="5d08d3bd94"><code>5d08d3b</code></a>
Merge pull request <a
href="https://redirect.github.com/go-git/go-git/issues/958">#958</a>
from pjbgf/workval</li>
<li><a
href="5bd1d8f4ab"><code>5bd1d8f</code></a>
build: Ensure checkout is the first operation</li>
<li><a
href="b2c1982477"><code>b2c1982</code></a>
git: worktree, Align validation with upstream rules</li>
<li><a
href="cec7da63ca"><code>cec7da6</code></a>
Merge pull request <a
href="https://redirect.github.com/go-git/go-git/issues/953">#953</a>
from pjbgf/alternates</li>
<li><a
href="8b47ceb1aa"><code>8b47ceb</code></a>
storage: filesystem, Add option to set a specific FS for alternates</li>
<li><a
href="4f61489104"><code>4f61489</code></a>
Merge pull request <a
href="https://redirect.github.com/go-git/go-git/issues/941">#941</a>
from djmoch/filestats-rename</li>
<li><a
href="ae552ce0bf"><code>ae552ce</code></a>
Merge pull request <a
href="https://redirect.github.com/go-git/go-git/issues/939">#939</a>
from dhoizner/fix-pull-after-shallow</li>
<li><a
href="cc1895b905"><code>cc1895b</code></a>
Merge pull request <a
href="https://redirect.github.com/go-git/go-git/issues/950">#950</a>
from aymanbagabas/validate-ref</li>
<li><a
href="de1d5a5978"><code>de1d5a5</code></a>
git: validate reference names</li>
<li><a
href="d87110b492"><code>d87110b</code></a>
Merge pull request <a
href="https://redirect.github.com/go-git/go-git/issues/948">#948</a>
from go-git/dependabot/go_modules/cli/go-git/github.c...</li>
<li>Additional commits viewable in <a
href="https://github.com/go-git/go-git/compare/v5.4.2...v5.11.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/go-git/go-git/v5&package-manager=go_modules&previous-version=5.4.2&new-version=5.11.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts page](https://github.com/fleetdm/fleet/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-02 10:44:03 -06:00
Jahziel Villasana-Espinoza
1b9b67aa9c
fix: query host search by email (#15833)
> 📜 Related issue: https://github.com/fleetdm/fleet/issues/15522

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

<!-- Note that API documentation changes are now addressed by the
product design team. -->

- [x] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [x] Input data is properly validated, `SELECT *` is avoided, SQL
injection is prevented (using placeholders for values in statements)
- [x] Added/updated tests
- [x] Manual QA for all new/changed functionality
2024-01-02 09:25:09 -05:00
JD
d6ee2ac121
Article Fleet policies behind the scenes (#15858)
Article: Understanding the intricacies of Fleet policies
https://github.com/fleetdm/confidential/issues/4869

---------

Co-authored-by: Victor Lyuboslavsky <victor.lyuboslavsky@gmail.com>
2023-12-29 11:06:16 -08:00
dependabot[bot]
ac8bcea518
Bump github.com/go-git/go-git/v5 from 5.4.2 to 5.11.0 (#15841)
Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git)
from 5.4.2 to 5.11.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/go-git/go-git/releases">github.com/go-git/go-git/v5's
releases</a>.</em></p>
<blockquote>
<h2>v5.11.0</h2>
<h2>What's Changed</h2>
<ul>
<li>git: validate reference names (<a
href="https://redirect.github.com/go-git/go-git/issues/929">#929</a>) by
<a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/950">go-git/go-git#950</a></li>
<li>git: stop iterating at oldest shallow when pulling. Fixes <a
href="https://redirect.github.com/go-git/go-git/issues/305">#305</a> by
<a href="https://github.com/dhoizner"><code>@​dhoizner</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/939">go-git/go-git#939</a></li>
<li>plumbing: object, enable renames in getFileStatsFromFilePatches by
<a href="https://github.com/djmoch"><code>@​djmoch</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/941">go-git/go-git#941</a></li>
<li>storage: filesystem, Add option to set a specific FS for alternates
by <a href="https://github.com/pjbgf"><code>@​pjbgf</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/953">go-git/go-git#953</a></li>
<li>Align worktree validation with upstream and remove build warnings by
<a href="https://github.com/pjbgf"><code>@​pjbgf</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/958">go-git/go-git#958</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/dhoizner"><code>@​dhoizner</code></a>
made their first contribution in <a
href="https://redirect.github.com/go-git/go-git/pull/939">go-git/go-git#939</a></li>
<li><a href="https://github.com/djmoch"><code>@​djmoch</code></a> made
their first contribution in <a
href="https://redirect.github.com/go-git/go-git/pull/941">go-git/go-git#941</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/go-git/go-git/compare/v5.10.1...v5.11.0">https://github.com/go-git/go-git/compare/v5.10.1...v5.11.0</a></p>
<h2>v5.10.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Worktree, ignore ModeSocket files by <a
href="https://github.com/steiler"><code>@​steiler</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/930">go-git/go-git#930</a></li>
<li>git: add tracer package by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/916">go-git/go-git#916</a></li>
<li>remote: Flip clause for fast-forward only check by <a
href="https://github.com/adityasaky"><code>@​adityasaky</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/875">go-git/go-git#875</a></li>
<li>plumbing: transport/ssh, Fix nil pointer dereference caused when an
unreachable proxy server is set. Fixes <a
href="https://redirect.github.com/go-git/go-git/issues/900">#900</a> by
<a href="https://github.com/anandf"><code>@​anandf</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/901">go-git/go-git#901</a></li>
<li>plumbing: uppload-server-info, implement upload-server-info by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/896">go-git/go-git#896</a></li>
<li>plumbing: optimise memory consumption for filesystem storage by <a
href="https://github.com/pjbgf"><code>@​pjbgf</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/799">go-git/go-git#799</a></li>
<li>plumbing: format/packfile, Refactor patch delta by <a
href="https://github.com/pjbgf"><code>@​pjbgf</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/908">go-git/go-git#908</a></li>
<li>plumbing: fix empty uploadpack request error by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/932">go-git/go-git#932</a></li>
<li>plumbing: transport/git, Improve tests error message by <a
href="https://github.com/pjbgf"><code>@​pjbgf</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/752">go-git/go-git#752</a></li>
<li>plumbing: format/pktline, Respect pktline error-line errors by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/936">go-git/go-git#936</a></li>
<li>utils: remove ioutil.Pipe and use std library io.Pipe by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/922">go-git/go-git#922</a></li>
<li>utils: move trace to utils by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/931">go-git/go-git#931</a></li>
<li>cli: separate go module for cli by <a
href="https://github.com/aymanbagabas"><code>@​aymanbagabas</code></a>
in <a
href="https://redirect.github.com/go-git/go-git/pull/914">go-git/go-git#914</a></li>
<li>build: bump github.com/google/go-cmp from 0.5.9 to 0.6.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/887">go-git/go-git#887</a></li>
<li>build: bump actions/setup-go from 3 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/891">go-git/go-git#891</a></li>
<li>build: bump github.com/skeema/knownhosts from 1.2.0 to 1.2.1 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/888">go-git/go-git#888</a></li>
<li>build: bump actions/checkout from 3 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/890">go-git/go-git#890</a></li>
<li>build: bump golang.org/x/sys from 0.13.0 to 0.14.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/907">go-git/go-git#907</a></li>
<li>build: bump golang.org/x/text from 0.13.0 to 0.14.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/906">go-git/go-git#906</a></li>
<li>build: bump golang.org/x/crypto from 0.14.0 to 0.15.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/917">go-git/go-git#917</a></li>
<li>build: bump golang.org/x/net from 0.17.0 to 0.18.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/918">go-git/go-git#918</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/anandf"><code>@​anandf</code></a> made
their first contribution in <a
href="https://redirect.github.com/go-git/go-git/pull/901">go-git/go-git#901</a></li>
<li><a href="https://github.com/steiler"><code>@​steiler</code></a> made
their first contribution in <a
href="https://redirect.github.com/go-git/go-git/pull/930">go-git/go-git#930</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/go-git/go-git/compare/v5.10.0...v5.10.1">https://github.com/go-git/go-git/compare/v5.10.0...v5.10.1</a></p>
<h2>v5.10.0</h2>
<h2>What's Changed</h2>
<ul>
<li>PlainInitOptions.Bare and allow using InitOptions with
PlainInitWithOptions by <a
href="https://github.com/ThinkChaos"><code>@​ThinkChaos</code></a> in <a
href="https://redirect.github.com/go-git/go-git/pull/782">go-git/go-git#782</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="5d08d3bd94"><code>5d08d3b</code></a>
Merge pull request <a
href="https://redirect.github.com/go-git/go-git/issues/958">#958</a>
from pjbgf/workval</li>
<li><a
href="5bd1d8f4ab"><code>5bd1d8f</code></a>
build: Ensure checkout is the first operation</li>
<li><a
href="b2c1982477"><code>b2c1982</code></a>
git: worktree, Align validation with upstream rules</li>
<li><a
href="cec7da63ca"><code>cec7da6</code></a>
Merge pull request <a
href="https://redirect.github.com/go-git/go-git/issues/953">#953</a>
from pjbgf/alternates</li>
<li><a
href="8b47ceb1aa"><code>8b47ceb</code></a>
storage: filesystem, Add option to set a specific FS for alternates</li>
<li><a
href="4f61489104"><code>4f61489</code></a>
Merge pull request <a
href="https://redirect.github.com/go-git/go-git/issues/941">#941</a>
from djmoch/filestats-rename</li>
<li><a
href="ae552ce0bf"><code>ae552ce</code></a>
Merge pull request <a
href="https://redirect.github.com/go-git/go-git/issues/939">#939</a>
from dhoizner/fix-pull-after-shallow</li>
<li><a
href="cc1895b905"><code>cc1895b</code></a>
Merge pull request <a
href="https://redirect.github.com/go-git/go-git/issues/950">#950</a>
from aymanbagabas/validate-ref</li>
<li><a
href="de1d5a5978"><code>de1d5a5</code></a>
git: validate reference names</li>
<li><a
href="d87110b492"><code>d87110b</code></a>
Merge pull request <a
href="https://redirect.github.com/go-git/go-git/issues/948">#948</a>
from go-git/dependabot/go_modules/cli/go-git/github.c...</li>
<li>Additional commits viewable in <a
href="https://github.com/go-git/go-git/compare/v5.4.2...v5.11.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/go-git/go-git/v5&package-manager=go_modules&previous-version=5.4.2&new-version=5.11.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts page](https://github.com/fleetdm/fleet/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-29 11:38:17 -03:00
Victor Lyuboslavsky
1704eb4014
Fixed missing 'Last restarted' values when filtering hosts by label. (#15852)
Fixed missing 'Last restarted' values when filtering hosts by label.
#15822

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

<!-- Note that API documentation changes are now addressed by the
product design team. -->

- [x] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [x] Added/updated tests
- [x] Manual QA for all new/changed functionality
2023-12-29 08:36:15 -06:00
JD
cde390c46d
Fix article header graphic (#15853)
Replace header graphic.
2023-12-28 14:32:41 -08:00
Joanne Stableford
ba1bc4b609
Add in Fleet IT dogfood responsibilities to BizOps handbook (#15851) 2023-12-28 15:09:52 -06:00
JD
b3134d8891
Article: Fleet and Axonius (#15850)
Article: Fleet & osquery: Unlocking the value of Axonius with
open-source telemetry
https://github.com/fleetdm/confidential/issues/4091

---------

Co-authored-by: Andrew Baker <89049099+DrewBakerfdm@users.noreply.github.com>
2023-12-28 12:40:03 -08:00
Victor Lyuboslavsky
ebf1650671
device_token endpoint improvements (#15849)
Fixed badly formatted error messages in /api/fleet/orbit/device_token
endpoint and others.
In /api/fleet/orbit/device_token:
- Added token validation -- empty token not allowed
- Replaced 500 error with 409 when token conflicts with another host

#15832 

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

<!-- Note that API documentation changes are now addressed by the
product design team. -->

- [x] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [x] Added/updated tests
- [x] Manual QA
2023-12-28 14:20:36 -06:00
Joanne Stableford
02dea5ac9d
Add in converting Fleetie to consultant (#15840)
Also minor consistency fix of converting numbered lists to bulleted
lists so formatting throughout the page is consistent.

---------

Co-authored-by: Sam Pfluger <108141731+Sampfluger88@users.noreply.github.com>
2023-12-28 13:53:55 -06:00
Joanne Stableford
d993f4c829
Add section for updating personnel details (#15844) 2023-12-28 13:23:19 -06:00
Joanne Stableford
61887804aa
Minor typo fixes (#15843) 2023-12-28 12:41:21 -06:00
Victor Lyuboslavsky
6725da2ad0
Added host_count_updated_at to policy API responses. (#15767)
Added `host_count_updated_at` to policy API responses.
#15323 

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

<!-- Note that API documentation changes are now addressed by the
product design team. -->

- [x] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [x] Added/updated tests
- [x] Manual QA for all new/changed functionality
2023-12-27 15:24:27 -06:00
Victor Lyuboslavsky
289eb271a6
Fixing TestQueries/Delete flaky tests. (#15838)
When deleting queries, associated query stats and aggregated stats are
deleted with separate SQL statements. When testing, we need to wait in a
for loop for both of these to be deleted before continuing with the
test.
2023-12-27 15:22:18 -06:00
JD
d4a99f164c
Article how live queries work (#15845)
Article: Live queries under the hood.
2023-12-27 11:47:33 -08:00
Grant Bilstad
41af14bd0e
update .deb install (#15569)
updated command for .deb install, was missing `./`
2023-12-27 11:15:22 -08:00
JD
eb9075026c
Article vuln mgmt for govt agencies (#15839)
Article: Vulnerability management: advantages of Fleet to support
government agencies
2023-12-26 10:55:46 -08:00
Eric
a4fdbdd142
Website: Update categories on pricing page features table (#15835)
Changes:
- Added a new (required) key to pricing-features-table.yml:
`pricingTableCategories` - an array of categories that will be used to
categorize the feature on the pricing page.
- Updated build-static-content to validate pricingTableCategories values
- Updated the pricing page features table to be categorized by the
pricingTableCategories value of features.
- Updated the names of tiers on the pricing features table to match the
cards above the table ("Free" » "Community")
2023-12-22 18:35:16 -06:00
Eric
e0018294d6
Website: update "subscribe" links on articles to copy rss links to users clipboard (#15793)
Closes: https://github.com/fleetdm/fleet/issues/15367

Changes: 
- Updated the "subscribe" button on article pages to copy a link to an
RSS feed for an article category to the user's clipboard.
2023-12-23 06:53:34 +09:00
Dave Herder
26de8a9a02
Update communications.md with slack to github issue (#15828)
Co-authored-by: Sam Pfluger <108141731+Sampfluger88@users.noreply.github.com>
2023-12-22 15:04:01 -06:00
Victor Lyuboslavsky
ce8eb74897
Added gigs_total_disk_space to host endpoint responses. (#15756)
Added `gigs_total_disk_space` to host endpoint responses.
- Now user will know host disk size even when disk is full
(percent_disk_space_available==0)
#15058 

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

<!-- Note that API documentation changes are now addressed by the
product design team. -->

- [x] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [x] Added support on fleet's osquery simulator `cmd/osquery-perf` for
new osquery data ingestion features.
- [x] Added/updated tests
- [x] Manual QA for all new/changed functionality
2023-12-22 12:46:33 -06:00
dependabot[bot]
6806f1b3a2
Bump golang.org/x/crypto from 0.14.0 to 0.17.0 (#15741)
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from
0.14.0 to 0.17.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="9d2ee975ef"><code>9d2ee97</code></a>
ssh: implement strict KEX protocol changes</li>
<li><a
href="4e5a26183e"><code>4e5a261</code></a>
ssh: close net.Conn on all NewServerConn errors</li>
<li><a
href="152cdb1503"><code>152cdb1</code></a>
x509roots/fallback: update bundle</li>
<li><a
href="fdfe1f8531"><code>fdfe1f8</code></a>
ssh: defer channel window adjustment</li>
<li><a
href="b8ffc16e10"><code>b8ffc16</code></a>
blake2b: drop Go 1.6, Go 1.8 compatibility</li>
<li><a
href="7e6fbd82c8"><code>7e6fbd8</code></a>
ssh: wrap errors from client handshake</li>
<li><a
href="bda2f3f5cf"><code>bda2f3f</code></a>
argon2: avoid clobbering BP</li>
<li><a
href="325b735346"><code>325b735</code></a>
ssh/test: skip TestSSHCLIAuth on Windows</li>
<li><a
href="1eadac50a5"><code>1eadac5</code></a>
go.mod: update golang.org/x dependencies</li>
<li><a
href="b2d7c26edb"><code>b2d7c26</code></a>
ssh: add (*Client).DialContext method</li>
<li>Additional commits viewable in <a
href="https://github.com/golang/crypto/compare/v0.14.0...v0.17.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/crypto&package-manager=go_modules&previous-version=0.14.0&new-version=0.17.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts page](https://github.com/fleetdm/fleet/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lucas Manuel Rodriguez <lucas@fleetdm.com>
2023-12-22 15:19:32 -03:00
Lucas Manuel Rodriguez
1bdd6a98a6
Bump Fleet Desktop version to 1.19.0 (#15819) 2023-12-22 15:16:02 -03:00
Lucas Manuel Rodriguez
f3aab18873
Change noisy directIngestWindowsUpdateHistory log from warn to debug (#15772)
#14939

- [X] Manual QA for all new/changed functionality.
2023-12-22 14:44:36 -03:00
JD
4d11235833
4.42.0 release article (#15826)
Release article https://github.com/fleetdm/fleet/issues/15537
2023-12-22 09:34:46 -08:00
Eric
51f032c87e
Website: Hide chatbot button on mobile devices (#15790)
Closes: https://github.com/fleetdm/confidential/issues/4757

Changes:
- Updated layout.less to hide the website chat button when the chat is
closed on screen sizes <575px. (The chat can still be opened on mobile
devices by clicking a "talk to an expert" button)
2023-12-21 18:19:25 -06:00
Luke Heath
f5af49f766
Prepare v4.42.0 (#15812) 2023-12-21 15:30:40 -06:00
Brock Walters
fa9f1838f2
Update Troubleshooting-live-queries.md (#15681)
Not meaning to be pedantic just trying to make the flow a bit more
natural. :)

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

<!-- Note that API documentation changes are now addressed by the
product design team. -->

- [ ] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [ ] Documented any permissions changes (docs/Using
Fleet/manage-access.md)
- [ ] Input data is properly validated, `SELECT *` is avoided, SQL
injection is prevented (using placeholders for values in statements)
- [ ] Added support on fleet's osquery simulator `cmd/osquery-perf` for
new osquery data ingestion features.
- [ ] Added/updated tests
- [ ] Manual QA for all new/changed functionality
  - For Orbit and Fleet Desktop changes:
- [ ] Manual QA must be performed in the three main OSs, macOS, Windows
and Linux.
- [ ] Auto-update manual QA, from released version of component to new
version (see [tools/tuf/test](../tools/tuf/test/README.md)).
2023-12-21 14:48:25 -06:00
Gabriel Hernandez
7e974970bb
fix for tooltip wrapper text alignment (#15755)
relates to #15435

fix for tooltip text alignment across multiple browsers. Firefox needs
additional styles to make the tooltip text appear correct.

- [x] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
- [x] Manual QA for all new/changed functionality
2023-12-21 14:43:18 -06:00
Jahziel Villasana-Espinoza
b348399f7e
fix: email searching when filtering by labels (#15774)
# Checklist for submitter

If some of the following don't apply, delete the relevant line.

<!-- Note that API documentation changes are now addressed by the
product design team. -->

- [x] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [x] Input data is properly validated, `SELECT *` is avoided, SQL
injection is prevented (using placeholders for values in statements)
- [x] Added/updated tests
- [x] Manual QA for all new/changed functionality
2023-12-21 15:42:44 -05:00
Sarah Gillespie
50550092c3
Update UI to display custom device mapping email (#15792) 2023-12-21 14:25:07 -06:00
Robert Fairburn
fc4646670e
Dogfood: Migrations to depend on new geolite2 image (#15804) 2023-12-21 14:19:22 -06:00
Brock Walters
85f0148e2c
Added nonpunctual GitHub User to humans list (#15813) 2023-12-21 14:42:12 -05:00
Mike McNeil
e4b95b0362
Issue template: Update story.md (#15715) 2023-12-21 13:41:21 -06:00
Victor Lyuboslavsky
846b3537c0
Improved error message when Fleet cannot write osquery log results to logging destination. (#15726)
Improved error message when Fleet cannot write osquery log results to
logging destination.
#15455 



# Checklist for submitter

If some of the following don't apply, delete the relevant line.

<!-- Note that API documentation changes are now addressed by the
product design team. -->

- [x] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
2023-12-21 12:15:25 -06:00
Victor Lyuboslavsky
72621e31ce
Added gigs_total_disk_space to host_disks. (#15753)
Added gigs_total_disk_space to host_disks.

This is just the migration that is needed for the rest of the changes in
#15058
2023-12-21 12:13:04 -06:00
Jahziel Villasana-Espinoza
367459fe02
fix: use other field for checking vuln scanning status (#15720)
# Checklist for submitter

To test, go through the repro steps in the issue; you should see that
the field is true instead of false!

If some of the following don't apply, delete the relevant line.

<!-- Note that API documentation changes are now addressed by the
product design team. -->

- [x] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [x] Added/updated tests
- [x] Manual QA for all new/changed functionality
2023-12-21 12:38:21 -05:00
Sarah Gillespie
682ab4aa7e
Add host display name to list hosts query (#15781) 2023-12-21 11:26:08 -06:00
Jacob Shandling
65d64b67a6
Document props pattern (#15497)
Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
2023-12-21 09:24:18 -08:00
Jacob Shandling
e58f1bbc22
Adjust paginated button icon alignment (#15795)
## Addresses #15032 

<img width="431" alt="Screenshot 2023-12-20 at 4 58 51 PM"
src="https://github.com/fleetdm/fleet/assets/61553566/89b856f8-f2bb-4c00-a8b7-7a115eb1de23">

- [x] Manual QA for all new/changed functionality

Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
2023-12-21 09:23:45 -08:00
Jacob Shandling
cce6875787
UI – Render Query Report 'No Results' state when discard_data is enabled, regardless of contents/presence of results; cleanup tooltip content (#15777)
## Addresses #15778 and part of #15608 

## Checklist for submitter
- [x] Manual QA for all new/changed functionality

---------

Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
2023-12-21 09:23:34 -08:00
Jacob Shandling
d49255dfdb
UI - clip live query results (#15760)
## Addresses #14874 
- once 250,000 (results + errors) return, end the query campaign and
display the "clipped" banner
- Format host counts with commas
- misc. cleanup

<img width="1796" alt="Screenshot 2023-12-19 at 4 37 28 PM"
src="https://github.com/fleetdm/fleet/assets/61553566/353ae5a0-24f0-49c5-b48c-555ff83567e9">

<img width="1796" alt="Screenshot 2023-12-19 at 4 37 02 PM"
src="https://github.com/fleetdm/fleet/assets/61553566/e5722dc5-07b4-4173-8eb3-8d00b3f327ab">


## Checklist for submitter

- [x] Changes file added for user-visible changes in `changes/`
- [x] Manual QA for all new/changed functionality

---------

Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
2023-12-21 09:23:07 -08:00
Martin Angers
2e8da551d0
Custom email device-mapping: implement the CLI (fleetd + fleetctl) changes (#15763)
Co-authored-by: Sarah Gillespie <73313222+gillespi314@users.noreply.github.com>
2023-12-21 11:22:59 -06:00