diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go index 8f7b65bdc..db093dd32 100644 --- a/cmd/prometheus/main.go +++ b/cmd/prometheus/main.go @@ -241,7 +241,7 @@ func reloadConfig(filename string, rls ...Reloadable) (err error) { } } if failed { - return fmt.Errorf("one or more errors occured while applying the new configuration (-config.file=%s)", filename) + return fmt.Errorf("one or more errors occurred while applying the new configuration (-config.file=%s)", filename) } return nil } diff --git a/promql/parse.go b/promql/parse.go index 6acaa11de..71ad87de0 100644 --- a/promql/parse.go +++ b/promql/parse.go @@ -48,7 +48,7 @@ func (e *ParseErr) Error() string { return fmt.Sprintf("parse error at line %d, char %d: %s", e.Line, e.Pos, e.Err) } -// ParseStmts parses the input and returns the resulting statements or any occuring error. +// ParseStmts parses the input and returns the resulting statements or any occurring error. func ParseStmts(input string) (Statements, error) { p := newParser(input) diff --git a/promql/parse_test.go b/promql/parse_test.go index 191cd39e1..5dd97fc23 100644 --- a/promql/parse_test.go +++ b/promql/parse_test.go @@ -1366,9 +1366,9 @@ var testExpr = []struct { fail: true, errMsg: "expected type vector in call to function \"floor\", got scalar", }, { - input: "non_existant_function_far_bar()", + input: "non_existent_function_far_bar()", fail: true, - errMsg: "unknown function with name \"non_existant_function_far_bar\"", + errMsg: "unknown function with name \"non_existent_function_far_bar\"", }, { input: "rate(some_metric)", fail: true, diff --git a/retrieval/scrape_test.go b/retrieval/scrape_test.go index bb641d4cd..e07cbdc85 100644 --- a/retrieval/scrape_test.go +++ b/retrieval/scrape_test.go @@ -137,7 +137,7 @@ func TestScrapePoolReload(t *testing.T) { ScrapeInterval: model.Duration(3 * time.Second), ScrapeTimeout: model.Duration(2 * time.Second), } - // On starting to run, new loops created on reload check whether their preceeding + // On starting to run, new loops created on reload check whether their preceding // equivalents have been stopped. newLoop := func(ctx context.Context, s scraper, app, reportApp storage.SampleAppender) loop { l := &testLoop{} @@ -163,7 +163,7 @@ func TestScrapePoolReload(t *testing.T) { } // Reloading a scrape pool with a new scrape configuration must stop all scrape - // loops and start new ones. A new loop must not be started before the preceeding + // loops and start new ones. A new loop must not be started before the preceding // one terminated. for i := 0; i < numTargets; i++ { diff --git a/storage/local/storage_test.go b/storage/local/storage_test.go index b5025827f..d04c5ac92 100644 --- a/storage/local/storage_test.go +++ b/storage/local/storage_test.go @@ -145,7 +145,7 @@ func TestMatches(t *testing.T) { matchers: metric.LabelMatchers{ newMatcher(metric.Equal, "all", "const"), newMatcher(metric.NotEqual, "label1", "test_0"), - newMatcher(metric.Equal, "not_existant", ""), + newMatcher(metric.Equal, "not_existent", ""), }, expected: fingerprints[10:], }, diff --git a/storage/remote/client.go b/storage/remote/client.go index 93c759fcd..563f47c00 100644 --- a/storage/remote/client.go +++ b/storage/remote/client.go @@ -40,7 +40,7 @@ func NewClient(address string, timeout time.Duration) (*Client, error) { // grpc.Dial() returns immediately and doesn't error when the server is // unreachable when not passing in the WithBlock() option. The client then // will continuously try to (re)establish the connection in the background. - // So this will only return here if some other uncommon error occured. + // So this will only return here if some other uncommon error occurred. return nil, err } return &Client{