From af9f58bb7223a2dfd7843115ad1c7dbd85845a2e Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Wed, 8 May 2024 01:30:43 +0800 Subject: [PATCH] Revert "feat(victoria): re-add VMCluster" This reverts commit 319585dbe4cb34bc08ffc42bd2532bcf5d3b2635. --- .../monitoring/victoria/cluster/vmagent.yaml | 1 - .../monitoring/victoria/cluster/vmalert.yaml | 3 +- .../victoria/cluster/vmcluster.yaml | 103 ------------------ 3 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 kube/deploy/core/monitoring/victoria/cluster/vmcluster.yaml diff --git a/kube/deploy/core/monitoring/victoria/cluster/vmagent.yaml b/kube/deploy/core/monitoring/victoria/cluster/vmagent.yaml index 1c3fd310..8378829d 100644 --- a/kube/deploy/core/monitoring/victoria/cluster/vmagent.yaml +++ b/kube/deploy/core/monitoring/victoria/cluster/vmagent.yaml @@ -9,7 +9,6 @@ spec: selectAllByDefault: true remoteWrite: - url: "http://vmsingle-victoria.monitoring.svc:8429/api/v1/write" - - url: "http://vminsert-victoria.monitoring.svc:8480/insert/0/prometheus/api/v1/write" scrapeInterval: 30s replicaCount: 3 statefulMode: true diff --git a/kube/deploy/core/monitoring/victoria/cluster/vmalert.yaml b/kube/deploy/core/monitoring/victoria/cluster/vmalert.yaml index db9c71b5..f036b5ba 100644 --- a/kube/deploy/core/monitoring/victoria/cluster/vmalert.yaml +++ b/kube/deploy/core/monitoring/victoria/cluster/vmalert.yaml @@ -12,8 +12,7 @@ spec: externalLabels: cluster: "${CLUSTER_NAME}" datasource: &vm - #url: http://vmsingle-victoria.monitoring.svc:8429 - url: http://vmselect-victoria.monitoring.svc:8481/select/0/prometheus + url: http://vmsingle-victoria.monitoring.svc:8429 remoteRead: *vm remoteWrite: url: http://vmagent-victoria.monitoring.svc:8429 diff --git a/kube/deploy/core/monitoring/victoria/cluster/vmcluster.yaml b/kube/deploy/core/monitoring/victoria/cluster/vmcluster.yaml deleted file mode 100644 index a2040f7e..00000000 --- a/kube/deploy/core/monitoring/victoria/cluster/vmcluster.yaml +++ /dev/null @@ -1,103 +0,0 @@ ---- -# yaml-language-server: $schema=https://crds.jank.ing/operator.victoriametrics.com/vmcluster_v1beta1.json -apiVersion: operator.victoriametrics.com/v1beta1 -kind: VMCluster -metadata: - name: victoria - namespace: monitoring -spec: - retentionPeriod: "6" # months if no unit specified - replicationFactor: 3 - # extraArgs: - # dedup.minScrapeInterval: 1m - # storage: - # storageClassName: block - # accessModes: [ReadWriteOnce] - # volumeMode: Filesystem - # resources: - # requests: - # storage: 100Gi - # dataSourceRef: - # apiGroup: volsync.backube - # kind: ReplicationDestination - # name: victoria-vmsingle-bootstrap - # resources: # TODO: refine - # requests: - # cpu: 500m - # memory: 1Gi - # limits: - # cpu: 1 - # memory: 4Gi - vmstorage: - replicaCount: 3 - extraArgs: - dedup.minScrapeInterval: 1m - storageDataPath: /vm-data - storage: - volumeClaimTemplate: - spec: - storageClassName: local - resources: - requests: - storage: 10Gi - resources: - requests: - cpu: 200m - memory: 1Gi - limits: - cpu: 1 - memory: 4Gi - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: kubernetes.io/hostname - whenUnsatisfiable: DoNotSchedule - labelSelector: - matchLabels: - app.kubernetes.io/name: vmstorage - app.kubernetes.io/instance: victoria - vmselect: - replicaCount: 3 - extraArgs: - dedup.minScrapeInterval: 1m - search.minStalenessInterval: 5m - vmalert.proxyURL: http://vmalert-victoria.svc.cluster.local:8080 - cacheMountPath: /select-cache - storage: - volumeClaimTemplate: - spec: - storageClassName: local - resources: - requests: - storage: 2Gi - resources: - requests: - cpu: 200m - memory: 1Gi - limits: - cpu: 1 - memory: 4Gi - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: kubernetes.io/hostname - whenUnsatisfiable: DoNotSchedule - labelSelector: - matchLabels: - app.kubernetes.io/name: vmselect - app.kubernetes.io/instance: victoria - vminsert: - replicaCount: 2 - resources: - requests: - cpu: 150m - memory: 1Gi - limits: - cpu: 1 - memory: 4Gi - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: kubernetes.io/hostname - whenUnsatisfiable: DoNotSchedule - labelSelector: - matchLabels: - app.kubernetes.io/name: vminsert - app.kubernetes.io/instance: victoria