diff --git a/.github/workflows/conventional-commits-check.yaml b/.github/workflows/conventional-commits-check.yaml new file mode 100644 index 000000000..5c28e5111 --- /dev/null +++ b/.github/workflows/conventional-commits-check.yaml @@ -0,0 +1,15 @@ +name: Conventional Commits Check + +on: + pull_request: + branches: [ develop ] + +jobs: + check-conventional-commits: + name: Conventional Commits + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Check Commit Conventions + uses: webiny/action-conventional-commits@v1.3.0 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index caaef7a84..993ee92bf 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -6,35 +6,18 @@ jobs: lint-charts: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: "0" - - name: Set up chart-testing - uses: helm/chart-testing-action@v2.1.0 - - name: Run chart-testing (list-changed) - id: list-changed - run: | - changed=$(ct list-changed --target-branch=develop --chart-dirs=. ) - if [[ -n "$changed" ]]; then - echo "::set-output name=changed::true" - fi - - name: Lint Sentry Helm Chart - uses: WyriHaximus/github-action-helm3@v2 - if: steps.list-changed.outputs.changed == 'true' + - name: Lint Sentry + uses: WyriHaximus/github-action-helm3@v3 with: - exec: for chart in $(ls -d ./*/); do helm lint $chart; done - - name: Run chart-testing (lint) - if: steps.list-changed.outputs.changed == 'true' - run: | - ct lint \ - --target-branch=develop \ - --chart-dirs=. \ - --chart-repos=bitnami=https://charts.bitnami.com/bitnami,bitnami-old=https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami,sentry-kubernetes=https://sentry-kubernetes.github.io/charts - # It would be nice to turn on this testing, but it is hard to get right and - # rather complex (as well as expensive in terms of runner compute time). - # Additionally, this is out of scope of fixing the issue brought up in #456 - # - name: Create kind cluster - # uses: helm/kind-action@v1.2.0 - # if: steps.list-changed.outputs.changed == 'true' - # - name: Run chart-testing (install) - # run: ct install --target-branch=develop --chart-dirs=. + exec: helm lint sentry + - name: Lint Clickhouse + uses: WyriHaximus/github-action-helm3@v3 + with: + exec: helm lint clickhouse + - name: Lint Sentry Kubernetes + uses: WyriHaximus/github-action-helm3@v3 + with: + exec: helm lint sentry-kubernetes diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index f8f6a61d1..a3985cd45 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -2,19 +2,19 @@ name: Build and push Chart on: push: - branches: - - develop + tags: + - '*' jobs: build-push: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: 'main' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: 'gh-pages' @@ -35,7 +35,6 @@ jobs: with: command: package main/sentry --destination gh-pages/charts - - name: Build zips uses: yeouchien/helm3-action@f3a7c239c5c60777210c8e631839edf5dd3fa29c with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 000000000..3fbc689ca --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,20 @@ +name: Release Please + +on: + push: + branches: + - develop + +permissions: + contents: write + pull-requests: write + +jobs: + release-please: + runs-on: ubuntu-latest + steps: + - name: Release Please Action + uses: google-github-actions/release-please-action@v4 + with: + token: ${{ secrets.PERSONAL_TOKEN }} + config-file: release-please-config.json diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index a1bcf3669..98be5f896 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -10,7 +10,7 @@ jobs: issues: write pull-requests: write steps: - - uses: actions/stale@v8 + - uses: actions/stale@v9 with: days-before-issue-stale: 30 days-before-issue-close: 14 diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 000000000..d708636ed --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1 @@ +{"clickhouse":"3.8.0","sentry":"22.2.0","sentry-kubernetes":"0.3.4"} \ No newline at end of file diff --git a/README.md b/README.md index 44bf8c495..06c3147e0 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,88 @@ Big thanks to the maintainers of the [deprecated chart](https://github.com/helm/ For now the full list of values is not documented but you can get inspired by the values.yaml specific to each directory. +## Upgrading from 21.x.x Version of This Chart to 22.x.x + +This version introduces a significant change by dropping support for Kafka Zookeeper and transitioning to Kafka Kraft +mode. This change requires action on your part to ensure a smooth upgrade. + +### Major Changes + +- **Kafka Upgrade**: We have upgraded from Kafka `23.0.7` to `27.1.2`. This involves moving from Zookeeper to Kraft, + requiring a fresh setup of Kafka. + +### Migration Guide + +1. **Backup Your Data**: Ensure all your data is backed up before starting the migration process. +2. **Retrieve the Cluster ID from Zookeeper** by executing: + + ```shell + kubectl exec -it -- zkCli.sh get /cluster/id + ``` + +3. **Deploy at least one Kraft controller-only** in your deployment with zookeeperMigrationMode=true. The Kraft + controllers will migrate the data from your Kafka ZkBroker to Kraft mode. + + To do this, add the following values to your Zookeeper deployment when upgrading: + + ```yaml + controller: + replicaCount: 1 + controllerOnly: true + zookeeperMigrationMode: true + broker: + zookeeperMigrationMode: true + kraft: + enabled: true + clusterId: "" + ``` + +4. **Wait until all brokers are ready.** You should see the following log in the broker logs: + + ```shell + INFO [KafkaServer id=100] Finished catching up on KRaft metadata log, requesting that the KRaft controller unfence this broker (kafka.server.KafkaServer) + INFO [BrokerLifecycleManager id=100 isZkBroker=true] The broker has been unfenced. Transitioning from RECOVERY to RUNNING. (kafka.server.BrokerLifecycleManager) + ``` + In the controllers, the following message should show up: + ```shell + Transitioning ZK migration state from PRE_MIGRATION to MIGRATION (org.apache.kafka.controller.FeatureControlManager) + ``` + +5. **Once all brokers have been successfully migrated,** set **'broker.zookeeperMigrationMode=false'** to fully migrate them. + ```yaml + broker: + zookeeperMigrationMode: false + ``` + +6. **To conclude the migration**, switch off migration mode on controllers and stop Zookeeper: + + ```yaml + controller: + zookeeperMigrationMode: false + zookeeper: + enabled: false + ``` + After the migration is complete, you should see the following message in your controllers: + + ```shell + [2023-07-13 13:07:45,226] INFO [QuorumController id=1] Transitioning ZK migration state from MIGRATION to POST_MIGRATION (org.apache.kafka.controller.FeatureControlManager) + ``` +7. **(Optional)** If you would like to switch to a non-dedicated cluster, set **'controller.controllerOnly=false'**. This will cause controller-only nodes to switch to controller+broker nodes. + + At this point, you could manually decommission broker-only nodes by reassigning its partitions to controller-eligible nodes. + + For more information about decommissioning a Kafka broker, check the official documentation. + +## Upgrading from 20.x.x version of this Chart to 21.x.x + +Bumped dependencies: +- memcached > 6.5.9 +- kafka > 23.0.7 - This is a major update, but only kafka version is updated. See [bitnami charts' update note](https://github.com/bitnami/charts/tree/main/bitnami/kafka#to-2300) +- clickhouse > 3.7.0 - Supports priorityClassName and max_suspicious_broken_parts config. +- zookeeper > 11.4.11 - 2 Major updates from v9 to v11. See [To v10 upgrade notes](https://github.com/bitnami/charts/tree/main/bitnami/zookeeper#to-1000) and [To v11 upgrade notes](https://github.com/bitnami/charts/tree/main/bitnami/zookeeper#to-1100) +- rabbitmq > 11.16.2 + + ## Upgrading from 19.x.x version of this Chart to 20.x.x Bumped dependencies: diff --git a/clickhouse/CHANGELOG.md b/clickhouse/CHANGELOG.md new file mode 100644 index 000000000..935bb75e3 --- /dev/null +++ b/clickhouse/CHANGELOG.md @@ -0,0 +1,43 @@ +# Changelog + +## [3.8.0](https://github.com/sentry-kubernetes/charts/compare/clickhouse-v3.7.2...clickhouse-v3.8.0) (2024-04-12) + + +### Features + +* add priorityClassName to clickhouse ([#1098](https://github.com/sentry-kubernetes/charts/issues/1098)) ([386e7b7](https://github.com/sentry-kubernetes/charts/commit/386e7b7328000a289a7642752af583e8f6d40106)) +* Allow to set max_suspicious_broken_parts in merge_tree settings… ([#1080](https://github.com/sentry-kubernetes/charts/issues/1080)) ([d2f305c](https://github.com/sentry-kubernetes/charts/commit/d2f305c73b7b0ab625734a30fe5b5363606cd751)) +* Allow to set specified merge_tree settings in config.xml ([#884](https://github.com/sentry-kubernetes/charts/issues/884)) ([a964753](https://github.com/sentry-kubernetes/charts/commit/a964753b6fc785292c448e2f8d7c3099c696039d)) +* clone clickhouse chart ([#71](https://github.com/sentry-kubernetes/charts/issues/71)) ([d4c252b](https://github.com/sentry-kubernetes/charts/commit/d4c252b752bd637595b2406e88f2118d8609667a)) +* distributed tables v2 ([#588](https://github.com/sentry-kubernetes/charts/issues/588)) ([cfe7d73](https://github.com/sentry-kubernetes/charts/commit/cfe7d736278feeeb72189efb841a6099685ed1dd)) +* put clickhouse with UTC timezone per default ([#82](https://github.com/sentry-kubernetes/charts/issues/82)) ([daab634](https://github.com/sentry-kubernetes/charts/commit/daab634449ce10ad45a0f73c765e04033a8cb657)) +* **tabix:** allow setting ingress annotations for dealing with cors ([#321](https://github.com/sentry-kubernetes/charts/issues/321)) ([b11361f](https://github.com/sentry-kubernetes/charts/commit/b11361f2fe6b27504d2f0fda4a12bc5ade780b05)) + + +### Bug Fixes + +* clickhouse chart lint ([a364b05](https://github.com/sentry-kubernetes/charts/commit/a364b053069ab9330af6c8bfd0d2bda619ada0f0)) +* clickhouse ingress ([#99](https://github.com/sentry-kubernetes/charts/issues/99)) ([94da94d](https://github.com/sentry-kubernetes/charts/commit/94da94d15a9528ebdb4782c20af48b02e0a256bf)) +* make ingress, rbac compatible with latest k8s versions ([#114](https://github.com/sentry-kubernetes/charts/issues/114)) ([8d2f319](https://github.com/sentry-kubernetes/charts/commit/8d2f3196fe797a301ba6ebb21b793f3030d70962)) +* replace hardcoded value ([#1085](https://github.com/sentry-kubernetes/charts/issues/1085)) ([c5fec72](https://github.com/sentry-kubernetes/charts/commit/c5fec72ad8dc16e727019094d07dbaae4359cdf8)) + +## 3.7.2 (2024-04-12) + + +### Features + +* add priorityClassName to clickhouse ([#1098](https://github.com/sentry-kubernetes/charts/issues/1098)) ([386e7b7](https://github.com/sentry-kubernetes/charts/commit/386e7b7328000a289a7642752af583e8f6d40106)) +* Allow to set max_suspicious_broken_parts in merge_tree settings… ([#1080](https://github.com/sentry-kubernetes/charts/issues/1080)) ([d2f305c](https://github.com/sentry-kubernetes/charts/commit/d2f305c73b7b0ab625734a30fe5b5363606cd751)) +* Allow to set specified merge_tree settings in config.xml ([#884](https://github.com/sentry-kubernetes/charts/issues/884)) ([a964753](https://github.com/sentry-kubernetes/charts/commit/a964753b6fc785292c448e2f8d7c3099c696039d)) +* clone clickhouse chart ([#71](https://github.com/sentry-kubernetes/charts/issues/71)) ([d4c252b](https://github.com/sentry-kubernetes/charts/commit/d4c252b752bd637595b2406e88f2118d8609667a)) +* distributed tables v2 ([#588](https://github.com/sentry-kubernetes/charts/issues/588)) ([cfe7d73](https://github.com/sentry-kubernetes/charts/commit/cfe7d736278feeeb72189efb841a6099685ed1dd)) +* put clickhouse with UTC timezone per default ([#82](https://github.com/sentry-kubernetes/charts/issues/82)) ([daab634](https://github.com/sentry-kubernetes/charts/commit/daab634449ce10ad45a0f73c765e04033a8cb657)) +* **tabix:** allow setting ingress annotations for dealing with cors ([#321](https://github.com/sentry-kubernetes/charts/issues/321)) ([b11361f](https://github.com/sentry-kubernetes/charts/commit/b11361f2fe6b27504d2f0fda4a12bc5ade780b05)) + + +### Bug Fixes + +* clickhouse chart lint ([a364b05](https://github.com/sentry-kubernetes/charts/commit/a364b053069ab9330af6c8bfd0d2bda619ada0f0)) +* clickhouse ingress ([#99](https://github.com/sentry-kubernetes/charts/issues/99)) ([94da94d](https://github.com/sentry-kubernetes/charts/commit/94da94d15a9528ebdb4782c20af48b02e0a256bf)) +* make ingress, rbac compatible with latest k8s versions ([#114](https://github.com/sentry-kubernetes/charts/issues/114)) ([8d2f319](https://github.com/sentry-kubernetes/charts/commit/8d2f3196fe797a301ba6ebb21b793f3030d70962)) +* replace hardcoded value ([#1085](https://github.com/sentry-kubernetes/charts/issues/1085)) ([c5fec72](https://github.com/sentry-kubernetes/charts/commit/c5fec72ad8dc16e727019094d07dbaae4359cdf8)) diff --git a/clickhouse/Chart.yaml b/clickhouse/Chart.yaml index 79e5d6b33..0af7dc9a5 100755 --- a/clickhouse/Chart.yaml +++ b/clickhouse/Chart.yaml @@ -1,16 +1,17 @@ apiVersion: v1 appVersion: "19.14" -description: ClickHouse is an open source column-oriented database management system - capable of real time generation of analytical data reports using SQL queries +description: ClickHouse is an open source column-oriented database management + system capable of real time generation of analytical data reports using SQL + queries home: https://clickhouse.yandex/ icon: https://clickhouse.yandex/images/logo.png keywords: -- clickhouse -- olap -- database + - clickhouse + - olap + - database name: clickhouse sources: -- https://github.com/sentry-kubernetes/charts -version: 3.5.0 + - https://github.com/sentry-kubernetes/charts +version: 3.8.0 maintainers: - name: sentry-kubernetes diff --git a/clickhouse/templates/configmap-config.yaml b/clickhouse/templates/configmap-config.yaml index 15c136499..883ff553f 100755 --- a/clickhouse/templates/configmap-config.yaml +++ b/clickhouse/templates/configmap-config.yaml @@ -165,6 +165,7 @@ data: {{ .Values.clickhouse.configmap.merge_tree.parts_to_delay_insert }} {{ .Values.clickhouse.configmap.merge_tree.parts_to_throw_insert }} {{ .Values.clickhouse.configmap.merge_tree.max_part_loading_threads }} + {{ .Values.clickhouse.configmap.merge_tree.max_suspicious_broken_parts }} {{- end }} diff --git a/clickhouse/templates/statefulset-clickhouse.yaml b/clickhouse/templates/statefulset-clickhouse.yaml index 54f441fdb..7e7caa9ea 100755 --- a/clickhouse/templates/statefulset-clickhouse.yaml +++ b/clickhouse/templates/statefulset-clickhouse.yaml @@ -46,6 +46,9 @@ spec: {{- end }} {{- end }} spec: + {{- with .Values.clickhouse.priorityClassName }} + priorityClassName: {{ . }} + {{- end }} {{- with .Values.clickhouse.podSecurityContext }} securityContext: {{- toYaml . | nindent 8 }} diff --git a/clickhouse/values.yaml b/clickhouse/values.yaml index 6a9092175..15fe03216 100755 --- a/clickhouse/values.yaml +++ b/clickhouse/values.yaml @@ -134,6 +134,8 @@ clickhouse: imageVersion: "19.14" imagePullPolicy: "IfNotPresent" + priorityClassName: ~ + ## The resource limits and requests used by clickhouse resources: {} @@ -371,6 +373,8 @@ clickhouse: parts_to_throw_insert: 300 # The maximum number of threads that read parts when ClickHouse starts. max_part_loading_threads: auto + # If the number of broken parts in a single partition exceeds the max_suspicious_broken_parts value, automatic deletion is denied. + max_suspicious_broken_parts: 100 ## ## Web interface for ClickHouse in the Tabix project. diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 000000000..2e3027c5a --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", + "packages": { + "clickhouse": { + "release-type": "helm", + "changelog-path": "CHANGELOG.md" + }, + "sentry": { + "release-type": "helm", + "changelog-path": "CHANGELOG.md" + }, + "sentry-kubernetes": { + "release-type": "helm", + "changelog-path": "CHANGELOG.md" + } + } +} diff --git a/renovate.json b/renovate.json index 64bb8c515..8dedbad18 100644 --- a/renovate.json +++ b/renovate.json @@ -1,20 +1,6 @@ { - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["config:base"], - "enabledManagers": ["helmv3", "github-actions"], - "baseBranches": ["develop"], - "labels": ["renovate"], - "packageRules": [ - { - "matchManagers": ["helmv3"], - "matchDatasources": ["helm"], - "stabilityDays": 7, - "enabled": true - }, - { - "matchManagers": ["github-actions"], - "stabilityDays": 7, - "enabled": true - } - ] -} + "extends": ["config:recommended", ":rebaseStalePrs", "docker:disable"], + "enabled": true, + "prConcurrentLimit": 30, + "enabledManagers": ["helmv3", "github-actions"] +} \ No newline at end of file diff --git a/sentry-kubernetes/CHANGELOG.md b/sentry-kubernetes/CHANGELOG.md new file mode 100644 index 000000000..352ecc536 --- /dev/null +++ b/sentry-kubernetes/CHANGELOG.md @@ -0,0 +1,15 @@ +# Changelog + +## [0.3.4](https://github.com/sentry-kubernetes/charts/compare/sentry-kubernetes-v0.3.3...sentry-kubernetes-v0.3.4) (2024-04-12) + + +### Bug Fixes + +* make ingress, rbac compatible with latest k8s versions ([#114](https://github.com/sentry-kubernetes/charts/issues/114)) ([8d2f319](https://github.com/sentry-kubernetes/charts/commit/8d2f3196fe797a301ba6ebb21b793f3030d70962)) + +## 0.3.3 (2024-04-12) + + +### Bug Fixes + +* make ingress, rbac compatible with latest k8s versions ([#114](https://github.com/sentry-kubernetes/charts/issues/114)) ([8d2f319](https://github.com/sentry-kubernetes/charts/commit/8d2f3196fe797a301ba6ebb21b793f3030d70962)) diff --git a/sentry-kubernetes/Chart.yaml b/sentry-kubernetes/Chart.yaml index de14f1188..fcc9e13da 100644 --- a/sentry-kubernetes/Chart.yaml +++ b/sentry-kubernetes/Chart.yaml @@ -1,14 +1,15 @@ apiVersion: v2 name: sentry-kubernetes -description: A Helm chart for sentry-kubernetes (https://github.com/getsentry/sentry-kubernetes) +description: A Helm chart for sentry-kubernetes + (https://github.com/getsentry/sentry-kubernetes) type: application -version: 0.3.2 +version: 0.3.4 appVersion: latest home: https://github.com/getsentry/sentry-kubernetes icon: https://sentry-brand.storage.googleapis.com/sentry-glyph-white.png keywords: -- sentry -- report kubernetes events + - sentry + - report kubernetes events sources: -- https://github.com/getsentry/sentry-kubernetes -- https://github.com/sentry-kubernetes/charts + - https://github.com/getsentry/sentry-kubernetes + - https://github.com/sentry-kubernetes/charts diff --git a/sentry/CHANGELOG.md b/sentry/CHANGELOG.md new file mode 100644 index 000000000..174abedee --- /dev/null +++ b/sentry/CHANGELOG.md @@ -0,0 +1,182 @@ +# Changelog + +## [22.2.0](https://github.com/sentry-kubernetes/charts/compare/sentry-v22.1.1...sentry-v22.2.0) (2024-04-17) + + +### Features + +* added flags on individual components ([#1188](https://github.com/sentry-kubernetes/charts/issues/1188)) ([fb4d6f1](https://github.com/sentry-kubernetes/charts/commit/fb4d6f14b50c545a798b3a27012f28013d36e2d5)) +* update kafka topic provisioning config ([#1134](https://github.com/sentry-kubernetes/charts/issues/1134)) ([cd508ff](https://github.com/sentry-kubernetes/charts/commit/cd508ff4e02b44189eae30d993deb3fb368fd5ee)) + + +### Bug Fixes + +* kafka.listeners.interBroker typo ([#1222](https://github.com/sentry-kubernetes/charts/issues/1222)) ([63e7062](https://github.com/sentry-kubernetes/charts/commit/63e70626a6bb0ea4caeac8dfd80b216ffcfe9c28)) + +## [22.1.1](https://github.com/sentry-kubernetes/charts/compare/sentry-v22.1.0...sentry-v22.1.1) (2024-04-15) + + +### Bug Fixes + +* When set to controller only, port 9092 is not listened on ([#1218](https://github.com/sentry-kubernetes/charts/issues/1218)) ([d5cbba6](https://github.com/sentry-kubernetes/charts/commit/d5cbba6b65da9f77f78299ddc9b07c24fd7b3cef)) + +## [22.1.0](https://github.com/sentry-kubernetes/charts/compare/sentry-v22.0.2...sentry-v22.1.0) (2024-04-12) + + +### Features + +* 1.0.0 ([9c5b70c](https://github.com/sentry-kubernetes/charts/commit/9c5b70c6396fd9974001e403cc11f92ccb61a011)) +* 11.0.0 ([9d333e6](https://github.com/sentry-kubernetes/charts/commit/9d333e6f259dad0444b349d839cdde0187f64cc9)) +* 11.2.0 ([0569872](https://github.com/sentry-kubernetes/charts/commit/05698720bc8a5eedcbaa847f766ac6a669360ec5)) +* 21.4.0 release ([#356](https://github.com/sentry-kubernetes/charts/issues/356)) ([84c56ac](https://github.com/sentry-kubernetes/charts/commit/84c56ac5417c94a15ec53374b63fe56ab5e9b9a2)) +* 9.0.0 ([d659dcb](https://github.com/sentry-kubernetes/charts/commit/d659dcbbea17eacf20653a6ca386ed233bd690f2)) +* ability to use existingSecret for psql ([#148](https://github.com/sentry-kubernetes/charts/issues/148)) ([8c02d7a](https://github.com/sentry-kubernetes/charts/commit/8c02d7ae67c5fc0d161e739e9968b6d272acc259)) +* add `existingSecret` param for Github ([#863](https://github.com/sentry-kubernetes/charts/issues/863)) ([8d43592](https://github.com/sentry-kubernetes/charts/commit/8d43592fe3f3a22e3189bd84995e5cecccd088be)) +* add podLables to Sentry hooks ([#659](https://github.com/sentry-kubernetes/charts/issues/659)) ([50b8f1e](https://github.com/sentry-kubernetes/charts/commit/50b8f1e8879e22dcf7d10035b64c8ffa2b7e41ae)) +* add pvc to clickhouse ([#50](https://github.com/sentry-kubernetes/charts/issues/50)) ([197930f](https://github.com/sentry-kubernetes/charts/commit/197930f1a29bbf038351fbc72d401297140fc857)) +* add sentry cleanup cronjob ([#178](https://github.com/sentry-kubernetes/charts/issues/178)) ([ae42bc4](https://github.com/sentry-kubernetes/charts/commit/ae42bc4b4783f7515cf4e8620576568a6cb6ff5c)) +* add service account names for cronjobs ([#681](https://github.com/sentry-kubernetes/charts/issues/681)) ([0bc212d](https://github.com/sentry-kubernetes/charts/commit/0bc212daf3a999019d035deaed979f157f69d8ad)) +* add share process namespace to hook jobs ([#688](https://github.com/sentry-kubernetes/charts/issues/688)) ([b81316d](https://github.com/sentry-kubernetes/charts/commit/b81316d4b524e19b6f2968c7552f76c47ef33368)) +* add support for configuring email by env variables ([#87](https://github.com/sentry-kubernetes/charts/issues/87)) ([5e91477](https://github.com/sentry-kubernetes/charts/commit/5e91477cb61b8edb3b54734f899dd9560288417b)) +* add support of GCS without secret, using GKE ServiceAccount ([#264](https://github.com/sentry-kubernetes/charts/issues/264)) ([e42656e](https://github.com/sentry-kubernetes/charts/commit/e42656ee3f5d88b9b7ba07ceba15d02c82fb544c)) +* Add tolerations to user-create hook ([#615](https://github.com/sentry-kubernetes/charts/issues/615)) ([f347039](https://github.com/sentry-kubernetes/charts/commit/f347039cc4ff0f9a9e9237d9c6785d39bc46280c)) +* added (partial) support for Symbolicator deployment ([#213](https://github.com/sentry-kubernetes/charts/issues/213)) ([098fdef](https://github.com/sentry-kubernetes/charts/commit/098fdef2af7b1f7b53c596cb6127d70c1d49bcea)) +* added activeDeadlineSeconds to all jobs ([#683](https://github.com/sentry-kubernetes/charts/issues/683)) ([2418ba8](https://github.com/sentry-kubernetes/charts/commit/2418ba8c38a85991c9c9eb5a281bfb3d5d72a020)) +* added cpu hpa for worker - remove replica if hpa ([#74](https://github.com/sentry-kubernetes/charts/issues/74)) ([5a14b8b](https://github.com/sentry-kubernetes/charts/commit/5a14b8b59c786eaa352c521dea00feb765cc2dc1)) +* added different types of snuba consumers ([#83](https://github.com/sentry-kubernetes/charts/issues/83)) ([951cf38](https://github.com/sentry-kubernetes/charts/commit/951cf38c08a548e3db92d7848b6d1e6205d40b66)) +* added env var config for init jobs ([#124](https://github.com/sentry-kubernetes/charts/issues/124)) ([5cec614](https://github.com/sentry-kubernetes/charts/commit/5cec61417e243ce49fe509f6bc62847add0975d0)) +* added hpa for the web deployment ([#36](https://github.com/sentry-kubernetes/charts/issues/36)) ([b89ca49](https://github.com/sentry-kubernetes/charts/commit/b89ca49bf38af686bc69ff5f3ad0fb3392a2dbb2)) +* added post process forwarder ([#9](https://github.com/sentry-kubernetes/charts/issues/9)) ([686613a](https://github.com/sentry-kubernetes/charts/commit/686613a31572d2bd54d5153d4d44c5ba8bc77ac2)) +* added redis worker ([#10](https://github.com/sentry-kubernetes/charts/issues/10)) ([9e1cc7a](https://github.com/sentry-kubernetes/charts/commit/9e1cc7a046615856b50f17e232a9901bdc6204a9)) +* allow custom mode for sentry-relay ([#197](https://github.com/sentry-kubernetes/charts/issues/197)) ([a78b5f1](https://github.com/sentry-kubernetes/charts/commit/a78b5f1f061fad910cd679bb9eca083f04607de6)) +* allow some snuba deployments to be pushed as hooks ([#198](https://github.com/sentry-kubernetes/charts/issues/198)) ([9bda4ee](https://github.com/sentry-kubernetes/charts/commit/9bda4ee401664382f54932adfd7135820bc45d1d)) +* allow to configure running relay as a hook ([#183](https://github.com/sentry-kubernetes/charts/issues/183)) ([652a838](https://github.com/sentry-kubernetes/charts/commit/652a8386a4f84a0fa8319b7afda3d3c1784c3d06)) +* allow to specify Recreate strategy type for sentry-web ([#216](https://github.com/sentry-kubernetes/charts/issues/216)) ([0179c79](https://github.com/sentry-kubernetes/charts/commit/0179c79fe490e1f44a3e54f6bcc8ff0f37a78d92)) +* allows revisionHistoryLimit ([#339](https://github.com/sentry-kubernetes/charts/issues/339)) ([65545c8](https://github.com/sentry-kubernetes/charts/commit/65545c87c98c3af930897f08f4d095f67beb3027)) +* bump sentry dependencies ([#1099](https://github.com/sentry-kubernetes/charts/issues/1099)) ([dccd183](https://github.com/sentry-kubernetes/charts/commit/dccd183760ee92aab2592333d8dc1a23d7411466)) +* configure Slack based on current documentation ([#189](https://github.com/sentry-kubernetes/charts/issues/189)) ([5c4447c](https://github.com/sentry-kubernetes/charts/commit/5c4447cd5f2055ac7356face9e19fa552adb5e77)) +* december release ([#245](https://github.com/sentry-kubernetes/charts/issues/245)) ([ec588a9](https://github.com/sentry-kubernetes/charts/commit/ec588a94520555e512b1b931eb5799e6d08293c9)) +* distributed tables v2 ([#588](https://github.com/sentry-kubernetes/charts/issues/588)) ([cfe7d73](https://github.com/sentry-kubernetes/charts/commit/cfe7d736278feeeb72189efb841a6099685ed1dd)) +* history limits for cronjobs ([#682](https://github.com/sentry-kubernetes/charts/issues/682)) ([f13da86](https://github.com/sentry-kubernetes/charts/commit/f13da86b541aa8645f1e7a72e54ea3df5ad6f7b2)) +* hpa for snuba ([#42](https://github.com/sentry-kubernetes/charts/issues/42)) ([36a6e10](https://github.com/sentry-kubernetes/charts/commit/36a6e10f87e2b124b2a6527901ac49454a6a29e2)) +* ingress ([#19](https://github.com/sentry-kubernetes/charts/issues/19)) ([a5fad21](https://github.com/sentry-kubernetes/charts/commit/a5fad21db773e664f2b51df0522f411b9be30698)) +* initial beta 0.5.0 ([51866df](https://github.com/sentry-kubernetes/charts/commit/51866df56c518d28c74937c6b5119cd683d667f0)) +* kafka fix db check ([a148a57](https://github.com/sentry-kubernetes/charts/commit/a148a57d7480e23adc912fe8700914792bea9807)) +* kafka ha ([#35](https://github.com/sentry-kubernetes/charts/issues/35)) ([3b581f0](https://github.com/sentry-kubernetes/charts/commit/3b581f0b33d5d7d297c8bf110c70b7ae4b0796d2)) +* **kafka:** enable kraft ([#1179](https://github.com/sentry-kubernetes/charts/issues/1179)) ([b01b26a](https://github.com/sentry-kubernetes/charts/commit/b01b26a15247daad77828d67b1cfa15a7c9cc95c)) +* lint ([#1](https://github.com/sentry-kubernetes/charts/issues/1)) ([680d142](https://github.com/sentry-kubernetes/charts/commit/680d142670ae1972a27d473837b0884dc9f536f9)) +* org subdomain disabled per default ([#248](https://github.com/sentry-kubernetes/charts/issues/248)) ([0819e79](https://github.com/sentry-kubernetes/charts/commit/0819e79bf71d2af2dc23a9347ee242945757a4d2)) +* pass entire symbolicator config as yaml ([#335](https://github.com/sentry-kubernetes/charts/issues/335)) ([20d23b5](https://github.com/sentry-kubernetes/charts/commit/20d23b5369dd9ebca7c8fb7cd0f63c8012ef45b3)) +* postgresql - and fix some issues ([#5](https://github.com/sentry-kubernetes/charts/issues/5)) ([70fa92d](https://github.com/sentry-kubernetes/charts/commit/70fa92dde31c7488f9303acfbd79813760fcebf7)) +* profiling support ([#938](https://github.com/sentry-kubernetes/charts/issues/938)) ([b58f8a3](https://github.com/sentry-kubernetes/charts/commit/b58f8a34bbfab27ab0ff10bddcd8c23033b230fc)) +* removal of hook resources can be configured ([#223](https://github.com/sentry-kubernetes/charts/issues/223)) ([32232da](https://github.com/sentry-kubernetes/charts/commit/32232da29ca7431084aea8048ef84da0ac1794f6)) +* secret key generation ([#672](https://github.com/sentry-kubernetes/charts/issues/672)) ([559afc9](https://github.com/sentry-kubernetes/charts/commit/559afc90bfc7e2fdfd8b2d471ade5293f56c94d7)) +* sentry 20.10.1 ([#211](https://github.com/sentry-kubernetes/charts/issues/211)) ([cb9c844](https://github.com/sentry-kubernetes/charts/commit/cb9c844592ac678fa1c86faafcf520a040f7d814)) +* sentry 20.7.2 ([#126](https://github.com/sentry-kubernetes/charts/issues/126)) ([43197bc](https://github.com/sentry-kubernetes/charts/commit/43197bcefc51efc92eb51bac6efc4198e5b5c0f7)) +* sentry 20.9.0 ([#182](https://github.com/sentry-kubernetes/charts/issues/182)) ([c7934ae](https://github.com/sentry-kubernetes/charts/commit/c7934aec90eb1231d6ad21d052ae50dca3c8bf21)) +* sentry 22.10 & split post-process-forwarder ([#766](https://github.com/sentry-kubernetes/charts/issues/766)) ([ca611ef](https://github.com/sentry-kubernetes/charts/commit/ca611efde92be5deb7756ae05837e6ff1402f839)) +* sentry january ([#291](https://github.com/sentry-kubernetes/charts/issues/291)) ([be0ba2a](https://github.com/sentry-kubernetes/charts/commit/be0ba2aa9baebe24bec119038e83fa6ffc56d75b)) +* sentry june release ([#910](https://github.com/sentry-kubernetes/charts/issues/910)) ([96eb327](https://github.com/sentry-kubernetes/charts/commit/96eb3278775032e594bbf893f4fd4ef6d958a3de)) +* sentry march release ([#333](https://github.com/sentry-kubernetes/charts/issues/333)) ([7408226](https://github.com/sentry-kubernetes/charts/commit/74082260202b8af97822d03b79f43cca61da9ca0)) +* sentry may 2022 ([#623](https://github.com/sentry-kubernetes/charts/issues/623)) ([2a4cb0c](https://github.com/sentry-kubernetes/charts/commit/2a4cb0c4afe16720475f05405aac08e718acdead)) +* **sentry:** adding statsd backend + prometheus-operator support ([#85](https://github.com/sentry-kubernetes/charts/issues/85)) ([7daee19](https://github.com/sentry-kubernetes/charts/commit/7daee1999c61934f937c751855d2746a78425456)) +* **sentry:** bump clickhouse image to 19.17 ([#143](https://github.com/sentry-kubernetes/charts/issues/143)) ([3b80f57](https://github.com/sentry-kubernetes/charts/commit/3b80f578d8647ed1a549590c04376ed76cc4473f)) +* **sentry:** enable snuba transactions consumer ([#142](https://github.com/sentry-kubernetes/charts/issues/142)) ([0203628](https://github.com/sentry-kubernetes/charts/commit/0203628f4c9d6e255ce163ceaa7997b89365c162)) +* **sentry:** use AppVersion as the default image tag ([#141](https://github.com/sentry-kubernetes/charts/issues/141)) ([a0e79cf](https://github.com/sentry-kubernetes/charts/commit/a0e79cf8c834c79c1018c02452274a6f43d5ef73)) +* separate config for external services ([#66](https://github.com/sentry-kubernetes/charts/issues/66)) ([5e80eba](https://github.com/sentry-kubernetes/charts/commit/5e80ebab63d8c78868edd63810789b47468b2986)) +* smtp support use-ssl options ([#494](https://github.com/sentry-kubernetes/charts/issues/494)) ([bf8fdd5](https://github.com/sentry-kubernetes/charts/commit/bf8fdd596861a22bff74299f9d23b60644d7a08f)) +* support for sentry relay & sentry 20.7.2 ([#144](https://github.com/sentry-kubernetes/charts/issues/144)) ([7ae3651](https://github.com/sentry-kubernetes/charts/commit/7ae365187da883efd891c351dc75c2e566112718)) +* support partitions parameter for consumer events ([#566](https://github.com/sentry-kubernetes/charts/issues/566)) ([26128fe](https://github.com/sentry-kubernetes/charts/commit/26128fe808c33008c1660fda1271cef4381bf1fa)) +* supports different values between redis&rabbitmq ([#16](https://github.com/sentry-kubernetes/charts/issues/16)) ([da70618](https://github.com/sentry-kubernetes/charts/commit/da7061889e42d66ce1085338f635fcbf9ed4c19d)) +* supports github apps - sso ([#17](https://github.com/sentry-kubernetes/charts/issues/17)) ([90829bd](https://github.com/sentry-kubernetes/charts/commit/90829bd1bff956ae1d6815b1837985931b623d10)) +* supports persistent workers ([#15](https://github.com/sentry-kubernetes/charts/issues/15)) ([ca63322](https://github.com/sentry-kubernetes/charts/commit/ca6332289753f333cfc3a0ce39942f7092eef01f)) +* update clickhouse version ([#332](https://github.com/sentry-kubernetes/charts/issues/332)) ([3a6b012](https://github.com/sentry-kubernetes/charts/commit/3a6b0123d564ea10d65845123c6cec61659ea9f2)) +* update rabbitmq-ha to allow setting affinity ([#110](https://github.com/sentry-kubernetes/charts/issues/110)) ([fe269f2](https://github.com/sentry-kubernetes/charts/commit/fe269f253d46f763e080c084b92fa4f8da296964)) +* update Sentry & Snuba ([#80](https://github.com/sentry-kubernetes/charts/issues/80)) ([3f28140](https://github.com/sentry-kubernetes/charts/commit/3f281400fde3f06062a823ee06ea5474cfa261a3)) +* update sentry to 20.7.1 ([#122](https://github.com/sentry-kubernetes/charts/issues/122)) ([e1014b8](https://github.com/sentry-kubernetes/charts/commit/e1014b8b49626818cf80329e445f48b2f68390a9)) +* update sentry to february release ([#306](https://github.com/sentry-kubernetes/charts/issues/306)) ([e8d13dc](https://github.com/sentry-kubernetes/charts/commit/e8d13dc8afac5c878d85cf96f318a7fa316243be)) +* update sentry&snuba ([#72](https://github.com/sentry-kubernetes/charts/issues/72)) ([3cae6b9](https://github.com/sentry-kubernetes/charts/commit/3cae6b9ae6f956ef9de8138265f3e18c95638bf5)) +* update sentry&snuba images ([#53](https://github.com/sentry-kubernetes/charts/issues/53)) ([0427a1f](https://github.com/sentry-kubernetes/charts/commit/0427a1fc098c72a1b8b3a7af8a376247790f899b)) +* updated clickhouse chart version ([6bdcea8](https://github.com/sentry-kubernetes/charts/commit/6bdcea8690d207b29e610f28363841cf0b0912c9)) +* updated clickhouse to 1.4.0 ([17aa7ef](https://github.com/sentry-kubernetes/charts/commit/17aa7ef5a442986393ee473b9bcb439c15c866e9)) +* updated kafka helm chart and supports kafka without zookeeper ([#888](https://github.com/sentry-kubernetes/charts/issues/888)) ([d8fab37](https://github.com/sentry-kubernetes/charts/commit/d8fab37ef108dea173e6e7412fd030bd977af754)) +* updated tags to 20.8.0 ([#167](https://github.com/sentry-kubernetes/charts/issues/167)) ([91c7d41](https://github.com/sentry-kubernetes/charts/commit/91c7d41e14cb57d0951d7d88eafa721ccf430bb5)) +* updating Sentry config.yaml to support actual yaml. ([#186](https://github.com/sentry-kubernetes/charts/issues/186)) ([945e4c0](https://github.com/sentry-kubernetes/charts/commit/945e4c0e44facbeae402fbb5f32a7ce05dd53dfe)) +* upgrade kafka for more stability ([#246](https://github.com/sentry-kubernetes/charts/issues/246)) ([898fbcd](https://github.com/sentry-kubernetes/charts/commit/898fbcd72f13e5d139456d56d3a87f6a0f6e8833)) +* upgrade sentry to 21.5.1 ([#389](https://github.com/sentry-kubernetes/charts/issues/389)) ([656d112](https://github.com/sentry-kubernetes/charts/commit/656d11265224a122a34eb5b043115af018f3c610)) +* upgrade sentry to 21.6.1 ([#416](https://github.com/sentry-kubernetes/charts/issues/416)) ([2234ab9](https://github.com/sentry-kubernetes/charts/commit/2234ab90fdd66a76813d78c541b6331b79839d96)) +* upgrade Sentry version to 21.3.1 ([#350](https://github.com/sentry-kubernetes/charts/issues/350)) ([13f4537](https://github.com/sentry-kubernetes/charts/commit/13f4537e4df3d67b4be82234309a580d2c4c9af4)) + + +### Bug Fixes + +* 419 using correct block indicator ([#420](https://github.com/sentry-kubernetes/charts/issues/420)) ([d4ff2b7](https://github.com/sentry-kubernetes/charts/commit/d4ff2b7476c91fb8f1120a5465203d6b8200eeca)) +* add dbcheck job that ensures that clickhouse and kafka are up before proceeding ([#267](https://github.com/sentry-kubernetes/charts/issues/267)) ([8bdd076](https://github.com/sentry-kubernetes/charts/commit/8bdd076d1b45bfcfc393b68726f5b55b597a6756)) +* add legacyApp field for slack ([#125](https://github.com/sentry-kubernetes/charts/issues/125)) ([dfe8a12](https://github.com/sentry-kubernetes/charts/commit/dfe8a1262989a44cbcdb0f79d11435dc13478740)) +* add noStrictOffsetReset with ingestConsumer ([#1186](https://github.com/sentry-kubernetes/charts/issues/1186)) ([f4d2f74](https://github.com/sentry-kubernetes/charts/commit/f4d2f74431cb3d041b248729b75bd474ec6ef455)) +* add performance-view in configmap-sentry.yaml ([#133](https://github.com/sentry-kubernetes/charts/issues/133)) ([72c41d2](https://github.com/sentry-kubernetes/charts/commit/72c41d2f70d70a66b9b8d1741eed098c19c03a0a)) +* allow Redis only and fix Redis password use in BROKER_URL ([#24](https://github.com/sentry-kubernetes/charts/issues/24)) ([20c4ca1](https://github.com/sentry-kubernetes/charts/commit/20c4ca1baac88cefb8bcd7cf76de15013003807c)) +* Apply appropriate batch apiVersion based on kubernetes version ([#700](https://github.com/sentry-kubernetes/charts/issues/700)) ([4128412](https://github.com/sentry-kubernetes/charts/commit/412841202e136f64266139132ebc96037a43d9ca)) +* charts path ([2d7bcc9](https://github.com/sentry-kubernetes/charts/commit/2d7bcc98abbc367c62643bd0cb1d02bce52f893a)) +* clickhouse database init "Bad get: has UInt64" because of '-' character in cluster name ([#204](https://github.com/sentry-kubernetes/charts/issues/204)) ([9f93287](https://github.com/sentry-kubernetes/charts/commit/9f932872ce44f8b4d3db5e7555cf3637be1a6d9d)) +* dbCheck image can be pulled from custom repository ([#358](https://github.com/sentry-kubernetes/charts/issues/358)) ([#359](https://github.com/sentry-kubernetes/charts/issues/359)) ([6145595](https://github.com/sentry-kubernetes/charts/commit/61455956b1db50fc5b2af47a673d9759c86308db)) +* distant clickhouse image ([5da5d86](https://github.com/sentry-kubernetes/charts/commit/5da5d866261db73d38437bdbbdf20057bd61b1df)) +* django.security.csrf issue ([#155](https://github.com/sentry-kubernetes/charts/issues/155)) ([a680856](https://github.com/sentry-kubernetes/charts/commit/a680856c0208f4df626e05163f754442f59fca10)) +* do not complete the user-create on error ([#58](https://github.com/sentry-kubernetes/charts/issues/58)) ([7b925fe](https://github.com/sentry-kubernetes/charts/commit/7b925feb8b0d28a2a47276ae666462d9107a4a9d)) +* empty email values were crashing the pods ([#12](https://github.com/sentry-kubernetes/charts/issues/12)) ([5b6101f](https://github.com/sentry-kubernetes/charts/commit/5b6101fb0860ec0a8fff2dca86d1affc9b5d9656)) +* erroneous formating in relay configmap ([#203](https://github.com/sentry-kubernetes/charts/issues/203)) ([a42d41f](https://github.com/sentry-kubernetes/charts/commit/a42d41fe502c8a8e2394330cbf1c03eddc9d8d20)), closes [#202](https://github.com/sentry-kubernetes/charts/issues/202) +* external db ([#34](https://github.com/sentry-kubernetes/charts/issues/34)) ([87bfc2c](https://github.com/sentry-kubernetes/charts/commit/87bfc2c7d2e2713ac0e5e39d6a7fca89ef32ba9a)) +* external postgres host ([#41](https://github.com/sentry-kubernetes/charts/issues/41)) ([bc6f5ab](https://github.com/sentry-kubernetes/charts/commit/bc6f5ab62ec1fb43d6b63254f6e6493344365acd)) +* Fix wrong service account for ingest-profiles deployment ([#966](https://github.com/sentry-kubernetes/charts/issues/966)) ([cead469](https://github.com/sentry-kubernetes/charts/commit/cead469eb418e8ae110f60c173ab0bb9f74e4cc3)) +* force UTC on clickhouse ([545052d](https://github.com/sentry-kubernetes/charts/commit/545052d90bb26559293e185f3436a671fa4ec2d4)) +* gcs filestore ([#18](https://github.com/sentry-kubernetes/charts/issues/18)) ([5249630](https://github.com/sentry-kubernetes/charts/commit/524963031fb29932992d166cb3ae06237c6cc19e)) +* github secret extra quotation mark([#415](https://github.com/sentry-kubernetes/charts/issues/415)) ([44cea73](https://github.com/sentry-kubernetes/charts/commit/44cea735054165be3e613dc142e9eb6f4136b032)) +* Healthcheck for Relay backend was missing so when using .Values.ingress.regexPathStyle: gke will throw an error that templat is missing ([#612](https://github.com/sentry-kubernetes/charts/issues/612)) ([9da34de](https://github.com/sentry-kubernetes/charts/commit/9da34de847716a74fd7e6f347c5bc723f7f00bc5)) +* hide content-disposition header on /static for Safari ([#1051](https://github.com/sentry-kubernetes/charts/issues/1051)) ([a688d20](https://github.com/sentry-kubernetes/charts/commit/a688d20687f4c24cf9dd9dd4d54dc108b6dba2c7)) +* hpa names to make them unique ([#102](https://github.com/sentry-kubernetes/charts/issues/102)) ([ab9126a](https://github.com/sentry-kubernetes/charts/commit/ab9126a20e74b816e8473e08e4dcd6eacca4224b)) +* image pull policy ([#184](https://github.com/sentry-kubernetes/charts/issues/184)) ([0175798](https://github.com/sentry-kubernetes/charts/commit/0175798cf9982daef6f28771ce2dc6f4c688ff8d)) +* imagePullPolicy ingest consumer ([b036dc1](https://github.com/sentry-kubernetes/charts/commit/b036dc1493d47e0888bd7d89e0ab8f5a26ff2a06)) +* kafka env if disabled ([#43](https://github.com/sentry-kubernetes/charts/issues/43)) ([df96f9e](https://github.com/sentry-kubernetes/charts/commit/df96f9e8c84089e4c853651be4defad58ad40494)) +* make ingress, rbac compatible with latest k8s versions ([#114](https://github.com/sentry-kubernetes/charts/issues/114)) ([8d2f319](https://github.com/sentry-kubernetes/charts/commit/8d2f3196fe797a301ba6ebb21b793f3030d70962)) +* make the relay paths in the ingress compatible with traefik ([#274](https://github.com/sentry-kubernetes/charts/issues/274)) ([1707630](https://github.com/sentry-kubernetes/charts/commit/17076301717c4beafacf0febb64bb474b3897f6e)) +* Make the snuba api liveness and readiness timeouts configurable ([#409](https://github.com/sentry-kubernetes/charts/issues/409)) ([9625fbe](https://github.com/sentry-kubernetes/charts/commit/9625fbe471aa751722e0daace15faa4d3a6e4fd9)) +* **memcache:** do not set SERVER_MAX_VALUE_LENGTH with latest django versions ([#1131](https://github.com/sentry-kubernetes/charts/issues/1131)) ([1307658](https://github.com/sentry-kubernetes/charts/commit/1307658414ad84668b658c7411e952d487944589)) +* Missing config for snuba migration ([#948](https://github.com/sentry-kubernetes/charts/issues/948)) ([becf6b5](https://github.com/sentry-kubernetes/charts/commit/becf6b5bcb7774e63c5c250ca0a99a4da289667f)) +* missing profiling config ([#1038](https://github.com/sentry-kubernetes/charts/issues/1038)) ([5d21ac2](https://github.com/sentry-kubernetes/charts/commit/5d21ac2b358664d63560faf99d9a7108f4287c5a)) +* new deployments should be sent as hook as well ([#229](https://github.com/sentry-kubernetes/charts/issues/229)) ([29cb2c9](https://github.com/sentry-kubernetes/charts/commit/29cb2c911620cbb179b34a7d6fc76c7e882e8c69)) +* new dist tables ([#282](https://github.com/sentry-kubernetes/charts/issues/282)) ([6dd45b7](https://github.com/sentry-kubernetes/charts/commit/6dd45b7def24e291126eabfe883a033a9706dd87)) +* nginx configmap name ([#185](https://github.com/sentry-kubernetes/charts/issues/185)) ([3e86a9a](https://github.com/sentry-kubernetes/charts/commit/3e86a9a3f09ce942782ab745009f9265f6d6574c)) +* nginx static path not pass proxy ([#1060](https://github.com/sentry-kubernetes/charts/issues/1060)) ([ae07c35](https://github.com/sentry-kubernetes/charts/commit/ae07c35e642def515eacdaf0bd95d507fb3e8249)) +* no events found ([6b85730](https://github.com/sentry-kubernetes/charts/commit/6b8573087a6363223335d8a5569e0811cb961858)) +* pass postgresql password to user-create job ([#55](https://github.com/sentry-kubernetes/charts/issues/55)) ([4778949](https://github.com/sentry-kubernetes/charts/commit/4778949104db6192dfa09e83f43206337e754b34)) +* pass postgress password to db-init ([#52](https://github.com/sentry-kubernetes/charts/issues/52)) ([73b5df2](https://github.com/sentry-kubernetes/charts/commit/73b5df227d1e996c24c8f301038d06f23e022862)) +* persistent volume discrepancy ([#30](https://github.com/sentry-kubernetes/charts/issues/30)) ([3f70746](https://github.com/sentry-kubernetes/charts/commit/3f7074668300c0c80a866eda56982ef8c7886025)) +* postgresql existing secret path ([#1004](https://github.com/sentry-kubernetes/charts/issues/1004)) ([68614e1](https://github.com/sentry-kubernetes/charts/commit/68614e1691e1d3a0f3ad6d80ca675e395fc439f7)) +* rabbitmq connection ([#57](https://github.com/sentry-kubernetes/charts/issues/57)) ([0b18d52](https://github.com/sentry-kubernetes/charts/commit/0b18d52563e1938555395d994004d37b5b024102)) +* rabbitmq to support new bitnami chart ([#320](https://github.com/sentry-kubernetes/charts/issues/320)) ([2936e90](https://github.com/sentry-kubernetes/charts/commit/2936e9075cc82c7aa2ad2fcdc2c11df8911d4e91)) +* relay connection to sentry if port not 9000 ([#181](https://github.com/sentry-kubernetes/charts/issues/181)) ([44aaabf](https://github.com/sentry-kubernetes/charts/commit/44aaabf4b925a65f77ab2e2945f6ec82c36afe34)) +* relay deployment ([#179](https://github.com/sentry-kubernetes/charts/issues/179)) ([d8e34f5](https://github.com/sentry-kubernetes/charts/commit/d8e34f569e01cb04e4c17d5a03313c95b2cbf642)) +* replay session ([#1054](https://github.com/sentry-kubernetes/charts/issues/1054)) ([78c93e5](https://github.com/sentry-kubernetes/charts/commit/78c93e5996f7bc26ea4148e0aa8cb6c4b0b3aafb)) +* reverted 20.7.2 (not working properly without relay) ([#128](https://github.com/sentry-kubernetes/charts/issues/128)) ([a61af24](https://github.com/sentry-kubernetes/charts/commit/a61af243e3adb85a2c89e6b0755dae250830a1d4)) +* run Snuba in Distributed Dataset Mode ([#70](https://github.com/sentry-kubernetes/charts/issues/70)) ([7188166](https://github.com/sentry-kubernetes/charts/commit/7188166710aaaab6013c087c6091738731bb7ecf)) +* sentry secret deleted ([#748](https://github.com/sentry-kubernetes/charts/issues/748)) ([7d90dda](https://github.com/sentry-kubernetes/charts/commit/7d90ddaa49c3b629049620d08b582bedbcd89b79)) +* sentry version ([81bbe82](https://github.com/sentry-kubernetes/charts/commit/81bbe825b9bf52495b1eb6ded1d5d5dd1dfd04ff)) +* sentry web options ([#406](https://github.com/sentry-kubernetes/charts/issues/406)) ([73d4213](https://github.com/sentry-kubernetes/charts/commit/73d4213d255746c1a05eb5b7bd23801489e416da)) +* Set the right service account for ingest occurrences deployment ([#988](https://github.com/sentry-kubernetes/charts/issues/988)) ([a7d8390](https://github.com/sentry-kubernetes/charts/commit/a7d8390d46537dd904d2a9745358a894e304a6df)) +* snuba - custom redis ([#23](https://github.com/sentry-kubernetes/charts/issues/23)) ([04ad7fa](https://github.com/sentry-kubernetes/charts/commit/04ad7fa1db3e52da3aeeb8751f17b9d7ff023e0a)) +* snuba connection ([#13](https://github.com/sentry-kubernetes/charts/issues/13)) ([9bf1ffb](https://github.com/sentry-kubernetes/charts/commit/9bf1ffbddd4f8bc917d7602ad11b1c00443038b8)) +* space in relay config ([4c281c4](https://github.com/sentry-kubernetes/charts/commit/4c281c400566d3d35e6dd50582cdbffe293c9390)) +* special characters in email and password ([#165](https://github.com/sentry-kubernetes/charts/issues/165)) ([72df379](https://github.com/sentry-kubernetes/charts/commit/72df379355382d620fa3d28bf9f859d7938542cf)) +* symbolicator usage ([#173](https://github.com/sentry-kubernetes/charts/issues/173)) ([4e457e3](https://github.com/sentry-kubernetes/charts/commit/4e457e3b228a41602a30ad5b4920bce3e673b474)) +* templating error when disabling hooks ([#76](https://github.com/sentry-kubernetes/charts/issues/76)) ([f0a8e3f](https://github.com/sentry-kubernetes/charts/commit/f0a8e3f47a16895f0a1e11c6955cb5816454ebe2)) +* the default clickhouse installation is distributed, only turn on single node when clickhouse is disabled ([#624](https://github.com/sentry-kubernetes/charts/issues/624)) ([d923eab](https://github.com/sentry-kubernetes/charts/commit/d923eab060512957e91217f9029cf5d3286fc2e6)) +* turn off clickhouse backups to fix default installation ([#292](https://github.com/sentry-kubernetes/charts/issues/292)) ([45cc76d](https://github.com/sentry-kubernetes/charts/commit/45cc76da1c03ffe4c9e46f4be2c8d5b5c41f907d)) +* update clickhouse chart to the latest version ([#103](https://github.com/sentry-kubernetes/charts/issues/103)) ([9b64422](https://github.com/sentry-kubernetes/charts/commit/9b6442221627531bf4ce2a60b559475f7d4070ba)) +* updated gke BackendConfig with new values added on [#432](https://github.com/sentry-kubernetes/charts/issues/432) pull request ([#445](https://github.com/sentry-kubernetes/charts/issues/445)) ([cedbd69](https://github.com/sentry-kubernetes/charts/commit/cedbd69290c1b52c39f19da5088e34ebf276a6d3)) +* worker should work with both redis & rabbitmq ([#48](https://github.com/sentry-kubernetes/charts/issues/48)) ([f4ab657](https://github.com/sentry-kubernetes/charts/commit/f4ab65782ac5603ae6df8df6d49220a9461f423a)) +* **worker:** fix liveness probe changes ([#1139](https://github.com/sentry-kubernetes/charts/issues/1139)) ([1042c3d](https://github.com/sentry-kubernetes/charts/commit/1042c3dcc583ca09b69dd0ce23c1869ea2ac6ba2)) +* zookeeper enabled per default ([ca18057](https://github.com/sentry-kubernetes/charts/commit/ca18057666d14159d968d9d0a10ee5a6b406f723)) + +## 22.0.2 (2024-04-12) + +Automated releases diff --git a/sentry/Chart.lock b/sentry/Chart.lock index 3091435b6..86b0f7225 100644 --- a/sentry/Chart.lock +++ b/sentry/Chart.lock @@ -1,27 +1,27 @@ dependencies: - name: memcached repository: oci://registry-1.docker.io/bitnamicharts - version: 6.5.2 + version: 6.5.9 - name: redis repository: oci://registry-1.docker.io/bitnamicharts version: 17.11.3 - name: kafka repository: oci://registry-1.docker.io/bitnamicharts - version: 22.1.3 + version: 27.1.2 - name: clickhouse repository: https://sentry-kubernetes.github.io/charts - version: 3.5.0 + version: 3.7.1 - name: zookeeper - repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami - version: 9.0.0 + repository: oci://registry-1.docker.io/bitnamicharts + version: 12.0.0 - name: rabbitmq repository: oci://registry-1.docker.io/bitnamicharts - version: 11.15.3 + version: 14.7.0 - name: postgresql repository: oci://registry-1.docker.io/bitnamicharts version: 12.5.1 - name: nginx repository: oci://registry-1.docker.io/bitnamicharts - version: 14.2.2 -digest: sha256:e5e8a8f0fca2c7298669bb86198f806cd770f8ce77ee41882a50eb40e4bd6672 -generated: "2023-07-19T08:53:14.343715+02:00" + version: 18.1.11 +digest: sha256:131b9d3e8d8558632dfbc73303556a65985fd185bc65e01c5dcd2e6eb55a9d65 +generated: "2024-09-14T13:22:15.20647-04:00" diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml index 35db34e56..9dcb55fa0 100644 --- a/sentry/Chart.yaml +++ b/sentry/Chart.yaml @@ -2,12 +2,12 @@ apiVersion: v2 name: sentry description: A Helm chart for Kubernetes type: application -version: 20.9.3 -appVersion: 23.10.1 +version: 22.2.4 +appVersion: 24.2.0 dependencies: - name: memcached repository: oci://registry-1.docker.io/bitnamicharts - version: 6.5.2 + version: 6.5.9 condition: sourcemaps.enabled - name: redis repository: oci://registry-1.docker.io/bitnamicharts @@ -15,19 +15,19 @@ dependencies: condition: redis.enabled - name: kafka repository: oci://registry-1.docker.io/bitnamicharts - version: 22.1.3 + version: 27.1.2 condition: kafka.enabled - name: clickhouse repository: https://sentry-kubernetes.github.io/charts - version: 3.5.0 + version: 3.7.1 condition: clickhouse.enabled - name: zookeeper - repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami - version: 9.0.0 + repository: oci://registry-1.docker.io/bitnamicharts + version: 12.0.0 condition: zookeeper.enabled - name: rabbitmq repository: oci://registry-1.docker.io/bitnamicharts - version: 11.15.3 + version: 14.7.0 alias: rabbitmq condition: rabbitmq.enabled - name: postgresql @@ -36,7 +36,7 @@ dependencies: condition: postgresql.enabled - name: nginx repository: oci://registry-1.docker.io/bitnamicharts - version: 14.2.2 + version: 18.1.11 condition: nginx.enabled maintainers: - name: sentry-kubernetes diff --git a/sentry/README.md b/sentry/README.md index d87fabf03..3a47cdd61 100644 --- a/sentry/README.md +++ b/sentry/README.md @@ -34,6 +34,10 @@ Note: this table is incomplete, so have a look at the values.yaml in case you mi | `user.create` | if `true`, creates a default admin user defined from `email` and `password` | `true` | | `user.email` | Admin user email | `admin@sentry.local` | | `user.password` | Admin user password | `aaaa` | +| `hooks.dbCheck.enabled` | Enable Sentry database check job | `true` | +| `hooks.dbInit.enabled` | Enable Sentry database init job | `true` | +| `hooks.snubaInit.enabled` | Enable Snuba database init job | `true` | +| `hooks.snubaMigrate.enabled` | Enable Snuba migration job | `true` | | `ingress.enabled` | Enabling Ingress | `false` | | `ingress.regexPathStyle` | Allows setting the style the regex paths are rendered in the ingress for the ingress controller in use. Possible values are `nginx`, `aws-alb`, `gke` and `traefik` | `nginx` | | `nginx.enabled` | Enabling NGINX | `true` | @@ -59,6 +63,24 @@ Note: this table is incomplete, so have a look at the values.yaml in case you mi | `metrics.serviceMonitor.honorLabels` | honorLabels chooses the metric's labels on collisions with target labels. | `false` | | `metrics.serviceMonitor.namespace` | namespace where servicemonitor resource should be created | `the same namespace as sentry` | | `metrics.serviceMonitor.scrapeInterval` | interval between Prometheus scraping | `30s` | +| `relay.enabled` | Enable Relay | `true` | +| `sentry.billingMetricsConsumer.enabled` | Enable Sentry billing metrics | `true` | +| `sentry.cron.enabled` | Enable Sentry cron | `true` | +| `sentry.genericMetricsConsumer.enabled` | Enable Sentry generic metrics consumer | `true` | +| `sentry.ingestConsumer.enabled` | Enable Sentry ingest consumer attachments, events, transactions | `true` | +| `sentry.ingestMonitors.enabled` | Enable Sentry ingest monitors | `true` | +| `sentry.ingestOccurrences.enabled` | Enable Sentry ingest occurences | `true` | +| `sentry.ingestReplayRecordings.enabled` | Enable Sentry ingest replay recordings | `true` | +| `sentry.metricsConsumer.enabled` | Enable Sentry metrics consumer | `true` | +| `sentry.postProcessForwardErrors.enabled` | Enable Sentry post process forward errors | `true` | +| `sentry.postProcessForwardIssuePlatform.enabled` | Enable Sentry post process forward issue platform | `true` | +| `sentry.postProcessForwardTransactions.enabled` | Enable Sentry post process forward transactions | `true` | +| `sentry.subscriptionConsumerEvents.enabled` | Enable Sentry subscription consumer events | `true` | +| `sentry.subscriptionConsumerGenericMetrics.enabled` | Enable Sentry subscription consumer generic metrics | `true` | +| `sentry.subscriptionConsumerMetrics.enabled` | Enable Sentry subscription consumer metrics | `true` | +| `sentry.subscriptionConsumerTransactions.enabled` | Enable Sentry subscription consumer transactions | `true` | +| `sentry.sentry.web.enabled` | Enable Sentry web | `true` | +| `sentry.sentry.worker.enabled` | Enable Sentry worker | `true` | | `serviceAccount.annotations` | Additional Service Account annotations. | `{}` | | `serviceAccount.enabled` | If `true`, a custom Service Account will be used. | `false` | | `serviceAccount.name` | The base name of the ServiceAccount to use. Will be appended with e.g. `snuba` or `web` for the pods accordingly. | `"sentry"` | @@ -67,6 +89,20 @@ Note: this table is incomplete, so have a look at the values.yaml in case you mi | `sentry.features.vstsLimitedScopes` | Disables the azdo-integrations with limited scopes that is the cause of so much pain | `true` | | `sentry.web.customCA.secretName` | Allows mounting a custom CA secret | `nil` | | `sentry.web.customCA.item` | Key of CA cert object within the secret | `ca.crt` | +| `snuba.api.enabled` | Enable Snuba api | `true` | +| `snuba.consumer.enabled` | Enable Snuba consumer | `true` | +| `snuba.genericMetricsCountersConsumer.enabled` | Enable Snuba generic metrics counters consumer | `true` | +| `snuba.genericMetricsDistributionConsumer.enabled` | Enable Snuba generic metrics distribution consumer | `true` | +| `snuba.genericMetricsSetsConsumer.enabled` | Enable Snuba generic metrics sets consumer | `true` | +| `snuba.issueOccurrenceConsumer.enabled` | Enable Snuba issue occurrence consumer | `true` | +| `snuba.metricsConsumer.enabled` | Enable Snuba metrics consumer | `true` | +| `snuba.outcomesConsumer.enabled` | Enable Snuba outcomes consumer | `true` | +| `snuba.replacer.enabled` | Enable Snuba replacer | `true` | +| `snuba.replaysConsumer.enabled` | Enable Snuba replays consumer | `true` | +| `snuba.subscriptionConsumerEvents.enabled` | Enable Snuba subscription consumer events | `true` | +| `snuba.subscriptionConsumerMetrics.enabled` | Enable Snuba subscription consumer metrics | `true` | +| `snuba.subscriptionConsumerTransactions.enabled` | Enable Snuba subscription consumer transactions | `true` | +| `snuba.transactionsConsumer.enabled` | Enable Snuba transactions consumer | `true` | | `symbolicator.api.enabled` | Enable Symbolicator | `false` | | `symbolicator.api.config` | Config file for Symbolicator, see [its docs](https://getsentry.github.io/symbolicator/#configuration) | see values.yaml | diff --git a/sentry/charts/clickhouse-3.5.0.tgz b/sentry/charts/clickhouse-3.5.0.tgz deleted file mode 100644 index b5fbfe9fd..000000000 Binary files a/sentry/charts/clickhouse-3.5.0.tgz and /dev/null differ diff --git a/sentry/charts/clickhouse-3.7.1.tgz b/sentry/charts/clickhouse-3.7.1.tgz new file mode 100644 index 000000000..a53c1b40d Binary files /dev/null and b/sentry/charts/clickhouse-3.7.1.tgz differ diff --git a/sentry/charts/kafka-22.1.3.tgz b/sentry/charts/kafka-22.1.3.tgz deleted file mode 100644 index 3b3c7c36c..000000000 Binary files a/sentry/charts/kafka-22.1.3.tgz and /dev/null differ diff --git a/sentry/charts/kafka-27.1.2.tgz b/sentry/charts/kafka-27.1.2.tgz new file mode 100644 index 000000000..f7f145057 Binary files /dev/null and b/sentry/charts/kafka-27.1.2.tgz differ diff --git a/sentry/charts/memcached-6.5.2.tgz b/sentry/charts/memcached-6.5.2.tgz deleted file mode 100644 index b1e52e70b..000000000 Binary files a/sentry/charts/memcached-6.5.2.tgz and /dev/null differ diff --git a/sentry/charts/memcached-6.5.9.tgz b/sentry/charts/memcached-6.5.9.tgz new file mode 100644 index 000000000..021e36db5 Binary files /dev/null and b/sentry/charts/memcached-6.5.9.tgz differ diff --git a/sentry/charts/nginx-14.2.2.tgz b/sentry/charts/nginx-14.2.2.tgz deleted file mode 100644 index d669b94f4..000000000 Binary files a/sentry/charts/nginx-14.2.2.tgz and /dev/null differ diff --git a/sentry/charts/nginx-18.1.11.tgz b/sentry/charts/nginx-18.1.11.tgz new file mode 100644 index 000000000..d73ea7443 Binary files /dev/null and b/sentry/charts/nginx-18.1.11.tgz differ diff --git a/sentry/charts/rabbitmq-11.15.3.tgz b/sentry/charts/rabbitmq-11.15.3.tgz deleted file mode 100644 index a3334a4a2..000000000 Binary files a/sentry/charts/rabbitmq-11.15.3.tgz and /dev/null differ diff --git a/sentry/charts/rabbitmq-14.7.0.tgz b/sentry/charts/rabbitmq-14.7.0.tgz new file mode 100644 index 000000000..1b04b455f Binary files /dev/null and b/sentry/charts/rabbitmq-14.7.0.tgz differ diff --git a/sentry/charts/zookeeper-12.0.0.tgz b/sentry/charts/zookeeper-12.0.0.tgz new file mode 100644 index 000000000..7dbd0b161 Binary files /dev/null and b/sentry/charts/zookeeper-12.0.0.tgz differ diff --git a/sentry/charts/zookeeper-9.0.0.tgz b/sentry/charts/zookeeper-9.0.0.tgz deleted file mode 100644 index f1126b9db..000000000 Binary files a/sentry/charts/zookeeper-9.0.0.tgz and /dev/null differ diff --git a/sentry/templates/_helper.tpl b/sentry/templates/_helper.tpl index 8ae32f31b..66af79d50 100644 --- a/sentry/templates/_helper.tpl +++ b/sentry/templates/_helper.tpl @@ -410,6 +410,17 @@ Set Kafka Confluent port {{- end -}} {{- end -}} +{{/* +Set Kafka Confluent Controller port +*/}} +{{- define "sentry.kafka.controller_port" -}} +{{- if and (.Values.kafka.enabled) (.Values.kafka.service.ports.controller ) -}} +{{- .Values.kafka.service.ports.controller }} +{{- else if and (.Values.externalKafka) (not (kindIs "slice" .Values.externalKafka)) -}} +{{ required "A valid .Values.externalKafka.port is required" .Values.externalKafka.port }} +{{- end -}} +{{- end -}} + {{/* Set Kafka bootstrap servers string */}} @@ -450,6 +461,8 @@ Common Snuba environment variables name: {{ .Values.externalClickhouse.existingSecret }} key: {{ default "clickhouse-password" .Values.externalClickhouse.existingSecretKey }} {{- end }} +- name: CLICKHOUSE_MAX_CONNECTIONS + value: {{ .Values.snuba.clickhouse.maxConnections | quote }} {{- end -}} {{- define "vroom.env" -}} @@ -500,6 +513,18 @@ Common Sentry environment variables name: {{ .Values.externalPostgresql.existingSecret }} key: {{ default "postgresql-password" .Values.externalPostgresql.existingSecretKey }} {{- end }} +{{- if and (eq .Values.filestore.backend "s3") .Values.filestore.s3.existingSecret }} +- name: S3_ACCESS_KEY_ID + valueFrom: + secretKeyRef: + name: {{ .Values.filestore.s3.existingSecret }} + key: {{ default "s3-access-key-id" .Values.filestore.s3.accessKeyIdRef }} +- name: S3_SECRET_ACCESS_KEY + valueFrom: + secretKeyRef: + name: {{ .Values.filestore.s3.existingSecret }} + key: {{ default "s3-secret-access-key" .Values.filestore.s3.secretAccessKeyRef }} +{{- end }} {{- if and (eq .Values.filestore.backend "gcs") .Values.filestore.gcs.secretName }} - name: GOOGLE_APPLICATION_CREDENTIALS value: /var/run/secrets/google/{{ .Values.filestore.gcs.credentialsFile }} @@ -519,17 +544,17 @@ Common Sentry environment variables valueFrom: secretKeyRef: name: {{ .Values.slack.existingSecret }} - key: "client-id" + key: {{ default "client-id" .Values.slack.existingSecretClientId }} - name: SLACK_CLIENT_SECRET valueFrom: secretKeyRef: name: {{ .Values.slack.existingSecret }} - key: "client-secret" + key: {{ default "client-secret" .Values.slack.existingSecretClientSecret }} - name: SLACK_SIGNING_SECRET valueFrom: secretKeyRef: name: {{ .Values.slack.existingSecret }} - key: "signing-secret" + key: {{ default "signing-secret" .Values.slack.existingSecretSigningSecret }} {{- end }} {{- if and .Values.github.existingSecret }} - name: GITHUB_APP_PRIVATE_KEY @@ -573,3 +598,11 @@ Common Sentry environment variables key: {{ default "api-token" .Values.openai.existingSecretKey }} {{- end }} {{- end -}} + +{{- define "sentry.autoscaling.apiVersion" -}} +{{- if .Capabilities.APIVersions.Has "autoscaling/v2" -}} +{{- print "autoscaling/v2" -}} +{{- else -}} +{{- print "autoscaling/v1" -}} +{{- end -}} +{{- end -}} diff --git a/sentry/templates/configmap-memcached.yaml b/sentry/templates/configmap-memcached.yaml index abe359071..7df7930e7 100644 --- a/sentry/templates/configmap-memcached.yaml +++ b/sentry/templates/configmap-memcached.yaml @@ -1,4 +1,5 @@ --- +{{- if .Values.sourcemaps.enabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -6,3 +7,4 @@ metadata: data: MEMCACHED_MEMORY_LIMIT: "{{ .Values.memcached.memoryLimit }}" MEMCACHED_MAX_ITEM_SIZE: "{{ .Values.memcached.maxItemSize }}" +{{- end }} diff --git a/sentry/templates/configmap-nginx.yaml b/sentry/templates/configmap-nginx.yaml index 6cd708bad..a3b922bc6 100644 --- a/sentry/templates/configmap-nginx.yaml +++ b/sentry/templates/configmap-nginx.yaml @@ -30,9 +30,10 @@ data: proxy_pass http://relay; } - {{ if and .Values.nginx.metrics.enabled .Values.nginx.metrics.serviceMonitor.enabled -}} + {{ if or .Values.nginx.metrics.enabled .Values.nginx.metrics.serviceMonitor.enabled -}} location = /status/ { - stub_status; + stub_status on; + access_log off; } {{ end -}} diff --git a/sentry/templates/configmap-relay.yaml b/sentry/templates/configmap-relay.yaml index 52713f8ca..9e93ae8eb 100644 --- a/sentry/templates/configmap-relay.yaml +++ b/sentry/templates/configmap-relay.yaml @@ -1,3 +1,4 @@ +{{- if .Values.relay.enabled }} {{- $redisHost := include "sentry.redis.host" . -}} {{- $redisPort := include "sentry.redis.port" . -}} {{- $redisPass := include "sentry.redis.password" . -}} @@ -42,3 +43,4 @@ data: metrics_sessions: ingest-metrics {{ .Values.config.relay | indent 4 }} +{{- end }} diff --git a/sentry/templates/configmap-sentry.yaml b/sentry/templates/configmap-sentry.yaml index 194882046..cc103a64e 100644 --- a/sentry/templates/configmap-sentry.yaml +++ b/sentry/templates/configmap-sentry.yaml @@ -96,37 +96,6 @@ data: filestore.options: bucket_name: {{ .Values.filestore.gcs.bucketName | quote }} {{ end }} - {{- if eq .Values.filestore.backend "s3" }} - filestore.options: - {{- if .Values.filestore.s3.accessKey }} - access_key: {{ .Values.filestore.s3.accessKey | quote }} - {{- end }} - {{- if .Values.filestore.s3.secretKey }} - secret_key: {{ .Values.filestore.s3.secretKey | quote }} - {{- end }} - {{- if .Values.filestore.s3.bucketName }} - bucket_name: {{ .Values.filestore.s3.bucketName | quote }} - {{- end }} - {{- if .Values.filestore.s3.endpointUrl }} - endpoint_url: {{ .Values.filestore.s3.endpointUrl | quote }} - {{- end }} - {{- if .Values.filestore.s3.signature_version }} - signature_version: {{ .Values.filestore.s3.signature_version | quote }} - {{- end }} - {{- if .Values.filestore.s3.region_name }} - region_name: {{ .Values.filestore.s3.region_name | quote }} - {{- end }} - {{- if .Values.filestore.s3.default_acl }} - default_acl: {{ .Values.filestore.s3.default_acl | quote }} - {{- end }} - #add comfig params for s3 - {{- if .Values.filestore.s3.addressing_style }} - addressing_style: {{ .Values.filestore.s3.addressing_style | quote }} - {{- end }} - {{- if .Values.filestore.s3.location }} - location: {{ .Values.filestore.s3.location | quote }} - {{- end }} - {{ end }} {{- if .Values.config.configYml }} {{ .Values.config.configYml | toYaml | indent 4 }} @@ -145,18 +114,14 @@ data: {{- if .Values.sourcemaps.enabled }} CACHES = { "default": { - "BACKEND": "django.core.cache.backends.memcached.MemcachedCache", + "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache", "LOCATION": [ "{{ template "sentry.fullname" . }}-memcached:11211" ], "TIMEOUT": 3600, - "OPTIONS": { - "server_max_value_length": unit_text_to_bytes(env("SENTRY_MAX_EXTERNAL_SOURCEMAP_SIZE", "1M")), - }, + "OPTIONS": {"ignore_exc": True} } } - import memcache - memcache.SERVER_MAX_VALUE_LENGTH = {{ .Values.memcached.maxItemSize }} {{- end }} DATABASES = { @@ -327,7 +292,7 @@ data: "http-keepalive": {{ .Values.config.web.httpKeepalive }}, "http-chunked-input": True, # the number of web workers - 'workers': 3, + 'workers': {{ .Values.config.web.workers }}, # Turn off memory reporting "memory-report": False, # Some stuff so uwsgi will cycle workers sensibly @@ -481,6 +446,14 @@ data: "organizations:profiling-view", {{ end -}} + {{- if .Values.sentry.features.enableFeedback }} + "organizations:user-feedback-ui", + "organizations:user-feedback-ingest", + "organizations:feedback-ingest", + "organizations:feedback-post-process-group", + "organizations:feedback-visible", + {{ end -}} + "organizations:dashboards-mep", "organizations:mep-rollout-flag", "organizations:dashboards-rh-widget", @@ -518,6 +491,38 @@ data: SENTRY_OPTIONS['mail.host'] = os.getenv("SENTRY_EMAIL_HOST", {{ .Values.mail.host | quote }}) SENTRY_OPTIONS['mail.from'] = os.getenv("SENTRY_EMAIL_FROM", {{ .Values.mail.from | quote }}) + ####################### + # Filestore S3 Configuration # + ####################### + {{- if eq .Values.filestore.backend "s3" }} + SENTRY_OPTIONS['filestore.options'] = { + 'access_key': os.getenv("S3_ACCESS_KEY_ID", {{ .Values.filestore.s3.accessKey | default "" | quote }}), + 'secret_key': os.getenv("S3_SECRET_ACCESS_KEY", {{ .Values.filestore.s3.secretKey | default "" | quote }}), + {{- if .Values.filestore.s3.bucketName }} + 'bucket_name': {{ .Values.filestore.s3.bucketName | quote }}, + {{- end }} + {{- if .Values.filestore.s3.endpointUrl }} + 'endpoint_url': {{ .Values.filestore.s3.endpointUrl | quote }}, + {{- end }} + {{- if .Values.filestore.s3.signature_version }} + 'signature_version': {{ .Values.filestore.s3.signature_version | quote }}, + {{- end }} + {{- if .Values.filestore.s3.region_name }} + 'region_name': {{ .Values.filestore.s3.region_name | quote }}, + {{- end }} + {{- if .Values.filestore.s3.default_acl }} + 'default_acl': {{ .Values.filestore.s3.default_acl | quote }}, + {{- end }} + #add comfig params for s3 + {{- if .Values.filestore.s3.addressing_style }} + 'addressing_style': {{ .Values.filestore.s3.addressing_style | quote }}, + {{- end }} + {{- if .Values.filestore.s3.location }} + 'location': {{ .Values.filestore.s3.location | quote }}, + {{- end }} + } + {{- end }} + ######################### # Bitbucket Integration # ######################### diff --git a/sentry/templates/configmap-snuba.yaml b/sentry/templates/configmap-snuba.yaml index 92996537a..018b09cf9 100644 --- a/sentry/templates/configmap-snuba.yaml +++ b/sentry/templates/configmap-snuba.yaml @@ -25,6 +25,7 @@ data: "port": int({{ include "sentry.clickhouse.port" . }}), "user": env("CLICKHOUSE_USER", "default"), "password": env("CLICKHOUSE_PASSWORD", ""), + "max_connections": int(os.environ.get("CLICKHOUSE_MAX_CONNECTIONS", 100)), "database": env("CLICKHOUSE_DATABASE", "default"), "http_port": {{ include "sentry.clickhouse.http_port" . }}, "storage_sets": { @@ -33,6 +34,7 @@ data: "events", "events_ro", "metrics", + "metrics_summaries", "migrations", "outcomes", "querylog", @@ -47,6 +49,7 @@ data: "generic_metrics_counters", "spans", "group_attributes", + "generic_metrics_gauges", }, {{- /* The default clickhouse installation runs in distributed mode, while the external diff --git a/sentry/templates/deployment-metrics.yaml b/sentry/templates/deployment-metrics.yaml index 1f66ea4e6..afcc41757 100644 --- a/sentry/templates/deployment-metrics.yaml +++ b/sentry/templates/deployment-metrics.yaml @@ -22,8 +22,8 @@ spec: checksum/configYml: {{ .Values.config.configYml | toYaml | toString | sha256sum }} checksum/sentryConfPy: {{ .Values.config.sentryConfPy | sha256sum }} checksum/config.yaml: {{ include (print $.Template.BasePath "/configmap-sentry.yaml") . | sha256sum }} - {{- if .Values.sentry.web.annotations }} -{{ toYaml .Values.sentry.web.annotations | indent 8 }} + {{- if .Values.metrics.podAnnotations }} +{{ toYaml .Values.metrics.podAnnotations | indent 8 }} {{- end }} labels: app: {{ template "sentry.fullname" . }}-metrics diff --git a/sentry/templates/deployment-relay.yaml b/sentry/templates/deployment-relay.yaml index 91792309e..55df49e4a 100644 --- a/sentry/templates/deployment-relay.yaml +++ b/sentry/templates/deployment-relay.yaml @@ -1,3 +1,4 @@ +{{- if .Values.relay.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -68,7 +69,7 @@ spec: imagePullPolicy: {{ default "IfNotPresent" .Values.images.sentry.pullPolicy }} args: - "credentials" - - "generate" + - {{ .Values.relay.init.credentialsSubcommand | default "generate" | quote }} {{- if .Values.relay.init.additionalArgs }} {{ toYaml .Values.relay.init.additionalArgs | indent 12 }} {{- end }} @@ -176,3 +177,4 @@ spec: {{- if .Values.relay.priorityClassName }} priorityClassName: "{{ .Values.relay.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-billing-metrics-consumer.yaml b/sentry/templates/deployment-sentry-billing-metrics-consumer.yaml index 1836f565b..148306985 100644 --- a/sentry/templates/deployment-sentry-billing-metrics-consumer.yaml +++ b/sentry/templates/deployment-sentry-billing-metrics-consumer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.billingMetricsConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -148,3 +149,4 @@ spec: {{- if .Values.sentry.billingMetricsConsumer.priorityClassName }} priorityClassName: "{{ .Values.sentry.billingMetricsConsumer.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-cron.yaml b/sentry/templates/deployment-sentry-cron.yaml index 6ad808c55..62d66e52b 100644 --- a/sentry/templates/deployment-sentry-cron.yaml +++ b/sentry/templates/deployment-sentry-cron.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.cron.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -67,6 +68,9 @@ spec: args: - "run" - "cron" + {{- if .Values.sentry.cron.logLevel }} + - "-l{{ .Values.sentry.cron.logLevel}}" + {{- end }} env: - name: C_FORCE_ROOT value: "true" @@ -126,3 +130,4 @@ spec: {{- if .Values.sentry.cron.priorityClassName }} priorityClassName: "{{ .Values.sentry.cron.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml b/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml index 4b7fb36c6..163e02f0f 100644 --- a/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml +++ b/sentry/templates/deployment-sentry-generic-metrics-consumer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.genericMetricsConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -146,3 +147,4 @@ spec: {{- if .Values.sentry.genericMetricsConsumer.priorityClassName }} priorityClassName: "{{ .Values.sentry.genericMetricsConsumer.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-ingest-consumer-attachments.yaml b/sentry/templates/deployment-sentry-ingest-consumer-attachments.yaml index 65268839f..399e277f4 100644 --- a/sentry/templates/deployment-sentry-ingest-consumer-attachments.yaml +++ b/sentry/templates/deployment-sentry-ingest-consumer-attachments.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.ingestConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -22,9 +23,9 @@ spec: matchLabels: app: {{ template "sentry.fullname" . }} release: "{{ .Release.Name }}" - role: ingest-consumer -{{- if not .Values.sentry.ingestConsumer.autoscaling.enabled }} - replicas: {{ .Values.sentry.ingestConsumer.replicas }} + role: ingest-consumer-attachments +{{- if not .Values.sentry.ingestConsumer.attachments.autoscaling.enabled }} + replicas: {{ .Values.sentry.ingestConsumer.attachments.replicas }} {{- end }} template: metadata: @@ -38,7 +39,7 @@ spec: labels: app: {{ template "sentry.fullname" . }} release: "{{ .Release.Name }}" - role: ingest-consumer + role: ingest-consumer-attachments {{- if .Values.sentry.ingestConsumer.podLabels }} {{ toYaml .Values.sentry.ingestConsumer.podLabels | indent 8 }} {{- end }} @@ -110,7 +111,7 @@ spec: {{ toYaml .Values.sentry.ingestConsumer.volumeMounts | indent 8 }} {{- end }} resources: -{{ toYaml .Values.sentry.ingestConsumer.resources | indent 12 }} +{{ toYaml .Values.sentry.ingestConsumer.attachments.resources | indent 12 }} {{- if .Values.sentry.ingestConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.sentry.ingestConsumer.containerSecurityContext | indent 12 }} @@ -148,3 +149,4 @@ spec: {{- if .Values.sentry.ingestConsumer.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestConsumer.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-ingest-consumer-events.yaml b/sentry/templates/deployment-sentry-ingest-consumer-events.yaml index 92edc534a..79bc95a2d 100644 --- a/sentry/templates/deployment-sentry-ingest-consumer-events.yaml +++ b/sentry/templates/deployment-sentry-ingest-consumer-events.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.ingestConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -22,9 +23,9 @@ spec: matchLabels: app: {{ template "sentry.fullname" . }} release: "{{ .Release.Name }}" - role: ingest-consumer -{{- if not .Values.sentry.ingestConsumer.autoscaling.enabled }} - replicas: {{ .Values.sentry.ingestConsumer.replicas }} + role: ingest-consumer-events +{{- if not .Values.sentry.ingestConsumer.events.autoscaling.enabled }} + replicas: {{ .Values.sentry.ingestConsumer.events.replicas }} {{- end }} template: metadata: @@ -38,7 +39,7 @@ spec: labels: app: {{ template "sentry.fullname" . }} release: "{{ .Release.Name }}" - role: ingest-consumer + role: ingest-consumer-events {{- if .Values.sentry.ingestConsumer.podLabels }} {{ toYaml .Values.sentry.ingestConsumer.podLabels | indent 8 }} {{- end }} @@ -89,6 +90,9 @@ spec: - "--max-batch-size" - "{{ .Values.sentry.ingestConsumer.maxBatchSize }}" {{- end }} + {{- if .Values.sentry.ingestConsumer.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} env: - name: C_FORCE_ROOT value: "true" @@ -110,7 +114,7 @@ spec: {{ toYaml .Values.sentry.ingestConsumer.volumeMounts | indent 8 }} {{- end }} resources: -{{ toYaml .Values.sentry.ingestConsumer.resources | indent 12 }} +{{ toYaml .Values.sentry.ingestConsumer.events.resources | indent 12 }} {{- if .Values.sentry.ingestConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.sentry.ingestConsumer.containerSecurityContext | indent 12 }} @@ -148,3 +152,4 @@ spec: {{- if .Values.sentry.ingestConsumer.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestConsumer.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml b/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml index 4e9f9edc6..d2121eb6c 100644 --- a/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml +++ b/sentry/templates/deployment-sentry-ingest-consumer-transactions.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.ingestConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -22,9 +23,9 @@ spec: matchLabels: app: {{ template "sentry.fullname" . }} release: "{{ .Release.Name }}" - role: ingest-consumer -{{- if not .Values.sentry.ingestConsumer.autoscaling.enabled }} - replicas: {{ .Values.sentry.ingestConsumer.replicas }} + role: ingest-consumer-transactions +{{- if not .Values.sentry.ingestConsumer.transactions.autoscaling.enabled }} + replicas: {{ .Values.sentry.ingestConsumer.transactions.replicas }} {{- end }} template: metadata: @@ -38,7 +39,7 @@ spec: labels: app: {{ template "sentry.fullname" . }} release: "{{ .Release.Name }}" - role: ingest-consumer + role: ingest-consumer-transactions {{- if .Values.sentry.ingestConsumer.podLabels }} {{ toYaml .Values.sentry.ingestConsumer.podLabels | indent 8 }} {{- end }} @@ -89,6 +90,9 @@ spec: - "--max-batch-size" - "{{ .Values.sentry.ingestConsumer.maxBatchSize }}" {{- end }} + {{- if .Values.sentry.ingestConsumer.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} env: - name: C_FORCE_ROOT value: "true" @@ -110,7 +114,7 @@ spec: {{ toYaml .Values.sentry.ingestConsumer.volumeMounts | indent 8 }} {{- end }} resources: -{{ toYaml .Values.sentry.ingestConsumer.resources | indent 12 }} +{{ toYaml .Values.sentry.ingestConsumer.transactions.resources | indent 12 }} {{- if .Values.sentry.ingestConsumer.containerSecurityContext }} securityContext: {{ toYaml .Values.sentry.ingestConsumer.containerSecurityContext | indent 12 }} @@ -148,3 +152,4 @@ spec: {{- if .Values.sentry.ingestConsumer.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestConsumer.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-ingest-metrics-consumer-perf.yaml b/sentry/templates/deployment-sentry-ingest-metrics-consumer-perf.yaml deleted file mode 100644 index 53cab388d..000000000 --- a/sentry/templates/deployment-sentry-ingest-metrics-consumer-perf.yaml +++ /dev/null @@ -1,145 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "sentry.fullname" . }}-ingest-metrics-consumer-perf - labels: - app: {{ template "sentry.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" - app.kubernetes.io/managed-by: "Helm" - {{- if .Values.asHook }} - {{- /* Add the Helm annotations so that deployment after asHook from true to false works */}} - annotations: - meta.helm.sh/release-name: "{{ .Release.Name }}" - meta.helm.sh/release-namespace: "{{ .Release.Namespace }}" - "helm.sh/hook": "post-install,post-upgrade" - "helm.sh/hook-weight": "10" - {{- end }} -spec: - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - selector: - matchLabels: - app: {{ template "sentry.fullname" . }} - release: "{{ .Release.Name }}" - role: ingest-metrics-consumer-perf -{{- if not .Values.sentry.ingestMetricsConsumerPerf.autoscaling.enabled }} - replicas: {{ .Values.sentry.ingestMetricsConsumerPerf.replicas }} -{{- end }} - template: - metadata: - annotations: - checksum/configYml: {{ .Values.config.configYml | toYaml | toString | sha256sum }} - checksum/sentryConfPy: {{ .Values.config.sentryConfPy | sha256sum }} - checksum/config.yaml: {{ include (print $.Template.BasePath "/configmap-sentry.yaml") . | sha256sum }} - {{- if .Values.sentry.ingestMetricsConsumerPerf.annotations }} -{{ toYaml .Values.sentry.ingestMetricsConsumerPerf.annotations | indent 8 }} - {{- end }} - labels: - app: {{ template "sentry.fullname" . }} - release: "{{ .Release.Name }}" - role: ingest-metrics-consumer-perf - {{- if .Values.sentry.ingestMetricsConsumerPerf.podLabels }} -{{ toYaml .Values.sentry.ingestMetricsConsumerPerf.podLabels | indent 8 }} - {{- end }} - spec: - affinity: - {{- if .Values.sentry.ingestMetricsConsumerPerf.affinity }} -{{ toYaml .Values.sentry.ingestMetricsConsumerPerf.affinity | indent 8 }} - {{- end }} - {{- if .Values.sentry.ingestMetricsConsumerPerf.nodeSelector }} - nodeSelector: -{{ toYaml .Values.sentry.ingestMetricsConsumerPerf.nodeSelector | indent 8 }} - {{- end }} - {{- if .Values.sentry.ingestMetricsConsumerPerf.tolerations }} - tolerations: -{{ toYaml .Values.sentry.ingestMetricsConsumerPerf.tolerations | indent 8 }} - {{- end }} - {{- if .Values.images.sentry.imagePullSecrets }} - imagePullSecrets: -{{ toYaml .Values.images.sentry.imagePullSecrets | indent 8 }} - {{- end }} - {{- if .Values.dnsPolicy }} - dnsPolicy: {{ .Values.dnsPolicy | quote }} - {{- end }} - {{- if .Values.dnsConfig }} - dnsConfig: -{{ toYaml .Values.dnsConfig | indent 8 }} - {{- end }} - {{- if .Values.sentry.ingestMetricsConsumerPerf.securityContext }} - securityContext: -{{ toYaml .Values.sentry.ingestMetricsConsumerPerf.securityContext | indent 8 }} - {{- end }} - containers: - - name: {{ .Chart.Name }}-ingest-metrics-consumer-perf - image: "{{ template "sentry.image" . }}" - imagePullPolicy: {{ default "IfNotPresent" .Values.images.sentry.pullPolicy }} - command: ["sentry"] - args: - - "run" - - "ingest-metrics-parallel-consumer" - - "--ingest-profile" - - "performance" - {{- if .Values.sentry.ingestMetricsConsumerPerf.maxBatchSize }} - - "--max-msg-batch-size" - - "{{ .Values.sentry.ingestMetricsConsumerPerf.maxBatchSize }}" - {{- end }} - env: - - name: C_FORCE_ROOT - value: "true" -{{ include "sentry.env" . | indent 8 }} -{{- if .Values.sentry.ingestMetricsConsumerPerf.env }} -{{ toYaml .Values.sentry.ingestMetricsConsumerPerf.env | indent 8 }} -{{- end }} - volumeMounts: - - mountPath: /etc/sentry - name: config - readOnly: true - - mountPath: {{ .Values.filestore.filesystem.path }} - name: sentry-data - {{- if and (eq .Values.filestore.backend "gcs") .Values.filestore.gcs.secretName }} - - name: sentry-google-cloud-key - mountPath: /var/run/secrets/google - {{ end }} -{{- if .Values.sentry.ingestMetricsConsumerPerf.volumeMounts }} -{{ toYaml .Values.sentry.ingestMetricsConsumerPerf.volumeMounts | indent 8 }} -{{- end }} - resources: -{{ toYaml .Values.sentry.ingestMetricsConsumerPerf.resources | indent 12 }} -{{- if .Values.sentry.ingestMetricsConsumerPerf.containerSecurityContext }} - securityContext: -{{ toYaml .Values.sentry.ingestMetricsConsumerPerf.containerSecurityContext | indent 12 }} -{{- end }} -{{- if .Values.sentry.ingestMetricsConsumerPerf.sidecars }} -{{ toYaml .Values.sentry.ingestMetricsConsumerPerf.sidecars | indent 6 }} -{{- end }} - {{- if .Values.serviceAccount.enabled }} - serviceAccountName: {{ .Values.serviceAccount.name }}-ingest-metrics-consumer-perf - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "sentry.fullname" . }}-sentry - - name: sentry-data - {{- if and (eq .Values.filestore.backend "filesystem") .Values.filestore.filesystem.persistence.enabled (.Values.filestore.filesystem.persistence.persistentWorkers) }} - {{- if .Values.filestore.filesystem.persistence.existingClaim }} - persistentVolumeClaim: - claimName: {{ .Values.filestore.filesystem.persistence.existingClaim }} - {{- else }} - persistentVolumeClaim: - claimName: {{ template "sentry.fullname" . }}-data - {{- end }} - {{- else }} - emptyDir: {} - {{ end }} - {{- if and (eq .Values.filestore.backend "gcs") .Values.filestore.gcs.secretName }} - - name: sentry-google-cloud-key - secret: - secretName: {{ .Values.filestore.gcs.secretName }} - {{ end }} -{{- if .Values.sentry.ingestMetricsConsumerPerf.volumes }} -{{ toYaml .Values.sentry.ingestMetricsConsumerPerf.volumes | indent 6 }} -{{- end }} - {{- if .Values.sentry.ingestMetricsConsumerPerf.priorityClassName }} - priorityClassName: "{{ .Values.sentry.ingestMetricsConsumerPerf.priorityClassName }}" - {{- end }} diff --git a/sentry/templates/deployment-sentry-ingest-metrics-consumer-rh.yaml b/sentry/templates/deployment-sentry-ingest-metrics-consumer-rh.yaml deleted file mode 100644 index d29616621..000000000 --- a/sentry/templates/deployment-sentry-ingest-metrics-consumer-rh.yaml +++ /dev/null @@ -1,145 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "sentry.fullname" . }}-ingest-metrics-consumer-rh - labels: - app: {{ template "sentry.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" - app.kubernetes.io/managed-by: "Helm" - {{- if .Values.asHook }} - {{- /* Add the Helm annotations so that deployment after asHook from true to false works */}} - annotations: - meta.helm.sh/release-name: "{{ .Release.Name }}" - meta.helm.sh/release-namespace: "{{ .Release.Namespace }}" - "helm.sh/hook": "post-install,post-upgrade" - "helm.sh/hook-weight": "10" - {{- end }} -spec: - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - selector: - matchLabels: - app: {{ template "sentry.fullname" . }} - release: "{{ .Release.Name }}" - role: ingest-metrics-consumer-rh -{{- if not .Values.sentry.ingestMetricsConsumerRh.autoscaling.enabled }} - replicas: {{ .Values.sentry.ingestMetricsConsumerRh.replicas }} -{{- end }} - template: - metadata: - annotations: - checksum/configYml: {{ .Values.config.configYml | toYaml | toString | sha256sum }} - checksum/sentryConfPy: {{ .Values.config.sentryConfPy | sha256sum }} - checksum/config.yaml: {{ include (print $.Template.BasePath "/configmap-sentry.yaml") . | sha256sum }} - {{- if .Values.sentry.ingestMetricsConsumerRh.annotations }} -{{ toYaml .Values.sentry.ingestMetricsConsumerRh.annotations | indent 8 }} - {{- end }} - labels: - app: {{ template "sentry.fullname" . }} - release: "{{ .Release.Name }}" - role: ingest-metrics-consumer-rh - {{- if .Values.sentry.ingestMetricsConsumerRh.podLabels }} -{{ toYaml .Values.sentry.ingestMetricsConsumerRh.podLabels | indent 8 }} - {{- end }} - spec: - affinity: - {{- if .Values.sentry.ingestMetricsConsumerRh.affinity }} -{{ toYaml .Values.sentry.ingestMetricsConsumerRh.affinity | indent 8 }} - {{- end }} - {{- if .Values.sentry.ingestMetricsConsumerRh.nodeSelector }} - nodeSelector: -{{ toYaml .Values.sentry.ingestMetricsConsumerRh.nodeSelector | indent 8 }} - {{- end }} - {{- if .Values.sentry.ingestMetricsConsumerRh.tolerations }} - tolerations: -{{ toYaml .Values.sentry.ingestMetricsConsumerRh.tolerations | indent 8 }} - {{- end }} - {{- if .Values.images.sentry.imagePullSecrets }} - imagePullSecrets: -{{ toYaml .Values.images.sentry.imagePullSecrets | indent 8 }} - {{- end }} - {{- if .Values.dnsPolicy }} - dnsPolicy: {{ .Values.dnsPolicy | quote }} - {{- end }} - {{- if .Values.dnsConfig }} - dnsConfig: -{{ toYaml .Values.dnsConfig | indent 8 }} - {{- end }} - {{- if .Values.sentry.ingestMetricsConsumerRh.securityContext }} - securityContext: -{{ toYaml .Values.sentry.ingestMetricsConsumerRh.securityContext | indent 8 }} - {{- end }} - containers: - - name: {{ .Chart.Name }}-ingest-metrics-consumer-rh - image: "{{ template "sentry.image" . }}" - imagePullPolicy: {{ default "IfNotPresent" .Values.images.sentry.pullPolicy }} - command: ["sentry"] - args: - - "run" - - "ingest-metrics-parallel-consumer" - - "--ingest-profile" - - "release-health" - {{- if .Values.sentry.ingestMetricsConsumerRh.maxBatchSize }} - - "--max-msg-batch-size" - - "{{ .Values.sentry.ingestMetricsConsumerRh.maxBatchSize }}" - {{- end }} - env: - - name: C_FORCE_ROOT - value: "true" -{{ include "sentry.env" . | indent 8 }} -{{- if .Values.sentry.ingestMetricsConsumerRh.env }} -{{ toYaml .Values.sentry.ingestMetricsConsumerRh.env | indent 8 }} -{{- end }} - volumeMounts: - - mountPath: /etc/sentry - name: config - readOnly: true - - mountPath: {{ .Values.filestore.filesystem.path }} - name: sentry-data - {{- if and (eq .Values.filestore.backend "gcs") .Values.filestore.gcs.secretName }} - - name: sentry-google-cloud-key - mountPath: /var/run/secrets/google - {{ end }} -{{- if .Values.sentry.ingestMetricsConsumerRh.volumeMounts }} -{{ toYaml .Values.sentry.ingestMetricsConsumerRh.volumeMounts | indent 8 }} -{{- end }} - resources: -{{ toYaml .Values.sentry.ingestMetricsConsumerRh.resources | indent 12 }} -{{- if .Values.sentry.ingestMetricsConsumerRh.containerSecurityContext }} - securityContext: -{{ toYaml .Values.sentry.ingestMetricsConsumerRh.containerSecurityContext | indent 12 }} -{{- end }} -{{- if .Values.sentry.ingestMetricsConsumerRh.sidecars }} -{{ toYaml .Values.sentry.ingestMetricsConsumerRh.sidecars | indent 6 }} -{{- end }} - {{- if .Values.serviceAccount.enabled }} - serviceAccountName: {{ .Values.serviceAccount.name }}-ingest-metrics-consumer-rh - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "sentry.fullname" . }}-sentry - - name: sentry-data - {{- if and (eq .Values.filestore.backend "filesystem") .Values.filestore.filesystem.persistence.enabled (.Values.filestore.filesystem.persistence.persistentWorkers) }} - {{- if .Values.filestore.filesystem.persistence.existingClaim }} - persistentVolumeClaim: - claimName: {{ .Values.filestore.filesystem.persistence.existingClaim }} - {{- else }} - persistentVolumeClaim: - claimName: {{ template "sentry.fullname" . }}-data - {{- end }} - {{- else }} - emptyDir: {} - {{ end }} - {{- if and (eq .Values.filestore.backend "gcs") .Values.filestore.gcs.secretName }} - - name: sentry-google-cloud-key - secret: - secretName: {{ .Values.filestore.gcs.secretName }} - {{ end }} -{{- if .Values.sentry.ingestMetricsConsumerRh.volumes }} -{{ toYaml .Values.sentry.ingestMetricsConsumerRh.volumes | indent 6 }} -{{- end }} - {{- if .Values.sentry.ingestMetricsConsumerRh.priorityClassName }} - priorityClassName: "{{ .Values.sentry.ingestMetricsConsumerRh.priorityClassName }}" - {{- end }} diff --git a/sentry/templates/deployment-sentry-ingest-monitors.yaml b/sentry/templates/deployment-sentry-ingest-monitors.yaml index 57b1abe69..16a28e886 100644 --- a/sentry/templates/deployment-sentry-ingest-monitors.yaml +++ b/sentry/templates/deployment-sentry-ingest-monitors.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.ingestMonitors.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -77,6 +78,9 @@ spec: command: ["sentry"] args: - "run" + - "consumer" + - "ingest-monitors" + - "--consumer-group" - "ingest-monitors" env: - name: C_FORCE_ROOT @@ -137,3 +141,4 @@ spec: {{- if .Values.sentry.ingestMonitors.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestMonitors.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-ingest-occurrences.yaml b/sentry/templates/deployment-sentry-ingest-occurrences.yaml index c2d3d1289..97941ed5e 100644 --- a/sentry/templates/deployment-sentry-ingest-occurrences.yaml +++ b/sentry/templates/deployment-sentry-ingest-occurrences.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.ingestOccurrences.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -140,3 +141,4 @@ spec: {{- if .Values.sentry.ingestOccurrences.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestOccurrences.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-ingest-profiles.yaml b/sentry/templates/deployment-sentry-ingest-profiles.yaml index 0a18ef77f..7a2af5460 100644 --- a/sentry/templates/deployment-sentry-ingest-profiles.yaml +++ b/sentry/templates/deployment-sentry-ingest-profiles.yaml @@ -78,6 +78,9 @@ spec: command: ["sentry"] args: - "run" + - "consumer" + - "ingest-profiles" + - "--consumer-group" - "ingest-profiles" env: - name: C_FORCE_ROOT diff --git a/sentry/templates/deployment-sentry-ingest-replay-recordings.yaml b/sentry/templates/deployment-sentry-ingest-replay-recordings.yaml index 8f2caeda7..894111c35 100644 --- a/sentry/templates/deployment-sentry-ingest-replay-recordings.yaml +++ b/sentry/templates/deployment-sentry-ingest-replay-recordings.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.ingestReplayRecordings.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -140,3 +141,4 @@ spec: {{- if .Values.sentry.ingestReplayRecordings.priorityClassName }} priorityClassName: "{{ .Values.sentry.ingestReplayRecordings.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-metrics-consumer.yaml b/sentry/templates/deployment-sentry-metrics-consumer.yaml index 069aca02f..ba64518b8 100644 --- a/sentry/templates/deployment-sentry-metrics-consumer.yaml +++ b/sentry/templates/deployment-sentry-metrics-consumer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.metricsConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -146,3 +147,4 @@ spec: {{- if .Values.sentry.metricsConsumer.priorityClassName }} priorityClassName: "{{ .Values.sentry.metricsConsumer.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-post-process-forwarder-errors.yaml b/sentry/templates/deployment-sentry-post-process-forwarder-errors.yaml index 05dda19ef..304f4775d 100644 --- a/sentry/templates/deployment-sentry-post-process-forwarder-errors.yaml +++ b/sentry/templates/deployment-sentry-post-process-forwarder-errors.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.postProcessForwardErrors.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -138,3 +139,4 @@ spec: {{- if .Values.sentry.postProcessForwardErrors.priorityClassName }} priorityClassName: "{{ .Values.sentry.postProcessForwardErrors.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-post-process-forwarder-issue-platform.yaml b/sentry/templates/deployment-sentry-post-process-forwarder-issue-platform.yaml index 453fb3a37..57c3cd1c7 100644 --- a/sentry/templates/deployment-sentry-post-process-forwarder-issue-platform.yaml +++ b/sentry/templates/deployment-sentry-post-process-forwarder-issue-platform.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.postProcessForwardIssuePlatform.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -139,3 +140,4 @@ spec: {{- if .Values.sentry.postProcessForwardIssuePlatform.priorityClassName }} priorityClassName: "{{ .Values.sentry.postProcessForwardIssuePlatform.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-post-process-forwarder-transactions.yaml b/sentry/templates/deployment-sentry-post-process-forwarder-transactions.yaml index 44c017b7d..252cabbe7 100644 --- a/sentry/templates/deployment-sentry-post-process-forwarder-transactions.yaml +++ b/sentry/templates/deployment-sentry-post-process-forwarder-transactions.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.postProcessForwardTransactions.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -82,6 +83,9 @@ spec: - "--synchronize-commit-log-topic=snuba-transactions-commit-log" - "--synchronize-commit-group" - "transactions_group" + {{- if .Values.sentry.postProcessForwardTransactions.noStrictOffsetReset }} + - "--no-strict-offset-reset" + {{- end }} env: {{ include "sentry.env" . | indent 8 }} {{- if .Values.sentry.postProcessForwardTransactions.env }} @@ -139,3 +143,4 @@ spec: {{- if .Values.sentry.postProcessForwardTransactions.priorityClassName }} priorityClassName: "{{ .Values.sentry.postProcessForwardTransactions.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-subscription-consumer-events.yaml b/sentry/templates/deployment-sentry-subscription-consumer-events.yaml index 0383f0d7c..26c21abf6 100644 --- a/sentry/templates/deployment-sentry-subscription-consumer-events.yaml +++ b/sentry/templates/deployment-sentry-subscription-consumer-events.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.subscriptionConsumerEvents.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -129,3 +130,4 @@ spec: {{- if .Values.sentry.subscriptionConsumerEvents.priorityClassName }} priorityClassName: "{{ .Values.sentry.subscriptionConsumerEvents.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-subscription-consumer-generic-metrics.yaml b/sentry/templates/deployment-sentry-subscription-consumer-generic-metrics.yaml index 17ee32beb..e368d345c 100644 --- a/sentry/templates/deployment-sentry-subscription-consumer-generic-metrics.yaml +++ b/sentry/templates/deployment-sentry-subscription-consumer-generic-metrics.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.subscriptionConsumerGenericMetrics.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -146,3 +147,4 @@ spec: {{- if .Values.sentry.subscriptionConsumerGenericMetrics.priorityClassName }} priorityClassName: "{{ .Values.sentry.subscriptionConsumerGenericMetrics.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-subscription-consumer-metrics.yaml b/sentry/templates/deployment-sentry-subscription-consumer-metrics.yaml index fe39c89a3..e74442096 100644 --- a/sentry/templates/deployment-sentry-subscription-consumer-metrics.yaml +++ b/sentry/templates/deployment-sentry-subscription-consumer-metrics.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.subscriptionConsumerMetrics.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -146,3 +147,4 @@ spec: {{- if .Values.sentry.subscriptionConsumerMetrics.priorityClassName }} priorityClassName: "{{ .Values.sentry.subscriptionConsumerMetrics.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-subscription-consumer-transactions.yaml b/sentry/templates/deployment-sentry-subscription-consumer-transactions.yaml index dc7860490..6a366b872 100644 --- a/sentry/templates/deployment-sentry-subscription-consumer-transactions.yaml +++ b/sentry/templates/deployment-sentry-subscription-consumer-transactions.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.subscriptionConsumerTransactions.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -129,3 +130,4 @@ spec: {{- if .Values.sentry.subscriptionConsumerTransactions.priorityClassName }} priorityClassName: "{{ .Values.sentry.subscriptionConsumerTransactions.priorityClassName }}" {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-web.yaml b/sentry/templates/deployment-sentry-web.yaml index 01739d344..0e8449913 100644 --- a/sentry/templates/deployment-sentry-web.yaml +++ b/sentry/templates/deployment-sentry-web.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.web.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -164,3 +165,4 @@ spec: {{- if .Values.sentry.web.volumes }} {{ toYaml .Values.sentry.web.volumes | indent 6 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-sentry-worker.yaml b/sentry/templates/deployment-sentry-worker.yaml index 6a0278a48..7827af621 100644 --- a/sentry/templates/deployment-sentry-worker.yaml +++ b/sentry/templates/deployment-sentry-worker.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.worker.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -108,7 +109,7 @@ spec: - sentry - exec - -c - - 'import celery, os; dest="celery@{}".format(os.environ["HOSTNAME"]); print(celery.task.control.ping(destination=[dest], timeout=5)[0][dest]["ok"])' + - 'from sentry.celery import app; import os; dest="celery@{}".format(os.environ["HOSTNAME"]); print(app.control.ping(destination=[dest], timeout=5)[0][dest]["ok"])' {{- end }} resources: {{ toYaml .Values.sentry.worker.resources | indent 12 }} @@ -149,3 +150,4 @@ spec: {{- if .Values.sentry.worker.volumes }} {{ toYaml .Values.sentry.worker.volumes | indent 6 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-api.yaml b/sentry/templates/deployment-snuba-api.yaml index a77cd03b1..7c239cd65 100644 --- a/sentry/templates/deployment-snuba-api.yaml +++ b/sentry/templates/deployment-snuba-api.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.api.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -124,3 +125,4 @@ spec: {{- if .Values.snuba.api.volumes }} {{ toYaml .Values.snuba.api.volumes | indent 8 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-consumer.yaml b/sentry/templates/deployment-snuba-consumer.yaml index 710127158..b6b04b722 100644 --- a/sentry/templates/deployment-snuba-consumer.yaml +++ b/sentry/templates/deployment-snuba-consumer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.consumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -71,7 +72,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "consumer" - "--storage" @@ -144,3 +146,4 @@ spec: {{- if .Values.snuba.consumer.volumes }} {{ toYaml .Values.snuba.consumer.volumes | indent 8 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml index bdd420c58..5339f5d08 100644 --- a/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml +++ b/sentry/templates/deployment-snuba-generic-metrics-counters-consumer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.genericMetricsCountersConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -71,7 +72,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "consumer" - "--storage" @@ -146,3 +148,4 @@ spec: {{- if .Values.snuba.genericMetricsCountersConsumer.volumes }} {{ toYaml .Values.snuba.genericMetricsCountersConsumer.volumes | indent 8 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml index 00d83c6bd..893263cea 100644 --- a/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml +++ b/sentry/templates/deployment-snuba-generic-metrics-distributions-consumer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.genericMetricsDistributionConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -71,7 +72,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "consumer" - "--storage" @@ -146,3 +148,4 @@ spec: {{- if .Values.snuba.genericMetricsDistributionConsumer.volumes }} {{ toYaml .Values.snuba.genericMetricsDistributionConsumer.volumes | indent 8 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml b/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml index 7a5a2f7b3..d41b8d366 100644 --- a/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml +++ b/sentry/templates/deployment-snuba-generic-metrics-sets-consumer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.genericMetricsSetsConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -71,7 +72,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "consumer" - "--storage" @@ -146,3 +148,4 @@ spec: {{- if .Values.snuba.genericMetricsSetsConsumer.volumes }} {{ toYaml .Values.snuba.genericMetricsSetsConsumer.volumes | indent 8 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml b/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml index aff5d74db..cd7b8f0a5 100644 --- a/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml +++ b/sentry/templates/deployment-snuba-issue-occurrence-consumer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.issueOccurrenceConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -71,7 +72,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "consumer" - "--storage" @@ -146,3 +148,4 @@ spec: {{- if .Values.snuba.issueOccurrenceConsumer.volumes }} {{ toYaml .Values.snuba.issueOccurrenceConsumer.volumes | indent 8 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-metrics-consumer.yaml b/sentry/templates/deployment-snuba-metrics-consumer.yaml index 7d5f2fd98..4ff4c3615 100644 --- a/sentry/templates/deployment-snuba-metrics-consumer.yaml +++ b/sentry/templates/deployment-snuba-metrics-consumer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.metricsConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -71,7 +72,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "consumer" - "--storage" @@ -146,3 +148,4 @@ spec: {{- if .Values.snuba.metricsConsumer.volumes }} {{ toYaml .Values.snuba.metricsConsumer.volumes | indent 8 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-outcomes-consumer.yaml b/sentry/templates/deployment-snuba-outcomes-consumer.yaml index e42a9a4b1..7e17fbbb0 100644 --- a/sentry/templates/deployment-snuba-outcomes-consumer.yaml +++ b/sentry/templates/deployment-snuba-outcomes-consumer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.outcomesConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -71,7 +72,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "consumer" - "--storage" @@ -140,3 +142,4 @@ spec: {{- if .Values.snuba.outcomesConsumer.volumes }} {{ toYaml .Values.snuba.outcomesConsumer.volumes | indent 8 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml b/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml index 8111428df..d927687b8 100644 --- a/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml +++ b/sentry/templates/deployment-snuba-profiling-functions-consumer.yaml @@ -72,7 +72,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "consumer" - "--storage" diff --git a/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml b/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml index fb09d4e68..c8110978e 100644 --- a/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml +++ b/sentry/templates/deployment-snuba-profiling-profiles-consumer.yaml @@ -72,7 +72,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "consumer" - "--storage" diff --git a/sentry/templates/deployment-snuba-replacer.yaml b/sentry/templates/deployment-snuba-replacer.yaml index 9ed59c716..d410e520f 100644 --- a/sentry/templates/deployment-snuba-replacer.yaml +++ b/sentry/templates/deployment-snuba-replacer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.replacer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -71,7 +72,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "replacer" - "--storage" @@ -123,3 +125,4 @@ spec: {{- if .Values.snuba.replacer.volumes }} {{ toYaml .Values.snuba.replacer.volumes | indent 6 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-replays-consumer.yaml b/sentry/templates/deployment-snuba-replays-consumer.yaml index 3242e211f..ce0fd1025 100644 --- a/sentry/templates/deployment-snuba-replays-consumer.yaml +++ b/sentry/templates/deployment-snuba-replays-consumer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.replaysConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -71,7 +72,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "consumer" - "--storage" @@ -146,3 +148,4 @@ spec: {{- if .Values.snuba.replaysConsumer.volumes }} {{ toYaml .Values.snuba.replaysConsumer.volumes | indent 8 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-sessions-consumer.yaml b/sentry/templates/deployment-snuba-sessions-consumer.yaml deleted file mode 100644 index 9765d4ae9..000000000 --- a/sentry/templates/deployment-snuba-sessions-consumer.yaml +++ /dev/null @@ -1,146 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "sentry.fullname" . }}-sessions-consumer - labels: - app: {{ template "sentry.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" - app.kubernetes.io/managed-by: "Helm" - {{- if .Values.asHook }} - {{- /* Add the Helm annotations so that deployment after asHook from true to false works */}} - annotations: - meta.helm.sh/release-name: "{{ .Release.Name }}" - meta.helm.sh/release-namespace: "{{ .Release.Namespace }}" - "helm.sh/hook": "post-install,post-upgrade" - "helm.sh/hook-weight": "16" - {{- end }} -spec: - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - selector: - matchLabels: - app: {{ template "sentry.fullname" . }} - release: "{{ .Release.Name }}" - role: sessions-consumer - replicas: {{ .Values.snuba.sessionsConsumer.replicas }} - template: - metadata: - annotations: - checksum/snubaSettingsPy: {{ .Values.config.snubaSettingsPy | sha256sum }} - checksum/config.yaml: {{ include (print $.Template.BasePath "/configmap-snuba.yaml") . | sha256sum }} - {{- if .Values.snuba.sessionsConsumer.annotations }} -{{ toYaml .Values.snuba.sessionsConsumer.annotations | indent 8 }} - {{- end }} - labels: - app: {{ template "sentry.fullname" . }} - release: "{{ .Release.Name }}" - role: sessions-consumer - {{- if .Values.snuba.sessionsConsumer.podLabels }} -{{ toYaml .Values.snuba.sessionsConsumer.podLabels | indent 8 }} - {{- end }} - spec: - affinity: - {{- if .Values.snuba.sessionsConsumer.affinity }} -{{ toYaml .Values.snuba.sessionsConsumer.affinity | indent 8 }} - {{- end }} - {{- if .Values.snuba.sessionsConsumer.nodeSelector }} - nodeSelector: -{{ toYaml .Values.snuba.sessionsConsumer.nodeSelector | indent 8 }} - {{- end }} - {{- if .Values.snuba.sessionsConsumer.tolerations }} - tolerations: -{{ toYaml .Values.snuba.sessionsConsumer.tolerations | indent 8 }} - {{- end }} - {{- if .Values.images.snuba.imagePullSecrets }} - imagePullSecrets: -{{ toYaml .Values.images.snuba.imagePullSecrets | indent 8 }} - {{- end }} - {{- if .Values.dnsPolicy }} - dnsPolicy: {{ .Values.dnsPolicy | quote }} - {{- end }} - {{- if .Values.dnsConfig }} - dnsConfig: -{{ toYaml .Values.dnsConfig | indent 8 }} - {{- end }} - {{- if .Values.snuba.sessionsConsumer.securityContext }} - securityContext: -{{ toYaml .Values.snuba.sessionsConsumer.securityContext | indent 8 }} - {{- end }} - containers: - - name: {{ .Chart.Name }}-snuba - image: "{{ template "snuba.image" . }}" - imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: - - "snuba" - - "consumer" - - "--storage" - - "sessions_raw" - - "--auto-offset-reset" - - "{{ .Values.snuba.sessionsConsumer.autoOffsetReset }}" - - "--max-batch-time-ms" - - "750" - {{- if .Values.snuba.sessionsConsumer.maxBatchSize }} - - "--max-batch-size" - - "{{ .Values.snuba.sessionsConsumer.maxBatchSize }}" - {{- end }} - {{- if .Values.snuba.sessionsConsumer.processes }} - - "--processes" - - "{{ .Values.snuba.sessionsConsumer.processes }}" - {{- end }} - {{- if .Values.snuba.sessionsConsumer.inputBlockSize }} - - "--input-block-size" - - "{{ .Values.snuba.sessionsConsumer.inputBlockSize }}" - {{- end }} - {{- if .Values.snuba.sessionsConsumer.outputBlockSize }} - - "--output-block-size" - - "{{ .Values.snuba.sessionsConsumer.outputBlockSize }}" - {{- end }} - {{- if .Values.snuba.sessionsConsumer.maxBatchTimeMs }} - - "--max-batch-time-ms" - - "{{ .Values.snuba.sessionsConsumer.maxBatchTimeMs }}" - {{- end }} - {{- if .Values.snuba.sessionsConsumer.queuedMaxMessagesKbytes }} - - "--queued-max-messages-kbytes" - - "{{ .Values.snuba.sessionsConsumer.queuedMaxMessagesKbytes }}" - {{- end }} - {{- if .Values.snuba.sessionsConsumer.queuedMinMessages }} - - "--queued-min-messages" - - "{{ .Values.snuba.sessionsConsumer.queuedMinMessages }}" - {{- end }} - {{- if .Values.snuba.sessionsConsumer.noStrictOffsetReset }} - - "--no-strict-offset-reset" - {{- end }} - ports: - - containerPort: {{ template "snuba.port" }} - env: -{{ include "sentry.snuba.env" . | indent 8 }} -{{- if .Values.snuba.sessionsConsumer.env }} -{{ toYaml .Values.snuba.sessionsConsumer.env | indent 8 }} -{{- end }} - envFrom: - - secretRef: - name: {{ template "sentry.fullname" . }}-snuba-env - volumeMounts: - - mountPath: /etc/snuba - name: config - readOnly: true -{{- if .Values.snuba.sessionsConsumer.volumeMounts }} -{{ toYaml .Values.snuba.sessionsConsumer.volumeMounts | indent 8 }} -{{- end }} - resources: -{{ toYaml .Values.snuba.sessionsConsumer.resources | indent 12 }} -{{- if .Values.snuba.sessionsConsumer.containerSecurityContext }} - securityContext: -{{ toYaml .Values.snuba.sessionsConsumer.containerSecurityContext | indent 12 }} -{{- end }} - {{- if .Values.serviceAccount.enabled }} - serviceAccountName: {{ .Values.serviceAccount.name }}-snuba - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "sentry.fullname" . }}-snuba -{{- if .Values.snuba.sessionsConsumer.volumes }} -{{ toYaml .Values.snuba.sessionsConsumer.volumes | indent 8 }} -{{- end }} diff --git a/sentry/templates/deployment-snuba-subscription-consumer-events.yaml b/sentry/templates/deployment-snuba-subscription-consumer-events.yaml index 4a2a3badb..4e6c91d4e 100644 --- a/sentry/templates/deployment-snuba-subscription-consumer-events.yaml +++ b/sentry/templates/deployment-snuba-subscription-consumer-events.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.subscriptionConsumerEvents.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -64,7 +65,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "subscriptions-scheduler-executor" - "--auto-offset-reset={{ .Values.snuba.subscriptionConsumerEvents.autoOffsetReset }}" @@ -75,7 +77,6 @@ spec: {{- end }} - "--consumer-group=snuba-events-subscriptions-consumers" - "--followed-consumer-group=snuba-consumers" - - "--delay-seconds=60" - "--schedule-ttl=60" - "--stale-threshold-seconds=900" ports: @@ -111,3 +112,4 @@ spec: {{- if .Values.snuba.subscriptionConsumerEvents.volumes }} {{ toYaml .Values.snuba.subscriptionConsumerEvents.volumes | indent 6 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml b/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml index cb470312b..698881a42 100644 --- a/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml +++ b/sentry/templates/deployment-snuba-subscription-consumer-metrics.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.subscriptionConsumerMetrics.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -64,7 +65,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "subscriptions-scheduler-executor" - "--auto-offset-reset={{ .Values.snuba.subscriptionConsumerMetrics.autoOffsetReset }}" @@ -76,7 +78,6 @@ spec: {{- end }} - "--consumer-group=nuba-metrics-subscriptions-consumers" - "--followed-consumer-group=snuba-metrics-consumers" - - "--delay-seconds=60" - "--schedule-ttl=60" - "--stale-threshold-seconds=900" ports: @@ -112,3 +113,4 @@ spec: {{- if .Values.snuba.subscriptionConsumerMetrics.volumes }} {{ toYaml .Values.snuba.subscriptionConsumerMetrics.volumes | indent 6 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-subscription-consumer-sessions.yaml b/sentry/templates/deployment-snuba-subscription-consumer-sessions.yaml deleted file mode 100644 index 112e2f4f3..000000000 --- a/sentry/templates/deployment-snuba-subscription-consumer-sessions.yaml +++ /dev/null @@ -1,113 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "sentry.fullname" . }}-snuba-subscription-consumer-sessions - labels: - app: {{ template "sentry.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" - app.kubernetes.io/managed-by: "Helm" - {{- if .Values.asHook }} - {{- /* Add the Helm annotations so that deployment after asHook from true to false works */}} - annotations: - meta.helm.sh/release-name: "{{ .Release.Name }}" - meta.helm.sh/release-namespace: "{{ .Release.Namespace }}" - "helm.sh/hook": "post-install,post-upgrade" - "helm.sh/hook-weight": "18" - {{- end }} -spec: - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - selector: - matchLabels: - app: {{ template "sentry.fullname" . }} - release: "{{ .Release.Name }}" - role: snuba-subscription-consumer-sessions - replicas: {{ .Values.snuba.subscriptionConsumerSessions.replicas }} - template: - metadata: - annotations: - checksum/snubaSettingsPy: {{ .Values.config.snubaSettingsPy | sha256sum }} - checksum/config.yaml: {{ include (print $.Template.BasePath "/configmap-snuba.yaml") . | sha256sum }} - {{- if .Values.snuba.subscriptionConsumerSessions.annotations }} -{{ toYaml .Values.snuba.subscriptionConsumerSessions.annotations | indent 8 }} - {{- end }} - labels: - app: {{ template "sentry.fullname" . }} - release: "{{ .Release.Name }}" - role: snuba-subscription-consumer-sessions - {{- if .Values.snuba.subscriptionConsumerSessions.podLabels }} -{{ toYaml .Values.snuba.subscriptionConsumerSessions.podLabels | indent 8 }} - {{- end }} - spec: - affinity: - {{- if .Values.snuba.subscriptionConsumerSessions.affinity }} -{{ toYaml .Values.snuba.subscriptionConsumerSessions.affinity | indent 8 }} - {{- end }} - {{- if .Values.snuba.subscriptionConsumerSessions.nodeSelector }} - nodeSelector: -{{ toYaml .Values.snuba.subscriptionConsumerSessions.nodeSelector | indent 8 }} - {{- end }} - {{- if .Values.snuba.subscriptionConsumerSessions.tolerations }} - tolerations: -{{ toYaml .Values.snuba.subscriptionConsumerSessions.tolerations | indent 8 }} - {{- end }} - {{- if .Values.images.snuba.imagePullSecrets }} - imagePullSecrets: -{{ toYaml .Values.images.snuba.imagePullSecrets | indent 8 }} - {{- end }} - {{- if .Values.snuba.subscriptionConsumerSessions.securityContext }} - securityContext: -{{ toYaml .Values.snuba.subscriptionConsumerSessions.securityContext | indent 8 }} - {{- end }} - containers: - - name: {{ .Chart.Name }}-snuba - image: "{{ template "snuba.image" . }}" - imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: - - "snuba" - - "subscriptions-scheduler-executor" - - "--auto-offset-reset={{ .Values.snuba.subscriptionConsumerSessions.autoOffsetReset }}" - - "--dataset=sessions" - - "--entity=sessions" - {{- if .Values.snuba.subscriptionConsumerSessions.noStrictOffsetReset }} - - "--no-strict-offset-reset" - {{- end }} - - "--consumer-group=snuba-sessions-subscriptions-consumers" - - "--followed-consumer-group=snuba-consumers" - - "--delay-seconds=60" - - "--schedule-ttl=60" - - "--stale-threshold-seconds=900" - ports: - - containerPort: {{ template "snuba.port" }} - env: -{{ include "sentry.snuba.env" . | indent 8 }} -{{- if .Values.snuba.subscriptionConsumerSessions.env }} -{{ toYaml .Values.snuba.subscriptionConsumerSessions.env | indent 8 }} -{{- end }} - envFrom: - - secretRef: - name: {{ template "sentry.fullname" . }}-snuba-env - volumeMounts: - - mountPath: /etc/snuba - name: config - readOnly: true -{{- if .Values.snuba.subscriptionConsumerSessions.volumeMounts }} -{{ toYaml .Values.snuba.subscriptionConsumerSessions.volumeMounts | indent 8 }} -{{- end }} - resources: -{{ toYaml .Values.snuba.subscriptionConsumerSessions.resources | indent 12 }} -{{- if .Values.snuba.subscriptionConsumerSessions.containerSecurityContext }} - securityContext: -{{ toYaml .Values.snuba.subscriptionConsumerSessions.containerSecurityContext | indent 12 }} -{{- end }} - {{- if .Values.serviceAccount.enabled }} - serviceAccountName: {{ .Values.serviceAccount.name }}-snuba - {{- end }} - volumes: - - name: config - configMap: - name: {{ template "sentry.fullname" . }}-snuba -{{- if .Values.snuba.subscriptionConsumerSessions.volumes }} -{{ toYaml .Values.snuba.subscriptionConsumerSessions.volumes | indent 6 }} -{{- end }} diff --git a/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml b/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml index b3a04c92c..bf4def9ed 100644 --- a/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml +++ b/sentry/templates/deployment-snuba-subscription-consumer-transactions.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.subscriptionConsumerTransactions.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -64,7 +65,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "subscriptions-scheduler-executor" - "--auto-offset-reset={{ .Values.snuba.subscriptionConsumerTransactions.autoOffsetReset }}" @@ -75,7 +77,6 @@ spec: {{- end }} - "--consumer-group=snuba-transactions-subscriptions-consumers" - "--followed-consumer-group=transactions_group" - - "--delay-seconds=60" - "--schedule-ttl=60" - "--stale-threshold-seconds=900" ports: @@ -111,3 +112,4 @@ spec: {{- if .Values.snuba.subscriptionConsumerTransactions.volumes }} {{ toYaml .Values.snuba.subscriptionConsumerTransactions.volumes | indent 6 }} {{- end }} +{{- end }} diff --git a/sentry/templates/deployment-snuba-transactions-consumer.yaml b/sentry/templates/deployment-snuba-transactions-consumer.yaml index d87d89bd3..8b0c6af2a 100644 --- a/sentry/templates/deployment-snuba-transactions-consumer.yaml +++ b/sentry/templates/deployment-snuba-transactions-consumer.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.transactionsConsumer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -71,7 +72,8 @@ spec: - name: {{ .Chart.Name }}-snuba image: "{{ template "snuba.image" . }}" imagePullPolicy: {{ default "IfNotPresent" .Values.images.snuba.pullPolicy }} - command: + command: ["/usr/src/snuba/custom-entrypoint.sh"] + args: - "snuba" - "consumer" - "--storage" @@ -146,3 +148,4 @@ spec: {{- if .Values.snuba.transactionsConsumer.volumes }} {{ toYaml .Values.snuba.transactionsConsumer.volumes | indent 8 }} {{- end }} +{{- end }} diff --git a/sentry/templates/gke/backendconfig-sentry-relay.yaml b/sentry/templates/gke/backendconfig-sentry-relay.yaml index 22e40ff57..544b4148c 100644 --- a/sentry/templates/gke/backendconfig-sentry-relay.yaml +++ b/sentry/templates/gke/backendconfig-sentry-relay.yaml @@ -1,5 +1,5 @@ {{- if and (.Values.ingress.enabled) (eq (default "nginx" .Values.ingress.regexPathStyle) "gke") }} -apiVersion: cloud.google.com/v1beta1 +apiVersion: cloud.google.com/v1 kind: BackendConfig metadata: name: {{ include "sentry.fullname" . }}-relay @@ -10,6 +10,14 @@ metadata: release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: + {{- if .Values.relay.customResponseHeaders }} + customResponseHeaders: + headers: + {{- if .Values.ingress.tls }} + - "strict-transport-security: max-age=31536000; includeSubDomains" + {{- end -}} + {{ toYaml .Values.relay.customResponseHeaders | nindent 6 }} + {{- end }} healthCheck: checkIntervalSec: {{ .Values.relay.probePeriodSeconds }} timeoutSec: {{ .Values.relay.probeTimeoutSeconds }} @@ -18,4 +26,8 @@ spec: type: HTTP requestPath: {{ template "relay.healthCheck.requestPath" }} port: {{ template "relay.port" . }} -{{- end }} + {{- if .Values.relay.securityPolicy }} + securityPolicy: + name: {{ .Values.relay.securityPolicy }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/sentry/templates/gke/backendconfig-sentry-web.yaml b/sentry/templates/gke/backendconfig-sentry-web.yaml index c33d8cb54..3011ec862 100644 --- a/sentry/templates/gke/backendconfig-sentry-web.yaml +++ b/sentry/templates/gke/backendconfig-sentry-web.yaml @@ -1,5 +1,5 @@ {{- if and (.Values.ingress.enabled) (eq (default "nginx" .Values.ingress.regexPathStyle) "gke") }} -apiVersion: cloud.google.com/v1beta1 +apiVersion: cloud.google.com/v1 kind: BackendConfig metadata: name: {{ include "sentry.fullname" . }}-web @@ -10,6 +10,14 @@ metadata: release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: + {{- if .Values.sentry.web.customResponseHeaders }} + customResponseHeaders: + headers: + {{- if .Values.ingress.tls }} + - "strict-transport-security: max-age=31536000; includeSubDomains" + {{- end -}} + {{ toYaml .Values.sentry.web.customResponseHeaders | nindent 6 }} + {{- end }} healthCheck: checkIntervalSec: {{ .Values.sentry.web.probePeriodSeconds }} timeoutSec: {{ .Values.sentry.web.probeTimeoutSeconds }} @@ -18,4 +26,8 @@ spec: type: HTTP requestPath: {{ template "sentry.healthCheck.requestPath" }} port: {{ .Values.service.externalPort }} -{{- end }} + {{- if .Values.sentry.web.securityPolicy }} + securityPolicy: + name: {{ .Values.sentry.web.securityPolicy }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/sentry/templates/hooks/sentry-db-check.job.yaml b/sentry/templates/hooks/sentry-db-check.job.yaml index 56773e44d..66b494d23 100644 --- a/sentry/templates/hooks/sentry-db-check.job.yaml +++ b/sentry/templates/hooks/sentry-db-check.job.yaml @@ -1,8 +1,9 @@ -{{- if .Values.hooks.enabled -}} +{{- if and .Values.hooks.enabled .Values.hooks.dbCheck.enabled -}} {{- $clickhouseHost := include "sentry.clickhouse.host" . -}} {{- $clickhousePort := include "sentry.clickhouse.port" . -}} {{- $kafkaHost := include "sentry.kafka.host" . -}} {{- $kafkaPort := include "sentry.kafka.port" . -}} +{{- $kafkaControllerPort := include "sentry.kafka.controller_port" . -}} apiVersion: batch/v1 kind: Job metadata: @@ -112,15 +113,47 @@ spec: while [ $KAFKA_STATUS -eq 0 ]; do KAFKA_STATUS=1 {{- if .Values.kafka.enabled }} - KAFKA_REPLICAS={{ .Values.kafka.replicaCount }} - i=0; while [ $i -lt $KAFKA_REPLICAS ]; do - KAFKA_HOST={{ $kafkaHost }}-$i.{{ $kafkaHost }}-headless - if ! nc -z "$KAFKA_HOST" {{ $kafkaPort }}; then - KAFKA_STATUS=0 - echo "$KAFKA_HOST is not available yet" + KAFKA_REPLICAS={{ .Values.kafka.controller.replicaCount | default 3 }} + {{- if .Values.kafka.zookeeper.enabled }} + echo "Kafka Zookeeper is enabled, checking if Zookeeper is up" + ZOOKEEPER_STATUS=0 + while [ $ZOOKEEPER_STATUS -eq 0 ]; do + ZOOKEEPER_STATUS=1 + i=0; while [ $i -lt $KAFKA_REPLICAS ]; do + ZOOKEEPER_HOST={{ $kafkaHost }}-$i.{{ $kafkaHost }}-headless + if ! nc -z "$ZOOKEEPER_HOST" {{ .Values.kafka.zookeeper.port }}; then + ZOOKEEPER_STATUS=0 + echo "$ZOOKEEPER_HOST is not available yet" + fi + i=$((i+1)) + done + if [ "$ZOOKEEPER_STATUS" -eq 0 ]; then + echo "Zookeeper not ready. Sleeping for 10s before trying again" + sleep 10; fi - i=$((i+1)) done + echo "Zookeeper is up" + {{- end }} + {{- if .Values.kafka.kraft.enabled }} + echo "Kafka Kraft is enabled, checking if Kraft controllers are up" + KRAFT_STATUS=0 + while [ $KRAFT_STATUS -eq 0 ]; do + KRAFT_STATUS=1 + i=0; while [ $i -lt $KAFKA_REPLICAS ]; do + KRAFT_HOST={{ $kafkaHost }}-controller-$i.{{ $kafkaHost }}-controller-headless + if ! nc -z "$KRAFT_HOST" {{ $kafkaControllerPort }}; then + KRAFT_STATUS=0 + echo "$KRAFT_HOST is not available yet" + fi + i=$((i+1)) + done + if [ "$KRAFT_STATUS" -eq 0 ]; then + echo "Kraft controllers not ready. Sleeping for 10s before trying again" + sleep 10; + fi + done + echo "Kraft controllers are up" + {{- end }} {{- else if (not (kindIs "slice" .Values.externalKafka)) }} KAFKA_HOST={{ .Values.externalKafka.host }} if ! nc -z "$KAFKA_HOST" {{ $kafkaPort }}; then diff --git a/sentry/templates/hooks/sentry-db-init.job.yaml b/sentry/templates/hooks/sentry-db-init.job.yaml index 4c7eb44ab..1f201bae7 100644 --- a/sentry/templates/hooks/sentry-db-init.job.yaml +++ b/sentry/templates/hooks/sentry-db-init.job.yaml @@ -1,4 +1,4 @@ -{{- if .Values.hooks.enabled -}} +{{- if and .Values.hooks.enabled .Values.hooks.dbInit.enabled -}} apiVersion: batch/v1 kind: Job metadata: diff --git a/sentry/templates/hooks/snuba-db-init.job.yaml b/sentry/templates/hooks/snuba-db-init.job.yaml index 9bbc5b930..05a7d3fe2 100644 --- a/sentry/templates/hooks/snuba-db-init.job.yaml +++ b/sentry/templates/hooks/snuba-db-init.job.yaml @@ -1,4 +1,4 @@ -{{- if .Values.hooks.enabled -}} +{{- if and .Values.hooks.enabled .Values.hooks.snubaInit.enabled -}} {{- $clickhouseHost := include "sentry.clickhouse.host" . -}} apiVersion: batch/v1 kind: Job diff --git a/sentry/templates/hooks/snuba-migrate.job.yaml b/sentry/templates/hooks/snuba-migrate.job.yaml index 9299d3cd6..3754804dd 100644 --- a/sentry/templates/hooks/snuba-migrate.job.yaml +++ b/sentry/templates/hooks/snuba-migrate.job.yaml @@ -1,4 +1,4 @@ -{{- if .Values.hooks.enabled -}} +{{- if and .Values.hooks.enabled .Values.hooks.snubaMigrate.enabled -}} {{- $clickhouseHost := include "sentry.clickhouse.host" . -}} apiVersion: batch/v1 kind: Job diff --git a/sentry/templates/hpa-ingest-consumer-attachments.yaml b/sentry/templates/hpa-ingest-consumer-attachments.yaml new file mode 100644 index 000000000..4b1754d73 --- /dev/null +++ b/sentry/templates/hpa-ingest-consumer-attachments.yaml @@ -0,0 +1,14 @@ +{{- if .Values.sentry.ingestConsumer.attachments.autoscaling.enabled }} +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ template "sentry.fullname" . }}-sentry-ingest-consumer-attachments +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ template "sentry.fullname" . }}-ingest-consumer-attachments + minReplicas: {{ .Values.sentry.ingestConsumer.attachments.autoscaling.minReplicas }} + maxReplicas: {{ .Values.sentry.ingestConsumer.attachments.autoscaling.maxReplicas }} + targetCPUUtilizationPercentage: {{ .Values.sentry.ingestConsumer.attachments.autoscaling.targetCPUUtilizationPercentage }} +{{- end }} diff --git a/sentry/templates/hpa-ingest-consumer-events.yaml b/sentry/templates/hpa-ingest-consumer-events.yaml new file mode 100644 index 000000000..13126a600 --- /dev/null +++ b/sentry/templates/hpa-ingest-consumer-events.yaml @@ -0,0 +1,14 @@ +{{- if .Values.sentry.ingestConsumer.events.autoscaling.enabled }} +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ template "sentry.fullname" . }}-sentry-ingest-consumer-events +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ template "sentry.fullname" . }}-ingest-consumer-events + minReplicas: {{ .Values.sentry.ingestConsumer.events.autoscaling.minReplicas }} + maxReplicas: {{ .Values.sentry.ingestConsumer.events.autoscaling.maxReplicas }} + targetCPUUtilizationPercentage: {{ .Values.sentry.ingestConsumer.events.autoscaling.targetCPUUtilizationPercentage }} +{{- end }} diff --git a/sentry/templates/hpa-ingest-consumer-transactions.yaml b/sentry/templates/hpa-ingest-consumer-transactions.yaml new file mode 100644 index 000000000..0aea14c79 --- /dev/null +++ b/sentry/templates/hpa-ingest-consumer-transactions.yaml @@ -0,0 +1,14 @@ +{{- if .Values.sentry.ingestConsumer.transactions.autoscaling.enabled }} +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ template "sentry.fullname" . }}-sentry-ingest-consumer-transactions +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ template "sentry.fullname" . }}-ingest-consumer-transactions + minReplicas: {{ .Values.sentry.ingestConsumer.transactions.autoscaling.minReplicas }} + maxReplicas: {{ .Values.sentry.ingestConsumer.transactions.autoscaling.maxReplicas }} + targetCPUUtilizationPercentage: {{ .Values.sentry.ingestConsumer.transactions.autoscaling.targetCPUUtilizationPercentage }} +{{- end }} diff --git a/sentry/templates/hpa-ingestConsumer.yaml b/sentry/templates/hpa-ingestConsumer.yaml deleted file mode 100644 index 296c974f7..000000000 --- a/sentry/templates/hpa-ingestConsumer.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if .Values.sentry.ingestConsumer.autoscaling.enabled }} -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ template "sentry.fullname" . }}-sentry-ingest-consumer -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ template "sentry.fullname" . }}-ingest-consumer - minReplicas: {{ .Values.sentry.ingestConsumer.autoscaling.minReplicas }} - maxReplicas: {{ .Values.sentry.ingestConsumer.autoscaling.maxReplicas }} - targetCPUUtilizationPercentage: {{ .Values.sentry.ingestConsumer.autoscaling.targetCPUUtilizationPercentage }} -{{- end }} diff --git a/sentry/templates/hpa-relay.yaml b/sentry/templates/hpa-relay.yaml index 974b917f0..dad896f83 100644 --- a/sentry/templates/hpa-relay.yaml +++ b/sentry/templates/hpa-relay.yaml @@ -1,5 +1,5 @@ -{{- if .Values.relay.autoscaling.enabled }} -apiVersion: autoscaling/v1 +{{- if and .Values.relay.enabled .Values.relay.autoscaling.enabled }} +apiVersion: {{ template "sentry.autoscaling.apiVersion" . }} kind: HorizontalPodAutoscaler metadata: name: {{ template "sentry.fullname" . }}-relay @@ -15,5 +15,24 @@ spec: name: {{ template "sentry.fullname" . }}-relay minReplicas: {{ .Values.relay.autoscaling.minReplicas }} maxReplicas: {{ .Values.relay.autoscaling.maxReplicas }} + {{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v1" }} targetCPUUtilizationPercentage: {{ .Values.relay.autoscaling.targetCPUUtilizationPercentage }} + {{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }} + metrics: + - type: ContainerResource + containerResource: + container: {{ .Chart.Name }}-relay + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.relay.autoscaling.targetCPUUtilizationPercentage }} + {{- else }} + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.relay.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} {{- end }} diff --git a/sentry/templates/hpa-snuba-api.yaml b/sentry/templates/hpa-snuba-api.yaml index 9f6b00524..24dc67210 100644 --- a/sentry/templates/hpa-snuba-api.yaml +++ b/sentry/templates/hpa-snuba-api.yaml @@ -1,5 +1,5 @@ -{{- if .Values.snuba.api.autoscaling.enabled }} -apiVersion: autoscaling/v1 +{{- if and .Values.snuba.api.enabled .Values.snuba.api.autoscaling.enabled }} +apiVersion: {{ template "sentry.autoscaling.apiVersion" . }} kind: HorizontalPodAutoscaler metadata: name: {{ template "sentry.fullname" . }}-snuba-api @@ -10,5 +10,24 @@ spec: name: {{ template "sentry.fullname" . }}-snuba-api minReplicas: {{ .Values.snuba.api.autoscaling.minReplicas }} maxReplicas: {{ .Values.snuba.api.autoscaling.maxReplicas }} + {{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v1" }} targetCPUUtilizationPercentage: {{ .Values.snuba.api.autoscaling.targetCPUUtilizationPercentage }} + {{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }} + metrics: + - type: ContainerResource + containerResource: + container: {{ .Chart.Name }}-snuba + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.snuba.api.autoscaling.targetCPUUtilizationPercentage }} + {{- else }} + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.snuba.api.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} {{- end }} diff --git a/sentry/templates/hpa-vroom.yaml b/sentry/templates/hpa-vroom.yaml index a91a8af4a..954b8bd8f 100644 --- a/sentry/templates/hpa-vroom.yaml +++ b/sentry/templates/hpa-vroom.yaml @@ -1,5 +1,5 @@ {{- if .Values.vroom.autoscaling.enabled }} -apiVersion: autoscaling/v1 +apiVersion: {{ template "sentry.autoscaling.apiVersion" . }} kind: HorizontalPodAutoscaler metadata: name: {{ template "sentry.fullname" . }}-vroom @@ -10,5 +10,24 @@ spec: name: {{ template "sentry.fullname" . }}-vroom minReplicas: {{ .Values.vroom.autoscaling.minReplicas }} maxReplicas: {{ .Values.vroom.autoscaling.maxReplicas }} + {{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v1" }} targetCPUUtilizationPercentage: {{ .Values.vroom.autoscaling.targetCPUUtilizationPercentage }} + {{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }} + metrics: + - type: ContainerResource + containerResource: + container: {{ .Chart.Name }}-vroom + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.vroom.autoscaling.targetCPUUtilizationPercentage }} + {{- else }} + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.vroom.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} {{- end }} diff --git a/sentry/templates/hpa-web.yaml b/sentry/templates/hpa-web.yaml index ebdc1be8a..227775796 100644 --- a/sentry/templates/hpa-web.yaml +++ b/sentry/templates/hpa-web.yaml @@ -1,5 +1,5 @@ -{{- if .Values.sentry.web.autoscaling.enabled }} -apiVersion: autoscaling/v1 +{{- if and .Values.sentry.web.enabled .Values.sentry.web.autoscaling.enabled }} +apiVersion: {{ template "sentry.autoscaling.apiVersion" . }} kind: HorizontalPodAutoscaler metadata: name: {{ template "sentry.fullname" . }}-sentry-web @@ -10,5 +10,24 @@ spec: name: {{ template "sentry.fullname" . }}-web minReplicas: {{ .Values.sentry.web.autoscaling.minReplicas }} maxReplicas: {{ .Values.sentry.web.autoscaling.maxReplicas }} + {{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v1" }} targetCPUUtilizationPercentage: {{ .Values.sentry.web.autoscaling.targetCPUUtilizationPercentage }} + {{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }} + metrics: + - type: ContainerResource + containerResource: + container: {{ .Chart.Name }}-web + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.sentry.web.autoscaling.targetCPUUtilizationPercentage }} + {{- else }} + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.sentry.web.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} {{- end }} diff --git a/sentry/templates/hpa-worker.yaml b/sentry/templates/hpa-worker.yaml index 96412a3cb..470167731 100644 --- a/sentry/templates/hpa-worker.yaml +++ b/sentry/templates/hpa-worker.yaml @@ -1,5 +1,5 @@ -{{- if .Values.sentry.worker.autoscaling.enabled }} -apiVersion: autoscaling/v1 +{{- if and .Values.sentry.worker.enabled .Values.sentry.worker.autoscaling.enabled }} +apiVersion: {{ template "sentry.autoscaling.apiVersion" . }} kind: HorizontalPodAutoscaler metadata: name: {{ template "sentry.fullname" . }}-sentry-worker @@ -10,5 +10,24 @@ spec: name: {{ template "sentry.fullname" . }}-worker minReplicas: {{ .Values.sentry.worker.autoscaling.minReplicas }} maxReplicas: {{ .Values.sentry.worker.autoscaling.maxReplicas }} + {{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v1" }} targetCPUUtilizationPercentage: {{ .Values.sentry.worker.autoscaling.targetCPUUtilizationPercentage }} + {{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }} + metrics: + - type: ContainerResource + containerResource: + container: {{ .Chart.Name }}-worker + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.sentry.worker.autoscaling.targetCPUUtilizationPercentage }} + {{- else }} + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.sentry.worker.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} {{- end }} diff --git a/sentry/templates/service-relay.yaml b/sentry/templates/service-relay.yaml index 962b0e393..a60ab581f 100644 --- a/sentry/templates/service-relay.yaml +++ b/sentry/templates/service-relay.yaml @@ -1,3 +1,4 @@ +{{- if .Values.relay.enabled }} apiVersion: v1 kind: Service metadata: @@ -24,3 +25,4 @@ spec: selector: app: {{ template "sentry.fullname" . }} role: relay +{{- end }} diff --git a/sentry/templates/service-sentry.yaml b/sentry/templates/service-sentry.yaml index 71c593a3f..0d9b3c5a8 100644 --- a/sentry/templates/service-sentry.yaml +++ b/sentry/templates/service-sentry.yaml @@ -1,3 +1,4 @@ +{{- if .Values.sentry.web.enabled }} apiVersion: v1 kind: Service metadata: @@ -35,3 +36,4 @@ spec: loadBalancerSourceRanges: {{- toYaml . | nindent 4 }} {{- end }} +{{- end }} diff --git a/sentry/templates/service-snuba.yaml b/sentry/templates/service-snuba.yaml index 14b7d58a7..f7641f129 100644 --- a/sentry/templates/service-snuba.yaml +++ b/sentry/templates/service-snuba.yaml @@ -1,3 +1,4 @@ +{{- if .Values.snuba.api.enabled }} apiVersion: v1 kind: Service metadata: @@ -35,3 +36,4 @@ spec: loadBalancerSourceRanges: {{- toYaml . | nindent 4 }} {{- end }} +{{- end }} diff --git a/sentry/templates/serviceaccount-relay.yaml b/sentry/templates/serviceaccount-relay.yaml index bad816ed2..4e0f8bd2e 100644 --- a/sentry/templates/serviceaccount-relay.yaml +++ b/sentry/templates/serviceaccount-relay.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.relay.enabled .Values.serviceAccount.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-billing-metrics-consumer.yaml b/sentry/templates/serviceaccount-sentry-billing-metrics-consumer.yaml index 10cc9b9b0..950164a58 100644 --- a/sentry/templates/serviceaccount-sentry-billing-metrics-consumer.yaml +++ b/sentry/templates/serviceaccount-sentry-billing-metrics-consumer.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.billingMetricsConsumer.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-cron.yaml b/sentry/templates/serviceaccount-sentry-cron.yaml index 51f3f5ed7..9f63cc39b 100644 --- a/sentry/templates/serviceaccount-sentry-cron.yaml +++ b/sentry/templates/serviceaccount-sentry-cron.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.cron.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-generic-metrics-consumer.yaml b/sentry/templates/serviceaccount-sentry-generic-metrics-consumer.yaml index 5c410f433..794b42865 100644 --- a/sentry/templates/serviceaccount-sentry-generic-metrics-consumer.yaml +++ b/sentry/templates/serviceaccount-sentry-generic-metrics-consumer.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.genericMetricsConsumer.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-ingest-consumer-attachments.yaml b/sentry/templates/serviceaccount-sentry-ingest-consumer-attachments.yaml index 9544283db..09dbcf1b4 100644 --- a/sentry/templates/serviceaccount-sentry-ingest-consumer-attachments.yaml +++ b/sentry/templates/serviceaccount-sentry-ingest-consumer-attachments.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.ingestConsumer.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-ingest-consumer-events.yaml b/sentry/templates/serviceaccount-sentry-ingest-consumer-events.yaml index 40b9b6eab..2cd5ef493 100644 --- a/sentry/templates/serviceaccount-sentry-ingest-consumer-events.yaml +++ b/sentry/templates/serviceaccount-sentry-ingest-consumer-events.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.ingestConsumer.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-ingest-consumer-transactions.yaml b/sentry/templates/serviceaccount-sentry-ingest-consumer-transactions.yaml index 4a08d214b..e1579d549 100644 --- a/sentry/templates/serviceaccount-sentry-ingest-consumer-transactions.yaml +++ b/sentry/templates/serviceaccount-sentry-ingest-consumer-transactions.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.ingestConsumer.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-ingest-metrics-consumer-perf.yaml b/sentry/templates/serviceaccount-sentry-ingest-metrics-consumer-perf.yaml deleted file mode 100644 index 36504786e..000000000 --- a/sentry/templates/serviceaccount-sentry-ingest-metrics-consumer-perf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{- if .Values.serviceAccount.enabled }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ .Values.serviceAccount.name }}-ingest-metrics-consumer-perf -{{- if .Values.serviceAccount.annotations }} - annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }} -{{- end }} -automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} -{{- end }} diff --git a/sentry/templates/serviceaccount-sentry-ingest-metrics-consumer-rh.yaml b/sentry/templates/serviceaccount-sentry-ingest-metrics-consumer-rh.yaml deleted file mode 100644 index 601a711d6..000000000 --- a/sentry/templates/serviceaccount-sentry-ingest-metrics-consumer-rh.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{- if .Values.serviceAccount.enabled }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ .Values.serviceAccount.name }}-ingest-metrics-consumer-rh -{{- if .Values.serviceAccount.annotations }} - annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }} -{{- end }} -automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} -{{- end }} diff --git a/sentry/templates/serviceaccount-sentry-ingest-monitors.yaml b/sentry/templates/serviceaccount-sentry-ingest-monitors.yaml index 6160cfc1e..a1896c1dc 100644 --- a/sentry/templates/serviceaccount-sentry-ingest-monitors.yaml +++ b/sentry/templates/serviceaccount-sentry-ingest-monitors.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.ingestMonitors.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-ingest-occurrences.yaml b/sentry/templates/serviceaccount-sentry-ingest-occurrences.yaml index 457ca66ec..a5f227a38 100644 --- a/sentry/templates/serviceaccount-sentry-ingest-occurrences.yaml +++ b/sentry/templates/serviceaccount-sentry-ingest-occurrences.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.ingestOccurrences.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-ingest-replay-recordings.yaml b/sentry/templates/serviceaccount-sentry-ingest-replay-recordings.yaml index a29e44d45..1b977de24 100644 --- a/sentry/templates/serviceaccount-sentry-ingest-replay-recordings.yaml +++ b/sentry/templates/serviceaccount-sentry-ingest-replay-recordings.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.ingestReplayRecordings.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-metrics-consumer.yaml b/sentry/templates/serviceaccount-sentry-metrics-consumer.yaml index 976c66691..2bc83bd10 100644 --- a/sentry/templates/serviceaccount-sentry-metrics-consumer.yaml +++ b/sentry/templates/serviceaccount-sentry-metrics-consumer.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.metricsConsumer.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-post-process-forwarder-errors.yaml b/sentry/templates/serviceaccount-sentry-post-process-forwarder-errors.yaml index a38e8fb01..35b243cf7 100644 --- a/sentry/templates/serviceaccount-sentry-post-process-forwarder-errors.yaml +++ b/sentry/templates/serviceaccount-sentry-post-process-forwarder-errors.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.postProcessForwardErrors.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-post-process-forwarder-issue-platform.yaml b/sentry/templates/serviceaccount-sentry-post-process-forwarder-issue-platform.yaml index 31bc330d6..c882b5479 100644 --- a/sentry/templates/serviceaccount-sentry-post-process-forwarder-issue-platform.yaml +++ b/sentry/templates/serviceaccount-sentry-post-process-forwarder-issue-platform.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.postProcessForwardIssuePlatform.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-post-process-forwarder-transactions.yaml b/sentry/templates/serviceaccount-sentry-post-process-forwarder-transactions.yaml index 3659704be..4689e4595 100644 --- a/sentry/templates/serviceaccount-sentry-post-process-forwarder-transactions.yaml +++ b/sentry/templates/serviceaccount-sentry-post-process-forwarder-transactions.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.postProcessForwardTransactions.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-subscription-consumer-events.yaml b/sentry/templates/serviceaccount-sentry-subscription-consumer-events.yaml index 7678d9c14..ccd86337e 100644 --- a/sentry/templates/serviceaccount-sentry-subscription-consumer-events.yaml +++ b/sentry/templates/serviceaccount-sentry-subscription-consumer-events.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.subscriptionConsumerEvents.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-subscription-consumer-generic-metrics.yaml b/sentry/templates/serviceaccount-sentry-subscription-consumer-generic-metrics.yaml index 04fd5fd8a..1c83405d1 100644 --- a/sentry/templates/serviceaccount-sentry-subscription-consumer-generic-metrics.yaml +++ b/sentry/templates/serviceaccount-sentry-subscription-consumer-generic-metrics.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.subscriptionConsumerGenericMetrics.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-subscription-consumer-metrics.yaml b/sentry/templates/serviceaccount-sentry-subscription-consumer-metrics.yaml index f08422933..bc4c8259b 100644 --- a/sentry/templates/serviceaccount-sentry-subscription-consumer-metrics.yaml +++ b/sentry/templates/serviceaccount-sentry-subscription-consumer-metrics.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.subscriptionConsumerMetrics.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-subscription-consumer-transactions.yaml b/sentry/templates/serviceaccount-sentry-subscription-consumer-transactions.yaml index 32af7cb6c..ad6d886eb 100644 --- a/sentry/templates/serviceaccount-sentry-subscription-consumer-transactions.yaml +++ b/sentry/templates/serviceaccount-sentry-subscription-consumer-transactions.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.subscriptionConsumerTransactions.enabled}} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-web.yaml b/sentry/templates/serviceaccount-sentry-web.yaml index 383ea192b..2fdada503 100644 --- a/sentry/templates/serviceaccount-sentry-web.yaml +++ b/sentry/templates/serviceaccount-sentry-web.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.web.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-sentry-worker.yaml b/sentry/templates/serviceaccount-sentry-worker.yaml index 1deb53bf6..e1e10a9f8 100644 --- a/sentry/templates/serviceaccount-sentry-worker.yaml +++ b/sentry/templates/serviceaccount-sentry-worker.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.serviceAccount.enabled .Values.sentry.worker.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/templates/serviceaccount-snuba.yaml b/sentry/templates/serviceaccount-snuba.yaml index c8a389697..8140edb94 100644 --- a/sentry/templates/serviceaccount-snuba.yaml +++ b/sentry/templates/serviceaccount-snuba.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.enabled }} +{{- if and .Values.snuba.api.enabled .Values.serviceAccount.enabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/sentry/values.yaml b/sentry/values.yaml index 54711c25d..fab04ba6d 100644 --- a/sentry/values.yaml +++ b/sentry/values.yaml @@ -88,6 +88,7 @@ vroom: # volumeMounts: [] relay: + enabled: true replicas: 1 # args: [] mode: managed @@ -101,6 +102,10 @@ relay: affinity: {} nodeSelector: {} securityContext: {} + # if you are using GKE Ingress controller use 'securityPolicy' to add Google Cloud Armor Ingress policy + securityPolicy: "" + # if you are using GKE Ingress controller use 'customResponseHeaders' to add custom response header + customResponseHeaders: [] containerSecurityContext: {} service: annotations: {} @@ -118,6 +123,7 @@ relay: init: resources: {} # additionalArgs: [] + # credentialsSubcommand: "" # env: [] # volumes: [] # volumeMounts: [] @@ -133,6 +139,7 @@ sentry: # existingSecretKey: "my-secret-key" singleOrganization: true web: + enabled: true # if using filestore backend filesystem with RWO access, set strategyType to Recreate strategyType: RollingUpdate replicas: 1 @@ -146,6 +153,10 @@ sentry: affinity: {} nodeSelector: {} securityContext: {} + # if you are using GKE Ingress controller use 'securityPolicy' to add Google Cloud Armor Ingress policy + securityPolicy: "" + # if you are using GKE Ingress controller use 'customResponseHeaders' to add custom response header + customResponseHeaders: [] containerSecurityContext: {} service: annotations: {} @@ -170,8 +181,10 @@ sentry: vstsLimitedScopes: true enableProfiling: false enableSessionReplay: true + enableFeedback: false worker: + enabled: true replicas: 3 # concurrency: 4 env: [] @@ -198,64 +211,10 @@ sentry: volumeMounts: [] ingestConsumer: + enabled: true replicas: 1 # concurrency: 4 env: [] - resources: {} - affinity: {} - nodeSelector: {} - securityContext: {} - containerSecurityContext: {} - # tolerations: [] - # podLabels: [] - # maxBatchSize: "" - - # it's better to use prometheus adapter and scale based on - # the size of the rabbitmq queue - autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 3 - targetCPUUtilizationPercentage: 50 - sidecars: [] - volumes: [] - - # volumeMounts: - # - mountPath: /dev/shm - # name: dshm - - ingestMetricsConsumerPerf: - replicas: 1 - # concurrency: 4 - env: [] - resources: {} - affinity: {} - nodeSelector: {} - securityContext: {} - containerSecurityContext: {} - # tolerations: [] - # podLabels: [] - # maxBatchSize: "" - - # it's better to use prometheus adapter and scale based on - # the size of the rabbitmq queue - autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 3 - targetCPUUtilizationPercentage: 50 - sidecars: [] - volumes: [] - - # volumeMounts: - # - mountPath: /dev/shm - # name: dshm - - ingestMetricsConsumerRh: - replicas: 1 - # concurrency: 4 - env: [] - resources: {} affinity: {} nodeSelector: {} securityContext: {} @@ -266,19 +225,39 @@ sentry: # it's better to use prometheus adapter and scale based on # the size of the rabbitmq queue - autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 3 - targetCPUUtilizationPercentage: 50 sidecars: [] volumes: [] + events: + replicas: 1 + autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 3 + resources: {} + attachments: + replicas: 1 + autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 3 + targetCPUUtilizationPercentage: 50 + resources: {} + transactions: + replicas: 1 + autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 3 + targetCPUUtilizationPercentage: 50 + resources: {} # volumeMounts: # - mountPath: /dev/shm # name: dshm + # noStrictOffsetReset: false ingestReplayRecordings: + enabled: true replicas: 1 env: [] resources: {} @@ -328,6 +307,7 @@ sentry: # - mountPath: /dev/shm # name: dshm ingestOccurrences: + enabled: true replicas: 1 env: [] resources: {} @@ -353,6 +333,7 @@ sentry: # name: dshm ingestMonitors: + enabled: true replicas: 1 env: [] resources: {} @@ -378,6 +359,7 @@ sentry: # name: dshm billingMetricsConsumer: + enabled: true replicas: 1 # concurrency: 4 env: [] @@ -405,6 +387,7 @@ sentry: # name: dshm genericMetricsConsumer: + enabled: true replicas: 1 # concurrency: 4 env: [] @@ -432,6 +415,7 @@ sentry: # name: dshm metricsConsumer: + enabled: true replicas: 1 # concurrency: 4 env: [] @@ -459,6 +443,7 @@ sentry: # name: dshm cron: + enabled: true replicas: 1 env: [] resources: {} @@ -469,8 +454,11 @@ sentry: sidecars: [] volumes: [] # volumeMounts: [] + ## Log level can be any of: DEBUG, INFO, WARNING, ERROR, CRITICAL, FATAL + # logLevel: info subscriptionConsumerEvents: + enabled: true replicas: 1 env: [] resources: {} @@ -501,6 +489,7 @@ sentry: # volumeMounts: [] subscriptionConsumerTransactions: + enabled: true replicas: 1 env: [] resources: {} @@ -515,8 +504,8 @@ sentry: # noStrictOffsetReset: false # volumeMounts: [] - postProcessForwardErrors: + enabled: true replicas: 1 env: [] resources: {} @@ -531,6 +520,7 @@ sentry: # volumeMounts: [] postProcessForwardTransactions: + enabled: true replicas: 1 env: [] resources: {} @@ -543,7 +533,9 @@ sentry: sidecars: [] volumes: [] # volumeMounts: [] + # noStrictOffsetReset: false postProcessForwardIssuePlatform: + enabled: true replicas: 1 env: [] resources: {} @@ -558,6 +550,7 @@ sentry: # volumeMounts: [] subscriptionConsumerGenericMetrics: + enabled: true replicas: 1 env: [] resources: {} @@ -572,6 +565,7 @@ sentry: # volumeMounts: [] subscriptionConsumerMetrics: + enabled: true replicas: 1 env: [] resources: {} @@ -603,6 +597,7 @@ sentry: snuba: api: + enabled: true replicas: 1 # set command to ["snuba","api"] if securityContext.runAsUser > 0 # see: https://github.com/getsentry/snuba/issues/956 @@ -635,6 +630,7 @@ snuba: # volumeMounts: [] consumer: + enabled: true replicas: 1 env: [] resources: {} @@ -663,6 +659,7 @@ snuba: # medium: Memory outcomesConsumer: + enabled: true replicas: 1 env: [] resources: {} @@ -691,6 +688,7 @@ snuba: # medium: Memory replacer: + enabled: true replicas: 1 env: [] resources: {} @@ -708,6 +706,7 @@ snuba: # volumeMounts: [] metricsConsumer: + enabled: true replicas: 1 env: [] resources: {} @@ -722,6 +721,7 @@ snuba: # volumeMounts: [] subscriptionConsumerEvents: + enabled: true replicas: 1 env: [] resources: {} @@ -736,6 +736,7 @@ snuba: # volumeMounts: [] genericMetricsCountersConsumer: + enabled: true replicas: 1 env: [] resources: {} @@ -750,6 +751,7 @@ snuba: # volumeMounts: [] genericMetricsDistributionConsumer: + enabled: true replicas: 1 env: [] resources: {} @@ -764,6 +766,7 @@ snuba: # volumeMounts: [] genericMetricsSetsConsumer: + enabled: true replicas: 1 env: [] resources: {} @@ -778,6 +781,7 @@ snuba: # volumeMounts: [] subscriptionConsumerMetrics: + enabled: true replicas: 1 env: [] resources: {} @@ -792,6 +796,7 @@ snuba: # volumeMounts: [] subscriptionConsumerTransactions: + enabled: true replicas: 1 env: [] resources: {} @@ -823,6 +828,7 @@ snuba: # volumeMounts: [] replaysConsumer: + enabled: true replicas: 1 env: [] resources: {} @@ -879,6 +885,7 @@ snuba: # medium: Memory transactionsConsumer: + enabled: true replicas: 1 env: [] resources: {} @@ -962,6 +969,7 @@ snuba: # emptyDir: # medium: Memory issueOccurrenceConsumer: + enabled: true replicas: 1 env: [] resources: {} @@ -995,12 +1003,15 @@ snuba: migrateJob: env: [] + clickhouse: + maxConnections: 100 hooks: enabled: true removeOnSuccess: true activeDeadlineSeconds: 100 shareProcessNamespace: false dbCheck: + enabled: true image: # repository: subfuzion/netcat # tag: latest @@ -1023,6 +1034,7 @@ hooks: # volumes: [] # volumeMounts: [] dbInit: + enabled: true env: [] # podLabels: [] podAnnotations: {} @@ -1040,6 +1052,7 @@ hooks: # volumes: [] # volumeMounts: [] snubaInit: + enabled: true # As snubaInit doesn't support configuring partition and replication factor, you can disable snubaInit's kafka topic creation by setting `kafka.enabled` to `false`, # and create the topics using `kafka.provisioning.topics` with the desired partition and replication factor. # Note that when you set `kafka.enabled` to `false`, snuba component might fail to start if newly added topics are not created by `kafka.provisioning`. @@ -1059,7 +1072,8 @@ hooks: # tolerations: [] # volumes: [] # volumeMounts: [] - snubaMigrate: {} + snubaMigrate: + enabled: true # podLabels: [] # volumes: [] # volumeMounts: [] @@ -1270,7 +1284,8 @@ filestore: ## be used existingClaim: "" - gcs: {} + gcs: + {} ## Point this at a pre-configured secret containing a service account. The resulting ## secret will be mounted at /var/run/secrets/google # secretName: @@ -1278,7 +1293,12 @@ filestore: # bucketName: ## Currently unconfigured and changing this has no impact on the template configuration. + ## Note that you can use a secret with default references "s3-access-key-id" and "s3-secret-access-key". + ## Otherwise, you can use custom secret references, or use plain text values. s3: {} + # existingSecret: + # accessKeyIdRef: + # secretAccessKeyRef: # accessKey: # secretKey: # bucketName: @@ -1298,6 +1318,7 @@ config: # No YAML relay config given web: httpKeepalive: 15 + workers: 3 clickhouse: enabled: true @@ -1374,16 +1395,6 @@ zookeeper: # See https://github.com/bitnami/charts/tree/master/bitnami/kafka kafka: enabled: true - replicaCount: 3 - allowPlaintextListener: true - defaultReplicationFactor: 3 - offsetsTopicReplicationFactor: 3 - transactionStateLogReplicationFactor: 3 - transactionStateLogMinIsr: 3 - # 50 MB - maxMessageBytes: "50000000" - # 50 MB - socketRequestMaxBytes: "50000000" provisioning: enabled: true # Topic list is based on files below. @@ -1396,18 +1407,30 @@ kafka: "message.timestamp.type": LogAppendTime - name: event-replacements - name: snuba-commit-log + config: + "cleanup.policy": "compact,delete" + "min.compaction.lag.ms": "3600000" - name: cdc - name: transactions config: "message.timestamp.type": LogAppendTime - name: snuba-transactions-commit-log + config: + "cleanup.policy": "compact,delete" + "min.compaction.lag.ms": "3600000" - name: snuba-metrics config: "message.timestamp.type": LogAppendTime - name: outcomes - name: ingest-sessions - name: snuba-sessions-commit-log + config: + "cleanup.policy": "compact,delete" + "min.compaction.lag.ms": "3600000" - name: snuba-metrics-commit-log + config: + "cleanup.policy": "compact,delete" + "min.compaction.lag.ms": "3600000" - name: scheduled-subscriptions-events - name: scheduled-subscriptions-transactions - name: scheduled-subscriptions-sessions @@ -1435,12 +1458,24 @@ kafka: config: "message.timestamp.type": LogAppendTime - name: snuba-generic-metrics-sets-commit-log + config: + "cleanup.policy": "compact,delete" + "min.compaction.lag.ms": "3600000" - name: snuba-generic-metrics-distributions-commit-log + config: + "cleanup.policy": "compact,delete" + "min.compaction.lag.ms": "3600000" - name: snuba-generic-metrics-counters-commit-log + config: + "cleanup.policy": "compact,delete" + "min.compaction.lag.ms": "3600000" - name: generic-events config: "message.timestamp.type": LogAppendTime - name: snuba-generic-events-commit-log + config: + "cleanup.policy": "compact,delete" + "min.compaction.lag.ms": "3600000" - name: group-attributes config: "message.timestamp.type": LogAppendTime @@ -1465,13 +1500,20 @@ kafka: - name: profiles - name: ingest-occurrences - name: snuba-spans + - name: shared-resources-usage + listeners: + client: + protocol: "PLAINTEXT" + controller: + protocol: "PLAINTEXT" + interbroker: + protocol: "PLAINTEXT" + external: + protocol: "PLAINTEXT" zookeeper: - enabled: true - kraft: enabled: false - service: - ports: - client: 9092 + kraft: + enabled: true ## Use this to enable an extra service account # serviceAccount: @@ -1576,7 +1618,8 @@ rabbitmq: persistence: enabled: true resources: {} - memoryHighWatermark: {} + memoryHighWatermark: + {} # enabled: true # type: relative # value: 0.4 @@ -1644,6 +1687,8 @@ memcached: metrics: enabled: false + podAnnotations: {} + ## Configure extra options for liveness and readiness probes ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes) livenessProbe: @@ -1702,7 +1747,6 @@ metrics: # honorLabels: true revisionHistoryLimit: 10 - # dnsPolicy: "ClusterFirst" # dnsConfig: # nameservers: []