chore: removed agamotto addon (#8324)

apecloud · Nov 5, 2024 · bed1a72 · bed1a72
1 parent 25b5850
commit bed1a72
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 339 deletions.
diff --git a/deploy/helm/templates/_helpers.tpl b/deploy/helm/templates/_helpers.tpl
@@ -270,13 +270,6 @@ Define addon loki name
 {{- print "loki" }}
 {{- end }}
 
-{{/*
-Define addon apecloud-otel-collector name
-*/}}
-{{- define "addon.apecloud-otel-collector.name" -}}
-{{- print "apecloud-otel-collector" }}
-{{- end }}
-
 {{/*
 Get cloud provider, now support aws, gcp, aliyun and tencentCloud.
 TODO: For azure, we should get provider from node.Spec.ProviderID

diff --git a/deploy/helm/templates/applications/apecloud-otel-collector-addon.yaml b/deploy/helm/templates/applications/apecloud-otel-collector-addon.yaml
diff --git a/deploy/helm/templates/applications/apecloud-otel-collector-values.yaml b/deploy/helm/templates/applications/apecloud-otel-collector-values.yaml
diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -475,7 +475,6 @@ autoInstalledAddons:
   - "qdrant"
   - "redis"
   - "alertmanager-webhook-adaptor"
-  - "apecloud-otel-collector"
   - "aws-load-balancer-controller"
   - "csi-hostpath-driver"
   - "csi-driver-nfs"
@@ -1476,9 +1475,6 @@ prometheus:
         - source_labels: [__meta_kubernetes_service_label_app_kubernetes_io_managed_by]
           action: keep
           regex: kubeblocks
-        - source_labels: [__meta_kubernetes_service_label_monitor_kubeblocks_io_managed_by]
-          action: drop
-          regex: agamotto
         - source_labels: [__meta_kubernetes_service_annotation_monitor_kubeblocks_io_scrape]
           action: keep
           regex: true
@@ -1516,39 +1512,6 @@ prometheus:
           regex: Succeeded|Failed|Completed
           action: drop
 
-      - job_name: 'kubeblocks-agamotto'
-        honor_labels: true
-
-        kubernetes_sd_configs:
-        - role: endpoints
-
-        relabel_configs:
-        - source_labels: [__meta_kubernetes_service_label_monitor_kubeblocks_io_managed_by]
-          action: keep
-          regex: agamotto
-        - source_labels: [__meta_kubernetes_service_annotation_monitor_kubeblocks_io_scrape]
-          action: keep
-          regex: true
-        - source_labels: [__meta_kubernetes_service_annotation_monitor_kubeblocks_io_scheme]
-          action: replace
-          target_label: __scheme__
-          regex: (https?)
-        - source_labels: [__meta_kubernetes_service_annotation_monitor_kubeblocks_io_path]
-          action: replace
-          target_label: __metrics_path__
-          regex: (.+)
-        - source_labels: [__address__, __meta_kubernetes_service_annotation_monitor_kubeblocks_io_port]
-          action: replace
-          target_label: __address__
-          regex: (.+?)(?::\d+)?;(\d+)
-          replacement: $1:$2
-        - action: labelmap
-          regex: __meta_kubernetes_service_annotation_monitor_kubeblocks_io_param_(.+)
-          replacement: __param_$1
-        - source_labels: [__meta_kubernetes_pod_phase]
-          regex: Pending|Succeeded|Failed|Completed
-          action: drop
-
   pushgateway:
     ## If false, pushgateway will not be installed
     ##
@@ -1818,13 +1781,6 @@ enabledAlphaFeatureGates:
   recoverVolumeExpansionFailure: false
 
 
-agamotto:
-  enabled: false
-  image:
-    # if the value of agamotto.image.registry is not specified using `--set`, it will be set to the value of 'image.registry' by default
-    registry: ""
-
-
 provider: "" # cloud be "aws","gcp","aliyun","tencentCloud", "huaweiCloud", "azure"
 validProviders:
  - "aws"
@@ -1936,9 +1892,6 @@ vmagent:
           - source_labels: [ __meta_kubernetes_service_label_app_kubernetes_io_managed_by ]
             action: keep
             regex: kubeblocks
-          - source_labels: [ __meta_kubernetes_service_label_monitor_kubeblocks_io_managed_by ]
-            action: drop
-            regex: agamotto
           - source_labels: [ __meta_kubernetes_service_annotation_monitor_kubeblocks_io_scrape ]
             action: keep
             regex: true
@@ -1976,39 +1929,6 @@ vmagent:
             regex: Pending|Succeeded|Failed|Completed
             action: drop
 
-      - job_name: 'kubeblocks-agamotto'
-        honor_labels: true
-
-        kubernetes_sd_configs:
-          - role: endpoints
-
-        relabel_configs:
-          - source_labels: [ __meta_kubernetes_service_label_monitor_kubeblocks_io_managed_by ]
-            action: keep
-            regex: agamotto
-          - source_labels: [ __meta_kubernetes_service_annotation_monitor_kubeblocks_io_scrape ]
-            action: keep
-            regex: true
-          - source_labels: [ __meta_kubernetes_service_annotation_monitor_kubeblocks_io_scheme ]
-            action: replace
-            target_label: __scheme__
-            regex: (https?)
-          - source_labels: [ __meta_kubernetes_service_annotation_monitor_kubeblocks_io_path ]
-            action: replace
-            target_label: __metrics_path__
-            regex: (.+)
-          - source_labels: [ __address__, __meta_kubernetes_service_annotation_monitor_kubeblocks_io_port ]
-            action: replace
-            target_label: __address__
-            regex: (.+?)(?::\d+)?;(\d+)
-            replacement: $1:$2
-          - action: labelmap
-            regex: __meta_kubernetes_service_annotation_monitor_kubeblocks_io_param_(.+)
-            replacement: __param_$1
-          - source_labels: [ __meta_kubernetes_pod_phase ]
-            regex: Pending|Succeeded|Failed|Completed
-            action: drop
-
 crd:
   enabled: true