devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-26 17:03:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'main' into patch-1

Browse source
This commit is contained in:
Niek van der Maas 2022-03-25 08:44:16 +01:00 committed by GitHub
commit b60727b205
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -2,6 +2,10 @@
## 0.16.0 (2022-xx-xx) ## 0.16.0 (2022-xx-xx)
### Changes
- Fix labels cardinality error when registering unknown pre-auth key [#519](https://github.com/juanfont/headscale/pull/519)
## 0.15.0 (2022-03-20) ## 0.15.0 (2022-03-20)
**Note:** Take a backup of your database before upgrading. **Note:** Take a backup of your database before upgrading.

2
api.go
View file

@ -573,7 +573,7 @@ func (h *Headscale) handleAuthKey(
machineRegistrations.WithLabelValues("new", RegisterMethodAuthKey, "error", pak.Namespace.Name). machineRegistrations.WithLabelValues("new", RegisterMethodAuthKey, "error", pak.Namespace.Name).
Inc() Inc()
} else { } else {
machineRegistrations.WithLabelValues("new", RegisterMethodAuthKey, "error").Inc() machineRegistrations.WithLabelValues("new", RegisterMethodAuthKey, "error", "unknown").Inc()
} }
return return