diff --git a/promql/lex.go b/promql/lex.go index 2d4f6819f..de2df838e 100644 --- a/promql/lex.go +++ b/promql/lex.go @@ -18,8 +18,6 @@ import ( "strings" "unicode" "unicode/utf8" - - "github.com/prometheus/common/log" ) // item represents a token or text string returned from the scanner. @@ -194,11 +192,6 @@ const ( itemGroupLeft itemGroupRight itemBool - // Removed keywords. Just here to detect and print errors. - itemSummary - itemDescription - itemRunbook - itemKeepExtra keywordsEnd ) @@ -234,11 +227,6 @@ var key = map[string]itemType{ "group_left": itemGroupLeft, "group_right": itemGroupRight, "bool": itemBool, - // Removed keywords. Just here to detect and print errors. - "summary": itemSummary, - "description": itemDescription, - "runbook": itemRunbook, - "keeping_extra": itemKeepExtra, } // These are the default string representations for common items. It does not @@ -429,14 +417,6 @@ func (l *lexer) errorf(format string, args ...interface{}) stateFn { func (l *lexer) nextItem() item { item := <-l.items l.lastPos = item.pos - - // TODO(fabxc): remove for version 1.0. - t := item.typ - if t == itemSummary || t == itemDescription || t == itemRunbook { - log.Errorf("Token %q is not valid anymore. Alerting rule syntax has changed with version 0.17.0. Please read https://prometheus.io/docs/alerting/rules/.", item) - } else if t == itemKeepExtra { - log.Error("Token 'keeping_extra' is not valid anymore. Use 'keep_common' instead.") - } return item }