diff --git a/README.md b/README.md index dac9cce2a8..6a95aeb675 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ Services available on the Cluster - limit access to elifesciences github org - __SealedSecrets__ ([docs/sealed-secrets.md](docs/sealed-secrets.md)) - encrypt secrets for safe storage in this repo -- __Loki__ +- __VictoriaLogs__ - Stores logs for services in cluster, is queriable from Grafana as a data source. - __Percona Server for MongoDB operator__ - Used to run a MongoDB cluster, with support for automated backup, reconvery and upgrades. diff --git a/clusters/end-to-end-tests/system.yaml b/clusters/end-to-end-tests/system.yaml index 0b78e87ad6..6b372a78d6 100644 --- a/clusters/end-to-end-tests/system.yaml +++ b/clusters/end-to-end-tests/system.yaml @@ -100,18 +100,6 @@ spec: target: kind: HelmRelease name: vector - - target: - kind: HelmRelease - name: loki - patch: | - apiVersion: helm.toolkit.fluxcd.io/v2 - kind: HelmRelease - metadata: - name: loki - namespace: grafana - spec: - install: - disableWait: true - target: kind: HelmRelease name: mimir diff --git a/docs/guide-for-application-teams.md b/docs/guide-for-application-teams.md index 5e069e8003..f71e9db7e9 100644 --- a/docs/guide-for-application-teams.md +++ b/docs/guide-for-application-teams.md @@ -122,7 +122,7 @@ Services available on the Cluster - pulls in secrets from storage easily accessible to the application teams - __SealedSecrets__ ([docs/sealed-secrets.md](docs/sealed-secrets.md)) - encrypt secrets for safe storage in this repo -- __Loki__ +- __VictoriaLogs__ - Stores logs for services in cluster, is queriable from Grafana as a data source. - __Percona Server for MongoDB operator__ - Used to run a MongoDB cluster, with support for automated backup, reconvery and upgrades. diff --git a/system/ack-system/documentdb-release.yaml b/system/ack-system/documentdb-release.yaml index 53d47e6ad2..a20b17ea8d 100644 --- a/system/ack-system/documentdb-release.yaml +++ b/system/ack-system/documentdb-release.yaml @@ -11,7 +11,7 @@ spec: chart: spec: chart: documentdb-chart - version: 0.0.8 + version: 1.0.0 sourceRef: kind: HelmRepository name: ack diff --git a/system/ack-system/iam-release.yaml b/system/ack-system/iam-release.yaml index 554cd765e3..fe1dff5299 100644 --- a/system/ack-system/iam-release.yaml +++ b/system/ack-system/iam-release.yaml @@ -11,7 +11,7 @@ spec: chart: spec: chart: iam-chart - version: 1.3.11 + version: 1.3.12 sourceRef: kind: HelmRepository name: ack diff --git a/system/ack-system/opensearch-release.yaml b/system/ack-system/opensearch-release.yaml index c026d25e0e..678f827d26 100644 --- a/system/ack-system/opensearch-release.yaml +++ b/system/ack-system/opensearch-release.yaml @@ -11,7 +11,7 @@ spec: chart: spec: chart: opensearchservice-chart - version: 0.0.27 + version: 1.0.0 sourceRef: kind: HelmRepository name: ack diff --git a/system/ack-system/rds-release.yaml b/system/ack-system/rds-release.yaml index 037f8b2b80..bc35df079c 100644 --- a/system/ack-system/rds-release.yaml +++ b/system/ack-system/rds-release.yaml @@ -11,7 +11,7 @@ spec: chart: spec: chart: rds-chart - version: 1.4.3 + version: 1.4.4 sourceRef: kind: HelmRepository name: ack diff --git a/system/ack-system/s3-release.yaml b/system/ack-system/s3-release.yaml index cc0b7745cd..25bf815ab4 100644 --- a/system/ack-system/s3-release.yaml +++ b/system/ack-system/s3-release.yaml @@ -11,7 +11,7 @@ spec: chart: spec: chart: s3-chart - version: 1.0.15 + version: 1.0.16 sourceRef: kind: HelmRepository name: ack diff --git a/system/ack-system/sqs-release.yaml b/system/ack-system/sqs-release.yaml index 36a6031bea..4d4a734067 100644 --- a/system/ack-system/sqs-release.yaml +++ b/system/ack-system/sqs-release.yaml @@ -11,7 +11,7 @@ spec: chart: spec: chart: sqs-chart - version: 1.0.15 + version: 1.0.16 sourceRef: kind: HelmRepository name: ack diff --git a/system/clusterclasses/base/kustomization.yaml b/system/clusterclasses/base/kustomization.yaml index 8e9e76c420..451559f109 100644 --- a/system/clusterclasses/base/kustomization.yaml +++ b/system/clusterclasses/base/kustomization.yaml @@ -9,7 +9,6 @@ resources: - ../../gemini - ../../grafana - ../../keda -# - ../../loki - ../../kube-web-view - ../../kubecost - ../../metrics-server diff --git a/system/external-secrets/external-secrets/release.yaml b/system/external-secrets/external-secrets/release.yaml index b9c323808f..b30512660f 100644 --- a/system/external-secrets/external-secrets/release.yaml +++ b/system/external-secrets/external-secrets/release.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: external-secrets - version: 0.10.0 + version: 0.10.2 sourceRef: kind: HelmRepository name: external-secrets diff --git a/system/grafana/release.yaml b/system/grafana/release.yaml index 1ebaa2b89b..5190ab8b57 100644 --- a/system/grafana/release.yaml +++ b/system/grafana/release.yaml @@ -33,7 +33,7 @@ spec: enabled: true searchNamespace: ALL plugins: - - https://github.com/VictoriaMetrics/victorialogs-datasource/releases/download/v0.2.6/victorialogs-datasource-v0.2.6.zip;victorialogs-datasource + - https://github.com/VictoriaMetrics/victorialogs-datasource/releases/download/v0.4.0/victorialogs-datasource-v0.4.0.zip;victorialogs-datasource grafana.ini: plugins: allow_loading_unsigned_plugins: victorialogs-datasource diff --git a/system/infra/external-dns/release.yaml b/system/infra/external-dns/release.yaml index 5e7478dd38..f5fff0686e 100644 --- a/system/infra/external-dns/release.yaml +++ b/system/infra/external-dns/release.yaml @@ -11,7 +11,7 @@ spec: chart: spec: chart: external-dns - version: 8.3.5 + version: 8.3.7 sourceRef: kind: HelmRepository name: external-dns diff --git a/system/infra/oauth2-proxy/release.yaml b/system/infra/oauth2-proxy/release.yaml index 905794f656..18e10ed7b6 100644 --- a/system/infra/oauth2-proxy/release.yaml +++ b/system/infra/oauth2-proxy/release.yaml @@ -11,7 +11,7 @@ spec: chart: spec: chart: oauth2-proxy - version: 7.7.9 + version: 7.7.16 sourceRef: kind: HelmRepository name: oauth2-proxy diff --git a/system/kubecost/release.yaml b/system/kubecost/release.yaml index 62002fdcb5..1e1c6b7075 100644 --- a/system/kubecost/release.yaml +++ b/system/kubecost/release.yaml @@ -11,7 +11,7 @@ spec: chart: spec: chart: cost-analyzer - version: 2.3.4 + version: 2.3.5 sourceRef: kind: HelmRepository name: kubecost diff --git a/system/loki/datasource.yaml b/system/loki/datasource.yaml deleted file mode 100644 index 1849f98de0..0000000000 --- a/system/loki/datasource.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-datasource-loki - labels: - grafana_datasource: "1" -data: - datasource.yaml: |- - apiVersion: 1 - datasources: - - name: loki - type: loki - url: "http://loki-gateway.loki/" diff --git a/system/loki/kustomization.yaml b/system/loki/kustomization.yaml deleted file mode 100644 index 7d150bbc91..0000000000 --- a/system/loki/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: loki -resources: -- namespace.yaml -- source.yaml -- release.yaml -- datasource.yaml diff --git a/system/loki/namespace.yaml b/system/loki/namespace.yaml deleted file mode 100644 index 9ed11b61cd..0000000000 --- a/system/loki/namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: loki - annotations: - elifesciences.org/default-project: ${cluster_name} diff --git a/system/loki/release.yaml b/system/loki/release.yaml deleted file mode 100644 index 0ce689a555..0000000000 --- a/system/loki/release.yaml +++ /dev/null @@ -1,133 +0,0 @@ ---- -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: loki - -spec: - interval: 1m - timeout: 10m - releaseName: loki - chart: - spec: - chart: loki - version: 6.10.0 - sourceRef: - kind: HelmRepository - name: grafana - interval: 1m - install: - remediation: - retries: 5 - - values: - deploymentMode: SimpleScalable - backend: - replicas: 3 - resources: - requests: - cpu: 10m - memory: 90Mi - limits: null - - read: - replicas: 3 - resources: - requests: - cpu: 10m - memory: 100Mi - limits: null - - write: - replicas: 3 - resources: - requests: - cpu: 80m - memory: 500Mi - limits: null - - gateway: - replicas: 1 - resources: - requests: - cpu: 10m - memory: 15Mi - limits: null - lokiCanary: - enabled: false - singleBinary: - replicas: 0 - ingester: - replicas: 0 - querier: - replicas: 0 - queryFrontend: - replicas: 0 - queryScheduler: - replicas: 0 - distributor: - replicas: 0 - compactor: - replicas: 0 - indexGateway: - replicas: 0 - bloomCompactor: - replicas: 0 - bloomGateway: - replicas: 0 - - loki: - schemaConfig: - configs: - - from: "2024-04-01" - store: tsdb - object_store: s3 - schema: v13 - index: - prefix: loki_index_ - period: 24h - auth_enabled: false - ingester: - chunk_encoding: snappy - compactor: - retention_enabled: true - retention_delete_delay: "10m" - compaction_interval: "10m" - delete_request_store: s3 - limits_config: - retention_period: 360h - storage: - s3: - region: us-east-1 - bucketNames: - chunks: elife-${cluster_name}-loki-logs - ruler: elife-${cluster_name}-loki-logs - admin: elife-${cluster_name}-loki-logs - chunksCache: - allocatedMemory: 512 - resources: - requests: - cpu: 10m - memory: 520Mi - limits: null - - resultsCache: - allocatedMemory: 128 - resources: - requests: - cpu: 10m - memory: 128Mi - limits: null - - test: - enabled: false - serviceAccount: - annotations: - eks.amazonaws.com/role-arn: arn:aws:iam::512686554592:role/elife-${cluster_name}-loki-cluster-role - - sidecar: - resources: - requests: - cpu: 10m - memory: 90Mi - limits: null diff --git a/system/loki/source.yaml b/system/loki/source.yaml deleted file mode 100644 index 7c01680b5b..0000000000 --- a/system/loki/source.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: grafana -spec: - interval: 5m0s - url: https://grafana.github.io/helm-charts diff --git a/system/spegel/release.yaml b/system/spegel/release.yaml index 82f5162282..498aee8d72 100644 --- a/system/spegel/release.yaml +++ b/system/spegel/release.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: spegel - version: "v0.0.23" + version: "v0.0.24" interval: 5m sourceRef: kind: HelmRepository diff --git a/system/temporal/temporal-kustomization.yaml b/system/temporal/temporal-kustomization.yaml index e38073a55c..ac7d055349 100644 --- a/system/temporal/temporal-kustomization.yaml +++ b/system/temporal/temporal-kustomization.yaml @@ -17,7 +17,7 @@ spec: - name: temporalio/server newTag: 1.24.2 - name: temporalio/ui - newTag: 2.29.2 + newTag: 2.30.2 - name: temporalio/admin-tools newTag: 1.24.1-tctl-1.18.1-cli-0.12.0 postBuild: diff --git a/system/vector/release.yaml b/system/vector/release.yaml index 4d3e201953..06e49345ce 100644 --- a/system/vector/release.yaml +++ b/system/vector/release.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: vector - version: 0.35.0 + version: 0.35.1 sourceRef: kind: HelmRepository name: vector diff --git a/system/victorialogs/release.yaml b/system/victorialogs/release.yaml index 7a4ef88fb4..aba6f42633 100644 --- a/system/victorialogs/release.yaml +++ b/system/victorialogs/release.yaml @@ -10,14 +10,14 @@ spec: sourceRef: kind: HelmRepository name: victoriametrics - version: "0.5.4" + version: "0.6.1" interval: 1h0m0s values: server: retentionPeriod: 30d persistentVolume: enabled: true - storageClass: ebs-gp3 + storageClassName: ebs-gp3 size: 40Gi ingress: enabled: true