From 21247ccafaa78797fb938b60d53301bf5335850b Mon Sep 17 00:00:00 2001 From: Scott Aubrey Date: Mon, 9 Sep 2024 06:50:50 +0100 Subject: [PATCH] chore(loki): cleanup Loki definitions from repo elifesciences/issues#8743 --- README.md | 2 +- docs/guide-for-application-teams.md | 2 +- system/clusterclasses/base/kustomization.yaml | 1 - system/loki/datasource.yaml | 13 -- system/loki/kustomization.yaml | 8 -- system/loki/namespace.yaml | 7 - system/loki/release.yaml | 133 ------------------ system/loki/source.yaml | 8 -- 8 files changed, 2 insertions(+), 172 deletions(-) delete mode 100644 system/loki/datasource.yaml delete mode 100644 system/loki/kustomization.yaml delete mode 100644 system/loki/namespace.yaml delete mode 100644 system/loki/release.yaml delete mode 100644 system/loki/source.yaml 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/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/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/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