a2714ab1f1
web/outpost: make metrics compliant with Prometheus best-practices Today, all NewHistogramVec store values in nanoseconds without changing the default histogram bucket, which are made for seconds, making them a bit useless. In addition, some metrics names are not self-explanatoryand and do not comply with Prometheus best practices. This commit tries to fix all of this "issues". NOTE: I kept old metrics in order to avoid breaking changes with existing dashboards and metrics. Signed-off-by: Alexandre NICOLAIE <xunleii@users.noreply.github.com>
88 lines
2.3 KiB
Go
88 lines
2.3 KiB
Go
package ldap
|
|
|
|
import (
|
|
"net"
|
|
"time"
|
|
|
|
"beryju.io/ldap"
|
|
"github.com/getsentry/sentry-go"
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
log "github.com/sirupsen/logrus"
|
|
"goauthentik.io/internal/outpost/ldap/constants"
|
|
"goauthentik.io/internal/outpost/ldap/metrics"
|
|
"goauthentik.io/internal/outpost/ldap/search"
|
|
)
|
|
|
|
func (ls *LDAPServer) Search(bindDN string, searchReq ldap.SearchRequest, conn net.Conn) (ldap.ServerSearchResult, error) {
|
|
req, span := search.NewRequest(bindDN, searchReq, conn)
|
|
selectedApp := ""
|
|
defer func() {
|
|
span.Finish()
|
|
metrics.Requests.With(prometheus.Labels{
|
|
"outpost_name": ls.ac.Outpost.Name,
|
|
"type": "search",
|
|
"app": selectedApp,
|
|
}).Observe(float64(span.EndTime.Sub(span.StartTime)) / float64(time.Second))
|
|
metrics.RequestsLegacy.With(prometheus.Labels{
|
|
"outpost_name": ls.ac.Outpost.Name,
|
|
"type": "search",
|
|
"app": selectedApp,
|
|
}).Observe(float64(span.EndTime.Sub(span.StartTime)))
|
|
req.Log().WithField("attributes", searchReq.Attributes).WithField("took-ms", span.EndTime.Sub(span.StartTime).Milliseconds()).Info("Search request")
|
|
}()
|
|
|
|
defer func() {
|
|
err := recover()
|
|
if err == nil {
|
|
return
|
|
}
|
|
log.WithError(err.(error)).Error("recover in search request")
|
|
sentry.CaptureException(err.(error))
|
|
}()
|
|
|
|
selectedProvider := ls.providerForRequest(req)
|
|
if selectedProvider == nil {
|
|
return ls.fallbackRootDSE(req)
|
|
}
|
|
selectedApp = selectedProvider.GetAppSlug()
|
|
result, err := ls.searchRoute(req, selectedProvider)
|
|
return result, err
|
|
}
|
|
|
|
func (ls *LDAPServer) fallbackRootDSE(req *search.Request) (ldap.ServerSearchResult, error) {
|
|
req.Log().Trace("returning fallback Root DSE")
|
|
return ldap.ServerSearchResult{
|
|
Entries: []*ldap.Entry{
|
|
{
|
|
DN: "",
|
|
Attributes: []*ldap.EntryAttribute{
|
|
{
|
|
Name: "objectClass",
|
|
Values: []string{constants.OCTop},
|
|
},
|
|
{
|
|
Name: "entryDN",
|
|
Values: []string{""},
|
|
},
|
|
{
|
|
Name: "subschemaSubentry",
|
|
Values: []string{"cn=subschema"},
|
|
},
|
|
{
|
|
Name: "namingContexts",
|
|
Values: []string{},
|
|
},
|
|
{
|
|
Name: "description",
|
|
Values: []string{
|
|
"This LDAP server requires an authenticated session.",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
Referrals: []string{}, Controls: []ldap.Control{}, ResultCode: ldap.LDAPResultSuccess,
|
|
}, nil
|
|
|
|
}
|