IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-23 09:26:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "APIkeys: Add metrics for apikey endpoints (#66732)" (#66754)

Browse Source 
This reverts commit c505d26430.
This commit is contained in:
Eric Leijonmarck 2023-04-18 13:05:52 +01:00 committed by GitHub
parent 840fb32ad8
commit 15c9ced944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/apikey.go
View File

@ -9,7 +9,6 @@ import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/components/apikeygen"
"github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/services/apikey"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
"github.com/grafana/grafana/pkg/web"
@ -65,7 +64,6 @@ func (hs *HTTPServer) GetAPIKeys(c *contextmodel.ReqContext) response.Response {
}
}
metrics.MApiAPIkeysGet.Inc()
return response.JSON(http.StatusOK, result)
}
@ -101,7 +99,6 @@ func (hs *HTTPServer) DeleteAPIKey(c *contextmodel.ReqContext) response.Response
return response.Error(status, "Failed to delete API key", err)
}
metrics.MApiAPIkeysDelete.Inc()
return response.Success("API key deleted")
}
@ -169,7 +166,6 @@ func (hs *HTTPServer) AddAPIKey(c *contextmodel.ReqContext) response.Response {
Key: newKeyInfo.ClientSecret,
}
metrics.MApiAPIkeysCreate.Inc()
return response.JSON(http.StatusOK, result)
}

27
pkg/infra/metrics/metrics.go
View File

@ -109,12 +109,6 @@ var (
// MPublicDashboardDatasourceQuerySuccess is a metric counter for successful queries labelled by datasource
MPublicDashboardDatasourceQuerySuccess *prometheus.CounterVec
MApiAPIkeysGet prometheus.Counter
MApiAPIkeysCreate prometheus.Counter
MApiAPIkeysDelete prometheus.Counter
)
// Timers
@ -452,24 +446,6 @@ func init() {
Namespace: ExporterName,
}, []string{"datasource", "status"}, map[string][]string{"status": pubdash.QueryResultStatuses})
MApiAPIkeysGet = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
Name: "api_api_keys_get_total",
Help: "counter for getting api keys",
Namespace: ExporterName,
})
MApiAPIkeysCreate = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
Name: "api_api_keys_create_total",
Help: "counter for creating api keys",
Namespace: ExporterName,
})
MApiAPIkeysDelete = metricutil.NewCounterStartingAtZero(prometheus.CounterOpts{
Name: "api_api_keys_delete_total",
Help: "counter for deleting api keys",
Namespace: ExporterName,
})
MStatTotalDashboards = prometheus.NewGauge(prometheus.GaugeOpts{
Name: "stat_totals_dashboard",
Help: "total amount of dashboards",
@ -739,8 +715,5 @@ func initMetricVars() {
MPublicDashboardRequestCount,
MPublicDashboardDatasourceQuerySuccess,
MStatTotalCorrelations,
MApiAPIkeysGet,
MApiAPIkeysCreate,
MApiAPIkeysDelete,
)
}