Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix some misspells #2725

Merged
merged 1 commit into from
Oct 5, 2020
Merged

fix some misspells #2725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/logcli/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ func newQuery(instant bool, cmd *kingpin.CmdClause) *query.Query {
cmd.Flag("include-label", "Include labels given the provided key during output.").StringsVar(&q.ShowLabelsKey)
cmd.Flag("labels-length", "Set a fixed padding to labels").Default("0").IntVar(&q.FixedLabelsLen)
cmd.Flag("store-config", "Execute the current query using a configured storage from a given Loki configuration file.").Default("").StringVar(&q.LocalConfig)
cmd.Flag("colored-output", "Show ouput with colored labels").Default("false").BoolVar(&q.ColoredOutput)
cmd.Flag("colored-output", "Show output with colored labels").Default("false").BoolVar(&q.ColoredOutput)

return q
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/logcli/query/query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func Test_batch(t *testing.T) {
Entries: []logproto.Entry{
logproto.Entry{Timestamp: time.Unix(1, 0), Line: "line1"},
logproto.Entry{Timestamp: time.Unix(2, 0), Line: "line2"},
logproto.Entry{Timestamp: time.Unix(3, 0), Line: "line3"}, // End timestmap is exclusive
logproto.Entry{Timestamp: time.Unix(3, 0), Line: "line3"}, // End timestamp is exclusive
},
},
},
Expand All @@ -193,7 +193,7 @@ func Test_batch(t *testing.T) {
Entries: []logproto.Entry{
logproto.Entry{Timestamp: time.Unix(1, 0), Line: "line1"},
logproto.Entry{Timestamp: time.Unix(2, 0), Line: "line2"},
logproto.Entry{Timestamp: time.Unix(3, 0), Line: "line3"}, // End timestmap is exclusive
logproto.Entry{Timestamp: time.Unix(3, 0), Line: "line3"}, // End timestamp is exclusive
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/logentry/stages/drop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ func (m *dropStage) Process(labels model.LabelSet, extracted map[string]interfac

// Everything matched, drop the line
if Debug {
level.Debug(m.logger).Log("msg", "all critera met, line will be dropped")
level.Debug(m.logger).Log("msg", "all criteria met, line will be dropped")
}
// Adds the drop label to not be sent by the api.EntryHandler
labels[dropLabel] = model.LabelValue(*m.cfg.DropReason)
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/stores/shipper/compactor/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (t *table) compact() error {
readObjectChan := make(chan string)
n := util.Min(len(objects), readDBsParallelism)

// read files parallely
// read files parallelly
for i := 0; i < n; i++ {
go func() {
var err error
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/stores/shipper/uploads/table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ func TestTable_ImmutableUploads(t *testing.T) {
boltDBIndexClient.Stop()
}()

// shardCutoff is calulated based on when shards are considered to not be active anymore and are safe to be uploaded.
// shardCutoff is calculated based on when shards are considered to not be active anymore and are safe to be uploaded.
shardCutoff := getOldestActiveShardTime()

// some dbs to setup
Expand Down