mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 13:44:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix common english misspellings

Browse source
This commit is contained in:
Tobias Schmidt 2016-09-14 23:23:28 -04:00
parent e2c12dcdb5
commit 29ced0090f
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/prometheus/main.go
View file

@ -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
}

2
promql/parse.go
View file

@ -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)

4
promql/parse_test.go
View file

@ -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,

4
retrieval/scrape_test.go
View file

@ -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++ {

2
storage/local/storage_test.go
View file

@ -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:],
},

2
storage/remote/client.go
View file

@ -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{