diff --git a/app/vmselect/graphite/metrics_api.go b/app/vmselect/graphite/metrics_api.go index a95fa8104e..c83fc96485 100644 --- a/app/vmselect/graphite/metrics_api.go +++ b/app/vmselect/graphite/metrics_api.go @@ -198,7 +198,7 @@ func MetricsIndexHandler(startTime time.Time, w http.ResponseWriter, r *http.Req deadline := searchutils.GetDeadlineForQuery(r, startTime) jsonp := r.FormValue("jsonp") sq := storage.NewSearchQuery(0, 0, nil, 0) - metricNames, err := netstorage.GetLabelValues(nil, "__name__", sq, 0, deadline) + metricNames, err := netstorage.LabelValues(nil, "__name__", sq, 0, deadline) if err != nil { return fmt.Errorf(`cannot obtain metric names: %w`, err) } @@ -219,7 +219,7 @@ func metricsFind(tr storage.TimeRange, label, qHead, qTail string, delimiter byt n := strings.IndexAny(qTail, "*{[") if n < 0 { query := qHead + qTail - suffixes, err := netstorage.GetTagValueSuffixes(nil, tr, label, query, delimiter, deadline) + suffixes, err := netstorage.TagValueSuffixes(nil, tr, label, query, delimiter, deadline) if err != nil { return nil, err } @@ -239,7 +239,7 @@ func metricsFind(tr storage.TimeRange, label, qHead, qTail string, delimiter byt } if n == len(qTail)-1 && strings.HasSuffix(qTail, "*") { query := qHead + qTail[:len(qTail)-1] - suffixes, err := netstorage.GetTagValueSuffixes(nil, tr, label, query, delimiter, deadline) + suffixes, err := netstorage.TagValueSuffixes(nil, tr, label, query, delimiter, deadline) if err != nil { return nil, err } diff --git a/app/vmselect/graphite/tags_api.go b/app/vmselect/graphite/tags_api.go index 9cb78d8c94..2606ec0635 100644 --- a/app/vmselect/graphite/tags_api.go +++ b/app/vmselect/graphite/tags_api.go @@ -178,11 +178,11 @@ func TagsAutoCompleteValuesHandler(startTime time.Time, w http.ResponseWriter, r return fmt.Errorf("cannot setup tag filters: %w", err) } if len(exprs) == 0 && len(etfs) == 0 { - // Fast path: there are no `expr` filters, so use netstorage.GetGraphiteTagValues. + // Fast path: there are no `expr` filters, so use netstorage.GraphiteTagValues. // Escape special chars in tagPrefix as Graphite does. // See https://github.com/graphite-project/graphite-web/blob/3ad279df5cb90b211953e39161df416e54a84948/webapp/graphite/tags/base.py#L228 filter := regexp.QuoteMeta(valuePrefix) - tagValues, err = netstorage.GetGraphiteTagValues(nil, tag, filter, limit, deadline) + tagValues, err = netstorage.GraphiteTagValues(nil, tag, filter, limit, deadline) if err != nil { return err } @@ -260,12 +260,12 @@ func TagsAutoCompleteTagsHandler(startTime time.Time, w http.ResponseWriter, r * return fmt.Errorf("cannot setup tag filters: %w", err) } if len(exprs) == 0 && len(etfs) == 0 { - // Fast path: there are no `expr` filters, so use netstorage.GetGraphiteTags. + // Fast path: there are no `expr` filters, so use netstorage.GraphiteTags. // Escape special chars in tagPrefix as Graphite does. // See https://github.com/graphite-project/graphite-web/blob/3ad279df5cb90b211953e39161df416e54a84948/webapp/graphite/tags/base.py#L181 filter := regexp.QuoteMeta(tagPrefix) - labels, err = netstorage.GetGraphiteTags(nil, filter, limit, deadline) + labels, err = netstorage.GraphiteTags(nil, filter, limit, deadline) if err != nil { return err } @@ -396,7 +396,7 @@ func TagValuesHandler(startTime time.Time, tagName string, w http.ResponseWriter return err } filter := r.FormValue("filter") - tagValues, err := netstorage.GetGraphiteTagValues(nil, tagName, filter, limit, deadline) + tagValues, err := netstorage.GraphiteTagValues(nil, tagName, filter, limit, deadline) if err != nil { return err } @@ -424,7 +424,7 @@ func TagsHandler(startTime time.Time, w http.ResponseWriter, r *http.Request) er return err } filter := r.FormValue("filter") - labels, err := netstorage.GetGraphiteTags(nil, filter, limit, deadline) + labels, err := netstorage.GraphiteTags(nil, filter, limit, deadline) if err != nil { return err } diff --git a/app/vmselect/netstorage/netstorage.go b/app/vmselect/netstorage/netstorage.go index 88ae27f678..25d1c25240 100644 --- a/app/vmselect/netstorage/netstorage.go +++ b/app/vmselect/netstorage/netstorage.go @@ -611,8 +611,8 @@ func DeleteSeries(qt *querytracer.Tracer, sq *storage.SearchQuery, deadline sear return vmstorage.DeleteMetrics(tfss) } -// GetLabelNames returns label names matching the given sq until the given deadline. -func GetLabelNames(qt *querytracer.Tracer, sq *storage.SearchQuery, maxLabelNames int, deadline searchutils.Deadline) ([]string, error) { +// LabelNames returns label names matching the given sq until the given deadline. +func LabelNames(qt *querytracer.Tracer, sq *storage.SearchQuery, maxLabelNames int, deadline searchutils.Deadline) ([]string, error) { qt = qt.NewChild("get labels: %s", sq) defer qt.Done() if deadline.Exceeded() { @@ -639,15 +639,15 @@ func GetLabelNames(qt *querytracer.Tracer, sq *storage.SearchQuery, maxLabelName return labels, nil } -// GetGraphiteTags returns Graphite tags until the given deadline. -func GetGraphiteTags(qt *querytracer.Tracer, filter string, limit int, deadline searchutils.Deadline) ([]string, error) { +// GraphiteTags returns Graphite tags until the given deadline. +func GraphiteTags(qt *querytracer.Tracer, filter string, limit int, deadline searchutils.Deadline) ([]string, error) { qt = qt.NewChild("get graphite tags: filter=%s, limit=%d", filter, limit) defer qt.Done() if deadline.Exceeded() { return nil, fmt.Errorf("timeout exceeded before starting the query processing: %s", deadline.String()) } sq := storage.NewSearchQuery(0, 0, nil, 0) - labels, err := GetLabelNames(qt, sq, 0, deadline) + labels, err := LabelNames(qt, sq, 0, deadline) if err != nil { return nil, err } @@ -687,8 +687,8 @@ func hasString(a []string, s string) bool { return false } -// GetLabelValues returns label values matching the given labelName and sq until the given deadline. -func GetLabelValues(qt *querytracer.Tracer, labelName string, sq *storage.SearchQuery, maxLabelValues int, deadline searchutils.Deadline) ([]string, error) { +// LabelValues returns label values matching the given labelName and sq until the given deadline. +func LabelValues(qt *querytracer.Tracer, labelName string, sq *storage.SearchQuery, maxLabelValues int, deadline searchutils.Deadline) ([]string, error) { qt = qt.NewChild("get values for label %s: %s", labelName, sq) defer qt.Done() if deadline.Exceeded() { @@ -715,8 +715,8 @@ func GetLabelValues(qt *querytracer.Tracer, labelName string, sq *storage.Search return labelValues, nil } -// GetGraphiteTagValues returns tag values for the given tagName until the given deadline. -func GetGraphiteTagValues(qt *querytracer.Tracer, tagName, filter string, limit int, deadline searchutils.Deadline) ([]string, error) { +// GraphiteTagValues returns tag values for the given tagName until the given deadline. +func GraphiteTagValues(qt *querytracer.Tracer, tagName, filter string, limit int, deadline searchutils.Deadline) ([]string, error) { qt = qt.NewChild("get graphite tag values for tagName=%s, filter=%s, limit=%d", tagName, filter, limit) defer qt.Done() if deadline.Exceeded() { @@ -726,7 +726,7 @@ func GetGraphiteTagValues(qt *querytracer.Tracer, tagName, filter string, limit tagName = "" } sq := storage.NewSearchQuery(0, 0, nil, 0) - tagValues, err := GetLabelValues(qt, tagName, sq, 0, deadline) + tagValues, err := LabelValues(qt, tagName, sq, 0, deadline) if err != nil { return nil, err } @@ -742,10 +742,10 @@ func GetGraphiteTagValues(qt *querytracer.Tracer, tagName, filter string, limit return tagValues, nil } -// GetTagValueSuffixes returns tag value suffixes for the given tagKey and the given tagValuePrefix. +// TagValueSuffixes returns tag value suffixes for the given tagKey and the given tagValuePrefix. // // It can be used for implementing https://graphite-api.readthedocs.io/en/latest/api.html#metrics-find -func GetTagValueSuffixes(qt *querytracer.Tracer, tr storage.TimeRange, tagKey, tagValuePrefix string, delimiter byte, deadline searchutils.Deadline) ([]string, error) { +func TagValueSuffixes(qt *querytracer.Tracer, tr storage.TimeRange, tagKey, tagValuePrefix string, delimiter byte, deadline searchutils.Deadline) ([]string, error) { qt = qt.NewChild("get tag value suffixes for tagKey=%s, tagValuePrefix=%s, timeRange=%s", tagKey, tagValuePrefix, &tr) defer qt.Done() if deadline.Exceeded() { @@ -764,10 +764,10 @@ func GetTagValueSuffixes(qt *querytracer.Tracer, tr storage.TimeRange, tagKey, t return suffixes, nil } -// GetTSDBStatus returns tsdb status according to https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-stats +// TSDBStatus returns tsdb status according to https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-stats // // It accepts aribtrary filters on time series in sq. -func GetTSDBStatus(qt *querytracer.Tracer, sq *storage.SearchQuery, focusLabel string, topN int, deadline searchutils.Deadline) (*storage.TSDBStatus, error) { +func TSDBStatus(qt *querytracer.Tracer, sq *storage.SearchQuery, focusLabel string, topN int, deadline searchutils.Deadline) (*storage.TSDBStatus, error) { qt = qt.NewChild("get tsdb stats: %s, focusLabel=%q, topN=%d", sq, focusLabel, topN) defer qt.Done() if deadline.Exceeded() { @@ -789,8 +789,8 @@ func GetTSDBStatus(qt *querytracer.Tracer, sq *storage.SearchQuery, focusLabel s return status, nil } -// GetSeriesCount returns the number of unique series. -func GetSeriesCount(qt *querytracer.Tracer, deadline searchutils.Deadline) (uint64, error) { +// SeriesCount returns the number of unique series. +func SeriesCount(qt *querytracer.Tracer, deadline searchutils.Deadline) (uint64, error) { qt = qt.NewChild("get series count") defer qt.Done() if deadline.Exceeded() { diff --git a/app/vmselect/prometheus/prometheus.go b/app/vmselect/prometheus/prometheus.go index b30bdc3043..bacf017803 100644 --- a/app/vmselect/prometheus/prometheus.go +++ b/app/vmselect/prometheus/prometheus.go @@ -456,7 +456,7 @@ func LabelValuesHandler(qt *querytracer.Tracer, startTime time.Time, labelName s return err } sq := storage.NewSearchQuery(cp.start, cp.end, cp.filterss, *maxUniqueTimeseries) - labelValues, err := netstorage.GetLabelValues(qt, labelName, sq, limit, cp.deadline) + labelValues, err := netstorage.LabelValues(qt, labelName, sq, limit, cp.deadline) if err != nil { return fmt.Errorf("cannot obtain values for label %q: %w", labelName, err) } @@ -521,7 +521,7 @@ func TSDBStatusHandler(qt *querytracer.Tracer, startTime time.Time, w http.Respo start := int64(date*secsPerDay) * 1000 end := int64((date+1)*secsPerDay)*1000 - 1 sq := storage.NewSearchQuery(start, end, cp.filterss, *maxTSDBStatusSeries) - status, err := netstorage.GetTSDBStatus(qt, sq, focusLabel, topN, cp.deadline) + status, err := netstorage.TSDBStatus(qt, sq, focusLabel, topN, cp.deadline) if err != nil { return fmt.Errorf("cannot obtain tsdb stats: %w", err) } @@ -553,7 +553,7 @@ func LabelsHandler(qt *querytracer.Tracer, startTime time.Time, w http.ResponseW return err } sq := storage.NewSearchQuery(cp.start, cp.end, cp.filterss, *maxUniqueTimeseries) - labels, err := netstorage.GetLabelNames(qt, sq, limit, cp.deadline) + labels, err := netstorage.LabelNames(qt, sq, limit, cp.deadline) if err != nil { return fmt.Errorf("cannot obtain labels: %w", err) } @@ -575,7 +575,7 @@ func SeriesCountHandler(startTime time.Time, w http.ResponseWriter, r *http.Requ defer seriesCountDuration.UpdateDuration(startTime) deadline := searchutils.GetDeadlineForStatusRequest(r, startTime) - n, err := netstorage.GetSeriesCount(nil, deadline) + n, err := netstorage.SeriesCount(nil, deadline) if err != nil { return fmt.Errorf("cannot obtain series count: %w", err) }