Skip to content
Snippets Groups Projects
Verified Commit 9bbcf414 authored by Vincent Sellier's avatar Vincent Sellier
Browse files

rancher/test-staging: Upgrade the monitoring application

- Reorder the fields to avoid having a wrong diff
- Add the alertmanagerConfigMatcherStrategy property
  to remove the filter of the alert matching
  namespace=cattle-monitoring-system

Related to sysadm-environment#5036
parent 30a5519f
No related branches found
No related tags found
No related merge requests found
...@@ -122,8 +122,14 @@ resource "rancher2_app_v2" "test-staging-rke2-rancher-monitoring" { ...@@ -122,8 +122,14 @@ resource "rancher2_app_v2" "test-staging-rke2-rancher-monitoring" {
namespace = "cattle-monitoring-system" namespace = "cattle-monitoring-system"
repo_name = "rancher-charts" repo_name = "rancher-charts"
chart_name = "rancher-monitoring" chart_name = "rancher-monitoring"
chart_version = "102.0.1+up40.1.2" chart_version = "103.1.0+up45.31.1"
values = <<EOF values = <<EOF
alertmanager:
alertmanagerSpec:
alertmanagerConfigMatcherStrategy:
type: None
configSecret: alertmanager-rancher-monitoring-alertmanager
useExistingSecret: true
prometheus: prometheus:
enabled: true enabled: true
prometheusSpec: prometheusSpec:
...@@ -135,10 +141,6 @@ prometheus: ...@@ -135,10 +141,6 @@ prometheus:
requests: requests:
cpu: 250m cpu: 250m
memory: 250Mi memory: 250Mi
# thanos:
# objectStorageConfig:
# key: thanos.yaml
# name: thanos-objstore-config-secret
resources: resources:
limits: limits:
cpu: 2000m cpu: 2000m
...@@ -146,31 +148,26 @@ prometheus: ...@@ -146,31 +148,26 @@ prometheus:
requests: requests:
cpu: 750m cpu: 750m
memory: 3500Mi memory: 3500Mi
# thanosIngress:
# annotations:
# cert-manager.io/cluster-issuer: letsencrypt-production-gandi
# metallb.universe.tf/allow-shared-ip: clusterIP
# nginx.ingress.kubernetes.io/backend-protocol: GRPC
# enabled: true
# hosts:
# - k8s-test-staging-rke2-thanos.internal.staging.swh.network
# loadBalancerIP: 192.168.130.129
# pathType: Prefix
# tls:
# - hosts:
# - k8s-test-staging-rke2-thanos.internal.staging.swh.network
# secretName: thanos-crt
prometheus-node-exporter: prometheus-node-exporter:
prometheus: prometheus:
monitor: monitor:
scrapeTimeout: 30s
relabelings: relabelings:
- sourceLabels: [__meta_kubernetes_pod_node_name] - action: replace
regex: ^(.*)$ regex: ^(.*)$
separator: ; replacement: $1.internal.staging.swh.network
targetLabel: instance separator: ;
replacement: $1.internal.staging.swh.network sourceLabels:
action: replace - __meta_kubernetes_pod_node_name
targetLabel: instance
scrapeTimeout: 30s
rke2ControllerManager:
enabled: true
rke2Etcd:
enabled: true
rke2Proxy:
enabled: true
rke2Scheduler:
enabled: true
EOF EOF
depends_on = [rancher2_cluster_sync.test-staging-rke2, depends_on = [rancher2_cluster_sync.test-staging-rke2,
rancher2_cluster_v2.test-staging-rke2, rancher2_cluster_v2.test-staging-rke2,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment