Skip to content

Commit 6000d6a

Browse files
iwysiuiwysiu
authored
ElasticSearch: Neaten up vars/consts (grafana#91989)
ElasticSearch: neaten up vars/consts
1 parent a12b372 commit 6000d6a

File tree

5 files changed

+65
-66
lines changed

5 files changed

+65
-66
lines changed

‎pkg/tsdb/elasticsearch/client/client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
)
2424

2525
// Used in logging to mark a stage
26-
var (
26+
const (
2727
StagePrepareRequest = "prepareRequest"
2828
StageDatabaseRequest = "databaseRequest"
2929
StageParseResponse = "parseResponse"

‎pkg/tsdb/elasticsearch/client/index_pattern.go‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,57 @@ const (
1818
intervalYearly = "yearly"
1919
)
2020

21+
var datePatternRegex = regexp.MustCompile("(LT|LL?L?L?|l{1,4}|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|Q)")
22+
23+
var datePatternReplacements = map[string]string{
24+
"M": "1", // stdNumMonth 1 2 ... 11 12
25+
"MM": "01", // stdZeroMonth 01 02 ... 11 12
26+
"MMM": "Jan", // stdMonth Jan Feb ... Nov Dec
27+
"MMMM": "January", // stdLongMonth January February ... November December
28+
"D": "2", // stdDay 1 2 ... 30 30
29+
"DD": "02", // stdZeroDay 01 02 ... 30 31
30+
"DDD": "<stdDayOfYear>", // Day of the year 1 2 ... 364 365
31+
"DDDD": "<stdDayOfYearZero>", // Day of the year 001 002 ... 364 365 @todo****
32+
"d": "<stdDayOfWeek>", // Numeric representation of day of the week 0 1 ... 5 6
33+
"dd": "Mon", // ***Su Mo ... Fr Sa @todo
34+
"ddd": "Mon", // Sun Mon ... Fri Sat
35+
"dddd": "Monday", // stdLongWeekDay Sunday Monday ... Friday Saturday
36+
"e": "<stdDayOfWeek>", // Numeric representation of day of the week 0 1 ... 5 6 @todo
37+
"E": "<stdDayOfWeekISO>", // ISO-8601 numeric representation of the day of the week (added in PHP 5.1.0) 1 2 ... 6 7 @todo
38+
"w": "<stdWeekOfYear>", // 1 2 ... 52 53
39+
"ww": "<stdWeekOfYear>", // ***01 02 ... 52 53 @todo
40+
"W": "<stdWeekOfYear>", // 1 2 ... 52 53
41+
"WW": "<stdWeekOfYear>", // ***01 02 ... 52 53 @todo
42+
"YY": "06", // stdYear 70 71 ... 29 30
43+
"YYYY": "2006", // stdLongYear 1970 1971 ... 2029 2030
44+
"gg": "<stdIsoYearShort>", // ISO-8601 year number 70 71 ... 29 30
45+
"gggg": "<stdIsoYear>", // ***1970 1971 ... 2029 2030
46+
"GG": "<stdIsoYearShort>", // 70 71 ... 29 30
47+
"GGGG": "<stdIsoYear>", // ***1970 1971 ... 2029 2030
48+
"Q": "<stdQuarter>", // 1, 2, 3, 4
49+
"A": "PM", // stdPM AM PM
50+
"a": "pm", // stdpm am pm
51+
"H": "<stdHourNoZero>", // stdHour 0 1 ... 22 23
52+
"HH": "15", // 00 01 ... 22 23
53+
"h": "3", // stdHour12 1 2 ... 11 12
54+
"hh": "03", // stdZeroHour12 01 02 ... 11 12
55+
"m": "4", // stdZeroMinute 0 1 ... 58 59
56+
"mm": "04", // stdZeroMinute 00 01 ... 58 59
57+
"s": "5", // stdSecond 0 1 ... 58 59
58+
"ss": "05", // stdZeroSecond ***00 01 ... 58 59
59+
"z": "MST", // EST CST ... MST PST
60+
"zz": "MST", // EST CST ... MST PST
61+
"Z": "Z07:00", // stdNumColonTZ -07:00 -06:00 ... +06:00 +07:00
62+
"ZZ": "-0700", // stdNumTZ -0700 -0600 ... +0600 +0700
63+
"X": "<stdUnix>", // Seconds since unix epoch 1360013296
64+
"LT": "3:04 PM", // 8:30 PM
65+
"L": "01/02/2006", // 09/04/1986
66+
"l": "1/2/2006", // 9/4/1986
67+
"ll": "Jan 2 2006", // Sep 4 1986
68+
"lll": "Jan 2 2006 3:04 PM", // Sep 4 1986 8:30 PM
69+
"llll": "Mon, Jan 2 2006 3:04 PM", // Thu, Sep 4 1986 8:30 PM
70+
}
71+
2172
type IndexPattern interface {
2273
GetIndices(timeRange backend.TimeRange) ([]string, error)
2374
}
@@ -200,57 +251,6 @@ func (i *yearlyInterval) Generate(from, to time.Time) []time.Time {
200251
return intervals
201252
}
202253

203-
var datePatternRegex = regexp.MustCompile("(LT|LL?L?L?|l{1,4}|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|Q)")
204-
205-
var datePatternReplacements = map[string]string{
206-
"M": "1", // stdNumMonth 1 2 ... 11 12
207-
"MM": "01", // stdZeroMonth 01 02 ... 11 12
208-
"MMM": "Jan", // stdMonth Jan Feb ... Nov Dec
209-
"MMMM": "January", // stdLongMonth January February ... November December
210-
"D": "2", // stdDay 1 2 ... 30 30
211-
"DD": "02", // stdZeroDay 01 02 ... 30 31
212-
"DDD": "<stdDayOfYear>", // Day of the year 1 2 ... 364 365
213-
"DDDD": "<stdDayOfYearZero>", // Day of the year 001 002 ... 364 365 @todo****
214-
"d": "<stdDayOfWeek>", // Numeric representation of day of the week 0 1 ... 5 6
215-
"dd": "Mon", // ***Su Mo ... Fr Sa @todo
216-
"ddd": "Mon", // Sun Mon ... Fri Sat
217-
"dddd": "Monday", // stdLongWeekDay Sunday Monday ... Friday Saturday
218-
"e": "<stdDayOfWeek>", // Numeric representation of day of the week 0 1 ... 5 6 @todo
219-
"E": "<stdDayOfWeekISO>", // ISO-8601 numeric representation of the day of the week (added in PHP 5.1.0) 1 2 ... 6 7 @todo
220-
"w": "<stdWeekOfYear>", // 1 2 ... 52 53
221-
"ww": "<stdWeekOfYear>", // ***01 02 ... 52 53 @todo
222-
"W": "<stdWeekOfYear>", // 1 2 ... 52 53
223-
"WW": "<stdWeekOfYear>", // ***01 02 ... 52 53 @todo
224-
"YY": "06", // stdYear 70 71 ... 29 30
225-
"YYYY": "2006", // stdLongYear 1970 1971 ... 2029 2030
226-
"gg": "<stdIsoYearShort>", // ISO-8601 year number 70 71 ... 29 30
227-
"gggg": "<stdIsoYear>", // ***1970 1971 ... 2029 2030
228-
"GG": "<stdIsoYearShort>", // 70 71 ... 29 30
229-
"GGGG": "<stdIsoYear>", // ***1970 1971 ... 2029 2030
230-
"Q": "<stdQuarter>", // 1, 2, 3, 4
231-
"A": "PM", // stdPM AM PM
232-
"a": "pm", // stdpm am pm
233-
"H": "<stdHourNoZero>", // stdHour 0 1 ... 22 23
234-
"HH": "15", // 00 01 ... 22 23
235-
"h": "3", // stdHour12 1 2 ... 11 12
236-
"hh": "03", // stdZeroHour12 01 02 ... 11 12
237-
"m": "4", // stdZeroMinute 0 1 ... 58 59
238-
"mm": "04", // stdZeroMinute 00 01 ... 58 59
239-
"s": "5", // stdSecond 0 1 ... 58 59
240-
"ss": "05", // stdZeroSecond ***00 01 ... 58 59
241-
"z": "MST", // EST CST ... MST PST
242-
"zz": "MST", // EST CST ... MST PST
243-
"Z": "Z07:00", // stdNumColonTZ -07:00 -06:00 ... +06:00 +07:00
244-
"ZZ": "-0700", // stdNumTZ -0700 -0600 ... +0600 +0700
245-
"X": "<stdUnix>", // Seconds since unix epoch 1360013296
246-
"LT": "3:04 PM", // 8:30 PM
247-
"L": "01/02/2006", // 09/04/1986
248-
"l": "1/2/2006", // 9/4/1986
249-
"ll": "Jan 2 2006", // Sep 4 1986
250-
"lll": "Jan 2 2006 3:04 PM", // Sep 4 1986 8:30 PM
251-
"llll": "Mon, Jan 2 2006 3:04 PM", // Thu, Sep 4 1986 8:30 PM
252-
}
253-
254254
func formatDate(t time.Time, pattern string) string {
255255
var formattedDatePatterns []string
256256
var bases []string

‎pkg/tsdb/elasticsearch/client/models.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ import (
77
"github.com/grafana/grafana-plugin-sdk-go/backend"
88
)
99

10+
// DateFormatEpochMS represents a date format of epoch milliseconds (epoch_millis)
11+
const DateFormatEpochMS = "epoch_millis"
12+
1013
// SearchRequest represents a search request
1114
type SearchRequest struct {
1215
Index string
@@ -119,9 +122,6 @@ type RangeFilter struct {
119122
Format string
120123
}
121124

122-
// DateFormatEpochMS represents a date format of epoch milliseconds (epoch_millis)
123-
const DateFormatEpochMS = "epoch_millis"
124-
125125
// MarshalJSON returns the JSON encoding of the query string filter.
126126
func (f *RangeFilter) MarshalJSON() ([]byte, error) {
127127
root := map[string]map[string]map[string]interface{}{

‎pkg/tsdb/elasticsearch/client/search_request.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ const (
1212
HighlightPostTagsString = "@/HIGHLIGHT@"
1313
HighlightFragmentSize = 2147483647
1414
DefaultGeoHashPrecision = 3
15+
16+
termsOrderTerm = "_term"
17+
)
18+
19+
type SortOrder string
20+
21+
const (
22+
SortOrderAsc SortOrder = "asc"
23+
SortOrderDesc SortOrder = "desc"
1524
)
1625

1726
// SearchRequestBuilder represents a builder which can build a search request
@@ -79,13 +88,6 @@ func (b *SearchRequestBuilder) Size(size int) *SearchRequestBuilder {
7988
return b
8089
}
8190

82-
type SortOrder string
83-
84-
const (
85-
SortOrderAsc SortOrder = "asc"
86-
SortOrderDesc SortOrder = "desc"
87-
)
88-
8991
// Sort adds a "asc" | "desc" sort to the search request
9092
func (b *SearchRequestBuilder) Sort(order SortOrder, field string, unmappedType string) *SearchRequestBuilder {
9193
if order != SortOrderAsc && order != SortOrderDesc {
@@ -386,8 +388,6 @@ func (b *aggBuilderImpl) DateHistogram(key, field string, fn func(a *DateHistogr
386388
return b
387389
}
388390

389-
const termsOrderTerm = "_term"
390-
391391
func (b *aggBuilderImpl) Terms(key, field string, fn func(a *TermsAggregation, b AggBuilder)) AggBuilder {
392392
innerAgg := &TermsAggregation{
393393
Field: field,

‎pkg/tsdb/elasticsearch/response_parser.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ const (
4646
)
4747

4848
var searchWordsRegex = regexp.MustCompile(regexp.QuoteMeta(es.HighlightPreTagsString) + `(.*?)` + regexp.QuoteMeta(es.HighlightPostTagsString))
49+
var aliasPatternRegex = regexp.MustCompile(`\{\{([\s\S]+?)\}\}`)
4950

5051
func parseResponse(ctx context.Context, responses []*es.SearchResponse, targets []*Query, configuredFields es.ConfiguredFields, keepLabelsInResponse bool, logger log.Logger) (*backend.QueryDataResponse, error) {
5152
result := backend.QueryDataResponse{
@@ -923,8 +924,6 @@ func nameFields(queryResult backend.DataResponse, target *Query, keepLabelsInRes
923924
}
924925
}
925926

926-
var aliasPatternRegex = regexp.MustCompile(`\{\{([\s\S]+?)\}\}`)
927-
928927
func getFieldName(dataField data.Field, target *Query, metricTypeCount int) string {
929928
metricType := dataField.Labels["metric"]
930929
metricName := getMetricName(metricType)

0 commit comments

Comments
 (0)