From e535e3dd5941d354914c3686bcb4e2bf46eff0e8 Mon Sep 17 00:00:00 2001 From: David Jetelina <6594163+djetelina@users.noreply.github.com> Date: Fri, 30 Sep 2022 13:04:16 +0200 Subject: [PATCH 1/3] Fix typo in cortex tenant parameter Also added information about Mimir Signed-off-by: David Jetelina <6594163+djetelina@users.noreply.github.com> --- content/docs/2.8/scalers/prometheus.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/docs/2.8/scalers/prometheus.md b/content/docs/2.8/scalers/prometheus.md index bc41e7901..f47572ccd 100644 --- a/content/docs/2.8/scalers/prometheus.md +++ b/content/docs/2.8/scalers/prometheus.md @@ -22,7 +22,7 @@ triggers: activationThreshold: '5.5' # Optional fields: namespace: example-namespace # for namespaced queries, eg. Thanos - cortexOrgId: my-org # Optional. X-Scope-OrgID header for Cortex. + cortexOrgID: my-org # Optional. X-Scope-OrgID header for Cortex. ignoreNullValues: false # Default is `true`, which means ignoring the empty value list from Prometheus. Set to `false` the scaler will return error when Prometheus target is lost ``` @@ -34,7 +34,7 @@ triggers: - `threshold` - Value to start scaling for. (This value can be a float) - `activationThreshold` - Target value for activating the scaler. Learn more about activation [here](./../concepts/scaling-deployments.md#activating-and-scaling-thresholds).(Default: `0`, Optional, This value can be a float) - `namespace` - A namespace that should be used for namespaced queries. These are required by some highly available Prometheus setups, such as [Thanos](https://thanos.io). (Optional) -- `cortexOrgId` - The `X-Scope-OrgID` header to query multi tenant [Cortex](https://cortexmetrics.io/). (Optional) +- `cortexOrgID` - The `X-Scope-OrgID` header to query multi tenant [Cortex](https://cortexmetrics.io/) or [Mimir](https://grafana.com/oss/mimir/). (Optional) - `ignoreNullValues` - Value to reporting error when Prometheus target is lost (Values: `true`,`false`, Default: `true`, Optional) ### Authentication Parameters From 315a22dbc608c4bba84fc2381213e737f2c6e788 Mon Sep 17 00:00:00 2001 From: David Jetelina <6594163+djetelina@users.noreply.github.com> Date: Fri, 30 Sep 2022 18:19:17 +0200 Subject: [PATCH 2/3] Update prometheus.md Signed-off-by: David Jetelina <6594163+djetelina@users.noreply.github.com> --- content/docs/2.7/scalers/prometheus.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/docs/2.7/scalers/prometheus.md b/content/docs/2.7/scalers/prometheus.md index f759dacae..03880eb08 100644 --- a/content/docs/2.7/scalers/prometheus.md +++ b/content/docs/2.7/scalers/prometheus.md @@ -21,7 +21,7 @@ triggers: threshold: '100' # Optional fields: namespace: example-namespace # for namespaced queries, eg. Thanos - cortexOrgId: my-org # Optional. X-Scope-OrgID header for Cortex. + cortexOrgID: my-org # Optional. X-Scope-OrgID header for Cortex. ``` **Parameter list:** @@ -31,7 +31,7 @@ triggers: - `query` - Query to run. - `threshold` - Value to start scaling for. - `namespace` - A namespace that should be used for namespaced queries. These are required by some highly available Prometheus setups, such as [Thanos](https://thanos.io). (Optional) -- `cortexOrgId` - The `X-Scope-OrgID` header to query multi tenant [Cortex](https://cortexmetrics.io/). (Optional) +- `cortexOrgID` - The `X-Scope-OrgID` header to query multi tenant [Cortex](https://cortexmetrics.io/) or [Mimir](https://grafana.com/oss/mimir/). (Optional) ### Authentication Parameters From 6e3bf2d6dc5828425848df2dcfc618a4daccf587 Mon Sep 17 00:00:00 2001 From: David Jetelina <6594163+djetelina@users.noreply.github.com> Date: Fri, 30 Sep 2022 18:20:22 +0200 Subject: [PATCH 3/3] Update prometheus.md Signed-off-by: David Jetelina <6594163+djetelina@users.noreply.github.com> --- content/docs/2.9/scalers/prometheus.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/docs/2.9/scalers/prometheus.md b/content/docs/2.9/scalers/prometheus.md index e78d288dd..6381a3b5b 100644 --- a/content/docs/2.9/scalers/prometheus.md +++ b/content/docs/2.9/scalers/prometheus.md @@ -22,7 +22,7 @@ triggers: activationThreshold: '5.5' # Optional fields: namespace: example-namespace # for namespaced queries, eg. Thanos - cortexOrgId: my-org # Optional. X-Scope-OrgID header for Cortex. + cortexOrgID: my-org # Optional. X-Scope-OrgID header for Cortex. ignoreNullValues: false # Default is `true`, which means ignoring the empty value list from Prometheus. Set to `false` the scaler will return error when Prometheus target is lost unsafeSsl: false # Default is `false`, Used for skipping certificate check when having self signed certs for Prometheus endpoint ``` @@ -35,7 +35,7 @@ triggers: - `threshold` - Value to start scaling for. (This value can be a float) - `activationThreshold` - Target value for activating the scaler. Learn more about activation [here](./../concepts/scaling-deployments.md#activating-and-scaling-thresholds).(Default: `0`, Optional, This value can be a float) - `namespace` - A namespace that should be used for namespaced queries. These are required by some highly available Prometheus setups, such as [Thanos](https://thanos.io). (Optional) -- `cortexOrgId` - The `X-Scope-OrgID` header to query multi tenant [Cortex](https://cortexmetrics.io/). (Optional) +- `cortexOrgID` - The `X-Scope-OrgID` header to query multi tenant [Cortex](https://cortexmetrics.io/) or [Mimir](https://grafana.com/oss/mimir/). (Optional) - `ignoreNullValues` - Value to reporting error when Prometheus target is lost (Values: `true`,`false`, Default: `true`, Optional) - `unsafeSsl` - Used for skipping certificate check e.g: using self signed certs (Values: `true`,`false`, Default: `false`, Optional)