From 54909d54c84fb041eff1078254d431290864799e Mon Sep 17 00:00:00 2001 From: Jack Baldry Date: Wed, 6 Oct 2021 10:02:17 +0100 Subject: [PATCH 1/4] fix: Ensure that production values include replication factor of three Signed-off-by: Jack Baldry --- charts/enterprise-metrics/capped-large.yaml | 8 ++++++++ charts/enterprise-metrics/capped-small.yaml | 8 ++++++++ charts/enterprise-metrics/large.yaml | 8 ++++++++ charts/enterprise-metrics/small.yaml | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/charts/enterprise-metrics/capped-large.yaml b/charts/enterprise-metrics/capped-large.yaml index be3cfeea5b..47a3999da7 100644 --- a/charts/enterprise-metrics/capped-large.yaml +++ b/charts/enterprise-metrics/capped-large.yaml @@ -11,6 +11,14 @@ # for more information. # Minio is no longer enabled and you are encouraged to use your cloud providers # object storage service for production deployments. +# Ingesters are configured with a replication factor of 3 to ensure that a single ingester failur does not +# result in data loss. +config: + ingester: + lifecycler: + ring: + replication_factor: 3 + admin_api: replicas: 3 resources: diff --git a/charts/enterprise-metrics/capped-small.yaml b/charts/enterprise-metrics/capped-small.yaml index c89596c198..e1fb2cd632 100644 --- a/charts/enterprise-metrics/capped-small.yaml +++ b/charts/enterprise-metrics/capped-small.yaml @@ -11,6 +11,14 @@ # for more information. # Minio is no longer enabled and you are encouraged to use your cloud providers # object storage service for production deployments. +# Ingesters are configured with a replication factor of 3 to ensure that a single ingester failur does not +# result in data loss. +config: + ingester: + lifecycler: + ring: + replication_factor: 3 + admin_api: replicas: 3 resources: diff --git a/charts/enterprise-metrics/large.yaml b/charts/enterprise-metrics/large.yaml index 0e1a771512..34ae970382 100644 --- a/charts/enterprise-metrics/large.yaml +++ b/charts/enterprise-metrics/large.yaml @@ -11,6 +11,14 @@ # for more information. # Minio is no longer enabled and you are encouraged to use your cloud providers # object storage service for production deployments. +# Ingesters are configured with a replication factor of 3 to ensure that a single ingester failur does not +# result in data loss. +config: + ingester: + lifecycler: + ring: + replication_factor: 3 + admin_api: replicas: 3 resources: diff --git a/charts/enterprise-metrics/small.yaml b/charts/enterprise-metrics/small.yaml index f872e37bdf..3748ab3bfd 100644 --- a/charts/enterprise-metrics/small.yaml +++ b/charts/enterprise-metrics/small.yaml @@ -11,6 +11,14 @@ # for more information. # Minio is no longer enabled and you are encouraged to use your cloud providers # object storage service for production deployments. +# Ingesters are configured with a replication factor of 3 to ensure that a single ingester failur does not +# result in data loss. +config: + ingester: + lifecycler: + ring: + replication_factor: 3 + admin_api: replicas: 3 resources: From 1fb89531aea702f56da2ab233736cf6872e1c372 Mon Sep 17 00:00:00 2001 From: Jack Baldry Date: Wed, 6 Oct 2021 10:08:08 +0100 Subject: [PATCH 2/4] chore: Bump chart version and update CHANGELOG Signed-off-by: Jack Baldry --- charts/enterprise-metrics/CHANGELOG.md | 8 ++++++++ charts/enterprise-metrics/Chart.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/enterprise-metrics/CHANGELOG.md b/charts/enterprise-metrics/CHANGELOG.md index 4c917df39a..46577e97fd 100644 --- a/charts/enterprise-metrics/CHANGELOG.md +++ b/charts/enterprise-metrics/CHANGELOG.md @@ -10,6 +10,14 @@ Entries should be ordered as follows: Entries should include a reference to the Pull Request that introduced the change. +## 1.6.0 + +* [FEATURE] Upgrade to [Grafana Enterprise Metrics v1.5.1](https://grafana.com/docs/metrics-enterprise/latest/downloads/#v151----september-21st-2021). #729 +* [CHANGE] Production values set the ingester replication factor to three to avoid data loss. +The resource calculations of these values already factored in this replication factor but did not apply it in the configuration. +If you have not reduced the compute resources in these values then this change should have no impact besides increased resilience to ingester failure. +If you have reduced the compute resources, consider increasing them back to the recommended values before installing this version. #729 + ## 1.5.6 * [BUGFIX] YAML exports are no longer included as part of the Helm chart. #726 diff --git a/charts/enterprise-metrics/Chart.yaml b/charts/enterprise-metrics/Chart.yaml index b443a21e2b..acb9ae40fd 100755 --- a/charts/enterprise-metrics/Chart.yaml +++ b/charts/enterprise-metrics/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -version: 1.5.6 +version: 1.6.0 appVersion: v1.5.0 description: 'Grafana Enterprise Metrics' engine: gotpl From 6ddc744d25dc23049f38566805c4bb0f8038b097 Mon Sep 17 00:00:00 2001 From: Jack Baldry Date: Thu, 7 Oct 2021 15:22:42 +0100 Subject: [PATCH 3/4] doc: Note scrape interval used in sizing calculations Signed-off-by: Jack Baldry --- charts/enterprise-metrics/capped-large.yaml | 2 +- charts/enterprise-metrics/capped-small.yaml | 2 +- charts/enterprise-metrics/large.yaml | 2 +- charts/enterprise-metrics/small.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/enterprise-metrics/capped-large.yaml b/charts/enterprise-metrics/capped-large.yaml index 47a3999da7..ea1b1008ec 100644 --- a/charts/enterprise-metrics/capped-large.yaml +++ b/charts/enterprise-metrics/capped-large.yaml @@ -1,6 +1,6 @@ # These values configure the Grafana Enterprise Metrics cluster to # handle production ingestion of ~10M active series using the blocks -# storage engine. +# storage engine scraped with a 15s interval. # Query requirements can vary dramatically depending on query rate and query # ranges. The values here satisfy a "usual" query load as seen from our # production clusters at this scale. diff --git a/charts/enterprise-metrics/capped-small.yaml b/charts/enterprise-metrics/capped-small.yaml index e1fb2cd632..1894d43269 100644 --- a/charts/enterprise-metrics/capped-small.yaml +++ b/charts/enterprise-metrics/capped-small.yaml @@ -1,6 +1,6 @@ # These values configure the Grafana Enterprise Metrics cluster to # handle production ingestion of ~1M active series using the blocks -# storage engine. +# storage engine scraped with a 15s interval. # Query requirements can vary dramatically depending on query rate and query # ranges. The values here satisfy a "usual" query load as seen from our # production clusters at this scale. diff --git a/charts/enterprise-metrics/large.yaml b/charts/enterprise-metrics/large.yaml index 34ae970382..4896c042d2 100644 --- a/charts/enterprise-metrics/large.yaml +++ b/charts/enterprise-metrics/large.yaml @@ -1,6 +1,6 @@ # These values configure the Grafana Enterprise Metrics cluster to # handle production ingestion of ~10M active series using the blocks -# storage engine. +# storage engine scraped with a 15s interval. # Query requirements can vary dramatically depending on query rate and query # ranges. The values here satisfy a "usual" query load as seen from our # production clusters at this scale. diff --git a/charts/enterprise-metrics/small.yaml b/charts/enterprise-metrics/small.yaml index 3748ab3bfd..d819dbfa86 100644 --- a/charts/enterprise-metrics/small.yaml +++ b/charts/enterprise-metrics/small.yaml @@ -1,6 +1,6 @@ # These values configure the Grafana Enterprise Metrics cluster to # handle production ingestion of ~1M active series using the blocks -# storage engine. +# storage engine scraped with a 15s interval. # Query requirements can vary dramatically depending on query rate and query # ranges. The values here satisfy a "usual" query load as seen from our # production clusters at this scale. From f2ace03a3e6da1b7f5fd1197d1df6810cc3367d3 Mon Sep 17 00:00:00 2001 From: Jack Baldry Date: Thu, 14 Oct 2021 09:15:05 +0100 Subject: [PATCH 4/4] style: Indent CHANGELOG entry Signed-off-by: Jack Baldry --- charts/enterprise-metrics/CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/enterprise-metrics/CHANGELOG.md b/charts/enterprise-metrics/CHANGELOG.md index 46577e97fd..b73c157f48 100644 --- a/charts/enterprise-metrics/CHANGELOG.md +++ b/charts/enterprise-metrics/CHANGELOG.md @@ -14,9 +14,9 @@ Entries should include a reference to the Pull Request that introduced the chang * [FEATURE] Upgrade to [Grafana Enterprise Metrics v1.5.1](https://grafana.com/docs/metrics-enterprise/latest/downloads/#v151----september-21st-2021). #729 * [CHANGE] Production values set the ingester replication factor to three to avoid data loss. -The resource calculations of these values already factored in this replication factor but did not apply it in the configuration. -If you have not reduced the compute resources in these values then this change should have no impact besides increased resilience to ingester failure. -If you have reduced the compute resources, consider increasing them back to the recommended values before installing this version. #729 + The resource calculations of these values already factored in this replication factor but did not apply it in the configuration. + If you have not reduced the compute resources in these values then this change should have no impact besides increased resilience to ingester failure. + If you have reduced the compute resources, consider increasing them back to the recommended values before installing this version. #729 ## 1.5.6