From 12ac2367d29e1ae23477f2aa74458d44e700b646 Mon Sep 17 00:00:00 2001 From: Jesus Vazquez Date: Mon, 20 Jun 2022 15:45:54 +0200 Subject: [PATCH] Merge r190 into out of order (#2140) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Extend Makefile and Dockerfiles to support multiarch builds for all Go binaries. (#1759) * Extend Dockerfiles to support multiarch builds for all Go binaries. By calling any of make push-multiarch-./cmd/metaconvert/.uptodate make push-multiarch-./cmd/mimir/.uptodate make push-multiarch-./cmd/query-tee/.uptodate make push-multiarch-./cmd/mimir-continuous-test/.uptodate make push-multiarch-./cmd/mimirtool/.uptodate make push-multiarch-./operations/mimir-rules-action/.uptodate Signed-off-by: Peter Štibraný * Update to latest dskit and memberlist fork (#1758) * Update to latest dskit and memberlist fork Fixes #1743 Signed-off-by: Nick Pillitteri * Update changelog Signed-off-by: Nick Pillitteri * update cli parameter description (#1760) Signed-off-by: Mauro Stettler * mimirtool config: Add more retained old defaults (#1762) * mimirtool config: Add more retained old defaults The following parameters have their old defaults retained even when `--update-defaults` is used with `mimirtool config covert`: * `activity_tracker.filepath` * `alertmanager.data_dir` * `blocks_storage.filesystem.dir` * `compactor.data_dir` * `ruler.rule_path` * `ruler_storage.filesystem.dir` * `graphite.querier.schemas.backend` (only in GEM) These are filepaths for which the new defaults don't make more sense than the old ones. In fact updating these can lead to subpar migration experience because components start using directories that don't exist. Because activity_tracker.filepath changed its name since cortex the tests needed to allow for differentiating old common options and new ones. This is something that was already there for GEM and was added for cortex/mimir too. Signed-off-by: Dimitar Dimitrov * Update CHANGELOG.md Signed-off-by: Dimitar Dimitrov * dashboards: add flag to skip gateway (#1761) * dashboards: add flag to skip gateway The gateway component seems to be an enterprise component, so groups that aren't running enterprise shouldn't need the empty panels and rows in their dashboards. This patch adds a flag to drop gateway-related widgets from the mixin dashboards. Signed-off-by: Josh Carp * Update CHANGELOG.md Co-authored-by: Marco Pracucci * Gracefully shutdown querier when using query-scheduler (#1756) * Gracefully shutdown querier when using query-scheduler Signed-off-by: Marco Pracucci * Fixed comment Signed-off-by: Marco Pracucci * Added TestQueuesOnTerminatingQuerier Signed-off-by: Marco Pracucci * Commented executionContext Signed-off-by: Marco Pracucci * Added CHANGELOG entry Signed-off-by: Marco Pracucci * Update pkg/querier/worker/util.go Co-authored-by: Peter Štibraný * Fixed typo in suggestion Signed-off-by: Marco Pracucci * Removed superfluous time sensitive assertion Signed-off-by: Marco Pracucci * Commented newExecutionContext() Signed-off-by: Marco Pracucci Co-authored-by: Peter Štibraný * Graceful shutdown querier without query-scheduler (#1767) * Graceful shutdown querier with not using query-scheduler Signed-off-by: Marco Pracucci * Updated CHANGELOG entry Signed-off-by: Marco Pracucci * Improved comment Signed-off-by: Marco Pracucci * Refactoring Signed-off-by: Marco Pracucci * Increase continuous test query timeout (#1777) * Increase mimir-continuous-test query timeout from 30s to 60 Signed-off-by: Marco Pracucci * Added PR number to CHANGELOG entry Signed-off-by: Marco Pracucci * Increased default -tests.run-interval from 1m to 5m (#1778) * Increased default -tests.run-interval from 1m to 5m Signed-off-by: Marco Pracucci * Added PR number to CHANGELOG entry Signed-off-by: Marco Pracucci * Fix flaky tests on querier graceful shutdown (#1779) * Fix flaky tests on querier graceful shutdown Signed-off-by: Marco Pracucci * Remove spurious newline Signed-off-by: Marco Pracucci * Update build image and GitHub workflow (#1781) * Update build-image to use golang:1.17.8-bullseye, and add skopeo to build image. Skopeo will be used in subsequent PR to push multiarch images. Signed-off-by: Peter Štibraný * Update build image. Use ubuntu-latest for workflow steps. Signed-off-by: Peter Štibraný * api: remote duplicated remote read querier handler (#1776) * Publish multiarch images (#1772) * Publish multiarch images. Signed-off-by: Peter Štibraný * Tag with extra tag, if pushing tagged commit or release. Signed-off-by: Peter Štibraný * Split building of docker images and archiving them into tar. Signed-off-by: Peter Štibraný * When tagging with test, use --all. Signed-off-by: Peter Štibraný * Only run deploy step on tags or weekly release branches. Signed-off-by: Peter Štibraný * Don't tag with test anymore. Signed-off-by: Peter Štibraný * Address review feedback. Signed-off-by: Peter Štibraný * Fix license check. Signed-off-by: Peter Štibraný * K6: Take into account HTTP status code 202 (#1787) When using `K6_HA_REPLICAS > 1`, Mimir will accept all HTTP calls but a part of those call will receive a status code `202`. The following commit makes this status code as expected otherwise user receive the following error: ``` reads_inat write (file:///.../mimir-k6/load-testing-with-k6.js:254:8(137)) reads_inat native executor=ramping-arrival-rate scenario=writing_metrics source=stacktrace ERRO[0015] GoError: ERR: write failed. Status: 202. Body: replicas did not mach, rejecting sample: replica=replica_1, elected=replica_0 ``` At the end of the benchmark summary display errors: ``` ✗ write worked ↳ 20% — ✓ 23 / ✗ 92 ``` Example of load testing: ```shell ./k6 run load-testing-with-k6.js \ -e K6_SCHEME="https" \ -e K6_WRITE_HOSTNAME="${mimir}" \ -e K6_READ_HOSTNAME="${mimir}" \ -e K6_USERNAME="${user}" \ -e K6_WRITE_TOKEN="${password}" \ -e K6_READ_TOKEN="${password}" \ -e K6_HA_CLUSTERS="1" \ -e K6_HA_REPLICAS="3" \ -e K6_DURATION_MIN="5" ``` Signed-off-by: Wilfried Roset * replace model.Metric with labels.Labels in distributor.MetricsForLabelMatchers() (#1788) * Streaming remote read (#1735) * implement read v2 * updated CHANGELOG.md * extend maxBytesInFram comment. * addressed PR feedback * addressed PR feedback * addressed PR feedback * use indexed xor chunk function to assert stream remote read tests * updated CHANGELOG.md Co-authored-by: Miguel Ángel Ortuño * Upgrade dskit (#1791) Signed-off-by: Marco Pracucci * Fix mimir-continuous-test when changing configured num-series (#1775) Signed-off-by: Marco Pracucci * Do not export per user and integration Alertmanager metrics when value is 0 (#1783) Signed-off-by: Marco Pracucci * Print version+arch of Mimir loaded to Docker. (#1793) * Print version+arch of Mimir loaded to Docker. Signed-off-by: Peter Štibraný * Use debug log for distributor. Signed-off-by: Peter Štibraný * Remove unused metrics cortex_distributor_ingester_queries_total and cortex_distributor_ingester_query_failures_total (#1797) * Remove unused metrics cortex_distributor_ingester_queries_total and cortex_distributor_ingester_query_failures_total Signed-off-by: Marco Pracucci * Remove unused fields Signed-off-by: Marco Pracucci * Added options support to SendSumOfCountersPerUser() (#1794) * Added options support to SendSumOfCountersPerUser() Signed-off-by: Marco Pracucci * Renamed SkipZeroValueMetrics() to WithSkipZeroValueMetrics() Signed-off-by: Marco Pracucci * Changed all Grafana dashboards UIDs to not conflict with Cortex ones, to let people install both while migrating from Cortex to Mimir (#1801) Signed-off-by: Marco Pracucci * Adopt mixin convention to set dashboard UIDs based on md5(filename) (#1808) Signed-off-by: Marco Pracucci * Add support for store_gateway_zone args (#1807) Allow customizing mimir cli flags per zone for the store gateway. Copied the same solution as we have for ingesters. Signed-off-by: György Krajcsovits * Add protection to store-gateway to not drop all blocks if unhealthy in the ring (#1806) * Add protection to store-gateway to not drop all blocks if unhealthy in the ring Signed-off-by: Marco Pracucci * Added CHANGELOG entry Signed-off-by: Marco Pracucci * Update CHANGELOG.md Co-authored-by: Peter Štibraný Co-authored-by: Peter Štibraný * Removed cortex_distributor_ingester_appends_total and cortex_distributor_ingester_append_failures_total unused metrics (#1799) Signed-off-by: Marco Pracucci * Remove unused clientConfig from ingester (#1814) Signed-off-by: Marco Pracucci * Add tracing to `mimir-continuous-test` (#1795) * Extract and test TracerTransport functionality We need to use a TracerTransport in mimir-continous-test. We have that in the frontend package, but I don't want to import frontend from the mimir-continous-test, so we extract it to util/instrumentation. Signed-off-by: Oleg Zaytsev * Set up global tracer in mimir-continuous-test Signed-off-by: Oleg Zaytsev * Add tracing to the client and spans to the tests Signed-off-by: Oleg Zaytsev * Add jaeger-mixin to mimir-continuous test container Signed-off-by: Oleg Zaytsev * make license Signed-off-by: Oleg Zaytsev * Add traces to the write path Signed-off-by: Oleg Zaytsev * Update CHANGELOG.md Signed-off-by: Oleg Zaytsev * Chore: remove unused code from BucketStore (#1816) * Removed unused Info() and advLabelSets from BucketStore Signed-off-by: Marco Pracucci * Removed unused FilterConfig from BucketStore Signed-off-by: Marco Pracucci * Removed unused relabelConfig from store-gateway tests Signed-off-by: Marco Pracucci * Removed unused function expectedTouchedBlockOps() Signed-off-by: Marco Pracucci * Removed unused recorder from BucketStore tests Signed-off-by: Marco Pracucci * go mod vendor Signed-off-by: Marco Pracucci * Refactoring: force removal of all blocks when BucketStore is closed (#1817) Signed-off-by: Marco Pracucci * Simplify FilterUsers() logic in store-gateway (#1819) Signed-off-by: Marco Pracucci * Migrate admin CSS to bootstrap 5 (#1821) * Migrate admin CSS to bootstrap 5 When I added bootstrap, for some reason I imported bootstrap 3 which was originally launched in 2013. Before adding more CSS styles, let's migrate to modern Bootstrap 5 launched in 2021. This doesn't require an explicit jquery dependency anymore. Also re-styled admin header to adapt properly to mobile devices screens. Signed-off-by: Oleg Zaytsev * Update CHANGELOG.md Signed-off-by: Oleg Zaytsev * ruler: make use of dskit `grpcclient.Config` on remote evaluation client (#1818) * ruler: use dskit grpc client for remote evaluation * addressed PR feedback * Memberlist status page CSS (#1824) * Update CHANGELOG.md Signed-off-by: Oleg Zaytsev * Update dskit to 4d7238067788a04f3dd921400dcf7a7657116907 This includes changes from https://github.com/grafana/dskit/pull/163 Signed-off-by: Oleg Zaytsev * Custom memberlist status template Signed-off-by: Oleg Zaytsev * Include `import` in jsonnet snippets (#1826) * Do not drop blocks in the store-gateway if missing in the ring (#1823) Signed-off-by: Marco Pracucci * Upgraded dskit to fix temporary partial query results when shuffle sharding is enabled and hash ring backend storage is flushed / reset (#1829) Signed-off-by: Marco Pracucci * Docs: ruler remote evaluation (#1714) * include documentation for remote rule evaluation * Update docs/sources/operators-guide/configuring/configuring-to-evaluate-rules-using-query-frontend.md Co-authored-by: Ursula Kallio * Update docs/sources/operators-guide/configuring/configuring-to-evaluate-rules-using-query-frontend.md Co-authored-by: Ursula Kallio * Update docs/sources/operators-guide/configuring/configuring-to-evaluate-rules-using-query-frontend.md Co-authored-by: Ursula Kallio * Update docs/sources/operators-guide/configuring/configuring-to-evaluate-rules-using-query-frontend.md Co-authored-by: Ursula Kallio * Update docs/sources/operators-guide/configuring/configuring-to-evaluate-rules-using-query-frontend.md Co-authored-by: Ursula Kallio * address PR feedback * Update docs/sources/operators-guide/architecture/components/ruler/index.md Co-authored-by: Marco Pracucci * Update docs/sources/operators-guide/architecture/components/ruler/index.md Co-authored-by: Marco Pracucci * Update docs/sources/operators-guide/architecture/components/ruler/index.md Co-authored-by: Marco Pracucci * Update docs/sources/operators-guide/architecture/components/ruler/index.md Co-authored-by: Marco Pracucci * Update docs/sources/operators-guide/architecture/components/ruler/index.md Co-authored-by: Marco Pracucci * addressed PR feedback * addressed PR feedback * Update docs/sources/operators-guide/architecture/components/ruler/index.md Co-authored-by: Marco Pracucci * Update docs/sources/operators-guide/running-production-environment/planning-capacity.md Co-authored-by: Marco Pracucci * Update docs/sources/operators-guide/running-production-environment/planning-capacity.md Co-authored-by: Marco Pracucci * addressed PR feedback Co-authored-by: Ursula Kallio Co-authored-by: Marco Pracucci * Alertmanager: Do not validate alertmanager configuration if it's not running. (#1835) Allows other targets to start up even if an invalid alertmanager configuration is passed in. Fixes #1784 * Alertmanager: Allow usage with `local` storage type, with appropriate warnings. (#1836) An oversight when we removed non-sharding modes of operation is that the `local` storage type stopped working. Unfortunately it is not conceptually simple to support this type fully, as alertmanager requires remote storage shared between all replicas, to support recovering tenant state to an arbitrary replica following an all-replica outage. To support provisioning of alerts with `local` storage, but persisting of state to remote storage, we would need to allow different storage configurations. This change fixes the issue in a more naive way, so that the alertmanager can at least be started up for testing or development purposes, but persisting state will always fail. A second PR will propose allowing the `Persister` to be disabled. Although this configuration is not recommended for production used, as long as the number of replicas is equal to the replication factor, then tenants will never move between replicas, and so the local snapshot behaviour of the upstream alertmanager will be sufficient. Fixes #1638 * Mixin: Additions to Top tenants dashboard regarding sample rate and discard rate. (#1842) Adds the following rows to the "Top tenants" dashboard: - By samples rate growth - By discarded samples rate - By discarded samples rate growth These queries are useful for determining what tenants are potentially putting excess load on distributors and ingesters (and if it increased recently). * Use concurrent open/close operations in compactor unit tests (#1844) Open and close files concurrently in compactor unit tests to expose bugs that implicitly rely on ordering. Exposes bugs such as https://github.com/prometheus/prometheus/pull/10108 Signed-off-by: Nick Pillitteri * Mixin: Show ingestion rate limit and rule group limit on Tenants dashboard. (#1845) Whilst diagnosing a recent issue, we thought it would be useful to show the current ingestion rate limit for the tenant. As the limit is applied to `cortex_distributor_received_samples_total`, the limit is shown on the panel which displays this metric. ("Distributor samples received (accepted) rate"). Also added `ruler_max_rule_groups_per_tenant` while in the area. We don't currently display the number of exemplars in storage on the dashboard anywhere, so cannot add `max_global_exemplars_per_user` right now. * Jsonnet: Preparatory refactoring to simplify deploying parallel query paths. (#1846) This change extracts some of the jsonnet used to build query deployments (querier, query-scheduler, query-frontend) such that it is easier to deploy secondary query paths. The use case for this is primarily to develop a query path deployment for ruler remote-evaluation, but there may be other use cases too. * Removed double space in Log (#1849) * Reference 'monolithic mode' instead of 'single binary' in logs (#1847) Signed-off-by: Marco Pracucci Co-authored-by: Ursula Kallio Co-authored-by: Ursula Kallio * Extend safeTemplateFilepath to cover more cases. (#1833) * Extend safeTemplateFilepath to cover more cases. - template name ../tmpfile, stored into /tmp dir - empty template name - template name being just "." Signed-off-by: Peter Štibraný * Relax mimir-continuous-test pressure when deployed with Jsonnet (#1853) Signed-off-by: Marco Pracucci * Add 2.1.0-rc.0 header (#1857) * Prepare release 2.1 (#1859) * Update VERSION to 2.1-rc.0 * Add relevant changelog entries for user facing PRs since mimir-2.0.0 * Add patch in semver VERSION * Adding updated ruler diagrams. (#1861) * Create v2-1.md (#1848) * Create v2-1.md * Update and rename v2-1.md to v2.1.md updated the header and renamed the file. * Update v2.1.md Missing the upgrade configurations. * Update v2.1.md added bug description * Update v2.1.md bug fix writeup. * Update v2.1.md Added the series count description * Apply suggestions from code review Co-authored-by: Peter Štibraný Co-authored-by: Marco Pracucci * Update v2.1.md * Update v2.1.md updated tsdb isolation wording. * Ran make doc. * Fixed a broken relref. * Update docs/sources/release-notes/v2.1.md Co-authored-by: Peter Štibraný Co-authored-by: Marco Pracucci * Allow custom data source regex in mixin dashboards (#1802) * dashboards: update grafana-builder The following commit update grafana-builder version and brings in: * enable toolip by default (#665) * Add 'Data Source' label for the default datasource template variable. (#672) * add dashboard link func (#683) * make allValue configurable (#703) * Allow datasource's regex to be configured Signed-off-by: Wilfried Roset * Allow custom data source regex in mixin dashboards The current dashboards offer the possibility to select a data source among all prometheus data sources in the organization. Depending on the number of data sources the list could be rather big (>10). Not all data sources host Mimir metrics as such listing them is not helpful for the users. Signed-off-by: Wilfried Roset * Revert back change that was enabling shared tooltips Signed-off-by: Marco Pracucci Co-authored-by: Marco Pracucci * Dashboards: Fix `container_memory_usage_bytes:sum` recording rule (#1865) * Dashboards: Fix `container_memory_usage_bytes:sum` recording rule This change causes recording rules that reference `container_memory_usage_bytes` to omit series that do not contain the required labels for rules to run successfully, by requiring a non-empty `image` label. Signed-off-by: Peter Fern * Update CHANGELOG Signed-off-by: Peter Fern * Add compiled rules Signed-off-by: Peter Fern Co-authored-by: Marco Pracucci * Deprecate -distributor.extend-writes and set it always to false (#1856) Signed-off-by: Marco Pracucci * Remove DCO from contributors guidelines (#1867) Signed-off-by: Marco Pracucci * Create v2-1.md (#1848) * Create v2-1.md * Update and rename v2-1.md to v2.1.md updated the header and renamed the file. * Update v2.1.md Missing the upgrade configurations. * Update v2.1.md added bug description * Update v2.1.md bug fix writeup. * Update v2.1.md Added the series count description * Apply suggestions from code review Co-authored-by: Peter Štibraný Co-authored-by: Marco Pracucci * Update v2.1.md * Update v2.1.md updated tsdb isolation wording. * Ran make doc. * Fixed a broken relref. * Update docs/sources/release-notes/v2.1.md Co-authored-by: Peter Štibraný Co-authored-by: Marco Pracucci * Adding updated ruler diagrams. (#1861) * Deprecate -distributor.extend-writes and set it always to false (#1856) Signed-off-by: Marco Pracucci * Bump version to 2.1.0-rc.1 to include cherry-picked * List Johanna as 2.1.0 release shepherd (#1871) * fix(mixin): add missing alertmanager hashring members (#1870) * fix(mixin): add missing alertmanager hashring members * docs(CHANGELOG): add changelog entry * Docs: clarify 'Set rule group' API specification (#1869) Signed-off-by: Marco Pracucci * Simplify documentation publishing logic (#1820) * Simplify documentation publishing logic Split into two pipelines, one that runs on main and one that runs on release branches and tags. Use `has-matching-release-tag` workflow to determine whether to release documentation on release branch and tags. `has-matching-release-tag` is documented in https://github.com/grafana/grafana-github-actions/blob/main/has-matching-release-tag/action.yaml Signed-off-by: Jack Baldry * Remove script no longer used for documentation releases Signed-off-by: Jack Baldry * Add missing clone step for the website-sync action Signed-off-by: Jack Baldry * Update RELEASE instructions to reflect automated docs publishing Signed-off-by: Jack Baldry * Remove conditional from website clone for next publishing Signed-off-by: Jack Baldry * Fix capitalization of Jsonnet and Tanka (#1875) Signed-off-by: Jack Baldry * Checkout the repository as part of the documentation sync (#1876) * Checkout the repository as part of the documentation sync I assumed this was already done but the GitHub docs confirm that it is required. https://docs.github.com/en/github-ae@latest/actions/using-workflows/about-workflows#about-workflows Signed-off-by: Jack Baldry * Allow manual triggering of workflow Signed-off-by: Jack Baldry * Fix manual workflow dispatch (#1877) TIL that if you edit the workflow in the GitHub UI, it will lint your workflow file and make sure that all the keys conform to the schema. * Simplify documentation publishing logic (#1820) * Simplify documentation publishing logic Split into two pipelines, one that runs on main and one that runs on release branches and tags. Use `has-matching-release-tag` workflow to determine whether to release documentation on release branch and tags. `has-matching-release-tag` is documented in https://github.com/grafana/grafana-github-actions/blob/main/has-matching-release-tag/action.yaml Signed-off-by: Jack Baldry * Remove script no longer used for documentation releases Signed-off-by: Jack Baldry * Add missing clone step for the website-sync action Signed-off-by: Jack Baldry * Update RELEASE instructions to reflect automated docs publishing Signed-off-by: Jack Baldry * Remove conditional from website clone for next publishing Signed-off-by: Jack Baldry * Checkout the repository as part of the documentation sync (#1876) * Checkout the repository as part of the documentation sync I assumed this was already done but the GitHub docs confirm that it is required. https://docs.github.com/en/github-ae@latest/actions/using-workflows/about-workflows#about-workflows Signed-off-by: Jack Baldry * Allow manual triggering of workflow Signed-off-by: Jack Baldry * Fix manual workflow dispatch (#1877) TIL that if you edit the workflow in the GitHub UI, it will lint your workflow file and make sure that all the keys conform to the schema. * Chore: cleanup unused alertmanager config in Mimir jsonnet (#1873) Signed-off-by: Marco Pracucci * Update mimir-prometheus to ceaa77f1 (#1883) * Update mimir-prometheus to ceaa77f1 This includes the fix https://github.com/grafana/mimir-prometheus/pull/234 for https://github.com/grafana/mimir/issues/1866 Signed-off-by: Oleg Zaytsev * Update CHANGELOG.md Signed-off-by: Oleg Zaytsev * Fix changelog Signed-off-by: Oleg Zaytsev * Bump version to 2.1.0-rc.1 to include cherry-picked (#1872) * Increased default configuration for -server.grpc-max-recv-msg-size-bytes and -server.grpc-max-send-msg-size-bytes from 4MB to 100MB (#1884) Signed-off-by: Marco Pracucci * Split mimir_queries rule group so that it doesn't have more than 20 rules (#1885) * Split mimir_queries rule group so that it doesn't have more than 20 rules. * Add check for number of rules in the group. Signed-off-by: Peter Štibraný * Add alert for store-gateways without blocks (#1882) * Add alert for store-gateways without blocks Signed-off-by: Dimitar Dimitrov * Update CHANGELOG.md Signed-off-by: Dimitar Dimitrov * Clarify messages Co-authored-by: Marco Pracucci * Replace "Store Gateway" with "store-gateway" Signed-off-by: Dimitar Dimitrov * Rename alert to StoreGatewayNoSyncedTenants Signed-off-by: Dimitar Dimitrov * Rebuild mixin Signed-off-by: Dimitar Dimitrov * Update CHANGELOG.md Co-authored-by: Marco Pracucci Co-authored-by: Marco Pracucci * Fix flaky integration tests caused by 'metric not found' (#1891) Signed-off-by: Marco Pracucci * Docs: Explain the runtime override of active series matchers (#1868) * Updated docs/sources/operators-guide/configuring/configuring-custom-trackers.md; made some tweaks to the examples; changed name interesting-service and also-interesting-service to service1 and service2 respectively Co-authored-by: Ursula Kallio Co-authored-by: Jennifer Villa * Update to latest Thanos for Memcached fixes (#1837) Update our vendor of Thanos to pull in the most recent changes to the Memcached client. In particular, these changes prevent the client from starting many goroutines as part of batching before they are able to make progress. Signed-off-by: Nick Pillitteri * Fixed deceiving error log "failed to update cached shipped blocks after shipper initialisation" (#1893) Signed-off-by: Marco Pracucci * Fix TestRulerEvaluationDelay flakyness (#1892) Signed-off-by: Marco Pracucci * Fix `MimirRulerMissedEvaluations` text and add playbook (#1895) * Correct magnitude on MimirRulerMissedEvaluations Signed-off-by: Dimitar Dimitrov * Add playbook for MimirRulerMissedEvaluations Signed-off-by: Dimitar Dimitrov * Update CHANGELOG.md Signed-off-by: Dimitar Dimitrov * Remove trailing spaces Signed-off-by: Dimitar Dimitrov * Update CHANGELOG.md Co-authored-by: Marco Pracucci Co-authored-by: Marco Pracucci * Conform to tech doc style. (#1904) * Use a dedicated threadpool for store-gateway requests (#1812) Remove the use of a dedicated threadpool for index-header operations because the call overhead is prohibitively expensive. Instead, use a dedicated threadpool for entire store-gateway requests so that the cost of switching between threads is only paid a single time. This allows for isolation in the case of page faults during mmap accesses without too much overhead. Fixes #1804 Signed-off-by: Nick Pillitteri * Upgrade consideration for active_series_custom_trackers_config (#1897) * Upgrade consideration for active_series_custom_trackers_config * Update docs/sources/release-notes/v2.1.md Co-authored-by: Jennifer Villa * Update docs/sources/release-notes/v2.1.md Co-authored-by: Marco Pracucci Co-authored-by: Jennifer Villa * Upgrade consideration for active_series_custom_trackers_config (#1897) * Upgrade consideration for active_series_custom_trackers_config * Update docs/sources/release-notes/v2.1.md Co-authored-by: Jennifer Villa * Update docs/sources/release-notes/v2.1.md Co-authored-by: Marco Pracucci Co-authored-by: Jennifer Villa * fix(mixin): do not trigger TooMuchMemory alerts if no container limits are supplied (#1905) * fix(mixin): do not trigger `MimirAllocatingTooMuchMemory` or `EtcdAllocatingTooMuchMemory` alerts if no container limits are supplied * Update CHANGELOG.md Co-authored-by: Marco Pracucci * Fix MimirCompactorHasNotUploadedBlocks alert false positive when Mimir is deployed in monolithic mode (#1902) Signed-off-by: Marco Pracucci * Set defaults to query ingesters, not store, for recent data (#1909) Set queriers to _not_ query storage (store-gateways) for recent data and set the store-gateways to ignore recent uncompacted blocks. Default values are set to match what we use in the Mimir jsonnet. Fixes #1639 Signed-off-by: Nick Pillitteri * Revert distributor log level to warn in integration tests (#1910) Signed-off-by: Marco Pracucci * Improved error returned by -querier.query-store-after validation (#1914) * Improved error returned by -querier.query-store-after validation Signed-off-by: Marco Pracucci * Update pkg/querier/querier.go Co-authored-by: Ursula Kallio Co-authored-by: Ursula Kallio * Remove jsonnet configuration settings that match default values (#1915) * Remove jsonnet configuration settings that match default values Follow up to #1909 Signed-off-by: Nick Pillitteri * Update CHANGELOG.md Co-authored-by: Marco Pracucci * Docs: recommend fast disks for ingesters and store-gateways (#1903) * Docs: recommend fast disks for ingesters and store-gateways Signed-off-by: Marco Pracucci * Apply suggestions from code review Co-authored-by: Ursula Kallio * Update docs/sources/operators-guide/running-production-environment/production-tips/index.md Co-authored-by: Ursula Kallio * Update docs/sources/operators-guide/running-production-environment/production-tips/index.md Co-authored-by: Ursula Kallio Co-authored-by: Ursula Kallio * Improve series, sample, metadata and exemplars validation errors (#1907) * Improved error messages returned by ValidateSample(), ValidateExemplar(), ValidateMetadata() and ValidateLabels() Signed-off-by: Marco Pracucci Co-authored-by: Ursula Kallio * Apply suggestions from code review Co-authored-by: Ursula Kallio * Fixed unit tests after error messages edit Signed-off-by: Marco Pracucci * Manually applied a suggestion to error message Signed-off-by: Marco Pracucci * Renamed globalerrors pkg to singular form Signed-off-by: Marco Pracucci * Cleanup globalerror package based on Oleg's feedback Signed-off-by: Marco Pracucci * Removed formatting support from globalerror.ID's message generation function Signed-off-by: Marco Pracucci * Changed another error message based on feedback Signed-off-by: Marco Pracucci * Added CHANGELOG entry Signed-off-by: Marco Pracucci * Update operations/mimir-mixin/docs/playbooks.md Co-authored-by: Ursula Kallio * Rephrased label name/value length error message based on feedback received in the test file Signed-off-by: Marco Pracucci * Final fixes to error messages Signed-off-by: Marco Pracucci Co-authored-by: Ursula Kallio * mixin-tool: adapt screenshots dockerimage to support arm64 (#1916) Signed-off-by: Miguel Ángel Ortuño * Ingester ring endpoint fix (#1918) * /ingester/ring is also available via distributor. Signed-off-by: Peter Štibraný * Revert unintended change. Signed-off-by: Peter Štibraný * Configuration files for GrafanaCon 2022 presentation. (#1881) * Configuration files for GrafanaCon 2022 presentation. Signed-off-by: Peter Štibraný * Update dskit to bring "Parallelize memberlist notified message processing" PR (#1912) * Update dskit to bring "Parallelize memberlist notified message processing" PR. Signed-off-by: Peter Štibraný * CHANGELOG.md Signed-off-by: Peter Štibraný * Account for StatefulSets and Depl-s named by the helm chart (#1913) Signed-off-by: Dimitar Dimitrov * Change shuffle sharding ingester lookback default config (#1921) * Change shuffle sharding ingester lookback default config Use the same default value for ingester lookback as the "query ingesters within" setting to reduce the number of things that need to be changed from their defaults. This change also removes use of the `-blocks-storage.tsdb.close-idle-tsdb-timeout` flag in jsonnet since the value being used matches the default. Follow up to #1915 Signed-off-by: Nick Pillitteri * Changelog Signed-off-by: Nick Pillitteri * Improved ValidateMetadata() errors (#1919) * Improved ValidateMetadata() errors Signed-off-by: Marco Pracucci * Added PR number to CHANGELOG Signed-off-by: Marco Pracucci * Update pkg/util/validation/errors.go Co-authored-by: Oleg Zaytsev * Converted all ValidationError to be non-pointers Signed-off-by: Marco Pracucci * Removed unused variable Signed-off-by: Marco Pracucci * Fixed unit test Signed-off-by: Marco Pracucci * Fixed markdown linter Signed-off-by: Marco Pracucci Co-authored-by: Oleg Zaytsev * mixin/dashboards: ruler query path dashboards (#1911) * mixin: added ruler query path dashboards Signed-off-by: Miguel Ángel Ortuño * addressed PR feedback Signed-off-by: Miguel Ángel Ortuño * docs: added ruler reads & ruler reads resources dashboard screenshots Signed-off-by: Miguel Ángel Ortuño * addressed PR feedback Signed-off-by: Miguel Ángel Ortuño * updated CHANGELOD.md Signed-off-by: Miguel Ángel Ortuño * Mark query_ingesters_within and query_store_after as advanced (#1929) * Mark query_ingesters_within and query_store_after as advanced Now that they have good defaults that match what we run in production, they shouldn't need to be tuned by users in most cases. Fixes #1924 Signed-off-by: Nick Pillitteri * Update CHANGELOG.md Co-authored-by: Marco Pracucci Co-authored-by: Marco Pracucci * Remove empty chunks panel from Queries dashboard (#1928) * Remove empty chunks panel from Queries dashboard Signed-off-by: Dimitar Dimitrov * Update CHANGELOG.md Signed-off-by: Dimitar Dimitrov * Make MimirGossipMembersMismatch less sensitive, and make it fire fewer alerts. (#1926) * Make MimirGossipMembersMismatch less sensitive, and make it fire fewer alerts. Signed-off-by: Peter Štibraný * CHANGELOG.md Signed-off-by: Peter Štibraný * Update config value for -querier.query-ingesters-within to work with … (#1930) * Update config value for -querier.query-ingesters-within to work with new default value for -querier.query-store-after * Remove config for -querier.query-ingesters-within as they are set to default * Update Thanos vendor for memcache improvements (#1920) Update our vendor of Thanos so that memcache keys are grouped by the server they are owned by before being split into batches. Fixes #423 Signed-off-by: Nick Pillitteri * Move usage generation to separate package (#1934) * Move usage function into a separate package and export it Signed-off-by: Patryk Prus * Add function to add to flag category overrides at runtime Signed-off-by: Patryk Prus * Document CHANGELOG scopes * Add documentation about changelog scopes * update CHANGELOG for #1934 * Improve instance limits, ingester limits, query limiter, some querier errors (#1888) * Add errors IDs to pkg/ingester/instance_limits.go Signed-off-by: Dimitar Dimitrov * Add errors IDs to pkg/ingester/limiter.go Signed-off-by: Dimitar Dimitrov * Add errors IDs to pkg/querier/blocks_store_queryable.go Signed-off-by: Dimitar Dimitrov * Differentiate max-ingester-ingestion-rate from distributor Signed-off-by: Dimitar Dimitrov * Update playbooks.md Signed-off-by: Dimitar Dimitrov * Correct misspelled flags Signed-off-by: Dimitar Dimitrov * Correct strings in tests as well Signed-off-by: Dimitar Dimitrov * Re-iterated on ingesters limit errors Signed-off-by: Marco Pracucci * Re-iterated on ingesters per-tenant limit errors Signed-off-by: Marco Pracucci * Apply suggestions from code review Co-authored-by: Dimitar Dimitrov * Re-iterated on query per-tenant limit errors Signed-off-by: Marco Pracucci * Added PR number to CHANGELOG entry Signed-off-by: Marco Pracucci * Apply suggestions from code review Co-authored-by: Dimitar Dimitrov * Mention the cardinality API endpoint in the err-mimir-max-series-per-metric runbook Signed-off-by: Marco Pracucci * Update operations/mimir-mixin/docs/playbooks.md Co-authored-by: Dimitar Dimitrov * Fixed InstanceLimits receiver name to be consistent Signed-off-by: Marco Pracucci * Clarify metadata is stored in memory Signed-off-by: Marco Pracucci * Fixed linter and tests Signed-off-by: Marco Pracucci * Fixed more tests Signed-off-by: Marco Pracucci * Update pkg/querier/blocks_store_queryable.go Co-authored-by: Oleg Zaytsev * Fix english grammar about 'how to fix it' Signed-off-by: Marco Pracucci Co-authored-by: Marco Pracucci Co-authored-by: Oleg Zaytsev * make ingesters use heartbeat timeout instead of period to fix the bug… (#1933) * make ingesters use heartbeat timeout instead of period to fix the bug where they sometimes appear as unhealthy * Update CHANGELOG.md Co-authored-by: Marco Pracucci * Update VERSION to 2.1.0 * Update dashboard screenshots (#1940) Signed-off-by: Marco Pracucci * Fix version in changelog * Update mimir tests to use new 2.1.0 image * Add minimum Grafana version to mixin dashboards (#1943) Signed-off-by: Patrick Oyarzun * Bump grafana/mimir image to 2.1.0 for backward compatibility testing (#1942) * Chore: renamed source files for remote ruler dashboards (#1937) Signed-off-by: Marco Pracucci * Move the mimir-distributed helm chart into the mimir repository (#1925) * Initial copy of mimir-distributed helm chart This commit is not expected to work in CI. Signed-off-by: György Krajcsovits * Update github action for helm lint and test Set the working directory for github actions for helm actions. Set more consistent name for github actions. Set chart name for testing. Ignore generated helm doc from prettier. Do not do release for now of helm chart. Signed-off-by: György Krajcsovits * Add bucket prefix configuration (#1686) * Add bucket prefix configuration Signed-off-by: Dimitar Dimitrov * Add allowed chars validation for storage prefix Signed-off-by: Dimitar Dimitrov * Add unit tests for PrefixedBucketClient Signed-off-by: Dimitar Dimitrov * Add CHANGELOG entry Signed-off-by: Dimitar Dimitrov * Use grafana/regexp instead of regexp Signed-off-by: Dimitar Dimitrov * Improve validation of storage_prefix Update docs and add validate for .. and . Signed-off-by: Dimitar Dimitrov * Add some tests for AM and ruler bucket validaiton Signed-off-by: Dimitar Dimitrov * Add tests for bucket prefix with filesystem client Signed-off-by: Dimitar Dimitrov * Update helm text too Signed-off-by: Dimitar Dimitrov * Update everything Signed-off-by: Dimitar Dimitrov * Simplify validation for storage_prefix Only accept alphanumeric characters for the storage_prefix to prevent mistypings and misunderstandings when the prefix ends with a slash or contains slashes and dots Signed-off-by: Dimitar Dimitrov * Update CHANGELOG.md Signed-off-by: Dimitar Dimitrov * Make stronger assertions in bucket validation test Signed-off-by: Dimitar Dimitrov * Make stronger assertions in bucket prefix test Signed-off-by: Dimitar Dimitrov * Assert on errors, not on strings Signed-off-by: Dimitar Dimitrov * Exclude YAML field names from error message Signed-off-by: Dimitar Dimitrov * Include full image tag on rollout dashboard (#1932) * Make version matcher in rollout dashboard work for non-weekly images Signed-off-by: Dimitar Dimitrov * Add CHANGELOG.md entry Signed-off-by: Dimitar Dimitrov * Update CHANGELOG.md Co-authored-by: Marco Pracucci * docs: move federated rule groups documentation to its own section (#1906) * docs: move federated rule groups documentation to its own section Signed-off-by: Miguel Ángel Ortuño * addressed PR feedback Signed-off-by: Miguel Ángel Ortuño * Make networking panels pod matchers work with helm chart (#1927) * Make networking panels pod matchers work with helm chart The pods created by the helm chart follow a format of -mimir-. This is a problem for all places that use the per_instance_label for matching. The per_instance_label is mostly used in aggregations (sum by (pod), count by (pod), ...). The networking panels are the only ones that use it for matching. Signed-off-by: Dimitar Dimitrov * Replace .* with a stronger regex in pod matchers Signed-off-by: Dimitar Dimitrov * Add CHANGELOG.md entry Signed-off-by: Dimitar Dimitrov * Add max query length error to errors catalog (#1939) * Add max query length error to errors catalogue Signed-off-by: Marco Pracucci * Added PR number to CHANGELOG entry Signed-off-by: Marco Pracucci * Apply suggestions from code review Co-authored-by: Ursula Kallio Co-authored-by: Ursula Kallio * Remove image spec from demo file. (#1946) * Remove image spec from demo file. Signed-off-by: Peter Štibraný * Fix rejected identity accept encoding (#1864) * Fix rejected identity accept-encoding When a request comes in with header: Accept-Encoding: gzip;q=1, identity;q=0 we should gzip the response even if it's smaller than the defined minimum size. We achieve this by fixing the github.com/nytimes/gziphandler code, and bringing the fixed code into this repository since: - they don't seem to be maintaining it anymore - we don't want to use a replace directive as it's very likely to be lost in codebases depending on this. - it's a little amount of code (500 lines) Signed-off-by: Oleg Zaytsev * Add API test for gzip Signed-off-by: Oleg Zaytsev * make lint pkg/util/gziphandler Mostly handling errors, also removed the deprecated http.CloseNotifier functionality and related code. Signed-off-by: Oleg Zaytsev * Update CHANGELOG.md Signed-off-by: Oleg Zaytsev * Fix comment Co-authored-by: Marco Pracucci * Add faillint for github.com/nytimes/gziphandler Signed-off-by: Oleg Zaytsev * make lint Signed-off-by: Oleg Zaytsev * Fix faillint paths Signed-off-by: Oleg Zaytsev * If there's content-encoding, start plain write Signed-off-by: Oleg Zaytsev * If less than min-size, don't encode Signed-off-by: Oleg Zaytsev * Refactor `handleContentType` to handle by default Signed-off-by: Oleg Zaytsev * Rename acceptsIdentity to rejectsIdentity, Hopefully this will minimise the amount of double negations making the code clearer. Signed-off-by: Oleg Zaytsev * Fix comment Signed-off-by: Oleg Zaytsev Co-authored-by: Marco Pracucci * Distributor: added per-tenant request limit (#1843) * distributor: added request limiter logic Signed-off-by: Miguel Ángel Ortuño * updated CHANGELOG.md * addressed PR feedback Signed-off-by: Miguel Ángel Ortuño * distributor: added type plans rate limits Assuming a minimum sane value of 100 samples per request, we've set default request limits for each user tier. * docs: added request limit distributor documentation * rebuilt jsonnet test output * make linter happy * addressed PR feedback Signed-off-by: Miguel Ángel Ortuño * addressed PR feedback Signed-off-by: Miguel Ángel Ortuño * addressed PR feedback Signed-off-by: Miguel Ángel Ortuño * addressed PR feedback Signed-off-by: Miguel Ángel Ortuño * updated reference help Signed-off-by: Miguel Ángel Ortuño * addressed PR feedback Signed-off-by: Miguel Ángel Ortuño * Add bucket prefix to experimental features (#1951) * Add bucket prefix to experimental features Signed-off-by: Dimitar Dimitrov * Update flag status of storage_prefix to experimental Signed-off-by: Dimitar Dimitrov * Copy thanos shipper (#1957) * Copy shipper from Thanos. * Remove support for uploading compacted blocks. * Always allow out-of-order uploads. Removed unused overlap checker. * Rename Shipper interface to BlocksUploader, and ThanosShipper to Shipper. * Extract readShippedBlocks method from user_tsdb.go * Added shipper unit tests (copied and adapted from original tests) * Add faillint rule to avoid using Thanos shipper. Signed-off-by: Peter Štibraný * Adjust the name of the tag expected by documentation publishing (#1974) Signed-off-by: Nick Pillitteri * Use github.com/colega/grafana-tools-sdk fork (#1973) * Use github.com/colega/grafana-tools-sdk fork See https://github.com/grafana/cortex-tools/pull/248 for more context (this is the same change). The grafana-tools/sdk dependency will eventually be removed entirely from analyse commands. Signed-off-by: hjet * Update CHANGELOG.md Signed-off-by: hjet * mod tidy * Deprecate -ingester.ring.join-after (#1965) * Deprecate -ingester.ring.join-after Signed-off-by: Marco Pracucci * Addressed review feedback Signed-off-by: Marco Pracucci * Dashboards: disable gateway panels by default (#1955) Signed-off-by: Marco Pracucci * Docs: rename 'playbooks' to 'runbooks' and move them to doc (#1970) * Docs: rename 'playbooks' to 'runbooks' and move them to doc Signed-off-by: Marco Pracucci * Named runbooks folder as 'mimir-runbooks/' to make it easy to import in Grafana Labs internal infrastructure as code Signed-off-by: Marco Pracucci * Fix anchors check because they're case insensitive Signed-off-by: Marco Pracucci * Apply suggestions from code review Co-authored-by: Ursula Kallio Co-authored-by: Ursula Kallio * Preparation of e2eutils for Thanos indexheader unit tests. (#1982) We want to pull in the indexheader package from Thanos so that we can add some experimental alternative implementations of BinaryReader. In order to also pull in the unit tests for this package, we need the replacements for e2eutil.Copy and e2eutil.CreateBlock. This change does two things: 1. Copy in e2eutil/copy.go and fix it up accordingly. 2. Move CreateBlock into a package to avoid circular imports. * Make propagation of forwarding errors configurable (#1978) * make propagation of forwarding errors optional Signed-off-by: Mauro Stettler * add test for disabled error propagation Signed-off-by: Mauro Stettler * leave error propagation enabled by default Signed-off-by: Mauro Stettler * update help Signed-off-by: Mauro Stettler * update docs * better wording Signed-off-by: Mauro Stettler * Release the mimir-distributed-beta helm chart (#1948) Use the common workflow from the helm-chart repo. Signed-off-by: György Krajcsovits * Copy Thanos block/indexheader package (#1983) * Copy thanos/pkg/block/indexheader. * Update provenance. * Fix linter error due to error variable name. * Use require instead of e2eutil. * Replace usage of e2eutil.Copy * Replace usage of e2eutil.CreateBlock with local version. * Replace use of Thanos indexheader with local copy. * Add faillint check for upstream indexheader. * Fix goleak ignore for NewReaderPool. * Update vendor directory. * Prepare mimir beta chart release (#1995) * Rename chart back to mimir-distributed Apparently the helm option --devel is needed to trigger using beta versions. This should be enough protection for accidental use. Avoids renaming issues. * Version bump helm chart Do version bump to a beta version but nothing else until we double check that such beta chart cannot be accidentally selected with helm tooling. * Enable helm chart release from main branch Release process tested ok on test branch. Signed-off-by: György Krajcsovits * Bump version of helm chart (#1996) Test if helm release triggers correctly. Signed-off-by: György Krajcsovits * Update gopkg.in/yaml.v3 (#1989) This updates to a version that contains the fix to CVE-2022-28948. * Remove hardlinking in Shipper code. (#1969) * Remove hardlinking in Shipper code. Signed-off-by: Peter Štibraný * [helm] use grpc round robin for distributor clients (#1991) * Use GRPC round-robin for gateway -> distributor requests Fixes https://github.com/grafana/mimir/issues/1987 Update chart version and changelog Use the headless distributor service for the nginx gateway Signed-off-by: Patrick Oyarzun * Fix binary_reader.go header text. (#1999) Mistakenly left two lines when updating the provenance for the file. * Workaround to keep using old memcached bitnami chart for now (#1998) * Workaround to keep using old memcached bitnami chart for now See also: https://github.com/grafana/helm-charts/pull/1438 Also clean up unused chart repositories from ct.yaml. Signed-off-by: György Krajcsovits Co-authored-by: Dimitar Dimitrov * [helm] add results cache (#1993) * [helm] Add query-frontend results cache Fixes https://github.com/grafana/helm-charts/issues/1403 * Add PR to CHANGELOG Signed-off-by: Patrick Oyarzun * Fix README Signed-off-by: Patrick Oyarzun * Disable distributor.extend-writes & ingester.ring.unregister-on-shutdown (#1994) Signed-off-by: Patrick Oyarzun * Update CHANGELOG.md (#1992) * [helm] Prepare image bump for 2.1 release (#2001) * Prepare image bump for 2.1 release Signed-off-by: Patrick Oyarzun * Fix README template to reference 2.1 Signed-off-by: Patrick Oyarzun * Add nice link text to CHANGELOG Signed-off-by: Patrick Oyarzun * Update CHANGELOG.md * Publish helm charts from release branches (#2002) * Update Thanos with https://github.com/thanos-io/thanos/pull/5400. (#2006) * Replace hardcoded intervals with $__rate_interval in dashboards (#2011) * Replace hardcoded intervals with $__rate_interval in dashboards Signed-off-by: Dimitar Dimitrov * Add CHANGELOG.md entry Signed-off-by: Dimitar Dimitrov * Standardise error messages for distributor instance limits (#1984) * standardise error messages for distributor instance limits * Apply suggestions from code review Co-authored-by: Marco Pracucci * Apply suggestions from code review Co-authored-by: Ursula Kallio * apply code review suggestions to rest of doc for consistency * manually apply suggestion from code review Co-authored-by: Marco Pracucci Co-authored-by: Ursula Kallio * Remove tutorials/ symlink (#2007) Signed-off-by: Marco Pracucci * Add querier autoscaler support to jsonnet (#2013) * Add querier autoscaler support to jsonnet Signed-off-by: Marco Pracucci * Fixed autoscaling.libsonnet import Signed-off-by: Marco Pracucci * Add a check to Mimir jsonnet to ensure query-scheduler is enabled when enabling querier autoscaling (#2023) * Add a check to Mimir jsonnet to ensure query-scheduler is enabled when enabling querier autoscaling Signed-off-by: Marco Pracucci * Shouldn't be an exported object Signed-off-by: Marco Pracucci * Don't include external labels in blocks uploaded by Ingester (#1972) * Remove support for external labels. * Fixed comments. * Don't use TenantID label. Filter out the label during compaction. * CHANGELOG.md * Use public function from Thanos. * Use new UploadBlock function, move GrpcContextMetadataTenantID constant. * Rename tsdb2 import to mimir_tsdb. * Fix tests. Signed-off-by: Peter Štibraný * Enhance MimirRequestLatency runbook with more advice (#1967) * Enhance MimirRequestLatency runbook with more advice Signed-off-by: Arve Knudsen Co-authored-by: Marco Pracucci * Include helm-docs in build and CI (#2026) * Update the mimir build image and its build doc Dockerfile: Add helm-docs package to the image. how-to: Write down the requirements for build in more detail. Add information about build on linux. Signed-off-by: György Krajcsovits * Expand make doc with helm-docs command This enables generating the helm chart README with the same make doc command as all other documentation. Signed-off-by: György Krajcsovits * Update docs/internal/how-to-update-the-build-image.md Co-authored-by: Dimitar Dimitrov * Update contributing guides for the helm chart (#2008) * Update contributing guides for the helm chart Signed-off-by: György Krajcsovits * Turn off helm version increment check in CI This enables periodic releases, as opposed to requiring version bump for release at every PR. Signed-off-by: György Krajcsovits * Add extraEnvFrom to all services and enable injection into mimir config (#2017) Add `extraEnvFrom` capability to all Mimir services to enable injecting secrets via environment variables. Enable `-config.exand-env=true` option in all Mimir services to be able to take secrets/settings from the environment and inject them into the Mimir configuration file. Signed-off-by: György Krajcsovits * Docs: fix mimir-mixin installation instructions (#2015) Signed-off-by: Marco Pracucci * Docs: make documentation a first class citizen in CHANGELOG (#2025) Signed-off-by: Marco Pracucci * Helm: add global.extraEnv and global.extraEnvFrom (#2031) * Helm: add global.extraEnv and global.extraEnvFrom Enables setting environment and env injection in one place for mimir + nginx. Signed-off-by: György Krajcsovits * Upgrade alpine to 3.16.0 (#2028) * Upgrade alpine to 3.16.0 * Enhance MimirRequestLatency runbook with more advice (#1967) * Enhance MimirRequestLatency runbook with more advice Signed-off-by: Arve Knudsen Co-authored-by: Marco Pracucci * Include helm-docs in build and CI (#2026) * Update the mimir build image and its build doc Dockerfile: Add helm-docs package to the image. how-to: Write down the requirements for build in more detail. Add information about build on linux. Signed-off-by: György Krajcsovits * Expand make doc with helm-docs command This enables generating the helm chart README with the same make doc command as all other documentation. Signed-off-by: György Krajcsovits * Update docs/internal/how-to-update-the-build-image.md Co-authored-by: Dimitar Dimitrov * Update contributing guides for the helm chart (#2008) * Update contributing guides for the helm chart Signed-off-by: György Krajcsovits * Turn off helm version increment check in CI This enables periodic releases, as opposed to requiring version bump for release at every PR. Signed-off-by: György Krajcsovits * Add extraEnvFrom to all services and enable injection into mimir config (#2017) Add `extraEnvFrom` capability to all Mimir services to enable injecting secrets via environment variables. Enable `-config.exand-env=true` option in all Mimir services to be able to take secrets/settings from the environment and inject them into the Mimir configuration file. Signed-off-by: György Krajcsovits * Docs: fix mimir-mixin installation instructions (#2015) Signed-off-by: Marco Pracucci * Docs: make documentation a first class citizen in CHANGELOG (#2025) Signed-off-by: Marco Pracucci * upgrade to alpine 3.16.0 * upgrade alpine to 3.16.0 Co-authored-by: Arve Knudsen Co-authored-by: Marco Pracucci Co-authored-by: George Krajcsovits Co-authored-by: Dimitar Dimitrov * Helm: release our first weekly (#2033) This should be automated, but now done manually. Signed-off-by: György Krajcsovits * Set memcache chunks cache timeout to 450ms (#2035) The default value, shared with all other memcache caches, of 200ms is too aggressive in most cases. This results in TSDB data often being fetched from object storage in cases where a slighly longer timeout would result in a cache hit. This is set in Jsonnet and Helm instead of as a default of the CLI flag since the flags (and hence their defaults) are shared among all caches (index, chunks, metadata, results). Signed-off-by: Nick Pillitteri * [helm] Add test-enterprise for Helm CI (#2027) * Add test-enterprise-values.yaml * Fix panic at startup when Mimir is running in monolithic mode and query sharding is enabled (#2036) Signed-off-by: Marco Pracucci * Chore: remove obsolete comment from jsonnet (#2038) Signed-off-by: Marco Pracucci * Chore: introduced newDiscoveryService() util in jsonnet (#2037) Signed-off-by: Marco Pracucci * Chore: add some jsonnet utilities to reduce code duplication (#2039) * Renamed newDiscoveryService() to newMimirDiscoveryService() Signed-off-by: Marco Pracucci * Added newMimirPdb() utility Signed-off-by: Marco Pracucci * Added newMimirStatefulSet() utility Signed-off-by: Marco Pracucci * Add a helm golden record (#2034) * Helm: Add golden-record build script * Helm: add test-values golden record * Add PR check for `check-helm-tests` * Add Helm setup to lint-helm action * Update generated helm tests * Fix bash linting * Update contribution guidelines * Update generated helm manifests * Helm: fix kube version Set kubeVersionOverride to generate PodDisruptionBudget API version consistently. When I ran the test, I got a diff, because my k8s is newer (1.23). Signed-off-by: György Krajcsovits * Update operations/helm/tests/build.sh Co-authored-by: Dimitar Dimitrov Co-authored-by: György Krajcsovits * Store Gateway: Add experimental configuration to use MAP_POPULATE for indexheader reads. (#2019) Introduces a new experimental configuration option (`-blocks-storage.bucket-store.index-header.map-populate-enabled`). This enables the use of the `MAP_POPULATE` flag when `mmap`-ing index-header files in the store-gateway. What this flag does is advise the kernel to (synchronously) pre-fault all pages in the memory region, loading them into the file system cache. Why is this a good idea? - The initial read process of the index-header files has shown to cause hangups in the store-gateway. - By using this option, I/O is done in the mmap() syscall, which the Go scheduler can cope with. - We reduce the likelyhood of Goroutines getting stalled in major page faults. - The initial read process walks the entire file anyway, so we are not doing any more I/O. - It's a very low risk change compared to re-writing the BinaryReader (work in progress). Why is this not perfect? - The Kernel does not guarantee the pages will stay in memory, so we are only reducing the probability of major page faults. Rationale about the implementation: - I have copied the mmap utilities from Prometheus as a temporary measure, for the sake of evaluating this change. * Initialize Tanka with k8s-libsonnet v1.21. (#2051) Signed-off-by: Peter Štibraný * Update Prometheus with async chunk mapper changes. (#2043) * Update Prometheus with async chunk mapper changes. Included changes: https://github.com/grafana/mimir-prometheus/pull/131 https://github.com/grafana/mimir-prometheus/pull/247 These result is lower memory usage by chunk mapper. Signed-off-by: Peter Štibraný * Fix ruler config in getting started guide (#2052) * Fix ruler config in getting started guide Signed-off-by: Marco Pracucci * Added CHANGELOG entry Signed-off-by: Marco Pracucci * Fix build for darwin platform. (#2054) A previous change (#2019) assumed MAP_POPULATE was available on Darwin. This fixes the build. * mixin: adapt alerts/playbooks to consider ruler query path components (#1949) * mixin: adapt alerts/playbooks to have into consideration ruler query path components. Signed-off-by: Miguel Ángel Ortuño * applied PR suggestion Signed-off-by: Miguel Ángel Ortuño * applied PR suggestion Signed-off-by: Miguel Ángel Ortuño * restored ruler missed evaluations alert Signed-off-by: Miguel Ángel Ortuño * updated CHANGELOG.md Signed-off-by: Miguel Ángel Ortuño * Return and log detailed services information on /ready (#2055) * Return and log detailed services information on /ready This helps debug starting services more easily. Signed-off-by: Dimitar Dimitrov * Only return non-running services Signed-off-by: Dimitar Dimitrov * Add validation.RateLimited and TooManyHAClusters to errors catalogue (#2009) * add validation.RateLimited to error catalogue * Add validation.TooManyHAClusters to error catalogue * update docs * Apply suggestions from code review Co-authored-by: Marco Pracucci * improve new MessageWithLimitConfig and add tests * Apply suggestions from code review Co-authored-by: Marco Pracucci * Update from changes in code review Co-authored-by: Marco Pracucci * Add Patrick Oyarzun as Team Member (#2057) * Add Patrick Oyarzun as Team Member * Update MAINTAINERS.md * mimir-continuous-test: Add smoke test mode (#2047) * mimir-continuous-test: Add smoke test mode * Add PR number to CHANGELOG * Update error assertions in write_read_series_test * Fix doc formatting * Address PR feedback * Fix goimports formatting * Jsonnet: add compactor service (#2063) Signed-off-by: Marco Pracucci * Tidy up code and names for errors catalogue (#2056) * Make MessageWithLimitConfig accept multiple flags * Add tenant string in per-tenant error labels * Revert "Add tenant string in per-tenant error labels" This reverts commit 758ef720c3876100dfc40d015de121161b09183e. * rename error too-many-ha-clusters * ruler: report failed eval on any 5xx status (#2053) * ruler: report failed eval on any 5xx status Signed-off-by: Miguel Ángel Ortuño * addressed PR suggestion Signed-off-by: Miguel Ángel Ortuño * Making active series custom tracker configs marshalable for runtime c… (#2065) * Making active series custom tracker configs marshalable for runtime config * Adding unit test * Test alertmanager firewall with HTTP proxy too (#2076) Signed-off-by: Marco Pracucci * Update dskit (#2085) * Update dskit * CHANGELOG.md * Make namespace in build-helm-tests explicit (#2069) * Make namespace in build-helm-tests explicit * Use a non-default namespace Signed-off-by: Dimitar Dimitrov * Helm: release weekly no. 190 (#2086) * Helm: release weekly no. 190 * Helm: Bump image versions for weekly Signed-off-by: György Krajcsovits * Ruler: Add timeout for remote rule evaluation queries. (#2090) During a rule group evaluation, if the remote query never completes for any reason, then the rule group will become stuck and never evaluate again. Co-authored-by: Peter Štibraný Co-authored-by: Nick Pillitteri <56quarters@users.noreply.github.com> Co-authored-by: Mauro Stettler Co-authored-by: Dimitar Dimitrov Co-authored-by: Joshua Carp Co-authored-by: Marco Pracucci Co-authored-by: Miguel Ángel Ortuño Co-authored-by: wilfriedroset Co-authored-by: Lim Chee Hau Co-authored-by: Miguel Ángel Ortuño Co-authored-by: George Krajcsovits Co-authored-by: Oleg Zaytsev Co-authored-by: Zach Leslie Co-authored-by: Ursula Kallio Co-authored-by: Steve Simpson Co-authored-by: Yusuf Papurcu Co-authored-by: Johanna Ratliff Co-authored-by: Jennifer Villa Co-authored-by: Peter Fern Co-authored-by: Sebastian Poxhofer Co-authored-by: Jack Baldry Co-authored-by: Janos Gub Co-authored-by: zenador Co-authored-by: Patryk Prus Co-authored-by: Patryk Prus Co-authored-by: Patrick Oyarzun Co-authored-by: hanif Co-authored-by: Christian Simon Co-authored-by: Arve Knudsen Co-authored-by: williamzelesny <41495262+williamzelesny@users.noreply.github.com> Co-authored-by: György Krajcsovits --- CHANGELOG.md | 2 ++ cmd/mimir/config-descriptor.json | 10 +++++++ cmd/mimir/help-all.txt.tmpl | 2 ++ cmd/mimir/help.txt.tmpl | 2 ++ .../index.md | 4 +++ go.mod | 2 +- go.sum | 4 +-- .../helm/charts/mimir-distributed/Chart.yaml | 2 +- .../helm/charts/mimir-distributed/README.md | 2 +- .../helm/charts/mimir-distributed/values.yaml | 4 +-- operations/helm/tests/build.sh | 2 +- ...nstall-prometheus-metrics-rolebinding.yaml | 2 +- .../minio/templates/serviceaccount.yaml | 2 +- .../templates/admin-api/admin-api-dep.yaml | 8 +++--- .../templates/admin-api/admin-api-svc.yaml | 2 +- .../alertmanager-statefulset.yaml | 8 +++--- .../alertmanager-svc-headless.yaml | 2 +- .../alertmanager/alertmanager-svc.yaml | 2 +- .../compactor/compactor-statefulset.yaml | 8 +++--- .../templates/compactor/compactor-svc.yaml | 2 +- .../distributor/distributor-dep.yaml | 8 +++--- .../distributor/distributor-svc-headless.yaml | 2 +- .../distributor/distributor-svc.yaml | 2 +- .../templates/gateway/gateway-dep.yaml | 8 +++--- .../templates/gateway/gateway-svc.yaml | 2 +- .../gossip-ring/gossip-ring-svc.yaml | 2 +- .../templates/ingester/ingester-pdb.yaml | 2 +- .../ingester/ingester-statefulset.yaml | 8 +++--- .../ingester/ingester-svc-headless.yaml | 2 +- .../templates/ingester/ingester-svc.yaml | 2 +- .../templates/license-secret.yaml | 2 +- .../templates/minio/create-bucket-job.yaml | 4 +-- .../overrides-exporter-dep.yaml | 8 +++--- .../overrides-exporter-svc.yaml | 2 +- .../templates/podsecuritypolicy.yaml | 2 +- .../templates/querier/querier-dep.yaml | 8 +++--- .../templates/querier/querier-svc.yaml | 2 +- .../query-frontend/query-frontend-dep.yaml | 8 +++--- .../query-frontend-svc-headless.yaml | 2 +- .../query-frontend/query-frontend-svc.yaml | 2 +- .../mimir-distributed/templates/role.yaml | 2 +- .../templates/rolebinding.yaml | 2 +- .../templates/ruler/ruler-dep.yaml | 8 +++--- .../templates/ruler/ruler-svc.yaml | 2 +- .../templates/runtime-configmap.yaml | 2 +- .../mimir-distributed/templates/secret.yaml | 4 +-- .../templates/serviceaccount.yaml | 2 +- .../store-gateway/store-gateway-pdb.yaml | 2 +- .../store-gateway-statefulset.yaml | 8 +++--- .../store-gateway-svc-headless.yaml | 2 +- .../store-gateway/store-gateway-svc.yaml | 2 +- .../templates/tokengen/tokengen-job.yaml | 6 ++-- ...nstall-prometheus-metrics-rolebinding.yaml | 2 +- .../minio/templates/serviceaccount.yaml | 2 +- .../alertmanager-statefulset.yaml | 8 +++--- .../alertmanager-svc-headless.yaml | 2 +- .../alertmanager/alertmanager-svc.yaml | 2 +- .../compactor/compactor-statefulset.yaml | 8 +++--- .../templates/compactor/compactor-svc.yaml | 2 +- .../distributor/distributor-dep.yaml | 8 +++--- .../distributor/distributor-svc-headless.yaml | 2 +- .../distributor/distributor-svc.yaml | 2 +- .../gossip-ring/gossip-ring-svc.yaml | 2 +- .../templates/ingester/ingester-pdb.yaml | 2 +- .../ingester/ingester-statefulset.yaml | 8 +++--- .../ingester/ingester-svc-headless.yaml | 2 +- .../templates/ingester/ingester-svc.yaml | 2 +- .../templates/minio/create-bucket-job.yaml | 4 +-- .../templates/nginx/nginx-configmap.yaml | 28 +++++++++---------- .../templates/nginx/nginx-dep.yaml | 6 ++-- .../templates/nginx/nginx-svc.yaml | 2 +- .../overrides-exporter-dep.yaml | 8 +++--- .../overrides-exporter-svc.yaml | 2 +- .../templates/podsecuritypolicy.yaml | 2 +- .../templates/querier/querier-dep.yaml | 8 +++--- .../templates/querier/querier-svc.yaml | 2 +- .../query-frontend/query-frontend-dep.yaml | 8 +++--- .../query-frontend-svc-headless.yaml | 2 +- .../query-frontend/query-frontend-svc.yaml | 2 +- .../mimir-distributed/templates/role.yaml | 2 +- .../templates/rolebinding.yaml | 2 +- .../templates/ruler/ruler-dep.yaml | 8 +++--- .../templates/ruler/ruler-svc.yaml | 2 +- .../templates/runtime-configmap.yaml | 2 +- .../mimir-distributed/templates/secret.yaml | 4 +-- .../templates/serviceaccount.yaml | 2 +- .../store-gateway/store-gateway-pdb.yaml | 2 +- .../store-gateway-statefulset.yaml | 8 +++--- .../store-gateway-svc-headless.yaml | 2 +- .../store-gateway/store-gateway-svc.yaml | 2 +- pkg/alertmanager/multitenant_test.go | 18 ++++++++++++ .../activeseries/custom_trackers_config.go | 5 ++++ .../custom_trackers_config_test.go | 18 ++++++++++++ pkg/mimir/modules.go | 2 +- pkg/ruler/remotequerier.go | 14 ++++++++++ pkg/ruler/remotequerier_test.go | 27 ++++++++++++++++-- .../grafana/dskit/modules/module_service.go | 18 ++++++++++++ .../grafana/dskit/ring/lifecycler.go | 11 +++++--- .../grafana/dskit/services/service.go | 2 ++ vendor/modules.txt | 2 +- 100 files changed, 297 insertions(+), 176 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5366a58616..f8bf9e79c21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,8 @@ * [BUGFIX] API: gzip is now enforced when identity encoding is explicitly rejected. #1864 * [BUGFIX] Fix panic at startup when Mimir is running in monolithic mode and query sharding is enabled. #2036 * [BUGFIX] Ruler: report failed evaluation metric for any 5xx status code returned by the query-frontend when remote operational mode is enabled. #2053 +* [BUGFIX] Ingester: fix slow rollout when using `-ingester.ring.unregister-on-shutdown=false` with long `-ingester.ring.heartbeat-period`. #2085 +* [BUGFIX] Ruler: add timeout for remote rule evaluation queries to prevent rule group evaluations getting stuck indefinitely. The duration is configurable with (`-ruler.query-frontend.timeout` (default `2m`). #2090 ### Mixin diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json index 63991730ee6..16618b533c2 100644 --- a/cmd/mimir/config-descriptor.json +++ b/cmd/mimir/config-descriptor.json @@ -7404,6 +7404,16 @@ "fieldFlag": "ruler.query-frontend.address", "fieldType": "string" }, + { + "kind": "field", + "name": "timeout", + "required": false, + "desc": "The timeout for a rule query being evaluated by the query-frontend.", + "fieldValue": null, + "fieldDefaultValue": 120000000000, + "fieldFlag": "ruler.query-frontend.timeout", + "fieldType": "duration" + }, { "kind": "block", "name": "grpc_client_config", diff --git a/cmd/mimir/help-all.txt.tmpl b/cmd/mimir/help-all.txt.tmpl index c340611d852..1493d5e8729 100644 --- a/cmd/mimir/help-all.txt.tmpl +++ b/cmd/mimir/help-all.txt.tmpl @@ -1450,6 +1450,8 @@ Usage of ./cmd/mimir/mimir: Path to the key file for the client certificate. Also requires the client certificate to be configured. -ruler.query-frontend.grpc-client-config.tls-server-name string Override the expected name on the server certificate. + -ruler.query-frontend.timeout duration + The timeout for a rule query being evaluated by the query-frontend. (default 2m0s) -ruler.query-stats-enabled Report the wall time for ruler queries to complete as a per-tenant metric and as an info level log message. -ruler.resend-delay duration diff --git a/cmd/mimir/help.txt.tmpl b/cmd/mimir/help.txt.tmpl index 467b52695f6..3669e3e28da 100644 --- a/cmd/mimir/help.txt.tmpl +++ b/cmd/mimir/help.txt.tmpl @@ -450,6 +450,8 @@ Usage of ./cmd/mimir/mimir: Maximum number of rules per rule group per-tenant. 0 to disable. (default 20) -ruler.query-frontend.address string GRPC listen address of the query-frontend(s). Must be a DNS address (prefixed with dns:///) to enable client side load balancing. + -ruler.query-frontend.timeout duration + The timeout for a rule query being evaluated by the query-frontend. (default 2m0s) -ruler.ring.consul.hostname string Hostname and port of Consul. (default "localhost:8500") -ruler.ring.etcd.endpoints value diff --git a/docs/sources/operators-guide/configuring/reference-configuration-parameters/index.md b/docs/sources/operators-guide/configuring/reference-configuration-parameters/index.md index 8b4aca215ea..39a0ed7c33a 100644 --- a/docs/sources/operators-guide/configuring/reference-configuration-parameters/index.md +++ b/docs/sources/operators-guide/configuring/reference-configuration-parameters/index.md @@ -1400,6 +1400,10 @@ query_frontend: # CLI flag: -ruler.query-frontend.address [address: | default = ""] + # The timeout for a rule query being evaluated by the query-frontend. + # CLI flag: -ruler.query-frontend.timeout + [timeout: | default = 2m] + grpc_client_config: # (advanced) gRPC client max receive message size (bytes). # CLI flag: -ruler.query-frontend.grpc-client-config.grpc-max-recv-msg-size diff --git a/go.mod b/go.mod index c42ed6bd477..443ee59d1e4 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/golang/snappy v0.0.4 github.com/google/gopacket v1.1.19 github.com/gorilla/mux v1.8.0 - github.com/grafana/dskit v0.0.0-20220526081034-789ec0ca4a3b + github.com/grafana/dskit v0.0.0-20220613090928-ebb5c6de233d github.com/grafana/e2e v0.1.1-0.20220519104354-1db01e4751fe github.com/hashicorp/golang-lru v0.5.4 github.com/json-iterator/go v1.1.12 diff --git a/go.sum b/go.sum index 3acdfc5ae59..2043dadf4b2 100644 --- a/go.sum +++ b/go.sum @@ -738,8 +738,8 @@ github.com/gosimple/slug v1.1.1 h1:fRu/digW+NMwBIP+RmviTK97Ho/bEj/C9swrCspN3D4= github.com/gosimple/slug v1.1.1/go.mod h1:ER78kgg1Mv0NQGlXiDe57DpCyfbNywXXZ9mIorhxAf0= github.com/grafana/dskit v0.0.0-20211021180445-3bd016e9d7f1/go.mod h1:uPG2nyK4CtgNDmWv7qyzYcdI+S90kHHRWvHnBtEMBXM= github.com/grafana/dskit v0.0.0-20220112093026-95274ccc858d/go.mod h1:M0/dlftwBvH7+hdNNpjMa/CUXD7gsew67mbkCuDlFXE= -github.com/grafana/dskit v0.0.0-20220526081034-789ec0ca4a3b h1:9h79WowXGj6wErMzoi35pBECxnh7ucKJlQTs4Gs0yOI= -github.com/grafana/dskit v0.0.0-20220526081034-789ec0ca4a3b/go.mod h1:9It/K30QPyj/FuTqBb/SYnaS4/BJCP5YL4SRfXB7dG0= +github.com/grafana/dskit v0.0.0-20220613090928-ebb5c6de233d h1:cHmYkgZr5vdkxt7EbzFIwdm9fS/0E3wyTMa1g2vezLg= +github.com/grafana/dskit v0.0.0-20220613090928-ebb5c6de233d/go.mod h1:9It/K30QPyj/FuTqBb/SYnaS4/BJCP5YL4SRfXB7dG0= github.com/grafana/e2e v0.1.1-0.20220519104354-1db01e4751fe h1:mxrRWDjKtob43xF9nEhJthdtCzX35/800Sk7nE//YHQ= github.com/grafana/e2e v0.1.1-0.20220519104354-1db01e4751fe/go.mod h1:+26VJWpczg2OU3D0537acnHSHzhJORpxOs6F+M27tZo= github.com/grafana/memberlist v0.3.1-0.20220425183535-6b97a09b7167 h1:PgEQkGHR4YimSCEGT5IoswN9gJKZDVskf+he6UClCLw= diff --git a/operations/helm/charts/mimir-distributed/Chart.yaml b/operations/helm/charts/mimir-distributed/Chart.yaml index 2c262d75e3c..c053243d507 100644 --- a/operations/helm/charts/mimir-distributed/Chart.yaml +++ b/operations/helm/charts/mimir-distributed/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -version: 2.2.0-weekly.189 +version: 2.2.0-weekly.190 appVersion: 2.1.0 description: "Grafana Mimir" engine: gotpl diff --git a/operations/helm/charts/mimir-distributed/README.md b/operations/helm/charts/mimir-distributed/README.md index 9b6ae1c1aea..2dddd53de73 100644 --- a/operations/helm/charts/mimir-distributed/README.md +++ b/operations/helm/charts/mimir-distributed/README.md @@ -4,7 +4,7 @@ Helm chart for deploying [Grafana Mimir](https://grafana.com/docs/mimir/v2.1.x/) # mimir-distributed -![Version: 2.2.0-weekly.189](https://img.shields.io/badge/Version-2.2.0--weekly.189-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square) +![Version: 2.2.0-weekly.190](https://img.shields.io/badge/Version-2.2.0--weekly.190-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square) Grafana Mimir diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml index b3bd7754e57..ce70acc84f2 100644 --- a/operations/helm/charts/mimir-distributed/values.yaml +++ b/operations/helm/charts/mimir-distributed/values.yaml @@ -16,7 +16,7 @@ fullnameOverride: null # Since the image is unique for all microservices, so are image settings. image: repository: grafana/mimir - tag: 2.1.0 + tag: r190-fe20bbd pullPolicy: IfNotPresent # Optionally specify an array of imagePullSecrets. # Secrets must be manually created in the namespace. @@ -1429,7 +1429,7 @@ enterprise: # Container image settings for enterprise, note that pullPolicy and pullSecrets are set in top level .image image: repository: grafana/enterprise-metrics - tag: v2.1.0 + tag: r190-9abd21a8 # In order to use Grafana Enterprise Metrics features, you will need to provide the contents of your Grafana Enterprise Metrics # license, either by providing the contents of the license.jwt, or the name Kubernetes Secret that contains your license.jwt. diff --git a/operations/helm/tests/build.sh b/operations/helm/tests/build.sh index b281e960299..08ab5b13c7c 100755 --- a/operations/helm/tests/build.sh +++ b/operations/helm/tests/build.sh @@ -19,5 +19,5 @@ for FILEPATH in $TESTS; do TEST_NAME=$(basename -s '.yaml' "$FILEPATH") echo "Templating $TEST_NAME" - helm template "${TEST_NAME}" ${CHART_PATH} -f "${FILEPATH}" --output-dir "operations/helm/tests/${TEST_NAME}-generated" + helm template "${TEST_NAME}" ${CHART_PATH} -f "${FILEPATH}" --output-dir "operations/helm/tests/${TEST_NAME}-generated" --namespace citestns done diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml index 0d793749d0b..4742a499a27 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml @@ -16,4 +16,4 @@ roleRef: subjects: - kind: ServiceAccount name: test-enterprise-values-minio-update-prometheus-secret - namespace: "default" + namespace: "citestns" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml index 9c86f090671..d3809bef623 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: "test-enterprise-values-minio" - namespace: "default" + namespace: "citestns" labels: app: minio chart: minio-8.0.10 diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-dep.yaml index 6fc0d5ff1d7..93b81f334f4 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-dep.yaml @@ -6,7 +6,7 @@ metadata: annotations: {} labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: admin-api @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: admin-api app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -45,7 +45,7 @@ spec: initContainers: containers: - name: admin-api - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=admin-api" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-svc.yaml index dbd9cb9ba9a..81103fb1081 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/admin-api/admin-api-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-admin-api labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: admin-api diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index 3f593bc2bea..08debdc65a3 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-enterprise-values-mimir-alertmanager labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: alertmanager @@ -27,7 +27,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: app.kubernetes.io/component: alertmanager app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -65,7 +65,7 @@ spec: emptyDir: {} containers: - name: alertmanager - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=alertmanager" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml index e5e72b636cb..8c1bc40d1c4 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-alertmanager-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: alertmanager diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml index 37975bf32b0..069b515589d 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-alertmanager labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: alertmanager diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml index 55f0cc868f8..f54a6ec79a2 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-enterprise-values-mimir-compactor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: compactor @@ -27,7 +27,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: app.kubernetes.io/component: compactor app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -73,7 +73,7 @@ spec: emptyDir: {} containers: - name: compactor - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=compactor" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml index fe7b12606b3..64ab4438cc2 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-compactor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: compactor diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml index d81968bc00a..f693f34a982 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-enterprise-values-mimir-distributor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: distributor @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: distributor app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -46,7 +46,7 @@ spec: [] containers: - name: distributor - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=distributor" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml index ad4a9f1ceff..b4e322b992e 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-distributor-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: distributor diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml index af815ba312c..a48639963f6 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-distributor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: distributor diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-dep.yaml index a946c6dbcca..6fa3f696c32 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-dep.yaml @@ -6,7 +6,7 @@ metadata: annotations: {} labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: gateway @@ -28,14 +28,14 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: gateway annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -44,7 +44,7 @@ spec: [] containers: - name: gateway - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=gateway" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-svc.yaml index 4d19d71a1a9..cbe51233d50 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gateway/gateway-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: gateway diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml index 51af4c76f2c..217acc520a6 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-gossip-ring labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: gossip-ring diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml index 1bb947a3e7e..f830428e40d 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml @@ -5,7 +5,7 @@ kind: PodDisruptionBudget metadata: name: test-enterprise-values-mimir-ingester labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: ingester diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml index 5e1efc64f63..343d7beb977 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-enterprise-values-mimir-ingester labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: ingester @@ -28,7 +28,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -36,7 +36,7 @@ spec: app.kubernetes.io/component: ingester app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -64,7 +64,7 @@ spec: emptyDir: {} containers: - name: ingester - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=ingester" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml index f91780d4ac9..b5fd6733345 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-ingester-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: ingester diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml index 1301971836a..5c0e8974955 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-ingester labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: ingester diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/license-secret.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/license-secret.yaml index 5846877f9bc..341cf160410 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/license-secret.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/license-secret.yaml @@ -5,7 +5,7 @@ kind: Secret metadata: name: test-enterprise-values-mimir-license labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml index 11e3e42d177..b65d5393348 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml @@ -4,10 +4,10 @@ apiVersion: batch/v1 kind: Job metadata: name: test-enterprise-values-mimir-distributed-make-bucket-job - namespace: "default" + namespace: "citestns" labels: app: mimir-distributed-make-bucket-job - chart: mimir-distributed-2.2.0-weekly.189 + chart: mimir-distributed-2.2.0-weekly.190 release: test-enterprise-values heritage: Helm spec: diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml index f9c31aa7108..8d6bc199d76 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml @@ -6,7 +6,7 @@ metadata: annotations: {} labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: overrides-exporter @@ -28,14 +28,14 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: overrides-exporter annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -44,7 +44,7 @@ spec: [] containers: - name: overrides-exporter - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=overrides-exporter" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml index c27fc7a1cf1..dd52c974ea5 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-overrides-exporter labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: overrides-exporter diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml index 3964fffda80..0f7c5e55732 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml @@ -5,7 +5,7 @@ kind: PodSecurityPolicy metadata: name: test-enterprise-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-dep.yaml index 237f6aefd0d..9c411525d7d 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-enterprise-values-mimir-querier labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: querier @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: querier app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -46,7 +46,7 @@ spec: [] containers: - name: querier - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=querier" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-svc.yaml index ded06cef9e3..a18847ce3f9 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/querier/querier-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-querier labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: querier diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml index aa598680f71..f4119775966 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-enterprise-values-mimir-query-frontend labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: query-frontend @@ -28,14 +28,14 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: query-frontend annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -44,7 +44,7 @@ spec: [] containers: - name: query-frontend - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=query-frontend" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml index 55290abe0c7..929fa344962 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-query-frontend-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: query-frontend diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml index 134e5fa6655..14ddca32d41 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-query-frontend labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: query-frontend diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/role.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/role.yaml index 0bfe0d93990..97fa1bf56e8 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/role.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/role.yaml @@ -5,7 +5,7 @@ kind: Role metadata: name: test-enterprise-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/rolebinding.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/rolebinding.yaml index daf73bf5a48..5e41a4791c6 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/rolebinding.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/rolebinding.yaml @@ -5,7 +5,7 @@ kind: RoleBinding metadata: name: test-enterprise-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index b40077a5b2a..3c4d148a983 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-enterprise-values-mimir-ruler labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: ruler @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: ruler app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -46,7 +46,7 @@ spec: [] containers: - name: ruler - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=ruler" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml index 95bc0b22dd8..0611911fc3d 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-ruler labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: ruler diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/runtime-configmap.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/runtime-configmap.yaml index 0974615fc37..2bc095421f3 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/runtime-configmap.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/runtime-configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: test-enterprise-values-mimir-runtime labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/secret.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/secret.yaml index a10a89ff534..176b9952bd8 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/secret.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/secret.yaml @@ -5,10 +5,10 @@ kind: Secret metadata: name: test-enterprise-values-mimir-config labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm data: - mimir.yaml: CgpsaW1pdHM6IHt9CgphY3Rpdml0eV90cmFja2VyOgogIGZpbGVwYXRoOiAvZGF0YS9tZXRyaWNzLWFjdGl2aXR5LmxvZwoKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAnL2RhdGEnCiAgZW5hYmxlX2FwaTogdHJ1ZQogIGV4dGVybmFsX3VybDogJy9hbGVydG1hbmFnZXInCmFsZXJ0bWFuYWdlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW5pby5kZWZhdWx0LnN2Yzo5MDAwCiAgICBidWNrZXRfbmFtZTogbWltaXItcnVsZXIKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgaW5zZWN1cmU6IHRydWUKCmZyb250ZW5kX3dvcmtlcjoKICBmcm9udGVuZF9hZGRyZXNzOiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXF1ZXJ5LWZyb250ZW5kLWhlYWRsZXNzLmRlZmF1bHQuc3ZjOjkwOTUKCnJ1bGVyOgogIGVuYWJsZV9hcGk6IHRydWUKICBydWxlX3BhdGg6ICcvZGF0YScKICBhbGVydG1hbmFnZXJfdXJsOiBkbnNzcnZub2EraHR0cDovL19odHRwLW1ldHJpY3MuX3RjcC50ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWFsZXJ0bWFuYWdlci1oZWFkbGVzcy5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2FsL2FsZXJ0bWFuYWdlcgoKc2VydmVyOgogIGdycGNfc2VydmVyX21heF9yZWN2X21zZ19zaXplOiAxMDQ4NTc2MDAKICBncnBjX3NlcnZlcl9tYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgZ3JwY19zZXJ2ZXJfbWF4X2NvbmN1cnJlbnRfc3RyZWFtczogMTAwMAoKZnJvbnRlbmQ6CiAgbG9nX3F1ZXJpZXNfbG9uZ2VyX3RoYW46IDEwcwogIGFsaWduX3F1ZXJpZXNfd2l0aF9zdGVwOiB0cnVlCgpjb21wYWN0b3I6CiAgZGF0YV9kaXI6ICIvZGF0YSIKCmluZ2VzdGVyOgogIHJpbmc6CiAgICBmaW5hbF9zbGVlcDogMHMKICAgIG51bV90b2tlbnM6IDUxMgogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKCmluZ2VzdGVyX2NsaWVudDoKICBncnBjX2NsaWVudF9jb25maWc6CiAgICBtYXhfcmVjdl9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgICBtYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCgpydW50aW1lX2NvbmZpZzoKICBmaWxlOiAvdmFyL21pbWlyL3J1bnRpbWUueWFtbAoKbWVtYmVybGlzdDoKICBhYm9ydF9pZl9jbHVzdGVyX2pvaW5fZmFpbHM6IGZhbHNlCiAgY29tcHJlc3Npb25fZW5hYmxlZDogZmFsc2UKICBqb2luX21lbWJlcnM6CiAgLSB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWdvc3NpcC1yaW5nCgojIFRoaXMgY29uZmlndXJlcyBob3cgdGhlIHN0b3JlLWdhdGV3YXkgc3luY2hyb25pemVzIGJsb2NrcyBzdG9yZWQgaW4gdGhlIGJ1Y2tldC4gSXQgdXNlcyBNaW5pbyBieSBkZWZhdWx0IGZvciBnZXR0aW5nIHN0YXJ0ZWQgKGNvbmZpZ3VyZWQgdmlhIGZsYWdzKSBidXQgdGhpcyBzaG91bGQgYmUgY2hhbmdlZCBmb3IgcHJvZHVjdGlvbiBkZXBsb3ltZW50cy4KYmxvY2tzX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICB0c2RiOgogICAgZGlyOiAvZGF0YS90c2RiCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uZGVmYXVsdC5zdmM6OTAwMAogICAgYnVja2V0X25hbWU6IG1pbWlyLXRzZGIKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgaW5zZWN1cmU6IHRydWUKcnVsZXJfc3RvcmFnZToKICBiYWNrZW5kOiBzMwogIHMzOgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uZGVmYXVsdC5zdmM6OTAwMAogICAgYnVja2V0X25hbWU6IG1pbWlyLXJ1bGVyCiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgIGluc2VjdXJlOiB0cnVlCm11bHRpdGVuYW5jeV9lbmFibGVkOiB0cnVlCgphZG1pbl9hcGk6CiAgbGVhZGVyX2VsZWN0aW9uOgogICAgZW5hYmxlZDogdHJ1ZQogICAgcmluZzoKICAgICAga3ZzdG9yZToKICAgICAgICBzdG9yZTogIm1lbWJlcmxpc3QiCmFkbWluX2NsaWVudDoKICBzdG9yYWdlOgogICAgdHlwZTogczMKICAgIHMzOgogICAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW5pby5kZWZhdWx0LnN2Yzo5MDAwCiAgICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4KICAgICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgICAgaW5zZWN1cmU6IHRydWUKCmF1dGg6CiAgdHlwZTogZW50ZXJwcmlzZQoKY2x1c3Rlcl9uYW1lOiAidGVzdC1lbnRlcnByaXNlLXZhbHVlcyIKCmxpY2Vuc2U6CiAgcGF0aDogIi9saWNlbnNlL2xpY2Vuc2Uuand0IgpnYXRld2F5OgogIHByb3h5OgogICAgZGVmYXVsdDoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hZG1pbi1hcGkuZGVmYXVsdC5zdmM6ODA4MAogICAgYWRtaW5fYXBpOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWFkbWluLWFwaS5kZWZhdWx0LnN2Yzo4MDgwCiAgICBhbGVydG1hbmFnZXI6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItYWxlcnRtYW5hZ2VyLmRlZmF1bHQuc3ZjOjgwODAKICAgIGNvbXBhY3RvcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1jb21wYWN0b3IuZGVmYXVsdC5zdmM6ODA4MAogICAgZGlzdHJpYnV0b3I6CiAgICAgIHVybDogZG5zOi8vL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItZGlzdHJpYnV0b3ItaGVhZGxlc3MuZGVmYXVsdC5zdmMuY2x1c3Rlci5sb2NhbDo5MDk1CiAgICBpbmdlc3RlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1pbmdlc3Rlci5kZWZhdWx0LnN2Yzo4MDgwCiAgICBxdWVyeV9mcm9udGVuZDoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1mcm9udGVuZC5kZWZhdWx0LnN2Yzo4MDgwCiAgICBydWxlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1ydWxlci5kZWZhdWx0LnN2Yzo4MDgwCiAgICBzdG9yZV9nYXRld2F5OgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLXN0b3JlLWdhdGV3YXkuZGVmYXVsdC5zdmM6ODA4MAoKaW5zdHJ1bWVudGF0aW9uOgogIGVuYWJsZWQ6IHRydWUKICBkaXN0cmlidXRvcl9jbGllbnQ6CiAgICBhZGRyZXNzOiAnZG5zOi8vL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItZGlzdHJpYnV0b3ItaGVhZGxlc3MuZGVmYXVsdC5zdmMuY2x1c3Rlci5sb2NhbDo5MDk1Jwo= + mimir.yaml: CgpsaW1pdHM6IHt9CgphY3Rpdml0eV90cmFja2VyOgogIGZpbGVwYXRoOiAvZGF0YS9tZXRyaWNzLWFjdGl2aXR5LmxvZwoKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAnL2RhdGEnCiAgZW5hYmxlX2FwaTogdHJ1ZQogIGV4dGVybmFsX3VybDogJy9hbGVydG1hbmFnZXInCmFsZXJ0bWFuYWdlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW5pby5jaXRlc3Rucy5zdmM6OTAwMAogICAgYnVja2V0X25hbWU6IG1pbWlyLXJ1bGVyCiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgIGluc2VjdXJlOiB0cnVlCgpmcm9udGVuZF93b3JrZXI6CiAgZnJvbnRlbmRfYWRkcmVzczogdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1mcm9udGVuZC1oZWFkbGVzcy5jaXRlc3Rucy5zdmM6OTA5NQoKcnVsZXI6CiAgZW5hYmxlX2FwaTogdHJ1ZQogIHJ1bGVfcGF0aDogJy9kYXRhJwogIGFsZXJ0bWFuYWdlcl91cmw6IGRuc3Nydm5vYStodHRwOi8vX2h0dHAtbWV0cmljcy5fdGNwLnRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItYWxlcnRtYW5hZ2VyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsL2FsZXJ0bWFuYWdlcgoKc2VydmVyOgogIGdycGNfc2VydmVyX21heF9yZWN2X21zZ19zaXplOiAxMDQ4NTc2MDAKICBncnBjX3NlcnZlcl9tYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgZ3JwY19zZXJ2ZXJfbWF4X2NvbmN1cnJlbnRfc3RyZWFtczogMTAwMAoKZnJvbnRlbmQ6CiAgbG9nX3F1ZXJpZXNfbG9uZ2VyX3RoYW46IDEwcwogIGFsaWduX3F1ZXJpZXNfd2l0aF9zdGVwOiB0cnVlCgpjb21wYWN0b3I6CiAgZGF0YV9kaXI6ICIvZGF0YSIKCmluZ2VzdGVyOgogIHJpbmc6CiAgICBmaW5hbF9zbGVlcDogMHMKICAgIG51bV90b2tlbnM6IDUxMgogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKCmluZ2VzdGVyX2NsaWVudDoKICBncnBjX2NsaWVudF9jb25maWc6CiAgICBtYXhfcmVjdl9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgICBtYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCgpydW50aW1lX2NvbmZpZzoKICBmaWxlOiAvdmFyL21pbWlyL3J1bnRpbWUueWFtbAoKbWVtYmVybGlzdDoKICBhYm9ydF9pZl9jbHVzdGVyX2pvaW5fZmFpbHM6IGZhbHNlCiAgY29tcHJlc3Npb25fZW5hYmxlZDogZmFsc2UKICBqb2luX21lbWJlcnM6CiAgLSB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWdvc3NpcC1yaW5nCgojIFRoaXMgY29uZmlndXJlcyBob3cgdGhlIHN0b3JlLWdhdGV3YXkgc3luY2hyb25pemVzIGJsb2NrcyBzdG9yZWQgaW4gdGhlIGJ1Y2tldC4gSXQgdXNlcyBNaW5pbyBieSBkZWZhdWx0IGZvciBnZXR0aW5nIHN0YXJ0ZWQgKGNvbmZpZ3VyZWQgdmlhIGZsYWdzKSBidXQgdGhpcyBzaG91bGQgYmUgY2hhbmdlZCBmb3IgcHJvZHVjdGlvbiBkZXBsb3ltZW50cy4KYmxvY2tzX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICB0c2RiOgogICAgZGlyOiAvZGF0YS90c2RiCiAgYnVja2V0X3N0b3JlOgogICAgc3luY19kaXI6IC9kYXRhL3RzZGItc3luYwogIHMzOgogICAgZW5kcG9pbnQ6IHRlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWluaW8uY2l0ZXN0bnMuc3ZjOjkwMDAKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci10c2RiCiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgIGluc2VjdXJlOiB0cnVlCnJ1bGVyX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICBzMzoKICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBidWNrZXRfbmFtZTogbWltaXItcnVsZXIKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgaW5zZWN1cmU6IHRydWUKbXVsdGl0ZW5hbmN5X2VuYWJsZWQ6IHRydWUKCmFkbWluX2FwaToKICBsZWFkZXJfZWxlY3Rpb246CiAgICBlbmFibGVkOiB0cnVlCiAgICByaW5nOgogICAgICBrdnN0b3JlOgogICAgICAgIHN0b3JlOiAibWVtYmVybGlzdCIKYWRtaW5fY2xpZW50OgogIHN0b3JhZ2U6CiAgICB0eXBlOiBzMwogICAgczM6CiAgICAgIGVuZHBvaW50OiB0ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICAgIGJ1Y2tldF9uYW1lOiBlbnRlcnByaXNlLW1ldHJpY3MtYWRtaW4KICAgICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgICAgaW5zZWN1cmU6IHRydWUKCmF1dGg6CiAgdHlwZTogZW50ZXJwcmlzZQoKY2x1c3Rlcl9uYW1lOiAidGVzdC1lbnRlcnByaXNlLXZhbHVlcyIKCmxpY2Vuc2U6CiAgcGF0aDogIi9saWNlbnNlL2xpY2Vuc2Uuand0IgpnYXRld2F5OgogIHByb3h5OgogICAgZGVmYXVsdDoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFkbWluX2FwaToKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hZG1pbi1hcGkuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGFsZXJ0bWFuYWdlcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1hbGVydG1hbmFnZXIuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGNvbXBhY3RvcjoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1jb21wYWN0b3IuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIGRpc3RyaWJ1dG9yOgogICAgICB1cmw6IGRuczovLy90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWRpc3RyaWJ1dG9yLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsOjkwOTUKICAgIGluZ2VzdGVyOgogICAgICB1cmw6IGh0dHA6Ly90ZXN0LWVudGVycHJpc2UtdmFsdWVzLW1pbWlyLWluZ2VzdGVyLmNpdGVzdG5zLnN2Yzo4MDgwCiAgICBxdWVyeV9mcm9udGVuZDoKICAgICAgdXJsOiBodHRwOi8vdGVzdC1lbnRlcnByaXNlLXZhbHVlcy1taW1pci1xdWVyeS1mcm9udGVuZC5jaXRlc3Rucy5zdmM6ODA4MAogICAgcnVsZXI6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItcnVsZXIuY2l0ZXN0bnMuc3ZjOjgwODAKICAgIHN0b3JlX2dhdGV3YXk6CiAgICAgIHVybDogaHR0cDovL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItc3RvcmUtZ2F0ZXdheS5jaXRlc3Rucy5zdmM6ODA4MAoKaW5zdHJ1bWVudGF0aW9uOgogIGVuYWJsZWQ6IHRydWUKICBkaXN0cmlidXRvcl9jbGllbnQ6CiAgICBhZGRyZXNzOiAnZG5zOi8vL3Rlc3QtZW50ZXJwcmlzZS12YWx1ZXMtbWltaXItZGlzdHJpYnV0b3ItaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjLmNsdXN0ZXIubG9jYWw6OTA5NScK diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/serviceaccount.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/serviceaccount.yaml index 78a8ad657b4..be6d49b5e35 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/serviceaccount.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: test-enterprise-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml index 485f99bff0d..b687d457336 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml @@ -5,7 +5,7 @@ kind: PodDisruptionBudget metadata: name: test-enterprise-values-mimir-store-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: store-gateway diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml index a6fd00b3770..039589abaf5 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-enterprise-values-mimir-store-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: store-gateway @@ -27,7 +27,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: app.kubernetes.io/component: store-gateway app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 20297fef45efa773cd872a3e65ada08c59029003e83d3b1eace4d87bbf72ce99 + checksum/config: deee5d2bcf924492c2988a219d9cf89cde36027ee6b101cee76fde256a0b9cef spec: serviceAccountName: test-enterprise-values-mimir securityContext: @@ -71,7 +71,7 @@ spec: emptyDir: {} containers: - name: store-gateway - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=store-gateway" diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml index 33c3e07dd34..2e5ee3a1ace 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-store-gateway-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: store-gateway diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml index a94d269f9ae..2b2ec9cfe84 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-enterprise-values-mimir-store-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: store-gateway diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/tokengen/tokengen-job.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/tokengen/tokengen-job.yaml index 0e2ea38b721..001799580e0 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/tokengen/tokengen-job.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/tokengen/tokengen-job.yaml @@ -5,7 +5,7 @@ kind: Job metadata: name: test-enterprise-values-mimir-tokengen labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/component: tokengen @@ -21,7 +21,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-enterprise-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: [] containers: - name: tokengen - image: "grafana/enterprise-metrics:v2.1.0" + image: "grafana/enterprise-metrics:r190-9abd21a8" imagePullPolicy: IfNotPresent args: - "-target=tokengen" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml index 49d29f0d92b..3775aa43d73 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/post-install-prometheus-metrics-rolebinding.yaml @@ -16,4 +16,4 @@ roleRef: subjects: - kind: ServiceAccount name: test-oss-values-minio-update-prometheus-secret - namespace: "default" + namespace: "citestns" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml index 117733a9d99..5b1e8bf80f6 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/charts/minio/templates/serviceaccount.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: "test-oss-values-minio" - namespace: "default" + namespace: "citestns" labels: app: minio chart: minio-8.0.10 diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml index be6b9c174a5..d020c3602cd 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-oss-values-mimir-alertmanager labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: alertmanager @@ -27,7 +27,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: app.kubernetes.io/component: alertmanager app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -62,7 +62,7 @@ spec: emptyDir: {} containers: - name: alertmanager - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=alertmanager" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml index 662fb5387b6..498704be570 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-alertmanager-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: alertmanager diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml index 3c6dcb67190..ac014a6f12f 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/alertmanager/alertmanager-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-alertmanager labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: alertmanager diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml index 1205d24e97b..84456a93b97 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-oss-values-mimir-compactor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: compactor @@ -27,7 +27,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: app.kubernetes.io/component: compactor app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -70,7 +70,7 @@ spec: emptyDir: {} containers: - name: compactor - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=compactor" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml index 2a5af3a6e46..4e80aef5d94 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/compactor/compactor-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-compactor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: compactor diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml index d27718199d8..dbcb6521cca 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-oss-values-mimir-distributor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: distributor @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: distributor app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -46,7 +46,7 @@ spec: [] containers: - name: distributor - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=distributor" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml index 2cecc4be2c9..10de1223eb5 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-distributor-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: distributor diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml index ef0dff05dc7..4a0ef61cc08 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/distributor/distributor-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-distributor labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: distributor diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml index ae66fd7c268..33b698d884a 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/gossip-ring/gossip-ring-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-gossip-ring labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: gossip-ring diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml index 8772a9d15af..98ebfea55c6 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-pdb.yaml @@ -5,7 +5,7 @@ kind: PodDisruptionBudget metadata: name: test-oss-values-mimir-ingester labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: ingester diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml index 8b9acade53d..adfb18ec0e2 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-oss-values-mimir-ingester labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: ingester @@ -28,7 +28,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -36,7 +36,7 @@ spec: app.kubernetes.io/component: ingester app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -61,7 +61,7 @@ spec: emptyDir: {} containers: - name: ingester - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=ingester" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml index bdde7e36d02..f596eb93692 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-ingester-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: ingester diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml index 75966d41959..2910c140543 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ingester/ingester-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-ingester labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: ingester diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml index b714a38d655..1031fc01bf0 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/minio/create-bucket-job.yaml @@ -4,10 +4,10 @@ apiVersion: batch/v1 kind: Job metadata: name: test-oss-values-mimir-distributed-make-bucket-job - namespace: "default" + namespace: "citestns" labels: app: mimir-distributed-make-bucket-job - chart: mimir-distributed-2.2.0-weekly.189 + chart: mimir-distributed-2.2.0-weekly.190 release: test-oss-values heritage: Helm spec: diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml index e85527322ab..a0a19c1bcdd 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: test-oss-values-mimir-nginx labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: nginx @@ -50,52 +50,52 @@ data: # Distributor endpoints location /distributor { - proxy_pass http://test-oss-values-mimir-distributor-headless.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-distributor-headless.citestns.svc.cluster.local:8080$request_uri; } location = /api/v1/push { - proxy_pass http://test-oss-values-mimir-distributor-headless.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-distributor-headless.citestns.svc.cluster.local:8080$request_uri; } # Alertmanager endpoints location /alertmanager { - proxy_pass http://test-oss-values-mimir-alertmanager.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-alertmanager.citestns.svc.cluster.local:8080$request_uri; } location = /multitenant_alertmanager/status { - proxy_pass http://test-oss-values-mimir-alertmanager.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-alertmanager.citestns.svc.cluster.local:8080$request_uri; } location = /api/v1/alerts { - proxy_pass http://test-oss-values-mimir-alertmanager.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-alertmanager.citestns.svc.cluster.local:8080$request_uri; } # Ruler endpoints location /prometheus/config/v1/rules { - proxy_pass http://test-oss-values-mimir-ruler.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-ruler.citestns.svc.cluster.local:8080$request_uri; } location /prometheus/api/v1/rules { - proxy_pass http://test-oss-values-mimir-ruler.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-ruler.citestns.svc.cluster.local:8080$request_uri; } location /api/v1/rules { - proxy_pass http://test-oss-values-mimir-ruler.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-ruler.citestns.svc.cluster.local:8080$request_uri; } location /prometheus/api/v1/alerts { - proxy_pass http://test-oss-values-mimir-ruler.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-ruler.citestns.svc.cluster.local:8080$request_uri; } location /prometheus/rules { - proxy_pass http://test-oss-values-mimir-ruler.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-ruler.citestns.svc.cluster.local:8080$request_uri; } location = /ruler/ring { - proxy_pass http://test-oss-values-mimir-ruler.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-ruler.citestns.svc.cluster.local:8080$request_uri; } # Rest of /prometheus goes to the query frontend location /prometheus { - proxy_pass http://test-oss-values-mimir-query-frontend.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-query-frontend.citestns.svc.cluster.local:8080$request_uri; } # Buildinfo endpoint can go to any component location = /api/v1/status/buildinfo { - proxy_pass http://test-oss-values-mimir-query-frontend.default.svc.cluster.local:8080$request_uri; + proxy_pass http://test-oss-values-mimir-query-frontend.citestns.svc.cluster.local:8080$request_uri; } } } diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml index 7ed199b4cb0..44dfda29701 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-oss-values-mimir-nginx labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: nginx @@ -25,9 +25,9 @@ spec: template: metadata: annotations: - checksum/config: d7fa3f4c1e841a4634ee7561fa92990e6525d1bfdb176f416744e0b8f72ae99d + checksum/config: 81a467707ff1e0acde06809af678fa262d9ab39cc2e7f33b9ae3292e0299dced labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-svc.yaml index e331454c698..c45a1a61ddc 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-nginx labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: nginx diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml index 107d7216c8b..688ed4e3588 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-dep.yaml @@ -6,7 +6,7 @@ metadata: annotations: {} labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: overrides-exporter @@ -28,14 +28,14 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: overrides-exporter annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -44,7 +44,7 @@ spec: [] containers: - name: overrides-exporter - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=overrides-exporter" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml index 0ff1ee8ec9d..ac25c7bd353 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/overrides-exporter/overrides-exporter-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-overrides-exporter labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: overrides-exporter diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml index 395db399470..a6e40700382 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/podsecuritypolicy.yaml @@ -5,7 +5,7 @@ kind: PodSecurityPolicy metadata: name: test-oss-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-dep.yaml index f5cd09319ed..9be660774f3 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-oss-values-mimir-querier labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: querier @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: querier app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -46,7 +46,7 @@ spec: [] containers: - name: querier - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=querier" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-svc.yaml index c1fcf0582bc..b26da30711f 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/querier/querier-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-querier labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: querier diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml index c14cc7b880a..de4c904bdc8 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-oss-values-mimir-query-frontend labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: query-frontend @@ -28,14 +28,14 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: query-frontend annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -44,7 +44,7 @@ spec: [] containers: - name: query-frontend - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=query-frontend" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml index 7295c71edcd..e87ff910f92 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-query-frontend-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: query-frontend diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml index f38983aca6f..e120a20fbe1 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/query-frontend/query-frontend-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-query-frontend labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: query-frontend diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/role.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/role.yaml index 744b7b2a513..3e581c33f6e 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/role.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/role.yaml @@ -5,7 +5,7 @@ kind: Role metadata: name: test-oss-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/rolebinding.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/rolebinding.yaml index a2310f0d972..9a703de6ebd 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/rolebinding.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/rolebinding.yaml @@ -5,7 +5,7 @@ kind: RoleBinding metadata: name: test-oss-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index f7ceb3b0491..fff925bf5c3 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: test-oss-values-mimir-ruler labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: ruler @@ -29,7 +29,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -37,7 +37,7 @@ spec: app.kubernetes.io/component: ruler app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -46,7 +46,7 @@ spec: [] containers: - name: ruler - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=ruler" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml index ce75a9acecc..242ff3cd61c 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-ruler labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: ruler diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/runtime-configmap.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/runtime-configmap.yaml index 7c5ea9aa679..37e49e5f821 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/runtime-configmap.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/runtime-configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: test-oss-values-mimir-runtime labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/secret.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/secret.yaml index 31de04f6fc8..6c0810d91b8 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/secret.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/secret.yaml @@ -5,10 +5,10 @@ kind: Secret metadata: name: test-oss-values-mimir-config labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" app.kubernetes.io/managed-by: Helm data: - mimir.yaml: bXVsdGl0ZW5hbmN5X2VuYWJsZWQ6IGZhbHNlCgpsaW1pdHM6IHt9CgphY3Rpdml0eV90cmFja2VyOgogIGZpbGVwYXRoOiAvZGF0YS9tZXRyaWNzLWFjdGl2aXR5LmxvZwoKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAnL2RhdGEnCiAgZW5hYmxlX2FwaTogdHJ1ZQogIGV4dGVybmFsX3VybDogJy9hbGVydG1hbmFnZXInCmFsZXJ0bWFuYWdlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1vc3MtdmFsdWVzLW1pbmlvLmRlZmF1bHQuc3ZjOjkwMDAKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci1ydWxlcgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgICBpbnNlY3VyZTogdHJ1ZQoKZnJvbnRlbmRfd29ya2VyOgogIGZyb250ZW5kX2FkZHJlc3M6IHRlc3Qtb3NzLXZhbHVlcy1taW1pci1xdWVyeS1mcm9udGVuZC1oZWFkbGVzcy5kZWZhdWx0LnN2Yzo5MDk1CgpydWxlcjoKICBlbmFibGVfYXBpOiB0cnVlCiAgcnVsZV9wYXRoOiAnL2RhdGEnCiAgYWxlcnRtYW5hZ2VyX3VybDogZG5zc3J2bm9hK2h0dHA6Ly9faHR0cC1tZXRyaWNzLl90Y3AudGVzdC1vc3MtdmFsdWVzLW1pbWlyLWFsZXJ0bWFuYWdlci1oZWFkbGVzcy5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2FsL2FsZXJ0bWFuYWdlcgoKc2VydmVyOgogIGdycGNfc2VydmVyX21heF9yZWN2X21zZ19zaXplOiAxMDQ4NTc2MDAKICBncnBjX3NlcnZlcl9tYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgZ3JwY19zZXJ2ZXJfbWF4X2NvbmN1cnJlbnRfc3RyZWFtczogMTAwMAoKZnJvbnRlbmQ6CiAgbG9nX3F1ZXJpZXNfbG9uZ2VyX3RoYW46IDEwcwogIGFsaWduX3F1ZXJpZXNfd2l0aF9zdGVwOiB0cnVlCgpjb21wYWN0b3I6CiAgZGF0YV9kaXI6ICIvZGF0YSIKCmluZ2VzdGVyOgogIHJpbmc6CiAgICBmaW5hbF9zbGVlcDogMHMKICAgIG51bV90b2tlbnM6IDUxMgogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKCmluZ2VzdGVyX2NsaWVudDoKICBncnBjX2NsaWVudF9jb25maWc6CiAgICBtYXhfcmVjdl9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgICBtYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCgpydW50aW1lX2NvbmZpZzoKICBmaWxlOiAvdmFyL21pbWlyL3J1bnRpbWUueWFtbAoKbWVtYmVybGlzdDoKICBhYm9ydF9pZl9jbHVzdGVyX2pvaW5fZmFpbHM6IGZhbHNlCiAgY29tcHJlc3Npb25fZW5hYmxlZDogZmFsc2UKICBqb2luX21lbWJlcnM6CiAgLSB0ZXN0LW9zcy12YWx1ZXMtbWltaXItZ29zc2lwLXJpbmcKCiMgVGhpcyBjb25maWd1cmVzIGhvdyB0aGUgc3RvcmUtZ2F0ZXdheSBzeW5jaHJvbml6ZXMgYmxvY2tzIHN0b3JlZCBpbiB0aGUgYnVja2V0LiBJdCB1c2VzIE1pbmlvIGJ5IGRlZmF1bHQgZm9yIGdldHRpbmcgc3RhcnRlZCAoY29uZmlndXJlZCB2aWEgZmxhZ3MpIGJ1dCB0aGlzIHNob3VsZCBiZSBjaGFuZ2VkIGZvciBwcm9kdWN0aW9uIGRlcGxveW1lbnRzLgpibG9ja3Nfc3RvcmFnZToKICBiYWNrZW5kOiBzMwogIHRzZGI6CiAgICBkaXI6IC9kYXRhL3RzZGIKICBidWNrZXRfc3RvcmU6CiAgICBzeW5jX2RpcjogL2RhdGEvdHNkYi1zeW5jCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1vc3MtdmFsdWVzLW1pbmlvLmRlZmF1bHQuc3ZjOjkwMDAKICAgIGJ1Y2tldF9uYW1lOiBtaW1pci10c2RiCiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgIGluc2VjdXJlOiB0cnVlCnJ1bGVyX3N0b3JhZ2U6CiAgYmFja2VuZDogczMKICBzMzoKICAgIGVuZHBvaW50OiB0ZXN0LW9zcy12YWx1ZXMtbWluaW8uZGVmYXVsdC5zdmM6OTAwMAogICAgYnVja2V0X25hbWU6IG1pbWlyLXJ1bGVyCiAgICBhY2Nlc3Nfa2V5X2lkOiBncmFmYW5hLW1pbWlyCiAgICBzZWNyZXRfYWNjZXNzX2tleTogc3VwZXJzZWNyZXQKICAgIGluc2VjdXJlOiB0cnVlCg== + mimir.yaml: bXVsdGl0ZW5hbmN5X2VuYWJsZWQ6IGZhbHNlCgpsaW1pdHM6IHt9CgphY3Rpdml0eV90cmFja2VyOgogIGZpbGVwYXRoOiAvZGF0YS9tZXRyaWNzLWFjdGl2aXR5LmxvZwoKYWxlcnRtYW5hZ2VyOgogIGRhdGFfZGlyOiAnL2RhdGEnCiAgZW5hYmxlX2FwaTogdHJ1ZQogIGV4dGVybmFsX3VybDogJy9hbGVydG1hbmFnZXInCmFsZXJ0bWFuYWdlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1vc3MtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBidWNrZXRfbmFtZTogbWltaXItcnVsZXIKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgaW5zZWN1cmU6IHRydWUKCmZyb250ZW5kX3dvcmtlcjoKICBmcm9udGVuZF9hZGRyZXNzOiB0ZXN0LW9zcy12YWx1ZXMtbWltaXItcXVlcnktZnJvbnRlbmQtaGVhZGxlc3MuY2l0ZXN0bnMuc3ZjOjkwOTUKCnJ1bGVyOgogIGVuYWJsZV9hcGk6IHRydWUKICBydWxlX3BhdGg6ICcvZGF0YScKICBhbGVydG1hbmFnZXJfdXJsOiBkbnNzcnZub2EraHR0cDovL19odHRwLW1ldHJpY3MuX3RjcC50ZXN0LW9zcy12YWx1ZXMtbWltaXItYWxlcnRtYW5hZ2VyLWhlYWRsZXNzLmNpdGVzdG5zLnN2Yy5jbHVzdGVyLmxvY2FsL2FsZXJ0bWFuYWdlcgoKc2VydmVyOgogIGdycGNfc2VydmVyX21heF9yZWN2X21zZ19zaXplOiAxMDQ4NTc2MDAKICBncnBjX3NlcnZlcl9tYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgZ3JwY19zZXJ2ZXJfbWF4X2NvbmN1cnJlbnRfc3RyZWFtczogMTAwMAoKZnJvbnRlbmQ6CiAgbG9nX3F1ZXJpZXNfbG9uZ2VyX3RoYW46IDEwcwogIGFsaWduX3F1ZXJpZXNfd2l0aF9zdGVwOiB0cnVlCgpjb21wYWN0b3I6CiAgZGF0YV9kaXI6ICIvZGF0YSIKCmluZ2VzdGVyOgogIHJpbmc6CiAgICBmaW5hbF9zbGVlcDogMHMKICAgIG51bV90b2tlbnM6IDUxMgogICAgdW5yZWdpc3Rlcl9vbl9zaHV0ZG93bjogZmFsc2UKCmluZ2VzdGVyX2NsaWVudDoKICBncnBjX2NsaWVudF9jb25maWc6CiAgICBtYXhfcmVjdl9tc2dfc2l6ZTogMTA0ODU3NjAwCiAgICBtYXhfc2VuZF9tc2dfc2l6ZTogMTA0ODU3NjAwCgpydW50aW1lX2NvbmZpZzoKICBmaWxlOiAvdmFyL21pbWlyL3J1bnRpbWUueWFtbAoKbWVtYmVybGlzdDoKICBhYm9ydF9pZl9jbHVzdGVyX2pvaW5fZmFpbHM6IGZhbHNlCiAgY29tcHJlc3Npb25fZW5hYmxlZDogZmFsc2UKICBqb2luX21lbWJlcnM6CiAgLSB0ZXN0LW9zcy12YWx1ZXMtbWltaXItZ29zc2lwLXJpbmcKCiMgVGhpcyBjb25maWd1cmVzIGhvdyB0aGUgc3RvcmUtZ2F0ZXdheSBzeW5jaHJvbml6ZXMgYmxvY2tzIHN0b3JlZCBpbiB0aGUgYnVja2V0LiBJdCB1c2VzIE1pbmlvIGJ5IGRlZmF1bHQgZm9yIGdldHRpbmcgc3RhcnRlZCAoY29uZmlndXJlZCB2aWEgZmxhZ3MpIGJ1dCB0aGlzIHNob3VsZCBiZSBjaGFuZ2VkIGZvciBwcm9kdWN0aW9uIGRlcGxveW1lbnRzLgpibG9ja3Nfc3RvcmFnZToKICBiYWNrZW5kOiBzMwogIHRzZGI6CiAgICBkaXI6IC9kYXRhL3RzZGIKICBidWNrZXRfc3RvcmU6CiAgICBzeW5jX2RpcjogL2RhdGEvdHNkYi1zeW5jCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1vc3MtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBidWNrZXRfbmFtZTogbWltaXItdHNkYgogICAgYWNjZXNzX2tleV9pZDogZ3JhZmFuYS1taW1pcgogICAgc2VjcmV0X2FjY2Vzc19rZXk6IHN1cGVyc2VjcmV0CiAgICBpbnNlY3VyZTogdHJ1ZQpydWxlcl9zdG9yYWdlOgogIGJhY2tlbmQ6IHMzCiAgczM6CiAgICBlbmRwb2ludDogdGVzdC1vc3MtdmFsdWVzLW1pbmlvLmNpdGVzdG5zLnN2Yzo5MDAwCiAgICBidWNrZXRfbmFtZTogbWltaXItcnVsZXIKICAgIGFjY2Vzc19rZXlfaWQ6IGdyYWZhbmEtbWltaXIKICAgIHNlY3JldF9hY2Nlc3Nfa2V5OiBzdXBlcnNlY3JldAogICAgaW5zZWN1cmU6IHRydWUK diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/serviceaccount.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/serviceaccount.yaml index c5f94d48a9c..4e828d2bb75 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/serviceaccount.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: test-oss-values-mimir labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml index 4d990a193d4..3044c7a7c60 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-pdb.yaml @@ -5,7 +5,7 @@ kind: PodDisruptionBudget metadata: name: test-oss-values-mimir-store-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: store-gateway diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml index 9f9eca6fde0..244f019655e 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: test-oss-values-mimir-store-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: store-gateway @@ -27,7 +27,7 @@ spec: template: metadata: labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/version: "2.1.0" @@ -35,7 +35,7 @@ spec: app.kubernetes.io/component: store-gateway app.kubernetes.io/part-of: memberlist annotations: - checksum/config: 7b9ed84df22bf324205968cf49b0d824eb15e1748888719ffc3bab3f17d5e2e4 + checksum/config: 51ee39d62dc7c50c36923ddac93650477ac8de7f5191f7cc3b234dbbf8beeddd spec: serviceAccountName: test-oss-values-mimir securityContext: @@ -68,7 +68,7 @@ spec: emptyDir: {} containers: - name: store-gateway - image: "grafana/mimir:2.1.0" + image: "grafana/mimir:r190-fe20bbd" imagePullPolicy: IfNotPresent args: - "-target=store-gateway" diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml index 07f36435a33..3b9829340c9 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc-headless.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-store-gateway-headless labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: store-gateway diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml index 288c52639da..92068071eb8 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/store-gateway/store-gateway-svc.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: test-oss-values-mimir-store-gateway labels: - helm.sh/chart: mimir-distributed-2.2.0-weekly.189 + helm.sh/chart: mimir-distributed-2.2.0-weekly.190 app.kubernetes.io/name: mimir app.kubernetes.io/instance: test-oss-values app.kubernetes.io/component: store-gateway diff --git a/pkg/alertmanager/multitenant_test.go b/pkg/alertmanager/multitenant_test.go index 174ac337df4..f6f81697646 100644 --- a/pkg/alertmanager/multitenant_test.go +++ b/pkg/alertmanager/multitenant_test.go @@ -472,6 +472,24 @@ receivers: - api_url: %s bot_token: xxx chat_id: 111 +`, backendURL) + }, + }, + // We expect requests against the HTTP proxy to be blocked too. + "HTTP proxy": { + getAlertmanagerConfig: func(backendURL string) string { + return fmt.Sprintf(` +route: + receiver: webhook + group_wait: 0s + group_interval: 1s + +receivers: + - name: webhook + webhook_configs: + - url: https://www.google.com + http_config: + proxy_url: %s `, backendURL) }, }, diff --git a/pkg/ingester/activeseries/custom_trackers_config.go b/pkg/ingester/activeseries/custom_trackers_config.go index a00821e8d43..3065a44d371 100644 --- a/pkg/ingester/activeseries/custom_trackers_config.go +++ b/pkg/ingester/activeseries/custom_trackers_config.go @@ -133,6 +133,11 @@ func (c *CustomTrackersConfig) UnmarshalYAML(unmarshal func(interface{}) error) return err } +// MarshalYAML implements yaml.Marshaler. +func (c CustomTrackersConfig) MarshalYAML() (interface{}, error) { + return c.source, nil +} + func NewCustomTrackersConfig(m map[string]string) (c CustomTrackersConfig, err error) { c.source = m c.config = map[string]labelsMatchers{} diff --git a/pkg/ingester/activeseries/custom_trackers_config_test.go b/pkg/ingester/activeseries/custom_trackers_config_test.go index 4c91fa5af98..6eb32faa587 100644 --- a/pkg/ingester/activeseries/custom_trackers_config_test.go +++ b/pkg/ingester/activeseries/custom_trackers_config_test.go @@ -205,3 +205,21 @@ func TestTrackersConfigs_Deserialization(t *testing.T) { assert.Error(t, err, "should not deserialize malformed input") }) } + +func TestTrackersConfigs_SerializeDeserialize(t *testing.T) { + sourceYAML := ` + baz: "{baz='bar'}" + foo: "{foo='bar'}" + ` + + obj := mustNewCustomTrackersConfigDeserializedFromYaml(t, sourceYAML) + + t.Run("ShouldSerializeDeserializeResultsTheSame", func(t *testing.T) { + out, err := yaml.Marshal(obj) + require.NoError(t, err, "failed do serialize Custom trackers config") + reSerialized := CustomTrackersConfig{} + err = yaml.Unmarshal(out, &reSerialized) + require.NoError(t, err, "Failed to deserialize serialized object") + assert.Equal(t, obj, reSerialized) + }) +} diff --git a/pkg/mimir/modules.go b/pkg/mimir/modules.go index 32ad4dc6b50..2cca624d7ee 100644 --- a/pkg/mimir/modules.go +++ b/pkg/mimir/modules.go @@ -576,7 +576,7 @@ func (t *Mimir) initRuler() (serv services.Service, err error) { if err != nil { return nil, err } - remoteQuerier := ruler.NewRemoteQuerier(queryFrontendClient, t.Cfg.API.PrometheusHTTPPrefix, util_log.Logger, ruler.WithOrgIDMiddleware) + remoteQuerier := ruler.NewRemoteQuerier(queryFrontendClient, t.Cfg.Ruler.QueryFrontend.Timeout, t.Cfg.API.PrometheusHTTPPrefix, util_log.Logger, ruler.WithOrgIDMiddleware) embeddedQueryable = prom_remote.NewSampleAndChunkQueryableClient( remoteQuerier, diff --git a/pkg/ruler/remotequerier.go b/pkg/ruler/remotequerier.go index 419f06a1aeb..f8b3a475a99 100644 --- a/pkg/ruler/remotequerier.go +++ b/pkg/ruler/remotequerier.go @@ -54,6 +54,9 @@ type QueryFrontendConfig struct { // Address is the address of the query-frontend to connect to. Address string `yaml:"address"` + // Timeout is the length of time we wait on the query-frontend before giving up. + Timeout time.Duration `yaml:"timeout"` + // GRPCClientConfig contains gRPC specific config options. GRPCClientConfig grpcclient.Config `yaml:"grpc_client_config"` } @@ -65,6 +68,8 @@ func (c *QueryFrontendConfig) RegisterFlags(f *flag.FlagSet) { "GRPC listen address of the query-frontend(s). Must be a DNS address (prefixed with dns:///) "+ "to enable client side load balancing.") + f.DurationVar(&c.Timeout, "ruler.query-frontend.timeout", 2*time.Minute, "The timeout for a rule query being evaluated by the query-frontend.") + c.GRPCClientConfig.RegisterFlagsWithPrefix("ruler.query-frontend.grpc-client-config", f) } @@ -92,6 +97,7 @@ type Middleware func(ctx context.Context, req *httpgrpc.HTTPRequest) error // RemoteQuerier executes read operations against a httpgrpc.HTTPClient. type RemoteQuerier struct { client httpgrpc.HTTPClient + timeout time.Duration middlewares []Middleware promHTTPPrefix string logger log.Logger @@ -100,12 +106,14 @@ type RemoteQuerier struct { // NewRemoteQuerier creates and initializes a new RemoteQuerier instance. func NewRemoteQuerier( client httpgrpc.HTTPClient, + timeout time.Duration, prometheusHTTPPrefix string, logger log.Logger, middlewares ...Middleware, ) *RemoteQuerier { return &RemoteQuerier{ client: client, + timeout: timeout, middlewares: middlewares, promHTTPPrefix: prometheusHTTPPrefix, logger: logger, @@ -147,6 +155,9 @@ func (q *RemoteQuerier) Read(ctx context.Context, query *prompb.Query) (*prompb. } } + ctx, cancel := context.WithTimeout(ctx, q.timeout) + defer cancel() + resp, err := q.client.Handle(ctx, &req) if err != nil { level.Warn(log).Log("msg", "failed to perform remote read", "err", err, "qs", query) @@ -211,6 +222,9 @@ func (q *RemoteQuerier) query(ctx context.Context, query string, ts time.Time, l } } + ctx, cancel := context.WithTimeout(ctx, q.timeout) + defer cancel() + resp, err := q.client.Handle(ctx, &req) if err != nil { level.Warn(logger).Log("msg", "failed to remotely evaluate query expression", "err", err, "qs", query, "tm", ts) diff --git a/pkg/ruler/remotequerier_test.go b/pkg/ruler/remotequerier_test.go index 5f34a8f6d2c..9a0f2478806 100644 --- a/pkg/ruler/remotequerier_test.go +++ b/pkg/ruler/remotequerier_test.go @@ -44,7 +44,7 @@ func TestRemoteQuerier_ReadReq(t *testing.T) { Body: snappy.Encode(nil, b), }, nil } - q := NewRemoteQuerier(mockHTTPGRPCClient(mockClientFn), "/prometheus", log.NewNopLogger()) + q := NewRemoteQuerier(mockHTTPGRPCClient(mockClientFn), time.Minute, "/prometheus", log.NewNopLogger()) _, err := q.Read(context.Background(), &prompb.Query{}) require.NoError(t, err) @@ -55,6 +55,17 @@ func TestRemoteQuerier_ReadReq(t *testing.T) { require.Equal(t, "/prometheus/api/v1/read", inReq.Url) } +func TestRemoteQuerier_ReadReqTimeout(t *testing.T) { + mockClientFn := func(ctx context.Context, req *httpgrpc.HTTPRequest, _ ...grpc.CallOption) (*httpgrpc.HTTPResponse, error) { + <-ctx.Done() + return nil, ctx.Err() + } + q := NewRemoteQuerier(mockHTTPGRPCClient(mockClientFn), time.Second, "/prometheus", log.NewNopLogger()) + + _, err := q.Read(context.Background(), &prompb.Query{}) + require.Error(t, err) +} + func TestRemoteQuerier_QueryReq(t *testing.T) { var inReq *httpgrpc.HTTPRequest mockClientFn := func(ctx context.Context, req *httpgrpc.HTTPRequest, _ ...grpc.CallOption) (*httpgrpc.HTTPResponse, error) { @@ -63,7 +74,7 @@ func TestRemoteQuerier_QueryReq(t *testing.T) { "status": "success","data": {"resultType":"vector","result":[]} }`)}, nil } - q := NewRemoteQuerier(mockHTTPGRPCClient(mockClientFn), "/prometheus", log.NewNopLogger()) + q := NewRemoteQuerier(mockHTTPGRPCClient(mockClientFn), time.Minute, "/prometheus", log.NewNopLogger()) tm := time.Unix(1649092025, 515834) _, err := q.Query(context.Background(), "qs", tm) @@ -74,3 +85,15 @@ func TestRemoteQuerier_QueryReq(t *testing.T) { require.Equal(t, "query=qs&time="+url.QueryEscape(tm.Format(time.RFC3339Nano)), string(inReq.Body)) require.Equal(t, "/prometheus/api/v1/query", inReq.Url) } + +func TestRemoteQuerier_QueryReqTimeout(t *testing.T) { + mockClientFn := func(ctx context.Context, req *httpgrpc.HTTPRequest, _ ...grpc.CallOption) (*httpgrpc.HTTPResponse, error) { + <-ctx.Done() + return nil, ctx.Err() + } + q := NewRemoteQuerier(mockHTTPGRPCClient(mockClientFn), time.Second, "/prometheus", log.NewNopLogger()) + + tm := time.Unix(1649092025, 515834) + _, err := q.Query(context.Background(), "qs", tm) + require.Error(t, err) +} diff --git a/vendor/github.com/grafana/dskit/modules/module_service.go b/vendor/github.com/grafana/dskit/modules/module_service.go index b27d0244ab7..8ca4e25714d 100644 --- a/vendor/github.com/grafana/dskit/modules/module_service.go +++ b/vendor/github.com/grafana/dskit/modules/module_service.go @@ -27,6 +27,16 @@ type moduleService struct { startDeps, stopDeps func(string) map[string]services.Service } +type delegatedNamedService struct { + services.Service + + delegate services.NamedService +} + +func (n delegatedNamedService) ServiceName() string { + return n.delegate.ServiceName() +} + // NewModuleService wraps a module service, and makes sure that dependencies are started/stopped before module service starts or stops. // If any dependency fails to start, this service fails as well. // On stop, errors from failed dependencies are ignored. @@ -40,6 +50,14 @@ func NewModuleService(name string, logger log.Logger, service services.Service, } w.Service = services.NewBasicService(w.start, w.run, w.stop) + + if namedService, isNamed := service.(services.NamedService); isNamed { + // return a value that implements services.NamedService only if the wrapped service implements services.NamedService + return delegatedNamedService{ + Service: w, + delegate: namedService, + } + } return w } diff --git a/vendor/github.com/grafana/dskit/ring/lifecycler.go b/vendor/github.com/grafana/dskit/ring/lifecycler.go index da5f603eec0..dfef6afb642 100644 --- a/vendor/github.com/grafana/dskit/ring/lifecycler.go +++ b/vendor/github.com/grafana/dskit/ring/lifecycler.go @@ -600,6 +600,10 @@ func (i *Lifecycler) initRing(ctx context.Context) error { instanceDesc.State = ACTIVE } + // We're taking over this entry, update instanceDesc with our values + instanceDesc.Addr = i.Addr + instanceDesc.Zone = i.Zone + // We exist in the ring, so assume the ring is right and copy out tokens & state out of there. i.setState(instanceDesc.State) tokens, _ := ringDesc.TokensFor(i.ID) @@ -607,10 +611,9 @@ func (i *Lifecycler) initRing(ctx context.Context) error { level.Info(i.logger).Log("msg", "existing entry found in ring", "state", i.GetState(), "tokens", len(tokens), "ring", i.RingName) - // Update the ring if the instance has been changed and the heartbeat is disabled. - // We dont need to update KV here when heartbeat is enabled as this info will eventually be update on KV - // on the next heartbeat - if i.cfg.HeartbeatPeriod == 0 && !instanceDesc.Equal(ringDesc.Ingesters[i.ID]) { + // Update the ring if the instance has been changed. We don't want to rely on heartbeat update, as heartbeat + // can be configured to long time, and until then lifecycler would not report this instance as ready in CheckReady. + if !instanceDesc.Equal(ringDesc.Ingesters[i.ID]) { // Update timestamp to give gossiping client a chance register ring change. instanceDesc.Timestamp = time.Now().Unix() ringDesc.Ingesters[i.ID] = instanceDesc diff --git a/vendor/github.com/grafana/dskit/services/service.go b/vendor/github.com/grafana/dskit/services/service.go index c559ef96a35..6170951a106 100644 --- a/vendor/github.com/grafana/dskit/services/service.go +++ b/vendor/github.com/grafana/dskit/services/service.go @@ -100,6 +100,8 @@ type NamedService interface { Service // ServiceName returns name of the service, if it has one. + // Subsequent calls to ServiceName can return different values, + // for example service may update its name based on its state. ServiceName() string } diff --git a/vendor/modules.txt b/vendor/modules.txt index 6449a1e6307..df8ee71f6fe 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -432,7 +432,7 @@ github.com/gosimple/slug # github.com/grafana-tools/sdk v0.0.0-20211220201350-966b3088eec9 => github.com/colega/grafana-tools-sdk v0.0.0-20220323154849-711bca56d13f ## explicit; go 1.13 github.com/grafana-tools/sdk -# github.com/grafana/dskit v0.0.0-20220526081034-789ec0ca4a3b +# github.com/grafana/dskit v0.0.0-20220613090928-ebb5c6de233d ## explicit; go 1.17 github.com/grafana/dskit/backoff github.com/grafana/dskit/concurrency