Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: removed agamotto addon #8324

Merged
merged 2 commits into from
Nov 5, 2024
Merged

chore: removed agamotto addon #8324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f95e32
chore: removed agamotto addon
sophon-zt Oct 24, 2024
f83e86d
chore: remove apecloud-otel-collector from values.yaml
sophon-zt Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions deploy/helm/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
52 changes: 0 additions & 52 deletions deploy/helm/templates/applications/apecloud-otel-collector-addon.yaml
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions deploy/helm/templates/applications/apecloud-otel-collector-values.yaml
View file
Open in desktop

This file was deleted.

80 changes: 0 additions & 80 deletions deploy/helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,6 @@ autoInstalledAddons:
- "qdrant"
- "redis"
- "alertmanager-webhook-adaptor"
- "apecloud-otel-collector"
- "aws-load-balancer-controller"
- "csi-hostpath-driver"
- "csi-driver-nfs"
Expand Down Expand Up @@ -1475,9 +1474,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
Expand Down Expand Up @@ -1515,39 +1511,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
##
Expand Down Expand Up @@ -1817,13 +1780,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"
Expand Down Expand Up @@ -1935,9 +1891,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
Expand Down Expand Up @@ -1975,39 +1928,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

Expand Down
Loading
Loading