-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into split-1928-test-render
- Loading branch information
Showing
21 changed files
with
574 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
...i/stages/kubernetes_services/template/modules/kubernetes/services/monitoring/loki/main.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| resource "random_password" "minio_root_password" { | ||
| length = 32 | ||
| special = false | ||
| } | ||
|
|
||
| locals { | ||
| minio-url = "http://${var.minio-release-name}:${var.minio-port}" | ||
| node-selector = { | ||
| "${var.node-group.key}" = "${var.node-group.value}" | ||
| } | ||
| } | ||
|
|
||
| resource "helm_release" "loki-minio" { | ||
| count = var.minio-enabled ? 1 : 0 | ||
| name = var.minio-release-name | ||
| namespace = var.namespace | ||
| repository = "https://raw.githubusercontent.com/bitnami/charts/defb094c658024e4aa8245622dab202874880cbc/bitnami" | ||
| chart = "minio" | ||
| # last release that was Apache-2.0 | ||
| version = var.minio-helm-chart-version | ||
|
|
||
| set { | ||
| name = "accessKey.password" | ||
| value = "admin" | ||
| } | ||
|
|
||
| set { | ||
| name = "secretKey.password" | ||
| value = random_password.minio_root_password.result | ||
| } | ||
|
|
||
| set { | ||
| name = "defaultBuckets" | ||
| value = join(" ", var.buckets) | ||
| } | ||
|
|
||
| set { | ||
| name = "persistence.size" | ||
| value = var.minio-storage | ||
| } | ||
|
|
||
| values = concat([ | ||
| file("${path.module}/values_minio.yaml"), | ||
| jsonencode({ | ||
| nodeSelector : local.node-selector | ||
| }) | ||
| ], var.grafana-loki-minio-overrides) | ||
| } | ||
|
|
||
|
|
||
| resource "helm_release" "grafana-loki" { | ||
| name = "nebari-loki" | ||
| namespace = var.namespace | ||
| repository = "https://grafana.github.io/helm-charts" | ||
| chart = "loki" | ||
| version = var.loki-helm-chart-version | ||
|
|
||
| values = concat([ | ||
| file("${path.module}/values_loki.yaml"), | ||
| jsonencode({ | ||
| loki : { | ||
| storage : { | ||
| s3 : { | ||
| endpoint : local.minio-url, | ||
| accessKeyId : "admin" | ||
| secretAccessKey : random_password.minio_root_password.result, | ||
| s3ForcePathStyle : true | ||
| } | ||
| } | ||
| } | ||
| storageConfig : { | ||
| # We configure MinIO by using the AWS config because MinIO implements the S3 API | ||
| aws : { | ||
| s3 : local.minio-url | ||
| s3ForcePathStyle : true | ||
| } | ||
| } | ||
| write : { nodeSelector : local.node-selector } | ||
| read : { nodeSelector : local.node-selector } | ||
| backend : { nodeSelector : local.node-selector } | ||
| gateway : { nodeSelector : local.node-selector } | ||
| }) | ||
| ], var.grafana-loki-overrides) | ||
|
|
||
| depends_on = [helm_release.loki-minio] | ||
| } | ||
|
|
||
| resource "helm_release" "grafana-promtail" { | ||
| # Promtail ships the contents of logs to Loki instance | ||
| name = "nebari-promtail" | ||
| namespace = var.namespace | ||
| repository = "https://grafana.github.io/helm-charts" | ||
| chart = "promtail" | ||
| version = var.promtail-helm-chart-version | ||
|
|
||
| values = concat([ | ||
| file("${path.module}/values_promtail.yaml"), | ||
| jsonencode({ | ||
| }) | ||
| ], var.grafana-promtail-overrides) | ||
|
|
||
| depends_on = [helm_release.grafana-loki] | ||
| } |
78 changes: 78 additions & 0 deletions
78
...kubernetes_services/template/modules/kubernetes/services/monitoring/loki/values_loki.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| # https://github.com/grafana/loki/blob/4cae003ecedd474e4c15feab4ea2ef435afff83f/production/helm/loki/values.yaml | ||
|
|
||
| loki: | ||
| storage: | ||
| type: s3 | ||
| commonConfig: | ||
| replication_factor: 1 | ||
| # Not required as it is inside cluster and not exposed to the public network | ||
| auth_enabled: false | ||
|
|
||
| # The Compactor deduplicates index entries and also apply granular retention. | ||
| compactor: | ||
| # is the directory where marked chunks and temporary tables will be saved. | ||
| working_directory: /var/loki/compactor/data/retention | ||
| # minio s3 | ||
| shared_store: s3 | ||
| # how often compaction will happen | ||
| compaction_interval: 1h | ||
| # should delete old logs after retention delete delay | ||
| # ideally we would want to do storage based retention, but this is not | ||
| # currently implemented in loki, that's why we're doing time based retention. | ||
| retention_enabled: true | ||
| # is the delay after which the Compactor will delete marked chunks. | ||
| retention_delete_delay: 1h | ||
| # specifies the maximum quantity of goroutine workers instantiated to delete chunks. | ||
| retention_delete_worker_count: 150 | ||
|
|
||
| limits_config: | ||
| # The minimum retention period is 24h. | ||
| # This is reasonable in most cases, but if people would like to retain logs for longer | ||
| # then they can override this variable from nebari-config.yaml | ||
| retention_period: 60d | ||
|
|
||
| schema_config: | ||
| configs: | ||
| # list of period_configs | ||
| # The date of the first day that index buckets should be created. | ||
| - from: "2024-03-01" | ||
| index: | ||
| period: 24h | ||
| prefix: loki_index_ | ||
| object_store: s3 | ||
| schema: v11 | ||
| store: boltdb-shipper | ||
| storage_config: | ||
| boltdb_shipper: | ||
| # Directory where ingesters would write index files which would then be | ||
| # uploaded by shipper to configured storage | ||
| active_index_directory: /var/loki/compactor/data/index | ||
| # Cache location for restoring index files from storage for queries | ||
| cache_location: /var/loki/compactor/data/boltdb-cache | ||
| # Shared store for keeping index files | ||
| shared_store: s3 | ||
|
|
||
| # Configuration for the write pod(s) | ||
| write: | ||
| # -- Number of replicas for the write | ||
| # Keeping cost of running Nebari in mind | ||
| # We don't need so many replicas, if people need it | ||
| # they can always override from nebari-config.yaml | ||
| replicas: 1 | ||
|
|
||
| read: | ||
| # -- Number of replicas for the read | ||
| replicas: 1 | ||
|
|
||
| backend: | ||
| # -- Number of replicas for the backend | ||
| replicas: 1 | ||
|
|
||
| minio: | ||
| # We are deploying minio from bitnami chart separately | ||
| enabled: false | ||
|
|
||
| monitoring: | ||
| selfMonitoring: | ||
| grafanaAgent: | ||
| installOperator: false |
1 change: 1 addition & 0 deletions
1
...ubernetes_services/template/modules/kubernetes/services/monitoring/loki/values_minio.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| # https://github.com/bitnami/charts/blob/440ec159c26e4ff0748b9e9866b345d98220c40a/bitnami/minio/values.yaml |
1 change: 1 addition & 0 deletions
1
...rnetes_services/template/modules/kubernetes/services/monitoring/loki/values_promtail.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| # https://github.com/grafana/helm-charts/blob/3831194ba2abd2a0ca7a14ca00e578f8e9d2abc6/charts/promtail/values.yaml |
Oops, something went wrong.