diff --git a/app/vmagent/README.md b/app/vmagent/README.md index ee69ce6a77..3467f673a2 100644 --- a/app/vmagent/README.md +++ b/app/vmagent/README.md @@ -122,7 +122,7 @@ Please see [these docs](#relabeling) for details. ### Splitting data streams among multiple systems -`vmagent` supports splitting the collected data between muliple destinations with the help of `-remoteWrite.urlRelabelConfig`, +`vmagent` supports splitting the collected data between multiple destinations with the help of `-remoteWrite.urlRelabelConfig`, which is applied independently for each configured `-remoteWrite.url` destination. For example, it is possible to replicate or split data among long-term remote storage, short-term remote storage and a real-time analytical system [built on top of Kafka](https://github.com/Telefonica/prometheus-kafka-adapter). Note that each destination can receive it's own subset of the collected data due to per-destination relabeling via `-remoteWrite.urlRelabelConfig`. @@ -136,7 +136,7 @@ Also, Basic Auth can be enabled for the incoming `remote_write` requests with `- ### remote_write for clustered version -While `vmagent` can accept data in several supported protocols (OpenTSDB, Influx, Prometheus, Graphite) and scrape data from various targets, writes are always peformed in Promethes remote_write protocol. Therefore for the [clustered version](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html), `-remoteWrite.url` the command-line flag should be configured as `://:8480/insert//prometheus/api/v1/write` according to [these docs](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html#url-format). There is also support for multitenant writes. See [these docs](#multitenancy). +While `vmagent` can accept data in several supported protocols (OpenTSDB, Influx, Prometheus, Graphite) and scrape data from various targets, writes are always performed in Promethes remote_write protocol. Therefore for the [clustered version](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html), `-remoteWrite.url` the command-line flag should be configured as `://:8480/insert//prometheus/api/v1/write` according to [these docs](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html#url-format). There is also support for multitenant writes. See [these docs](#multitenancy). ## Multitenancy @@ -332,7 +332,7 @@ The following articles contain useful information about Prometheus relabeling: VictoriaMetrics provides the following additional relabeling actions on top of standard actions from the [Prometheus relabeling](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config): -* `replace_all` replaces all of the occurences of `regex` in the values of `source_labels` with the `replacement` and stores the results in the `target_label`. For example, the following relabeling config replaces all the occurences of `-` char in metric names with `_` char (e.g. `foo-bar-baz` metric name is transformed into `foo_bar_baz`): +* `replace_all` replaces all of the occurrences of `regex` in the values of `source_labels` with the `replacement` and stores the results in the `target_label`. For example, the following relabeling config replaces all the occurrences of `-` char in metric names with `_` char (e.g. `foo-bar-baz` metric name is transformed into `foo_bar_baz`): ```yaml - action: replace_all @@ -342,7 +342,7 @@ VictoriaMetrics provides the following additional relabeling actions on top of s replacement: "_" ``` -* `labelmap_all` replaces all of the occurences of `regex` in all the label names with the `replacement`. For example, the following relabeling config replaces all the occurences of `-` char in all the label names with `_` char (e.g. `foo-bar-baz` label name is transformed into `foo_bar_baz`): +* `labelmap_all` replaces all of the occurrences of `regex` in all the label names with the `replacement`. For example, the following relabeling config replaces all the occurrences of `-` char in all the label names with `_` char (e.g. `foo-bar-baz` label name is transformed into `foo_bar_baz`): ```yaml - action: labelmap_all diff --git a/app/vmalert/group_test.go b/app/vmalert/group_test.go index 046acd2b09..fc01b0e1bc 100644 --- a/app/vmalert/group_test.go +++ b/app/vmalert/group_test.go @@ -148,7 +148,7 @@ func TestUpdateWith(t *testing.T) { t.Fatalf("expected to have rule %q; got %q", want, got) } if err := compareRules(t, got, want); err != nil { - t.Fatalf("comparsion error: %s", err) + t.Fatalf("comparison error: %s", err) } } }) diff --git a/app/vmalert/helpers_test.go b/app/vmalert/helpers_test.go index 96bd2b1e21..1a7978cc1b 100644 --- a/app/vmalert/helpers_test.go +++ b/app/vmalert/helpers_test.go @@ -164,7 +164,7 @@ func compareGroups(t *testing.T, a, b *Group) { t.Fatalf("expected to have rule %q; got %q", want.ID(), got.ID()) } if err := compareRules(t, want, got); err != nil { - t.Fatalf("comparsion error: %s", err) + t.Fatalf("comparison error: %s", err) } } } diff --git a/app/vmalert/main_test.go b/app/vmalert/main_test.go index 30595d2f02..43e42b93be 100644 --- a/app/vmalert/main_test.go +++ b/app/vmalert/main_test.go @@ -47,7 +47,7 @@ func TestGetAlertURLGenerator(t *testing.T) { } _, err = getAlertURLGenerator(nil, "foo?{{invalid}}", true) if err == nil { - t.Errorf("expected tempalte validation error got nil") + t.Errorf("expected template validation error got nil") } fn, err = getAlertURLGenerator(u, "foo?query={{$value}}", true) if err != nil { diff --git a/app/vmalert/manager_test.go b/app/vmalert/manager_test.go index 2ac3574caa..e5ecb73af9 100644 --- a/app/vmalert/manager_test.go +++ b/app/vmalert/manager_test.go @@ -30,7 +30,7 @@ func TestManagerEmptyRulesDir(t *testing.T) { m := &manager{groups: make(map[uint64]*Group)} cfg := loadCfg(t, []string{"foo/bar"}, true, true) if err := m.update(context.Background(), cfg, false); err != nil { - t.Fatalf("expected to load succesfully with empty rules dir; got err instead: %v", err) + t.Fatalf("expected to load successfully with empty rules dir; got err instead: %v", err) } } diff --git a/app/vmalert/templates/template_test.go b/app/vmalert/templates/template_test.go index 16e4b5c252..67b450594e 100644 --- a/app/vmalert/templates/template_test.go +++ b/app/vmalert/templates/template_test.go @@ -185,7 +185,7 @@ func TestTemplates_Load(t *testing.T) { } if tc.expErr != "" && err == nil { t.Error("%+w", err) - t.Error("expected error that didn't happend") + t.Error("expected error that didn't happened") } if err != nil && !strings.Contains(err.Error(), tc.expErr) { t.Error("%+w", err) diff --git a/docs/vmagent.md b/docs/vmagent.md index 96f202c9e9..c05d37c4c3 100644 --- a/docs/vmagent.md +++ b/docs/vmagent.md @@ -126,7 +126,7 @@ Please see [these docs](#relabeling) for details. ### Splitting data streams among multiple systems -`vmagent` supports splitting the collected data between muliple destinations with the help of `-remoteWrite.urlRelabelConfig`, +`vmagent` supports splitting the collected data between multiple destinations with the help of `-remoteWrite.urlRelabelConfig`, which is applied independently for each configured `-remoteWrite.url` destination. For example, it is possible to replicate or split data among long-term remote storage, short-term remote storage and a real-time analytical system [built on top of Kafka](https://github.com/Telefonica/prometheus-kafka-adapter). Note that each destination can receive it's own subset of the collected data due to per-destination relabeling via `-remoteWrite.urlRelabelConfig`. @@ -140,7 +140,7 @@ Also, Basic Auth can be enabled for the incoming `remote_write` requests with `- ### remote_write for clustered version -While `vmagent` can accept data in several supported protocols (OpenTSDB, Influx, Prometheus, Graphite) and scrape data from various targets, writes are always peformed in Promethes remote_write protocol. Therefore for the [clustered version](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html), `-remoteWrite.url` the command-line flag should be configured as `://:8480/insert//prometheus/api/v1/write` according to [these docs](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html#url-format). There is also support for multitenant writes. See [these docs](#multitenancy). +While `vmagent` can accept data in several supported protocols (OpenTSDB, Influx, Prometheus, Graphite) and scrape data from various targets, writes are always performed in Promethes remote_write protocol. Therefore for the [clustered version](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html), `-remoteWrite.url` the command-line flag should be configured as `://:8480/insert//prometheus/api/v1/write` according to [these docs](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html#url-format). There is also support for multitenant writes. See [these docs](#multitenancy). ## Multitenancy @@ -336,7 +336,7 @@ The following articles contain useful information about Prometheus relabeling: VictoriaMetrics provides the following additional relabeling actions on top of standard actions from the [Prometheus relabeling](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config): -* `replace_all` replaces all of the occurences of `regex` in the values of `source_labels` with the `replacement` and stores the results in the `target_label`. For example, the following relabeling config replaces all the occurences of `-` char in metric names with `_` char (e.g. `foo-bar-baz` metric name is transformed into `foo_bar_baz`): +* `replace_all` replaces all of the occurrences of `regex` in the values of `source_labels` with the `replacement` and stores the results in the `target_label`. For example, the following relabeling config replaces all the occurrences of `-` char in metric names with `_` char (e.g. `foo-bar-baz` metric name is transformed into `foo_bar_baz`): ```yaml - action: replace_all @@ -346,7 +346,7 @@ VictoriaMetrics provides the following additional relabeling actions on top of s replacement: "_" ``` -* `labelmap_all` replaces all of the occurences of `regex` in all the label names with the `replacement`. For example, the following relabeling config replaces all the occurences of `-` char in all the label names with `_` char (e.g. `foo-bar-baz` label name is transformed into `foo_bar_baz`): +* `labelmap_all` replaces all of the occurrences of `regex` in all the label names with the `replacement`. For example, the following relabeling config replaces all the occurrences of `-` char in all the label names with `_` char (e.g. `foo-bar-baz` label name is transformed into `foo_bar_baz`): ```yaml - action: labelmap_all