diff --git a/cmd/promtool/main_test.go b/cmd/promtool/main_test.go index 48bed9a2df..5d36a66fcd 100644 --- a/cmd/promtool/main_test.go +++ b/cmd/promtool/main_test.go @@ -136,8 +136,8 @@ func TestCheckSDFile(t *testing.T) { }, { name: "bad file extension", - file: "./testdata/bad-sd-file-extension.nonexistant", - err: "invalid file extension: \".nonexistant\"", + file: "./testdata/bad-sd-file-extension.nonexistent", + err: "invalid file extension: \".nonexistent\"", }, { name: "bad format", diff --git a/cmd/promtool/testdata/bad-sd-file-extension.nonexistant b/cmd/promtool/testdata/bad-sd-file-extension.nonexistent similarity index 100% rename from cmd/promtool/testdata/bad-sd-file-extension.nonexistant rename to cmd/promtool/testdata/bad-sd-file-extension.nonexistent diff --git a/discovery/aws/ec2_test.go b/discovery/aws/ec2_test.go index 888816b4e2..2955e0e02e 100644 --- a/discovery/aws/ec2_test.go +++ b/discovery/aws/ec2_test.go @@ -217,7 +217,7 @@ func TestEC2DiscoveryRefresh(t *testing.T) { State: &ec2.InstanceState{Name: strptr("running")}, SubnetId: strptr("azid-3"), VpcId: strptr("vpc-ipv4"), - // network intefaces + // network interfaces NetworkInterfaces: []*ec2.InstanceNetworkInterface{ // interface without subnet -> should be ignored { @@ -285,7 +285,7 @@ func TestEC2DiscoveryRefresh(t *testing.T) { State: &ec2.InstanceState{Name: strptr("running")}, SubnetId: strptr("azid-2"), VpcId: strptr("vpc-ipv6"), - // network intefaces + // network interfaces NetworkInterfaces: []*ec2.InstanceNetworkInterface{ // interface without primary IPv6, index 2 { diff --git a/docs/configuration/alerting_rules.md b/docs/configuration/alerting_rules.md index cd33dba8e3..0a442876c3 100644 --- a/docs/configuration/alerting_rules.md +++ b/docs/configuration/alerting_rules.md @@ -46,7 +46,7 @@ this alert firing for the specified duration after the firing condition was last This can be used to prevent situations such as flapping alerts, false resolutions due to lack of data loss, etc. Alerting rules without the `keep_firing_for` clause will deactivate on the first evaluation where the condition is not met (assuming -any optional `for` duration desribed above has been satisfied). +any optional `for` duration described above has been satisfied). The `labels` clause allows specifying a set of additional labels to be attached to the alert. Any existing conflicting labels will be overwritten. The label diff --git a/docs/migration.md b/docs/migration.md index 34dae93e85..44cd466b3d 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -26,7 +26,7 @@ This document offers guidance on migrating from Prometheus 2.x to Prometheus 3.0 - Prometheus v3 will no longer add ports to scrape targets according to the specified scheme. Target will now appear in labels as configured. - If you rely on scrape targets like - `https://example.com/metrics` or `http://exmaple.com/metrics` to be + `https://example.com/metrics` or `http://example.com/metrics` to be represented as `https://example.com/metrics:443` and `http://example.com/metrics:80` respectively, add them to your target URLs - `agent` @@ -139,7 +139,7 @@ may now fail if this fallback protocol is not specified. The TSDB format has been changed slightly in Prometheus v2.55 in preparation for changes to the index format. Consequently, a Prometheus v3 TSDB can only be read by a Prometheus v2.55 or newer. Keep that in mind when upgrading to v3 -- you will be only -able to downgrade to v2.55, not lower, without losing your TSDB persitent data. +able to downgrade to v2.55, not lower, without losing your TSDB persistent data. As an extra safety measure, you could optionally consider upgrading to v2.55 first and confirm Prometheus works as expected, before upgrading to v3. diff --git a/docs/querying/api.md b/docs/querying/api.md index 10f963f209..033a2dfcf5 100644 --- a/docs/querying/api.md +++ b/docs/querying/api.md @@ -45,7 +45,7 @@ The JSON response envelope format is as follows: // Only set if there were warnings while executing the request. // There will still be data in the data field. "warnings": [""], - // Only set if there were info-level annnotations while executing the request. + // Only set if there were info-level annotations while executing the request. "infos": [""] } ``` diff --git a/promql/promqltest/testdata/functions.test b/promql/promqltest/testdata/functions.test index 49ab6c50ff..04d844bef9 100644 --- a/promql/promqltest/testdata/functions.test +++ b/promql/promqltest/testdata/functions.test @@ -1390,10 +1390,10 @@ clear eval instant at 50m absent(sum(nonexistent{job="testjob", instance="testinstance"})) {} 1 -eval instant at 50m absent(max(nonexistant)) +eval instant at 50m absent(max(nonexistent)) {} 1 -eval instant at 50m absent(nonexistant > 1) +eval instant at 50m absent(nonexistent > 1) {} 1 eval instant at 50m absent(a + b) @@ -1402,7 +1402,7 @@ eval instant at 50m absent(a + b) eval instant at 50m absent(a and b) {} 1 -eval instant at 50m absent(rate(nonexistant[5m])) +eval instant at 50m absent(rate(nonexistent[5m])) {} 1 clear @@ -1420,7 +1420,7 @@ eval instant at 1m absent_over_time(http_requests_total{handler!="/foo"}[5m]) eval instant at 1m absent_over_time(http_requests_total{handler="/foo", handler="/bar", handler="/foobar"}[5m]) {} 1 -eval instant at 1m absent_over_time(rate(nonexistant[5m])[5m:]) +eval instant at 1m absent_over_time(rate(nonexistent[5m])[5m:]) {} 1 eval instant at 1m absent_over_time(http_requests_total{handler="/foo", handler="/bar", instance="127.0.0.1"}[5m]) @@ -1497,7 +1497,7 @@ eval instant at 1m present_over_time(http_requests_total{handler!="/foo"}[5m]) eval instant at 1m present_over_time(http_requests_total{handler="/foo", handler="/bar", handler="/foobar"}[5m]) -eval instant at 1m present_over_time(rate(nonexistant[5m])[5m:]) +eval instant at 1m present_over_time(rate(nonexistent[5m])[5m:]) eval instant at 1m present_over_time(http_requests_total{handler="/foo", handler="/bar", instance="127.0.0.1"}[5m]) diff --git a/storage/remote/write_handler.go b/storage/remote/write_handler.go index 073ffed2e5..21e3693e50 100644 --- a/storage/remote/write_handler.go +++ b/storage/remote/write_handler.go @@ -513,7 +513,7 @@ func (h *writeHandler) appendV2(app storage.Appender, req *writev2.Request, rs * } // handleHistogramZeroSample appends CT as a zero-value sample with CT value as the sample timestamp. -// It doens't return errors in case of out of order CT. +// It doesn't return errors in case of out of order CT. func (h *writeHandler) handleHistogramZeroSample(app storage.Appender, ref storage.SeriesRef, l labels.Labels, hist writev2.Histogram, ct int64) (storage.SeriesRef, error) { var err error if hist.IsFloatHistogram() {